优化修改

api/meter/meter-sample.js

@@ -54,10 +54,15 @@ export default {
     http.post('meter/v1/sample/page_distribute_his', data).then(res => res),
   pageOutPersonalTask: data =>
     http.post('meter/v1/sample/page_out_personal_task', data).then(res => res),
-
+  pageOutPersonalTaskHis: data =>
+    http
+      .post('meter/v1/sample/page_out_personal_task_his', data)
+      .then(res => res),
   pageSampleInput: data =>
     http.post('meter/v1/sample/page_sample_input', data).then(res => res),
 
+  pageSampleInputHis: data =>
+    http.post('meter/v1/sample/page_sample_input_his', data).then(res => res),
   pageSampleInStock: data =>
     http.post('meter/v1/sample/page_sample_in_stock', data).then(res => res),
   pageSampleInStockHis: data =>

pages/meter-out/personal-task/MeterOutPersonalTaskHis.vue

@@ -6,29 +6,29 @@
                 <Row>
                     <!--查询-->
                     <Col span="24" style="margin-top: 10px">
-            <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
+                        <Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
                             <label class="label-sign"></label>
-              <Form-item class="search-item" label="实验室名称:">
-                <Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/>
+                            <Form-item class="search-item" label="样品名称:">
+                                <Input v-model="formObj.name" name="name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
                             </Form-item>
-              <Form-item class="search-item" label="资质:">
-                <Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
+                            <Form-item class="search-item" label="样品编号:">
+                                <Input v-model="formObj.code" name="aptitude" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
                             </Form-item>
                             <Form-item class="search-btn">
-                <Button @click="_formSearch" type="primary">搜索</Button>
+                                <Button type="primary" @click="_formSearch">搜索</Button>
                             </Form-item>
                         </Form>
                     </Col>
                     <!--操作-->
                     <Col span="24">
 
-            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
-                     class="contHide"></btn-list>
+                        <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
+                                  @on-result-change="_btnClick"></btn-list>
                     </Col>
                     <!--表格-->
                     <Col span="24">
                         <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
-                        :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" >
+                                    :get-page="getPage" :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
                             <vxe-table-column
                                     v-for="item in pageColumns"
                                     :key="item.key"
@@ -37,6 +37,8 @@
                                     :min-width="item.width?item.width:200"
                                     :fixed="item.fixed?item.fixed:undefined" sortable>
                                 <template slot-scope="scope">
+
+
                   <span v-if="item.key==='type'">
                       <span v-if="scope.row[item.key]===0">
                           检定
@@ -48,6 +50,7 @@
                           外观检查
                       </span>
                   </span>
+
                                     <span v-else>{{scope.row[item.key]}}</span>
                                 </template>
                             </vxe-table-column>
@@ -56,57 +59,96 @@
                 </Row>
             </div>
         </div>
-    <operationModal ref="operationModal" @on-result-change="_page"></operationModal>
+        <CertificateMake ref="itemOriginalRecordModal" @on-result-change="_resultRecord"></CertificateMake>
+        <SelectOriTempRecord ref="SelectOriTempRecord" @on-result-change="_certificateSelectBack"></SelectOriTempRecord>
+        <docimasy ref="docimasy" @on-result-change="_page"></docimasy>
         <FileManage ref="FileManage" @on-result-change="_page"></FileManage>
+        <operationModal ref="operationModal" @on-result-change="_page"></operationModal>
+        <SelEquip ref="SelEquip" @on-result-change="_equipSelectBack"></SelEquip>
+        <CarManage ref="carEdit" @on-result-change="_page"></CarManage>
+        <InstruMentEdit ref="InstruEdit" @on-result-change="_page"></InstruMentEdit>
+        <MeterPersonItemTaskManage ref="personModal" @on-result-change="_page"></MeterPersonItemTaskManage>
         <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
+        <CertificateMakeLook ref="itemOriginalRecordLookModal" @on-result-change="_resultRecord"></CertificateMakeLook>
+
     </div>
 </template>
 <script>
-import { meterEntrust, meterSample } from '../../../api'
+import { meterDevice, meterSample } from '../../../api'
+import CertificateMake from '../../meter-certificate/CertificateMake'
+import SelEquip from '../../../components/select-equip/SelEquip'
 import operationModal from '../../../components/operation/Operation'
+import CertificateMakeLook from '../../meter-certificate/CertificateMakeLook'
 import MeterSubcontractorEdit from './MeterGoOutTestEdit'
+import CarManage from './CarManage'
+import MeterPersonItemTaskManage from './MeterPersonItemTaskManage'
+import InstruMentEdit from './InstrumentEdit'
+import docimasy from './docimasy'
+import SelectOriTempRecord from './SelectOriTempRecord'
 export default {
-  components: { MeterSubcontractorEdit, operationModal },
+  components: {
+    CertificateMake,
+    CertificateMakeLook,
+    SelectOriTempRecord,
+    docimasy,
+    MeterSubcontractorEdit,
+    CarManage,
+    MeterPersonItemTaskManage,
+    SelEquip,
+    InstruMentEdit,
+    operationModal
+  },
   data() {
     return {
       currentComponent: '',
       formId: 'meterSubcontractorFormId',
-      searchOpen: false,
+      searchOpen: true,
       btn: [
         // {
         //   type: 'success',
-        //   id: 'meter-go-out-entrust-add-btn',
-        //   name: '添加'
+        //   id: '',
+        //   name: '仪器领用'
         // },
         // {
         //   type: 'success',
-        //   id: 'meter-go-out-entrust-submit-btn',
-        //   name: '提交'
-        // }
-      ],
-      iconMsg: [
+        //   id: '',
+        //   name: '车辆管理'
+        // },
         // {
-        //   type: 'md-create',
+        //   type: 'success',
         //   id: '',
-        //   name: '编辑'
+        //   name: '提交'
         // },
         // {
-        //   type: 'ios-beaker',
+        //   type: 'success',
         //   id: '',
-        //   name: '管理样品'
+        //   name: '提交至证书编制'
         // },
-        // { type: 'md-cloud', id: '', name: '附件' },
         // {
-        //   type: 'ios-clock',
+        //   type: 'success',
         //   id: '',
-        //   name: '操作日志'
+        //   name: '检定条件'
         // }
       ],
+      iconMsg: [
+        {
+          type: 'ios-bookmarks',
+          id: '',
+          name: '查看证书'
+        },
+        { type: 'md-cloud', id: '', name: '附件' },
+        {
+          type: 'ios-clock',
+          id: '',
+          name: '操作日志'
+        }
+      ],
       formObj: {
         name: undefined,
-        aptitude: undefined
+        code: undefined
       },
       selectIds: [],
+      selectData: [],
       getPage: {},
       pageColumns: [
         { title: '样品名称', key: 'name', width: 120 },
@@ -146,11 +188,23 @@ export default {
       this.currentComponent = componentName
       this.$nextTick(function() {
         switch (msg) {
+          case '检定条件':
+            this._docimasy()
+            break
+          case '仪器领用':
+            this._receiveApparatus()
+            break
+          case '车辆管理':
+            this._carManage()
+            break
           case '添加':
             this._editModal(false)
             break
           case '提交':
-            this._submitToReview()
+            this._submitToReportReview()
+            break
+          case '提交至证书编制':
+            this._submitToReportMake()
             break
           case 'search':
             this.searchOpen = !this.searchOpen
@@ -158,35 +212,89 @@ export default {
         }
       })
     },
-    _submitToReview() {
-      this._submitByContractIds('委托评审')
+    _docimasy() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条数据！')
+      } else {
+        this.$refs.docimasy._open(this.selectIds)
+      }
+    },
+    _carManage() {
+      this.$refs.carEdit._open()
     },
-    _submitByContractIds(cont) {
+    _receiveApparatus() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条数据！')
+      } else {
+        this.$refs.SelEquip._open('sample-input')
+      }
+    },
+    _submitToReportReview() {
       const ids = this.selectIds
+      const data = this.selectData
       if (ids.length === 0) {
         this.$Message.warning('请至少选择一条数据！')
       } else {
+        for (let i = 0; i < data.length; i++) {
+          if (data[i].recordId === undefined) {
+            this.$Message.warning(
+              '您选择的样品编号为' + data[i].code + '暂未编制证书，无法提交！'
+            )
+            return false
+          }
+        }
         this.$Modal.confirm({
           title: '提示',
-          content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？',
+          content: '确定要把这 ' + ids.length + ' 条记录提交到证书核准？',
           onOk: () => {
-            const result = meterEntrust.submit(ids)
+            this._submitReportCheck(ids)
+          }
+        })
+      }
+    },
+    _submitReportCheck: async function(ids) {
+      const result = await meterSample.toReportCheck(ids)
       if (result) {
-              console.log(result)
+        await this._page()
+        this.$Message.success('提交成功！')
       }
+    },
+    _submitToReportMake() {
+      const ids = this.selectIds
+      if (ids.length === 0) {
+        this.$Message.warning('请至少选择一条数据！')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定要把这 ' + ids.length + ' 条记录提交到证书编制？',
+          onOk: () => {
+            this._submitReportMake(ids)
           }
         })
       }
     },
+    _submitReportMake: async function(ids) {
+      const result = await meterSample.toReportMake(ids)
+      if (result) {
+        await this._page()
+        this.$Message.success('提交成功！')
+      }
+    },
     _iconClick(res, data, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {
         switch (res) {
-          case '查看样品':
-            this._manageSample(data.id)
+          case '查看证书':
+            this._makeCertificate(data)
+            break
+          case '仪器领用':
+            this.$refs.InstruEdit._open(data.id)
+            break
+          case '车辆管理':
+            this.$refs.carEdit._open()
             break
-          case '编辑':
-            this._editModal(true, data.id)
+          case '检测结果':
+            this._personModal(data)
             break
           case '资质项目':
             this._itemModal(data.id)
@@ -203,23 +311,106 @@ export default {
         }
       })
     },
-    _manageSample(data) {
-      // 查看样品
-      // this.$refs.meterSampleManageModal._open(data)
+    _certificateSelectBack(data) {
+      console.log('_certificateSelectBack', data)
+      if (data) {
+        this._makeCode(data)
+      } else {
+        const ids = this.selectIds
+        if (ids.length === 0) {
+          this.$Message.warning('请至少选择一条数据!')
+        } else {
+          // this._appendOriginalRecord()
+        }
+      }
     },
+
+    _makeCode: async function(data) {
+      const result = await meterSample.makeCode(data)
+      if (result) {
+        if (result === '' || result === undefined) {
+          this.$Message.warning('证书编号暂未生成！')
+          return false
+        }
+        data.dataSource.cc = result
+        this.$refs.itemOriginalRecordModal._open(
+          data.sampleId,
+          data.tempId,
+          data.dataSource
+        )
+      }
+    },
+
+    _makeCertificate(data) {
+      if (data.onlineReported === '否' || undefined === data.recordId) {
+        // console.log('click')
+        // this.$refs.SelectOriTempRecord._open(data.id, data)
+        this.$Message.warning('证书暂未编制！')
+      } else {
+        this._itemOriginalRecordLook(data, 'only')
+      }
+    },
+    _itemOriginalRecordLook(data, name) {
+      if (
+        data.recordId === null ||
+        undefined === data.recordId ||
+        data.recordId === ''
+      ) {
+        this.$Message.warning('证书暂未编制！')
+      } else {
+        console.log('Original')
+        this.$refs.itemOriginalRecordLookModal._open(
+          data.recordId,
+          name,
+          data.id
+        )
+      }
+    },
+    _resultRecord() {
+      this.$refs.SelectOriTempRecord.showModal = false
+      this._page()
+      this.$emit('on-result-change')
+    },
+    _personModal(data) {
+      this.$refs.personModal._open(data.id)
+    },
+    _equipSelectBack(data) {
+      console.log('_equipSelectBack', data)
+      const equipData = []
+      for (let i = 0; i < data.length; i++) {
+        const object = data[i]
+        const obj = {}
+        obj.name = object.name
+        obj.certificateNo = object.ceNum
+        obj.measuringRange = object.range
+        obj.uncertaintyAccuray = object.uncertainty
+        obj.validUntil = object.effectDate
+        equipData.push(obj)
+      }
+      this._addEquipUse({ sampleIds: this.selectIds, devicesList: equipData })
+    },
+
+    _addEquipUse: async function(data) {
+      const result = await meterDevice.addEquipUse(data)
+      if (result) {
+        await this._page()
+      }
+    },
+
     _record(id) {
       this.$refs.operationModal._open(id)
     },
     _tableResultChange(msg, data) {
       switch (msg) {
-        case 'page':
-          this.getPage = this.$store.state.FoodSubcontracter.page
-          break
         case 'iconClick':
           this._iconClick(data.name, data.rowData, data.componentName)
           break
-        case 'selectIds':
-          this.selectIds = data
+        case 'selectData':
+          this.selectData = data
+          this.selectIds = []
+          for (let i = 0; i < data.length; i++) {
+            this.selectIds.push(data[i].id)
+          }
           break
         case 'changeSize':
           this._page()
@@ -228,8 +419,7 @@ export default {
     },
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
-      console.log('this.formObj', this.formObj)
-      const result = await meterSample.pageOutPersonalTask(this.formObj)
+      const result = await meterSample.pageOutPersonalTaskHis(this.formObj)
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.getPage = result
@@ -268,13 +458,13 @@ export default {
       this.$refs.FileManage._open(id, 'subcontractorId')
     },
     _getById: async function(id) {
-      const result = await meterEntrust.getVOById(id)
+      const result = await meterSample.getById(id)
       if (result) {
         this.$refs.editSubcontractorModal._openEdit(result)
       }
     },
     _delete: async function(ids) {
-      const result = await meterEntrust.deleteById(ids)
+      const result = await meterSample.deleteById(ids)
       if (result) {
         this._formSearch()
         this.$Message.success('删除成功！')

pages/meter-out/task-distribute/MeterOutTaskDistributeHis.vue

@@ -73,17 +73,17 @@ export default {
         //   id: '',
         //   name: '编辑'
         // },
-        // {
-        //   type: 'ios-contact',
-        //   id: '',
-        //   name: '任务分配'
-        // },
-        // { type: 'md-cloud', id: '', name: '附件' },
-        // {
-        //   type: 'ios-clock',
-        //   id: '',
-        //   name: '操作日志'
-        // }
+        {
+          type: 'ios-contact',
+          id: '',
+          name: '任务分配'
+        },
+        { type: 'md-cloud', id: '', name: '附件' },
+        {
+          type: 'ios-clock',
+          id: '',
+          name: '操作日志'
+        }
       ],
       formObj: {
         client: undefined,
@@ -98,7 +98,7 @@ export default {
         { title: '联系电话', key: 'tel', width: 120 },
         { title: '传真', key: 'fax', width: 120 },
         { title: '详细地址', key: 'address', width: 250 },
-        { title: '邮编', key: 'postcode' },
+        { title: '邮编', key: 'postcode', width: 110 },
         { title: 'E-mail', key: 'email', width: 120 },
         { title: '委托日期', key: 'edate', width: 120 },
         { title: '费用合计', key: 'fee', width: 120 },

pages/meter-send/sample-flow/MeterSampleFlow.vue

@@ -82,11 +82,6 @@ export default {
         {
           type: 'success',
           id: '',
-          name: '任务转发'
-        },
-        {
-          type: 'success',
-          id: '',
           name: '流转'
         }
       ],

pages/meter-send/sample-input/MeterSampleInputHis.vue

@@ -385,8 +385,7 @@ export default {
     },
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
-      console.log('this.formObj', this.formObj)
-      const result = await meterSample.pageSampleInput(this.formObj)
+      const result = await meterSample.pageSampleInputHis(this.formObj)
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.getPage = result