Merge remote-tracking branch 'origin/dev' into dev

api/meter/meter-entrust.js

@@ -87,6 +87,9 @@ export default {
   // 操作日志
   pageOutTaskOperation: data =>
     http.post('meter/v1/entrust_record/page', data).then(res => res),
+  // 任务分配操作日志
+  pageTask: data =>
+    http.post('meter/v1/sample_record/page', data).then(res => res),
   getById: data => http.get('meter/v1/entrust/' + data).then(res => res),
   getVOById: data => http.get('meter/v1/entrust/vo/' + data).then(res => res),
   deleteById: data =>

components/operation/Operation.vue

@@ -9,18 +9,18 @@
             <Form id="search-contract-record" :label-width="70" inline onsubmit="return false">
               <label class="label-sign"></label>
               <Form-item label="操作阶段:">
-                <Input v-model="formObj.origin" placeholder="请输入操作阶段" style="width: 200px"
-                       clearable @on-enter="_search"/>
+                <Input v-model="formObj.origin" @on-enter="_search" placeholder="请输入操作阶段"
+                       style="width: 200px" clearable/>
               </Form-item>
               <Form-item class="search-btn">
-                <Button type="primary" @click="_search">搜索</Button>
+                <Button @click="_search" type="primary">搜索</Button>
               </Form-item>
             </Form>
           </Col>
           <!-- 表格 -->
           <Col span="24">
             <PTVXETable ref="pageTable" :table-height="tableHeight"
-                        :get-page="getPage" hide-checkbox @on-result-change="_tableResultChange">
+                        :get-page="getPage" @on-result-change="_tableResultChange" hide-checkbox>
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -65,7 +65,8 @@ export default {
       ],
       formObj: {
         entrustId: '',
-        origin: undefined
+        origin: undefined,
+        sampleId: ''
       }
     }
   },
