Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev

api/index.js

@@ -27,5 +27,6 @@ export { default as meterSubcontractor } from './meter/meter-subcontractor'
 export { default as meterAptitude } from './meter/meter-aptitude'
 export { default as meterManage } from './meter/meter-manage'
 export { default as meterEntrust } from './meter/meter-entrust'
+export { default as meterSample } from './meter/meter-sample'
 export { default as meterManageItem } from './meter/meter-manage-item'
 export { default as lmsBaseDict } from './lims/lms-base-dict'

api/meter/meter-entrust.js

@@ -50,8 +50,5 @@ export default {
   // 城市
   getCity: data => http.post('/base/v1/city/list_' + data).then(res => res),
   // 地区
-  getArea: data => http.post('/base/v1/area/list_' + data).then(res => res),
-  //
-  getInfo: data =>
-    http.post('meter/v1/sample/page?entrustId=' + data).then(res => res)
+  getArea: data => http.post('/base/v1/area/list_' + data).then(res => res)
 }

api/meter/meter-sample.js

+/**
+ * 工作台
+ */
+
+import http from '../http'
+import { https } from '../https'
+
+export default {
+  // page
+  page: data => http.post('meter/v1/sample/page', data).then(res => res),
+  getById: data => http.get('meter/v1/sample/' + data).then(res => res),
+  deleteById: data =>
+    http.delete('meter/v1/sample/?ids=' + data).then(res => res),
+  // 保存
+  save: data =>
+    https
+      .post('meter/v1/sample/add_send_entrust', JSON.stringify(data))
+      .then(res => res)
+}

pages/meter-review/MeterReviewEntrust.vue

@@ -45,15 +45,14 @@
         </Row>
       </div>
     </div>
-<!--    <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult" keep-alive></component>-->
-    <FoodSampleGovern ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></FoodSampleGovern>
+    <MeterSampleManage ref="meterSampleManageModal"  @on-result-change="_componentResult"></MeterSampleManage>
   </div>
 </template>
 <script>
 import { meterEntrust, meterSubcontractor } from '../../api'
-import FoodSampleGovern from './FoodSampleGovern'
+import MeterSampleManage from './MeterSampleManage'
 export default {
-  components: { FoodSampleGovern },
+  components: { MeterSampleManage },
   data() {
     return {
       currentComponent: 'FoodSampleGovern',
@@ -143,8 +142,7 @@ export default {
         }
       })
     },
