修改了出检管理历史记录

pages/meter-contract/contract-review/MeterContractReview.vue

@@ -6,24 +6,24 @@
         <Row>
           <!--查询-->
           <Col span="24" style="margin-top: 10px">
-            <Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
+            <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
               <label class="label-sign"></label>
               <Form-item class="search-item" label="实验室名称:">
-                <Input v-model="formObj.name" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/>
               </Form-item>
               <Form-item class="search-item" label="资质:">
-                <Input v-model="formObj.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
               </Form-item>
               <Form-item class="search-btn">
-                <Button type="primary" @click="_formSearch">搜索</Button>
+                <Button @click="_formSearch" type="primary">搜索</Button>
               </Form-item>
             </Form>
           </Col>
           <!--操作-->
           <Col span="24">
 
-            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
-                     @on-result-change="_btnClick"></btn-list>
+            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
+                     class="contHide"></btn-list>
           </Col>
           <!--表格-->
           <Col span="24">
@@ -51,17 +51,20 @@
     <MeterSendOperation ref="operationModal"></MeterSendOperation>
     <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
     <MeterSubcontractorAddEdit ref="addEditModal" @on-result-change="_page"></MeterSubcontractorAddEdit>
+    <MeterSampleManage ref="meterSampleManageModal"  @on-result-change="_page"></MeterSampleManage>
   </div>
 </template>
 <script>
 import { meterContract, meterSubcontractor } from '../../../api'
 import Reason from '../../../components/base/Reason'
 import MeterSendOperation from '../MeterContractReviewOperation'
+import MeterSampleManage from '../MeterSampleQuoteManage'
 import MeterSubcontractorEdit from './MeterContractReviewEdit'
 import MeterSubcontractorAddEdit from './MeterContractReviewAddEdit'
 export default {
   components: {
     MeterSubcontractorEdit,
+    MeterSampleManage,
     MeterSendOperation,
     MeterSubcontractorAddEdit,
     Reason
@@ -187,6 +190,9 @@ export default {
       this.currentComponent = componentName
       this.$nextTick(function() {
         switch (res) {
+          case '查看样品':
+            this._manageSample(data.id)
+            break
           case '评审':
             this._reviewContract(data.id)
             break
@@ -205,6 +211,10 @@ export default {
         }
       })
     },
+    _manageSample(data) {
+      // 查看样品
+      this.$refs.meterSampleManageModal._open(data)
+    },
     _submitToReview() {
       this._submitByContractIds('合同评审')
     },

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

@@ -4,7 +4,7 @@
     <p slot="header">仪器领用</p>
     <Form :label-width="60" onsubmit="return false" inline>
       <Form-item label="仪器名称">
-        <Input v-model="name" placeholder="请输入仪器名称,回车查询" icon="ios-search-strong"
+        <Input v-model="formObj.name" placeholder="请输入仪器名称,回车查询" icon="ios-search-strong"
                @on-enter="_search"/>
       </Form-item>
       <Form-item class="search-btn" style="margin-left: -10px">

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

@@ -51,7 +51,7 @@
   </div>
 </template>
 <script>
-import { meterEntrust } from '../../../api'
+import { meterEntrust, meterSample } from '../../../api'
 import operationModal from '../../../components/operation/Operation'
 import MeterSubcontractorEdit from './MeterGoOutTestEdit'
 export default {
@@ -79,17 +79,17 @@ export default {
         //   id: '',
         //   name: '编辑'
         // },
-        {
-          type: 'ios-beaker',
-          id: '',
-          name: '管理样品'
-        },
-        { type: 'md-cloud', id: '', name: '附件' },
-        {
-          type: 'ios-clock',
-          id: '',
-          name: '操作日志'
-        }
+        // {
+        //   type: 'ios-beaker',
+        //   id: '',
+        //   name: '管理样品'
+        // },
+        // { type: 'md-cloud', id: '', name: '附件' },
+        // {
+        //   type: 'ios-clock',
+        //   id: '',
+        //   name: '操作日志'
+        // }
       ],
       formObj: {
         name: undefined,
@@ -98,16 +98,22 @@ export default {
       selectIds: [],
       getPage: {},
       pageColumns: [
+        { title: '样品名称', key: 'name', width: 120 },
+        { title: '样品编号', key: 'code', width: 120 },
+        { title: '证书是否编制', key: 'onlineReported', width: 120 },
+        { title: '证书编号', key: 'reportCode', width: 130 },
+        { title: '型号规格', key: 'spec', width: 120 },
+        { title: '出厂编号', key: 'factoryNumber', width: 120 },
+        { title: '检测类型', key: 'type', width: 100 },
+        { title: '温度', key: 'temperature', width: 100 },
+        { title: '湿度', key: 'humidity', width: 100 },
+        { title: '地点', key: 'place', width: 100 },
+        { title: '其他', key: 'cElse', width: 100 },
         { title: '委托单位', key: 'client', width: 200 },
         { title: '联系人', key: 'person', width: 120 },
         { title: '联系电话', key: 'tel', width: 120 },
-        { title: '传真', key: 'fax', width: 120 },
         { title: '详细地址', key: 'address', width: 250 },
-        { title: '邮编', key: 'postcode' },
-        { title: 'E-mail', key: 'email', width: 120 },
-        { title: '委托日期', key: 'edate', width: 120 },
-        { title: '费用合计', key: 'fee', width: 120 },
-        { title: '合同号', key: 'contractCode', width: 120 },
+        { title: '数量', key: 'quantity' },
         { title: '备注', key: 'remark' }
       ]
     }
@@ -165,6 +171,9 @@ export default {
       this.currentComponent = componentName
       this.$nextTick(function() {
         switch (res) {
+          case '查看样品':
+            this._manageSample(data.id)
+            break
           case '编辑':
             this._editModal(true, data.id)
             break
@@ -183,6 +192,10 @@ export default {
         }
       })
     },
+    _manageSample(data) {
+      // 查看样品
+      // this.$refs.meterSampleManageModal._open(data)
+    },
     _record(id) {
       this.$refs.operationModal._open(id)
     },
@@ -205,7 +218,7 @@ export default {
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       console.log('this.formObj', this.formObj)
-      const result = await meterEntrust.pageGoOutEntrust(this.formObj)
+      const result = await meterSample.pageOutPersonalTask(this.formObj)
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.getPage = result

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

@@ -71,17 +71,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,