@@ -78,8 +79,15 @@ export default {
     _open(entrustId) {
       this.showModal = true
       this.formObj.entrustId = entrustId
+      this.formObj.sampleId = undefined
       this._page()
     },
+    _openTask(sampleId) {
+      this.showModal = true
+      this.formObj.sampleId = sampleId
+      this.formObj.entrustId = undefined
+      this._pageTask()
+    },
     _page: async function() {
       console.log('要传的参数')
       console.log(this.formObj)
@@ -94,7 +102,15 @@ export default {
       //   this.$serializeFormSearch(this.formObj)
       // )
     },
-
+    _pageTask: async function() {
+      console.log('要传的参数')
+      console.log(this.formObj)
+      const result = await meterEntrust.pageTask(this.formObj)
+      console.log(result)
+      if (result) {
+        this.getPage = result
+      }
+    },
     _tableResultChange(msg, data) {
       switch (msg) {
         case 'page':

pages/meter-entrust/go-out-test/MeterGoOutEntrust.vue

@@ -183,6 +183,10 @@ export default {
         this._resultChange('提交成功')
       }
     },
+    _resultChange(msg) {
+      this.$Message.success(msg)
+      this._page()
+    },
     _submitToReview() {
       this._submitByContractIds('委托评审')
     },

pages/meter-entrust/go-out-test/MeterGoOutTestEdit.vue

@@ -654,6 +654,7 @@ export default {
       this.formObj.id = ''
       this.formObj.operation.id = ''
       this.modalTitle = '出检委托单登记'
+      this.formObj.edate = new Date()
       this.testedCityData = []
     },
 

pages/meter-entrust/send-test/MeterSendEntrust.vue

@@ -6,21 +6,21 @@
         <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.client" name="name" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.client" @on-enter="_formSearch" name="name" 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">
@@ -35,7 +35,7 @@
                 :fixed="item.fixed?item.fixed:undefined" sortable>
                 <template slot-scope="scope">
                   <span v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
-                  <span v-if="item.status">{{scope.row[item.key].display}}</span>
+                  <span v-else-if="item.status">{{scope.row[item.key].display}}</span>
                   <span v-else>{{scope.row[item.key]}}</span>
                 </template>
               </vxe-table-column>
@@ -117,7 +117,7 @@ export default {
         { title: '详细地址', key: 'address', width: 250 },
         { title: '邮编', key: 'postcode' },
         { title: 'E-mail', key: 'email', width: 120 },
-        { title: '委托日期', key: 'edate', width: 120 },
+        { title: '委托日期', key: 'edate', width: 120, date: true },
         { title: '费用合计', key: 'fee', width: 120 },
         { title: '合同号', key: 'contractCode', width: 120 },
         { title: '备注', key: 'remark' }

pages/meter-entrust/send-test/MeterSendTestEdit.vue

@@ -640,6 +640,7 @@ export default {
         this.formObj.id = ''
         this.formObj.operation.id = ''
         this.formObj.aptitude = []
+        this.formObj.edate = new Date()
         this.modalTitle = '送检委托单新增'
       } else {
         this.id = formObj.id

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

@@ -10,24 +10,24 @@
             <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" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入样品名称" clearable/>
               </Form-item>
               <Form-item label="样品编号:" class="search-item">
-                <Input v-model="formObj.code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入样品编号" clearable/>
               </Form-item>
               <Form-item class="search-btn" style="margin-left: -10px">
-                <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">
             <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage"
-                        :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
+                        :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -61,8 +61,8 @@
         </Row>
       </div>
     </Modal>
-    <assignPerson ref="userModal" is-change @on-result-change="_userData"></assignPerson>
-
+    <assignPerson ref="userModal" @on-result-change="_userData" is-change></assignPerson>
+    <MeterOutTaskOperation ref="operationModal" @on-result-change="_page"></MeterOutTaskOperation>
     <MeterItemManage ref="itemManageModal"  @on-result-change="_page"></MeterItemManage>
     <importModal ref="importModal"  @on-result-change="_importBack"></importModal>
   </div>
@@ -72,16 +72,25 @@ import { meterSample } from '../../../api'
 import assignPerson from '../../../components/user-info-single/assignPerson'
 import MeterItemManage from '../MeterItemManage'
 import importModal from '../../contract-tab/ContractTab'
+import MeterOutTaskOperation from '../../../components/operation/Operation'
 export default {
   components: {
     assignPerson,
     MeterItemManage,
-    importModal
+    importModal,
+    MeterOutTaskOperation
   },
   data() {
     return {
       currentComponent: '',
-      iconMsg: [{ type: 'ios-beaker', id: '', name: '检测项目' }],
+      iconMsg: [
+        { type: 'ios-beaker', id: '', name: '检测项目' },
+        {
+          type: 'ios-clock',
+          id: '',
+          name: '操作日志'
+        }
+      ],
       btn: [
         {
           type: 'success',
@@ -226,9 +235,16 @@ export default {
           case '检测项目':
             this._itemManage(data.id)
             break
+          case '操作日志':
+            console.log(data)
+            this._record(data.id)
+            break
         }
       })
     },
+    _record(id) {
+      this.$refs.operationModal._openTask(id)
+    },
     _tableResultChange(msg, data) {
       switch (msg) {
         case 'selectData':

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

@@ -10,24 +10,24 @@
             <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" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入样品名称" clearable/>
               </Form-item>
               <Form-item label="样品编号:" class="search-item">
-                <Input v-model="formObj.code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入样品编号" clearable/>
               </Form-item>
               <Form-item class="search-btn" style="margin-left: -10px">
-                <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">
             <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage"
-                        :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
+                        :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -62,8 +62,8 @@
         </Row>
       </div>
     </Modal>
-    <assignPerson ref="userModal" is-change @on-result-change="_userData"></assignPerson>
-
+    <assignPerson ref="userModal" @on-result-change="_userData" is-change></assignPerson>
+    <MeterOutHisTaskOperation ref="operationModal" @on-result-change="_page"></MeterOutHisTaskOperation>
     <MeterItemManage ref="itemManageModal"  @on-result-change="_page"></MeterItemManage>
     <importModal ref="importModal"  @on-result-change="_importBack"></importModal>
   </div>
@@ -73,16 +73,25 @@ import { meterSample } from '../../../api'
 import assignPerson from '../../../components/user-info-single/assignPerson'
 import MeterItemManage from '../MeterItemManage'
 import importModal from '../../contract-tab/ContractTab'
+import MeterOutHisTaskOperation from '../../../components/operation/Operation'
 export default {
   components: {
     assignPerson,
     MeterItemManage,
-    importModal
+    importModal,
+    MeterOutHisTaskOperation
   },
   data() {
     return {
       currentComponent: '',
-      iconMsg: [{ type: 'ios-beaker', id: '', name: '检测项目' }],
+      iconMsg: [
+        { type: 'ios-beaker', id: '', name: '检测项目' },
+        {
+          type: 'ios-clock',
+          id: '',
+          name: '操作日志'
+        }
+      ],
       btn: [
         {
           type: 'success',
@@ -229,9 +238,15 @@ export default {
           case '检测项目':
             this._itemManage(data.id)
             break
+          case '操作日志':
+            this._record(data.id)
+            break
         }
       })
     },
+    _record(id) {
+      this.$refs.operationModal._openTask(id)
+    },
     _tableResultChange(msg, data) {
       switch (msg) {
         case 'selectData':

pages/meter-send/task-distribute/MeterTaskAlloca.vue

@@ -10,24 +10,24 @@
             <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" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入样品名称" clearable/>
               </Form-item>
               <Form-item label="样品编号:" class="search-item">
-                <Input v-model="formObj.code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入样品编号" clearable/>
               </Form-item>
               <Form-item class="search-btn" style="margin-left: -10px">
-                <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">
             <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage"
-                        :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
+                        :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -60,10 +60,10 @@
         <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
       </div>
     </Modal>
-    <assignPerson ref="userModal" is-change @on-result-change="_userData"></assignPerson>
+    <assignPerson ref="userModal" @on-result-change="_userData" is-change></assignPerson>
 
     <MeterItemManage ref="itemManageModal"  @on-result-change="_page"></MeterItemManage>
-
+    <MeterSendTaskOperation ref="operationModal" @on-result-change="_page"></MeterSendTaskOperation>
     <importModal ref="importModal"  @on-result-change="_importBack"></importModal>
   </div>
 </template>
@@ -72,11 +72,13 @@ import { meterSample } from '../../../api'
 import assignPerson from '../../../components/user-info-single/assignPerson'
 import MeterItemManage from '../MeterItemManage'
 import importModal from '../../contract-tab/ContractTab'
+import MeterSendTaskOperation from '../../../components/operation/Operation'
 export default {
   components: {
     assignPerson,
     MeterItemManage,
-    importModal
+    importModal,
+    MeterSendTaskOperation
     // FoodSampleGovernDetail,
     // CopyModal,
     // FoodSampleGovernLYEdits
@@ -93,7 +95,14 @@ export default {
       //   {id: '', name: '复制历史样品检测项目', componentName: 'CopyHisItem'},
       //   {id: '', name: '删除'},
       // ],
-      iconMsg: [{ type: 'ios-beaker', id: '', name: '检测项目管理' }],
+      iconMsg: [
+        { type: 'ios-beaker', id: '', name: '检测项目管理' },
+        {
+          type: 'ios-clock',
+          id: '',
+          name: '操作日志'
+        }
+      ],
       footerList: [
         { id: '', name: '关闭', type: '' },
         { id: '', name: '确定', type: 'primary' }
@@ -249,9 +258,15 @@ export default {
           case '检测项目管理':
             this._itemManage(data.id)
             break
+          case '操作日志':
+            this._record(data.id)
+            break
         }
       })
     },
+    _record(id) {
+      this.$refs.operationModal._openTask(id)
+    },
     _itemManage(id) {
       this.$refs.itemManageModal._open(id)
     },

pages/meter-send/task-distribute/MeterTaskAllocaHis.vue

@@ -10,24 +10,24 @@
             <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" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入样品名称" clearable/>
               </Form-item>
               <Form-item label="样品编号:" class="search-item">
-                <Input v-model="formObj.code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入样品编号" clearable/>
               </Form-item>
               <Form-item class="search-btn" style="margin-left: -10px">
-                <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">
             <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage"
-                        :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
+                        :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -61,10 +61,10 @@
         <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
       </div>
     </Modal>
-    <assignPerson ref="userModal" is-change @on-result-change="_userData"></assignPerson>
+    <assignPerson ref="userModal" @on-result-change="_userData" is-change></assignPerson>
 
     <MeterItemManage ref="itemManageModal"  @on-result-change="_page"></MeterItemManage>
-
+    <MeterSendHisTaskOperation ref="operationModal" @on-result-change="_page"></MeterSendHisTaskOperation>
     <importModal ref="importModal"  @on-result-change="_importBack"></importModal>
   </div>
 </template>
@@ -73,11 +73,13 @@ import { meterSample } from '../../../api'
 import assignPerson from '../../../components/user-info-single/assignPerson'
 import MeterItemManage from '../MeterItemManage'
 import importModal from '../../contract-tab/ContractTab'
+import MeterSendHisTaskOperation from '../../../components/operation/Operation'
 export default {
   components: {
     assignPerson,
     MeterItemManage,
-    importModal
+    importModal,
+    MeterSendHisTaskOperation
     // FoodSampleGovernDetail,
     // CopyModal,
     // FoodSampleGovernLYEdits
@@ -94,7 +96,14 @@ export default {
       //   {id: '', name: '复制历史样品检测项目', componentName: 'CopyHisItem'},
       //   {id: '', name: '删除'},
       // ],
-      iconMsg: [{ type: 'ios-beaker', id: '', name: '检测项目管理' }],
+      iconMsg: [
+        { type: 'ios-beaker', id: '', name: '检测项目管理' },
+        {
+          type: 'ios-clock',
+          id: '',
+          name: '操作日志'
+        }
+      ],
       footerList: [
         { id: '', name: '关闭', type: '' },
         { id: '', name: '确定', type: 'primary' }
@@ -252,9 +261,15 @@ export default {
           case '检测项目管理':
             this._itemManage(data.id)
             break
+          case '操作日志':
+            this._record(data.id)
+            break
         }
       })
     },
+    _record(id) {
+      this.$refs.operationModal._openTask(id)
+    },
     _itemManage(id) {
       this.$refs.itemManageModal._open(id)
     },