-    _iconClick(res, data, componentName) {
-      this.currentComponent = componentName
+    _iconClick(res, data) {
       this.$nextTick(function() {
         switch (res) {
           case '样品管理':
@@ -170,20 +168,7 @@ export default {
     },
     _manageSample(data) {
       // 管理样品
-      console.log(data)
-      if (data.type === 0) {
-        // 企业
-        alert(123456)
-        // this.currentComponent = 'FoodSampleCompany'
-      } else {
-        // 政府
-        this.currentComponent = 'FoodSampleGovern'
-      }
-      this.$nextTick(() => {
-        console.log('要传的数字')
-        console.log(data.id)
-        this.$refs.refModal._open(data.id)
-      })
+      this.$refs.meterSampleManageModal._open(data.id)
     },
     _componentResult(data, msg) {
       switch (this.currentComponent) {
@@ -210,7 +195,7 @@ export default {
           this.getPage = this.$store.state.FoodSubcontracter.page
           break
         case 'iconClick':
-          this._iconClick(data.name, data.rowData, data.componentName)
+          this._iconClick(data.name, data.rowData)
           break
         case 'changeSize':
           this._page()

pages/meter-review/FoodSampleGovern.vue → pages/meter-review/MeterSampleManage.vue

@@ -7,46 +7,36 @@
         <Row>
           <!--查询-->
           <Col span="24">
-            <Form id="search-sample-govern" :label-width="80" inline onsubmit="return false">
+            <Form id="formId" :label-width="80" inline onsubmit="return false">
               <label class="label-sign"></label>
               <Form-item label="样品名称:" class="search-item">
-                <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入样品名称" clearable/>
+                <Input v-model="formObj.name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item label="样品编号:" class="search-item">
-                <Input v-model="formObj.num" @on-enter="_formSearch" placeholder="请输入样品编号" clearable/>
-              </Form-item>
-              <Form-item label="抽样单编号:" class="search-item">
-                <Input v-model="formObj.samplingNum" @on-enter="_formSearch" placeholder="请输入抽样单编号" clearable/>
-              </Form-item>
-              <Form-item label="制单日期:" style="width: 24%">
-                <Date-picker :editable="false" @on-change="_dateChange" v-model="dateList"
-                             type="daterange" placeholder="制单日期" format="yyyy-MM-dd"
-                             style="width:100%" placement="bottom-end"></Date-picker>
+                <Input v-model="formObj.code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item class="search-btn" style="margin-left: -10px">
-                <Button @click="_formSearch" type="primary">搜索</Button>
+                <Button type="primary" @click="_formSearch">搜索</Button>
               </Form-item>
             </Form>
           </Col>
-          <!--操作-->
-<!--          <Col span="24">-->
-<!--            <BtnList :msg="btn" @on-result-change="_btnClick" class="contHide"></BtnList>-->
-<!--          </Col>-->
-          <!-- 表格 -->
           <Col span="24">
-            <PTVXETable ref="pageTable" :tableHeight="tableHeight" @on-result-change="_tableResultChange"
-                        :getPage="getPage" :iconMsg="iconMsg" select-data>
+            <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage"
+                        :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
               <vxe-table-column
+                v-for="item in pageColumns"
+                :key="item.key"
                 :field="item.key"
                 :title="item.title"
                 :min-width="item.width?item.width:200"
-                :fixed="item.fixed?item.fixed:undefined"
-                v-for="item in pageColumns"
-                :key="item.key" sortable>
+                :fixed="item.fixed?item.fixed:undefined" sortable>
                 <template slot-scope="scope">
                   <div v-if="item.detail"><a @click.stop="_detailModal(scope.row.id)">{{scope.row[item.key]}}</a></div>
                   <div v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
                   </div>
+                  <div v-else-if="item.key==='jobOut'">
+                     {{scope.row[item.key]===1?'是':'否'}}
+                  </div>
                   <div v-else-if="item.key==='type'">
                     <Select v-model="scope.row.type">
                       <Option v-for="(item,index) in options" :key="item.name" :value="index">
@@ -62,22 +52,10 @@
         </Row>
       </div>
     </Modal>
-<!--    <component ref="refModal" :is="currentComponent" @on-result-change="_modalResult"-->
-<!--               :sampleList="selectData"></component>-->
   </div>
 </template>
 <script>
-import { meterEntrust } from '../../api'
-// import FoodImportSample from '../../../../../components/import/DownloadTemplateImport'
-// import RelItem from '../food-item/rel-item/ImportItemIndex'
-// import RelItemPackage from '../food-item/rel-package/RelItemPackage'
-// import CopyModal from '../food-sample-company/CopyModal'
-// import CopyHisItem from '../food-item/copy-his-item/CopyHisItem'
-// import FoodSampleGovernLYEdit from './FoodSampleGovernLYEdit'
-// import FoodSampleGovernDetail from './FoodSampleGovernDetail'
-// import FoodSampleGovernBatchAdd from './FoodSampleGovernBatchAdd'
-// import FoodSampleGovernEdit from './FoodSampleGovernEdit'
-
+import { meterSample } from '../../api'
 export default {
   components: {
     // FoodSampleGovernDetail,
@@ -112,28 +90,27 @@ export default {
           name: '外观检查'
         }
       ],
-      contractId: '', // 合同id
+      formId: 'meterReviewSampleManageFormId',
       showModal: false,
       modalTitle: '管理样品',
       selectIds: [],
       selectData: [],
       getPage: {},
       pageColumns: [
-        { title: '样品编号', key: 'code', detail: true, width: 180 },
+        { title: '样品编号', key: 'code', detail: true, width: 120 },
         { title: '样品名称', key: 'name', width: 140 },
         { title: '型号规格', key: 'spec', width: 140 },
         { title: '出厂编号', key: 'factoryNumber', width: 140 },
+        { title: '是否分包', key: 'jobOut', width: 110 },
         { title: '检测类型', key: 'type', width: 140 },
         { title: '数量', key: 'quantity', width: 140 }
       ],
       dateList: [],
       formObj: {
-        contractId: '',
-        name: '',
-        num: '',
-        samplingNum: '',
-        ctimeBegin: '',
-        ctimeEnd: ''
+        entrustId: undefined,
+        name: undefined,
+        code: undefined,
+        type: undefined
       }
     }
   },
@@ -167,12 +144,6 @@ export default {
           case '添加':
             this._editModal(false)
             break
-          case '批量添加':
-            this.$refs.refModal._open(this.contractId)
-            break
-          case '导入样品':
-            this._importSample()
-            break
           case '导入检测项目':
             this._importItem()
             break
@@ -214,10 +185,6 @@ export default {
     },
     _tableResultChange(msg, data) {
       switch (msg) {
-        case 'page':
-          this.selectIds = []
-          this.getPage = this.$store.state.FoodSample.governPage
-          break
         case 'selectData':
           const selectIds = []
           for (let i = 0; i < data.length; i++) {
@@ -235,30 +202,21 @@ export default {
       }
     },
     _open(id) {
-      this.formObj = this.$resetFields(this.formObj)
-      console.log(this.formObj)
-      this.dateList = []
+      this.formObj.entrustId = id
       this.showModal = true
-      this.contractId = id // 合同id
-      this._page(this.contractId)
+      this._page()
     },
     _formSearch() {
       this.$refs.pageTable._pageChange(1)
     },
     _page: async function(id) {
-      this.formObj.contractId = this.contractId
-      console.log(this.formObj.contractId)
-      const result = await meterEntrust.getInfo(id)
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      console.log('this.formObj', this.formObj)
+      const result = await meterSample.page(this.formObj)
       if (result) {
-        console.log('请求到的')
-        console.log(result)
         this.getPage = result
+        this.$refs.pageTable._hideLoading()
       }
-      // this.$refs.pageTable._page(
-      //   'search-sample-govern',
-      //   'FoodSample/governPage',
-      //   this.$serializeFormSearch(this.formObj)
-      // )
     },
     _deleteByIds(ids, content) {
       this.$Modal.confirm({