整体优化

api/meter/meter-entrust.js

@@ -30,6 +30,10 @@ export default {
 
   pageGoOutEntrust: data =>
     http.post('meter/v1/entrust/page_out_draft_entrust', data).then(res => res),
+  pageClientOnlineEntrust: data =>
+    http
+      .post('meter/v1/entrust/page_client_online_entrust', data)
+      .then(res => res),
   pageGoOutEntrustHis: data =>
     http
       .post('meter/v1/entrust/page_out_draft_entrust_his', data)

pages/meter-certificate/check/MeterCertificateCheck.vue

@@ -150,11 +150,6 @@ export default {
         await this._page()
       }
     },
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

pages/meter-certificate/check/MeterCertificateCheckHis.vue

@@ -122,11 +122,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

pages/meter-certificate/issue/MeterCertificateIssue.vue

@@ -126,11 +126,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

pages/meter-certificate/issue/MeterCertificateIssueHis.vue

@@ -122,11 +122,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

pages/meter-certificate/make/MeterCertificateMake.vue

@@ -143,11 +143,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

pages/meter-certificate/make/MeterCertificateMakeHis.vue

@@ -122,11 +122,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

pages/meter-contract/MeterSampleQuoteManage.vue

@@ -132,7 +132,7 @@ export default {
       ],
       dateList: [],
       formObj: {
-        entrustId: undefined,
+        contractId: undefined,
         name: undefined,
         code: undefined,
         type: undefined
@@ -145,19 +145,6 @@ export default {
     }
   },
   methods: {
-    _modalResult(data1, data2) {
-      switch (this.currentComponent) {
-        case 'CopyModal':
-          if (data1 === 0) {
-            this._copySample(data2)
-          } else {
-            this._copyAll(data2)
-          }
-          break
-        default:
-          this._search()
-      }
-    },
     _dateChange(data) {
       this.formObj.ctimeBegin = data[0]
       this.formObj.ctimeEnd = data[1]
@@ -227,7 +214,8 @@ export default {
       }
     },
     _open(id) {
-      this.formObj.entrustId = id
+      alert(id)
+      this.formObj.contractId = id
       this.showModal = true
       this._page()
     },

pages/meter-contract/contract-file/MeterContractFile.vue

@@ -137,11 +137,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {
@@ -169,27 +164,15 @@ export default {
         this.$refs.reasonModal._open('退回原因')
       }
     },
-    // _reportCheckBack: async function(data) {
-    //   const result = await meterContract.checkSecond({
-    //     ids: this.selectIds,
-    //     remark: data
-    //   })
-    //
-    //   if (result) {
-    //     this.$Message.success('退回成功！')
-    //     await this._page()
-    //   }
-    // },
     _reasonResult(data) {
       if (undefined !== data && data !== '') {
-        // this._reportCheckBack(data)
         console.log('退回')
       }
       console.log(data)
     },
     _manageSample(data) {
       // 管理样品
-      this.$refs.meterSampleManageModal._open(data.id)
+      this.$refs.meterSampleManageModal._open(data)
     },
     _iconClick(res, data, componentName) {
       this.currentComponent = componentName

pages/meter-contract/contract-register/MeterContractRegister.vue

@@ -127,11 +127,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {
@@ -175,7 +170,7 @@ export default {
     },
     _manageSample(data) {
       // 管理样品
-      this.$refs.meterSampleManageModal._open(data.id)
+      this.$refs.meterSampleManageModal._open(data)
     },
     _submitToReview() {
       this._submitByContractIds('合同评审')

pages/meter-contract/contract-register/MeterContractRegisterHis.vue

@@ -119,11 +119,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

pages/meter-contract/contract-register/MeterContractRegisterIndex.vue

@@ -2,13 +2,10 @@
   <div>
     <div class="layout-content-padding">
       <div class="layout-content-main">
-        <el-tabs v-model="activeName">
+        <el-tabs v-model="activeName" @tab-click="_changeTabs">
           <el-tab-pane label="待完成" name="wait">
             <MeterSendEntrust ref="waitTabs"></MeterSendEntrust>
           </el-tab-pane>
-          <el-tab-pane label="已完成" name="finish">
-            <MeterSendEntrustFinish ref="finishTabs"></MeterSendEntrustFinish>
-          </el-tab-pane>
           <el-tab-pane label="历史记录" name="his">
             <MeterSendEntrustHis ref="hisTabs"></MeterSendEntrustHis>
           </el-tab-pane>
@@ -20,19 +17,33 @@
 
 <script>
 import MeterSendEntrust from './MeterContractRegister'
-import MeterSendEntrustFinish from './MeterContractRegisterFinish'
 import MeterSendEntrustHis from './MeterContractRegisterHis'
 export default {
   name: 'MeterSendEntrustIndex',
   components: {
     MeterSendEntrust,
-    MeterSendEntrustFinish,
     MeterSendEntrustHis
   },
   data() {
     return {
       activeName: 'wait'
     }
+  },
+  mounted() {
+    this.activeName = 'wait'
+    this._page()
+  },
+  methods: {
+    _changeTabs(tab, event) {
+      if (tab.name === 'wait') {
+        this._page()
+      } else {
+        this.$refs.hisTabs._page()
+      }
+    },
+    _page() {
+      this.$refs.waitTabs._page()
+    }
   }
 }
 </script>

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

@@ -135,11 +135,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

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

@@ -119,11 +119,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

pages/meter-contract/contract-technology/MeterTechnologyReview.vue

@@ -135,11 +135,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

pages/meter-contract/contract-technology/MeterTechnologyReviewHis.vue

@@ -119,11 +119,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

pages/meter-entrust/MeterItemManage.vue

@@ -121,19 +121,6 @@ export default {
     }
   },
   methods: {
-    _modalResult(data1, data2) {
-      switch (this.currentComponent) {
-        case 'CopyModal':
-          if (data1 === 0) {
-            this._copySample(data2)
-          } else {
-            this._copyAll(data2)
-          }
-          break
-        default:
-          this._search()
-      }
-    },
     _dateChange(data) {
       this.formObj.ctimeBegin = data[0]
       this.formObj.ctimeEnd = data[1]

pages/meter-entrust/MeterSampleManage.vue

@@ -153,19 +153,6 @@ export default {
     }
   },
   methods: {
-    _modalResult(data1, data2) {
-      switch (this.currentComponent) {
-        case 'CopyModal':
-          if (data1 === 0) {
-            this._copySample(data2)
-          } else {
-            this._copyAll(data2)
-          }
-          break
-        default:
-          this._search()
-      }
-    },
     _dateChange(data) {
       this.formObj.ctimeBegin = data[0]
       this.formObj.ctimeEnd = data[1]

pages/meter-entrust/MeterSampleManageRead.vue

@@ -153,19 +153,6 @@ export default {
     }
   },
   methods: {
-    _modalResult(data1, data2) {
-      switch (this.currentComponent) {
-        case 'CopyModal':
-          if (data1 === 0) {
-            this._copySample(data2)
-          } else {
-            this._copyAll(data2)
-          }
-          break
-        default:
-          this._search()
-      }
-    },
     _dateChange(data) {
       this.formObj.ctimeBegin = data[0]
       this.formObj.ctimeEnd = data[1]

pages/meter-entrust/client-online/EditModal.vue

+<template>
+<div>
+  <Modal v-model="showUserGroupModal">
+    <p slot="header">
+      {{ modalTitle }}
+    </p>
+    <Row>
+      <!--查询条件-->
+      <Col span="24">
+        <Form id="test-item-form" :label-width="90" inline onsubmit="return false">
+          <label class="label-sign" />
+          <Form-item :label-width="70" label="授权资质仪器名称" >
+            <Input
+              v-model="code"
+              placeholder="授权资质仪器名称"
+              style="width: 100%"
+              @on-enter="_pageChange(1)"
+            />
+          </Form-item>
+          <Form-item label="检测依据名称">
+            <Input
+              v-model="name"
+              placeholder="请输入检测依据名称"
+              style="width: 100%"
+              @on-enter="_pageChange(1)"
+            />
+          </Form-item>
+        </Form>
+      </Col>
+      <Col span="24" style="margin-bottom: 10px">
+        <el-table
+          :height="300"
+          :data="getPage"
+          border
+          size="small"
+          highlight-current-row
+          style="width: 100%"
+          @row-click="_rowChange"
+          @row-dblclick="_dbClick"
+        >
+          <el-table-column
+            v-for="item in pageColumns"
+            :key="item.key"
+            :prop="item.key"
+            :label="item.title"
+            :min-width="item.width"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <span v-if="item.key==='status'">
+                {{ scope.row[item.key]?scope.row[item.key].display:'' }}
+              </span>
+              <span v-else>{{ scope.row[item.key] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </Col>
+      <Col span="24">
+        <Page
+          :total="getPage.total"
+          :page-size="getPage.size"
+          placement="top"
+          show-total
+          show-elevator
+          show-sizer
+          @on-change="_pageChange"
+          @on-page-size-change="_pageRows"
+        />
+        <div style="clear: both" />
+      </Col>
+    </Row>
+    <div slot="footer" class="btn-width">
+      <Button style="margin-left: 8px" @click="_cancel">
+        取消
+      </Button>
+      <Button type="primary" @click="_ok">
+        确定
+      </Button>
+    </div>
+  </Modal>
+</div>
+</template>
+
+<script>
+// import { meterAptitude } from '../../../api'
+import { meterManage } from '../../../api'
+export default {
+  name: 'EditModal',
+  data() {
+    return {
+      loading: true,
+      pageParams: { rows: 20 },
+      pageColumns: [
+        { title: '样品名称', key: 'name' },
+        { title: '检定依据', key: 'code' },
+        { title: '检定依据名称', key: 'basis' }
+      ],
+      getPage: [],
+      showUserGroupModal: false,
+      modalTitle: '',
+      currentRowData: {},
+      name: '',
+      code: ''
+    }
+  },
+  methods: {
+    _open() {
+      this.modalTitle = '选择检测依据'
+      this.name = ''
+      this.code = ''
+      this._judge()
+    },
+    _judge() {
+      this.showUserGroupModal = true
+      this.currentRowData = {}
+      this._page()
+    },
+    _page: async function() {
+      const result = await meterManage.page(this._searchParams())
+      if (result) {
+        console.log('查询结果')
+        console.log(result)
+        this.getPage = result.records
+        this.loading = false
+        console.log(this.getPage)
+      }
+    },
+    _pageChange(page) {
+      this.pageParams.page = page
+      this._page()
+    },
+    _pageRows(rows) {
+      this.pageParams.rows = rows
+      this._page()
+    },
+    _searchParams() {
+      const data = this.$serialize('test-item-form')
+      if (this.name) {
+        data.name = this.name
+      }
+      if (this.code) {
+        data.code = this.code
+      }
+      return this.$extend(data, this.pageParams)
+    },
+    _search() {
+      this._page()
+    },
+    _rowChange(data) {
+      this.currentRowData = data // 选中的行数据;
+    },
+    _cancel() {
+      this.showUserGroupModal = false
+    },
+    _ok() {
+      if (JSON.stringify(this.currentRowData) === '{}') {
+        switch (this.modalTitle) {
+          case '选择检测依据':
+            this.$Message.warning('请选择一条检测依据！')
+            break
+        }
+      } else {
+        this.$emit('on-result-change', this.currentRowData)
+        this.showUserGroupModal = false
+      }
+    },
+    // 双击
+    _dbClick(data, event) {
+      this.currentRowData = data
+      // 选中的行数据;
+      this._ok()
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

pages/meter-entrust/client-online/MeterClientOnlineEntrust.vue

+<template>
+  <div>
+    <!--内容-->
+    <div class="layout-content-padding">
+      <div class="layout-content-main">
+        <Row>
+          <!--查询-->
+          <Col span="24" style="margin-top: 10px">
+            <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" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/>
+              </Form-item>
+              <Form-item class="search-item" label="资质:">
+                <Input v-model="formObj.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/>
+              </Form-item>
+              <Form-item class="search-btn">
+                <Button type="primary" @click="_formSearch">搜索</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>
+          </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" >
+              <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" sortable>
+                <template slot-scope="scope">
+                  <span v-if="item.status">
+                     {{scope.row[item.key].display}}
+                  </span>
+                  <span v-else>{{scope.row[item.key]}}</span>
+                </template>
+              </vxe-table-column>
+            </PTVXETable>
+          </Col>
+        </Row>
+      </div>
+    </div>
+    <FileManage ref="FileManage"></FileManage>
+    <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
+    <MeterSampleManage ref="meterSampleManageModal"  @on-result-change="_page"></MeterSampleManage>
+    <MeterEntrustRecord ref="entrustRecordModal"  @on-result-change="_page"></MeterEntrustRecord>
+  </div>
+</template>
+<script>
+import { meterEntrust } from '../../../api'
+import MeterEntrustRecord from '../../../components/operation/Operation'
+import MeterSampleManage from './MeterSampleManage'
+import MeterSubcontractorEdit from './MeterGoOutTestEdit'
+export default {
+  components: { MeterSubcontractorEdit, MeterSampleManage, MeterEntrustRecord },
+  data() {
+    return {
+      currentComponent: '',
+      formId: 'meterSubcontractorFormId',
+      searchOpen: false,
+      btn: [
+        {
+          type: 'success',
+          id: '',
+          name: '添加'
+        },
+        {
+          type: 'success',
+          id: '',
+          name: '提交'
+        }
+      ],
+      iconMsg: [
+        {
+          type: 'md-create',
+          id: '',
+          name: '编辑'
+        },
+        {
+          type: 'ios-beaker',
+          id: '',
+          name: '管理样品'
+        },
+        { type: 'md-cloud', id: '', name: '附件' },
+        { type: 'md-remove-circle', id: '', name: '删除' },
+        {
+          type: 'ios-clock',
+          id: '',
+          name: '操作日志'
+        }
+      ],
+      formObj: {
+        name: undefined,
+        aptitude: undefined
+      },
+      selectIds: [],
+      getPage: {},
+      pageColumns: [
+        { title: '委托单位', key: 'client', width: 140 },
+        { title: '联系人', key: 'person', width: 120 },
+        { title: '下单号', key: 'orderNum', width: 130 },
+        { title: '联系电话', key: 'tel', width: 120 },
+        { title: '进度', key: 'progress', width: 200, status: true },
+        { 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: 'remark' }
+      ]
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      if (this.searchOpen) {
+        return this.$tableHeight('search')
+      } else {
+        return this.$tableHeight('noSearch')
+      }
+    }
+  },
+  mounted() {
+    this._page()
+  },
+  methods: {
+    _btnClick(msg, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (msg) {
+          case '添加':
+            this._editModal(false)
+            break
+          case '提交':
+            this._submitToReview()
+            break
+          case 'search':
+            this.searchOpen = !this.searchOpen
+            break
+        }
+      })
+    },
+    _submitToReview() {
+      this._submitByContractIds('委托评审')
+    },
+    _submitByContractIds(cont) {
+      const ids = this.selectIds
+      if (ids.length === 0) {
+        this.$Message.warning('请至少选择一条数据！')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？',
+          onOk: () => {
+            const result = meterEntrust.submit(ids)
+            if (result) {
+              this.$Message.warning('提交成功！')
+              this._page()
+            }
+          }
+        })
+      }
+    },
+    _sampleManage(data) {
+      // 管理样品
+      this.$refs.meterSampleManageModal._open(data)
+    },
+    _iconClick(res, data, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (res) {
+          case '编辑':
+            this._editModal(true, data.id)
+            break
+          case '管理样品':
+            this._sampleManage(data.id)
+            break
+          case '附件':
+            this._upload(data.id)
+            break
+          case '删除':
+            this._deleteByIds([data.id])
+            break
+          case '操作日志':
+            this._record(data)
+            break
+        }
+      })
+    },
+    _record(data) {
+      this.$refs.entrustRecordModal._open(data.id)
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData, data.componentName)
+          break
+        case 'selectIds':
+          this.selectIds = data
+          break
+        case 'changeSize':
+          this._page()
+          break
+      }
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      const result = await meterEntrust.pageClientOnlineEntrust(this.formObj)
+      if (result) {
+        this.$refs.pageTable._hideLoading()
+        this.getPage = result
+      }
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    // 删除
+    _deleteByIds(ids, content) {
+      this.$Modal.confirm({
+        title: '提示',
+        content: content || '确定删除该记录？',
+        onOk: () => {
+          this._delete(ids)
+        }
+      })
+    },
+    // 编辑&添加
+    _editModal(edit, id) {
+      if (edit) {
+        // 编辑
+        this._getById(id)
+      } else {
+        // 添加
+        this.$refs.editSubcontractorModal._open()
+      }
+    },
+    // 追加项目
+    _itemModal(data) {
+      this.$refs.refModal._open(data)
+    },
+
+    _upload(id) {
+      // 上传文件
+      this.$refs.FileManage._open(id, 'subcontractorId')
+    },
+    _getById: async function(id) {
+      const result = await meterEntrust.getVOById(id)
+      if (result) {
+        this.$refs.editSubcontractorModal._openEdit(result)
+      }
+    },
+    _delete: async function(ids) {
+      const result = await meterEntrust.deleteById(ids)
+      if (result) {
+        this._formSearch()
+        this.$Message.success('删除成功！')
+      }
+    }
+  }
+}
+</script>

pages/meter-contract/contract-register/MeterContractRegisterFinish.vue → pages/meter-entrust/client-online/MeterClientOnlineEntrustHis.vue

@@ -28,7 +28,7 @@
           <!--表格-->
           <Col span="24">
             <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
-                        :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" hide-checkbox>
+                        :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" >
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -46,14 +46,17 @@
       </div>
     </div>
 
-    <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
+    <MeterSampleManage ref="meterSampleManageModal"  @on-result-change="_page"></MeterSampleManage>
+
+    <MeterEntrustRecord ref="entrustRecordModal"  @on-result-change="_page"></MeterEntrustRecord>
   </div>
 </template>
 <script>
-import { meterEntrust, meterSubcontractor } from '../../../api'
-import MeterSubcontractorEdit from './MeterContractRegisterEdit'
+import { meterEntrust } from '../../../api'
+import MeterSampleManage from '../MeterSampleManageRead'
+import MeterEntrustRecord from '../../../components/operation/Operation'
 export default {
-  components: { MeterSubcontractorEdit },
+  components: { MeterSampleManage, MeterEntrustRecord },
   data() {
     return {
       currentComponent: '',
@@ -62,26 +65,24 @@ export default {
       btn: [
         {
           type: 'success',
-          id: 'meter-subcontractor-add-btn',
+          id: 'meter-go-out-entrust-add-btn',
           name: '添加'
+        },
+        {
+          type: 'success',
+          id: 'meter-go-out-entrust-submit-btn',
+          name: '提交'
         }
       ],
       iconMsg: [
         {
-          type: 'ios-clock',
+          type: 'md-flask',
           id: '',
-          name: '编辑'
+          name: '查看样品'
         },
         {
           type: 'ios-clock',
           id: '',
-          name: '资质项目'
-        },
-        { type: 'ios-clock', id: '', name: '附件' },
-        { type: 'ios-clock', id: '', name: '删除' },
-        {
-          type: 'ios-clock',
-          id: '',
           name: '操作日志'
         }
       ],
@@ -94,6 +95,7 @@ export default {
       pageColumns: [
         { title: '委托单位', key: 'client', width: 200 },
         { title: '联系人', key: 'person', width: 120 },
+        { title: '委托编号', key: 'entrustCode', width: 120 },
         { title: '联系电话', key: 'tel', width: 120 },
         { title: '传真', key: 'fax', width: 120 },
         { title: '详细地址', key: 'address', width: 250 },
@@ -119,11 +121,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {
@@ -131,12 +128,35 @@ export default {
           case '添加':
             this._editModal(false)
             break
+          case '提交':
+            this._submitToReview()
+            break
           case 'search':
             this.searchOpen = !this.searchOpen
             break
         }
       })
     },
+    _submitToReview() {
+      this._submitByContractIds('委托评审')
+    },
+    _submitByContractIds(cont) {
+      const ids = this.selectIds
+      if (ids.length === 0) {
+        this.$Message.warning('请至少选择一条数据！')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？',
+          onOk: () => {
+            const result = meterEntrust.submit(ids)
+            if (result) {
+              console.log(result)
+            }
+          }
+        })
+      }
+    },
     _iconClick(res, data, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {
@@ -150,26 +170,30 @@ export default {
           case '附件':
             this._upload(data.id)
             break
-          case '删除':
-            this._deleteByIds([data.id])
-            break
           case '操作日志':
             this._record(data.id)
             break
+          case '查看样品':
+            this._sampleManage(data.id)
+            break
         }
       })
     },
+    _sampleManage(data) {
+      // 管理样品
+      this.$refs.meterSampleManageModal._open(data)
+    },
     _record(id) {
-      this.$refs.refModal._open(id)
+      this.$refs.entrustRecordModal._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
+          break
         case 'changeSize':
           this._page()
           break
@@ -177,8 +201,7 @@ export default {
     },
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
-      console.log('this.formObj', this.formObj)
-      const result = await meterEntrust.pageSendEntrust(this.formObj)
+      const result = await meterEntrust.pageGoOutEntrustHis(this.formObj)
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.getPage = result
@@ -201,7 +224,6 @@ export default {
     _editModal(edit, id) {
       if (edit) {
         // 编辑
-        // this.$refs.editSubcontractorModal._open(id)
         this._getById(id)
       } else {
         // 添加
@@ -218,13 +240,13 @@ export default {
       this.$refs.refModal._open(id, 'subcontractorId')
     },
     _getById: async function(id) {
-      const result = await meterSubcontractor.getById(id)
+      const result = await meterEntrust.getVOById(id)
       if (result) {
-        this.$refs.editSubcontractorModal._open(result)
+        this.$refs.editSubcontractorModal._openEdit(result)
       }
     },
     _delete: async function(ids) {
-      const result = await meterSubcontractor.deleteById(ids)
+      const result = await meterEntrust.deleteById(ids)
       if (result) {
         this._formSearch()
         this.$Message.success('删除成功！')

pages/meter-entrust/client-online/MeterClientOnlineEntrustIndex.vue

+<template>
+  <div>
+    <div class="layout-content-padding">
+      <div class="layout-content-main">
+        <el-tabs v-model="activeName" @tab-click="_changeTabs">
+          <el-tab-pane label="待完成" name="wait">
+            <MeterGoOutEntrust ref="waitTabs"></MeterGoOutEntrust>
+          </el-tab-pane>
+          <el-tab-pane label="历史记录" name="his">
+            <MeterGoOutEntrustHis ref="hisTabs"></MeterGoOutEntrustHis>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import MeterGoOutEntrust from './MeterClientOnlineEntrust'
+import MeterGoOutEntrustHis from './MeterClientOnlineEntrustHis'
+export default {
+  name: 'MeterGoOutEntrustIndex',
+  components: {
+    MeterGoOutEntrust,
+    MeterGoOutEntrustHis
+  },
+  data() {
+    return {
+      activeName: 'wait'
+    }
+  },
+  mounted() {
+    this.activeName = 'wait'
+    this._page()
+  },
+  methods: {
+    _changeTabs(tab, event) {
+      if (tab.name === 'wait') {
+        this._page()
+      } else {
+        this.$refs.hisTabs._page()
+      }
+    },
+    _page() {
+      this.$refs.waitTabs._page()
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

pages/meter-entrust/client-online/MeterGoOutTestEdit.vue

+<template>
+  <div>
+    <Modal v-model="showModal" :mask-closable="false" width="1230">
+      <p slot="header">{{modalTitle}}</p>
+      <div>
+        <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline>
+          <Form-item label="委托方是否第一次送检" prop="firsted" class="width-48">
+            <Radio-group v-model="formObj.firsted">
+              <Radio v-for="item in judgeType" :key="item.value" :label="item.value">{{item.name}}</Radio>
+            </Radio-group>
+          </Form-item>
+          <Form-item label="委托单位" prop="client" class="width-48">
+            <AutoComplete :value="formObj.client" :down-data="customerData" name="client"
+                          placeholder="请输入或选择委托单位" @on-result-change="_cusNameChange"
+            ></AutoComplete>
+          </Form-item>
+          <Form-item label="联系人" prop="operation.person" class="width-48">
+            <Input v-model="formObj.operation.person" name="operation.person" placeholder="请输入委托单位"/>
+          </Form-item>
+          <Form-item label="联系电话" prop="operation.tel" class="width-48">
+            <Input v-model="formObj.operation.tel" name="operation.tel" placeholder="请输入委托单位"/>
+          </Form-item>
+          <Form-item label="传真" prop="operation.fax" class="width-48">
+            <Input v-model="formObj.operation.fax" name="operation.fax" placeholder="请输入委托单位"/>
+          </Form-item>
+          <Form-item label="省、市、区" prop="testedCityData" class="width-48">
+<!--            <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>-->
+            <CityNameCascader v-model="testedCityData" name="tested" @on-result-change="_cascaderResult">
+            </CityNameCascader>
+          </Form-item>
+          <Form-item label="街道" prop="street" class="width-48">
+            <Input v-model="formObj.street" name="street" placeholder="请输入委托单位"/>
+          </Form-item>
+          <Form-item label="邮编" prop="operation.postcode" class="width-48">
+            <Input v-model="formObj.operation.postcode" name="operation.postcode" placeholder="请输入委托单位"/>
+          </Form-item>
+
+          <Form-item label="E-mail" prop="operation.email" class="width-48">
+            <Input v-model="formObj.operation.email" name="operation.email" placeholder="请输入实验室名称"/>
+          </Form-item>
+          <Form-item label="委托日期：" prop="edate" class="width-48">
+<!--            <Input v-model="formObj.edate" name="edate" placeholder="请输入联系人"/>-->
+            <Date-picker type="date" split-panels style="width:100%;" placeholder="请选择委托日期"
+                         @on-change="_ctimeChange"></Date-picker>
+          </Form-item>
+          <Form-item label="合同号：" prop="contractCode" class="width-48">
+            <Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入联系人"/>
+          </Form-item>
+          <Form-item label="备注：" prop="remark" style="width: 99.8%">
+            <Input v-model="formObj.remark" :rows="3" name="remark" type="textarea"
+                   placeholder="请输入备注"/>
+          </Form-item>
+        </Form>
+        <Col span="24">
+          <!--          <btn-list :msg="btn" :open="searchOpen" :showSearchBtn="false" @on-result-change="_btnClick"-->
+          <!--                    class="contHide"></btn-list>-->
+          <Button type="success" @click="_add()">添加</Button>
+        </Col>
+        <Col span="24">
+          <PTVXETable
+            ref="pageTable"
+            :form-id="formId"
+            :table-height="500"
+            :get-page="getPage"
+            :icon-msg="iconMsg"
+            @on-result-change="_tableResultChange">
+            <vxe-table-column
+              v-for="item in pageColumns"
+              :key="item.key"
+              :field="item.key"
+              :title="item.title"
+              :width="item.width"
+              :min-width="200"
+              :fixed="item.fixed?item.fixed:undefined"
+              sortable
+            >
+              <template slot-scope="scope">
+                <div v-if="item.key==='name'" @click.stop="_handleRow(scope)">
+                  <el-input v-model="scope.row.name" blur placeholder="请输入或选择样品名称" @on-result-change="_judgeBasisChange"  @click.native="_selectjudgeBasis(scope.$rowIndex)"
+                  ></el-input>
+                </div>
+                <div v-if="item.key==='spec'" @click.stop="_handleRow(scope)">
+                  <el-input v-model="scope.row.spec" blur placeholder="请输入或选择型号规格"
+                  ></el-input>
+                </div>
+                <div v-if="item.key==='factoryNumber'" @click.stop="_handleRow(scope)">
+                  <el-input v-model="scope.row.factoryNumber" blur placeholder="请输入或选择出厂编号"
+                  ></el-input>
+                </div>
+                <div v-if="item.key==='type'" @click.stop="_handleRow(scope)">
+                  <Select v-model="scope.row.type">
+                    <Option v-for="(item,index) in options" :key="item.name" :value="index">
+                      {{ item.name }}
+                    </Option>
+                  </Select>
+                </div>
+                <div v-if="item.key==='quantity'" @click.stop="_handleRow(scope)">
+                  <el-input
+                    v-model="scope.row.quantity"
+                    type="number"
+                    placeholder="请输入或选择数量"
+                    @keydown.native="channelInputLimit"
+                  />
+                </div>
+              </template>
+            </vxe-table-column>
+          </PTVXETable>
+        </Col>
+      </div>
+      <div slot="footer">
+        <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
+      </div>
+      <EditModal ref="EditModal" is-change @on-result-change="_backData" />
+    </Modal>
+  </div>
+</template>
+<script>
+/**
+ * 添加编辑分包商
+ */
+import { lmsBaseDict, meterEntrust } from '../../../api'
+import CityNameCascader from '../../../components/base/CityNameCascader'
+import AutoComplete from '../../../components/base/AutoCompletes'
+import EditModal from './EditModal'
+
+export default {
+  components: { EditModal, CityNameCascader, AutoComplete },
+  data() {
+    const validateRemark = (rule, value, callback) => {
+      if (this.testedCityData.length === 0) {
+        callback(new Error('内容不能为空'))
+      } else {
+        callback()
+      }
+    }
+    const validateClient = (rule, value, callback) => {
+      if (this.formObj.client === '') {
+        callback(new Error('内容不能为空'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      formId: 'meterSendTestEditFormId',
+      getPage: {
+        records: []
+      },
+      testedCityData: [],
+      customerData: [],
+      judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
+      iconMsg: [
+        { type: 'ios-clock', id: '', name: '编辑' },
+        { type: 'ios-clock', id: '', name: '删除' }
+      ],
+      pageColumns: [
+        { title: '样品名称', key: 'name', width: 160 },
+        { title: '型号规格', key: 'spec' },
+        { title: '出厂编号', key: 'factoryNumber' },
+        { title: '检测类型', key: 'type' },
+        { title: '数量', key: 'quantity' }
+        // {title: '限制范围或说明', key: 'limitDescription'},
+      ],
+      options: [
+        {
+          name: '检定'
+        },
+        {
+          name: '校准'
+        },
+        {
+          name: '外观检查'
+        }
+      ],
+      index: 0,
+      id: '',
+      modalTitle: '',
+      subcontractorId: '',
+      formObj: {
+        firsted: 1,
+        client: '',
+        linkman: '',
+        tel: '',
+        email: '',
+        address: '',
+        remark: '',
+        street: '',
+        province: '',
+        city: '',
+        county: '',
+        aptitude: [],
+        assessFormSn: '',
+        subArea: '',
+        personCondition: '',
+        edate: '',
+        contractCode: '',
+        operation: {
+          person: '',
+          tel: '',
+          fax: '',
+          postcode: '',
+          email: '',
+          fee: ''
+        },
+        testedTemp: {
+          testedName: '',
+          testedContactor: '',
+          testedContactorTel: '',
+          testedTel: '',
+          testedProvince: '',
+          testedCity: '',
+          testedCounty: '',
+          testedStreet: ''
+        }
+      },
+      ruleValidate: {
+        testedCityData: [
+          {
+            required: true,
+            message: '省市区不能为空',
+            validator: validateRemark,
+            trigger: 'blur'
+          }
+        ],
+        client: [
+          {
+            required: true,
+            validator: validateClient,
+            message: '委托单位不能为空',
+            trigger: 'blur'
+          }
+        ],
+        'operation.person': [
+          { required: true, message: '联系人不能为空', trigger: 'blur' }
+        ],
+        'operation.tel': [
+          { required: true, message: '联系电话不能为空', trigger: 'blur' }
+        ]
+        // testedCityData: [
+        //   { required: true, message: '省市区不能为空', trigger: 'blur' }
+        // ]
+      },
+      clearingWayList: ['款到后测试', '先测试后付款', '其他情况（）'],
+      clearingWayListTemp: ['款到后测试', '先测试后付款', '其他情况（）'],
+      showModal: false,
+      footerList: [
+        { id: '', name: '取消', type: '' },
+        { id: '', name: '保存', type: 'primary' }
+      ],
+      aptitudeData: []
+    }
+  },
+  // created() {
+  //   this.$set(
+  //     this.formObj,
+  //     'tested',
+  //     JSON.parse(JSON.stringify(this.testedTemp))
+  //   )
+  // },
+  methods: {
+    _cusNameChange(msg, data) {
+      // this.financeObj = {} // 清空维护发票信息的数据
+      if (this.$string(this.id).isEmpty()) {
+        // 添加的时候选择单位
+        switch (msg) {
+          case 'select':
+            this._customerMatch(data)
+            break
+          case 'query':
+            this._cusNameQuery(data)
+            break
+        }
+      } else {
+        // 编辑的时候选择单位(互不影响)
+        // this.cusName = data
+        // this.formObj.customer.cname = data
+      }
+    },
+    _customerMatch(data) {
+      // this.formObj.client = data
+      this._getQueryList(data)
+      console.log(data)
+    },
+    _cusNameQuery(query) {
+      this.formObj.client = query
+      console.log(query)
+    },
+    _ctimeChange(data) {
+      console.log('时间', data)
+      this.formObj.edate = data
+    },
+    _backData(data) {
+      console.log(typeof this.index)
+      this.getPage.records[this.index].name = data.name
+      this.getPage.records[this.index].aptitudeId = data.id
+      console.log('返回的数据')
+      console.log(data)
+      console.log(this.getPage.records)
+    },
+    _selectjudgeBasis(index) {
+      console.log(index)
+      this.index = index
+      this.$refs.EditModal._open()
+    },
+    _cascaderResult(name, data, msg) {
+      switch (name) {
+        case 'cus':
+          this._casChange(data, msg)
+          break
+        case 'tested':
+          this._testedChange(data, msg)
+          break
+      }
+    },
+    _emptyProvince() {
+      this.cityData = []
+      this.testedCityData = []
+      // this.formObj.tested.testedProvince = ''
+      // this.formObj.tested.testedCity = ''
+      // this.formObj.tested.testedCounty = ''
+      this.formObj.testedTemp.testedProvince = ''
+      this.formObj.testedTemp.testedCity = ''
+      this.formObj.testedTemp.testedCounty = ''
+    },
+    _testedChange(data, msg) {
+      // 省、市、区
+      console.log('数据')
+      console.log(data)
+      console.log('msg', msg)
+      if (msg === 'clear') {
+        // this.formObj.tested.testedProvince = ''
+        // this.formObj.tested.testedCity = ''
+        // this.formObj.tested.testedCounty = ''
+        this.formObj.testedTemp.testedProvince = ''
+        this.formObj.testedTemp.testedCity = ''
+        this.formObj.testedTemp.testedCounty = ''
+        this.formObj.province = ''
+        this.formObj.city = ''
+        this.formObj.county = ''
+        this.testedCityData = []
+      } else {
+        // this.formObj.tested.testedProvince = data.value[0]
+        // this.formObj.tested.testedCity = data.value[1]
+        // this.formObj.tested.testedCounty = data.value[2]
+        // this.formObj.testedTemp.testedProvince = data.value[0]
+        // this.formObj.testedTemp.testedCity = data.value[1]
+        // this.formObj.testedTemp.testedCounty = data.value[0]
+
+        this.formObj.province = data.value[0]
+        this.formObj.city = data.value[1]
+        this.formObj.county = data.value[2]
+        this.testedCityData = [data.value[0], data.value[1], data.value[2]]
+        console.log('地址', this.testedCityData)
+      }
+    },
+    _getJudgeBasisList(data) {
+      const obj = { classify: 0 }
+      if (data) {
+        obj.stdNum = data
+      }
+      // this.$store.dispatch('StandardInfo/list', obj).then(() => {
+      //   this.judgeBasisData = this.$store.state.StandardInfo.list
+      // })
+    },
+    _judgeBasisChange(msg, data) {
+      switch (msg) {
+        case 'select':
+          this.formObj.stdId = data.id
+          this.formObj.code = data.stdNum
+          this.formObj.name = data.name
+          this.$refs.formObj.validateField('code')
+          break
+        case 'query':
+          this.formObj.stdId = ''
+          this.formObj.code = data.stdNum
+          this.formObj.name = ''
+          this._getJudgeBasisList(data.stdNum)
+          break
+        case 'focus':
+          this._getJudgeBasisList()
+          break
+        case 'blur':
+          if (this.formObj.stdId === '') {
+            this.formObj.code = ''
+            this._getJudgeBasisList()
+          }
+          this.$refs.formObj.validateField('code')
+      }
+    },
+    _add() {
+      const data = {
+        name: '',
+        spec: '',
+        factoryNumber: '',
+        quantity: '',
+        type: ''
+      }
+      this.getPage.records.unshift(data)
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'selectIds':
+          // this.selectIds = data
+          break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData, data.rowIndex)
+          break
+        // case 'changeSize':
+        //   this._page()
+        //   break
+      }
+    },
+    _iconClick(res, data, index) {
+      switch (res) {
+        case '编辑':
+          // this._editModal(true, data.id)
+          break
+        case '删除':
+          // this._deleteById(data.id)
+          console.log('点击了删除按钮')
+          console.log(index)
+          this.getPage.records.splice(index, 1)
+          break
+        case '操作日志':
+          // this._record(data.id)
+          break
+      }
+    },
+    _handleRow(data) {
+      this.currentRow = data.row
+      this.currentIndex = data.rowIndex
+    },
+    channelInputLimit(e) {
+      const key = e.key
+      // 不允许输入'e'和'.'
+      if (key === 'e' || key === '.') {
+        e.returnValue = false
+        return false
+      }
+      return true
+    },
+    /** *modal-footer */
+    _footerResult(name) {
+      switch (name) {
+        case '取消':
+          this._cancel()
+          break
+        case '保存':
+          this._ok()
+          break
+      }
+    },
+    _hideLoading() {
+      this.$refs.footerModal._hideLoading()
+    },
+    _resultChange(msg) {
+      this.showModal = false
+      this.$Message.success(msg)
+      this.$emit('on-result-change')
+      this._hideLoading()
+    },
+    _ok() {
+      this.$refs.formObj.validate(valid => {
+        if (valid) {
+          const data = this.$serialize('edit-form')
+          Object.assign(this.formObj, data)
+          if (this.$string(this.id).isEmpty()) {
+            // 添加
+            const saveData = this.formObj
+            saveData.sampleList = this.getPage.records
+            this._save(saveData)
+          } else {
+            const saveData = this.formObj
+            saveData.sampleList = this.getPage.records
+            // 编辑
+            this._edit(saveData)
+          }
+        } else {
+          this.$Message.error('表单验证失败!')
+          this._hideLoading()
+        }
+      })
+    },
+    _wayResult(msg, data) {
+      switch (msg) {
+        case 'select':
+          this.formObj.clearingWay = data
+          break
+        case 'query':
+          this.formObj.clearingWay = data
+          this._wayQuery(data)
+          break
+      }
+    },
+    _wayQuery(query) {
+      if (query === '') {
+        this.clearingWayList = this.clearingWayListTemp
+      } else {
+        this.clearingWayList = this.clearingWayListTemp.filter(
+          item => item.indexOf(query) > -1
+        )
+      }
+    },
+    _cancel() {
+      this.showModal = false
+    },
+    _open() {
+      this.showModal = true
+      this._getList()
+      this.$refs.formObj.resetFields()
+      this._hideLoading()
+      this.getPage.records = []
+      this.id = ''
+      this.modalTitle = '出检委托单登记'
+      this.testedCityData = []
+    },
+
+    _openEdit(formObj) {
+      this._getList()
+      this.getPage.records = []
+      this.showModal = true
+      this.$refs.formObj.resetFields()
+      this._hideLoading()
+      this.id = ''
+      this.modalTitle = '出检委托单编辑'
+      this.id = formObj.id
+      this.formObj = formObj
+      this._showAddress(formObj)
+      this.getPage.records = formObj.sampleList
+      console.log(this.formObj)
+    },
+    _getList: async function() {
+      const result = await meterEntrust.pageList()
+      const list = []
+      console.log('result', result)
+      if (result) {
+        for (let i = 0; i < result.length; i++) {
+          console.log(result[i].cname)
+          list.push(result[i].cname)
+        }
+        console.log('委托单位名单', list)
+        this.customerData = list
+      }
+    },
+    _getQueryList: async function(data) {
+      const result = await meterEntrust.pageQueryList(data)
+      console.log(result)
+      if (result) {
+        this.formObj.client = data
+        this.formObj.operation.person = result[0].contact
+        this.formObj.operation.tel = result[0].mobile
+        this.formObj.operation.fax = result[0].fax
+        this.testedCityData = [
+          result[0].province,
+          result[0].city,
+          result[0].area
+        ]
+        if (result[0].province) {
+          this.formObj.province = result[0].province
+        }
+        if (result[0].city) {
+          this.formObj.city = result[0].city
+        }
+        if (result[0].area) {
+          this.formObj.county = result[0].area
+        }
+      }
+    },
+    _getAptitudeList: async function() {
+      const result = await lmsBaseDict.getItem('subcontractorAptitude')
+      if (result) {
+        this.aptitudeData = result
+      }
+    },
+    _showTime(formObj) {
+      // 回显资质类型
+      // if (formObj.aptitude !== undefined || '') {
+      //   this.formObj.aptitude = formObj.aptitude.split(',')
+      // } else {
+      //   this.formObj.aptitude = []
+      // }
+    },
+    _showAddress(formObj) {
+      this.testedCityData = []
+      if (
+        formObj.province !== undefined &&
+        formObj.city !== undefined &&
+        formObj.county !== undefined
+      ) {
+        this.testedCityData.push(formObj.province)
+        this.testedCityData.push(formObj.city)
+        this.testedCityData.push(formObj.county)
+      }
+    },
+    _save: async function(data) {
+      const result = await meterEntrust.saveOutEntrust(data)
+      console.log(result)
+      if (result) {
+        this._resultChange('添加成功!')
+      }
+    },
+    _edit: async function(data) {
+      const result = await meterEntrust.editDTO(data)
+      if (result) {
+        this._resultChange('编辑成功!')
+      }
+    }
+  }
+}
+</script>

pages/meter-entrust/client-online/MeterItemManage.vue

+<template>
+  <div>
+    <Modal v-model="showModal" width="1100" class="modal-footer-none">
+      <p slot="header">{{modalTitle}}</p>
+      <div>
+        <!--内容-->
+        <Row>
+          <!--查询-->
+          <Col span="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"/>
+              </Form-item>
+              <Form-item class="search-btn" style="margin-left: -10px">
+                <Button type="primary" @click="_formSearch">搜索</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>
+          </Col>
+          <Col span="24">
+            <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage"
+                         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" 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>
+                  <span v-else-if="item.key==='singleJudge'">
+                     {{ scope.row[item.key]===undefined?'':scope.row[item.key].display }}
+                   </span>
+<!--                  <div v-else-if="item.key==='testValue'">-->
+<!--                    <el-input-->
+<!--                      v-model="scope.row.testValue"-->
+<!--                      size="medium"-->
+<!--                      placeholder="请输入检测结果"-->
+<!--                      @blur="_handleTestValueEdit(scope.row.id,scope.row.testValue)"-->
+<!--                    />-->
+<!--                  </div>-->
+                  <div v-else-if="item.key==='progress'">
+                    {{scope.row.progress.display}}
+                  </div>
+                  <div v-else>{{scope.row[item.key]}}</div>
+                </template>
+              </vxe-table-column>
+            </PTVXETable>
+          </Col>
+        </Row>
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+import { meterItem } from '../../../api'
+export default {
+  components: {
+    // FoodSampleGovernDetail,
+    // CopyModal,
+    // FoodSampleGovernLYEdits
+  },
+  data() {
+    return {
+      currentComponent: '',
+      iconMsg: [
+        { type: 'compose', id: '', name: '编辑' },
+        { type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' },
+        { type: 'trash-a', id: '', name: '删除' }
+      ],
+      btn: [],
+      options: [
+        {
+          name: '检定'
+        },
+        {
+          name: '校准'
+        },
+        {
+          name: '外观检查'
+        }
+      ],
+      formId: 'meterReviewSampleManageFormId',
+      showModal: false,
+      searchOpen: false,
+      modalTitle: '检测项目管理',
+      selectIds: [],
+      selectData: [],
+      getPage: {},
+      pageColumns: [
+        { title: '检定项目', key: 'name', width: 180 },
+        { title: '比较符', key: 'compare', width: 100 },
+        { title: '限量值', key: 'limitValue', width: 140 },
+        { title: '检测值', key: 'testValue', width: 140 },
+        { title: '单项判定', key: 'singleJudge', width: 140 },
+        { title: '进度', key: 'progress', width: 110 }
+      ],
+      dateList: [],
+      formObj: {
+        sampleId: undefined,
+        name: undefined,
+        code: undefined,
+        type: undefined
+      }
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      return this.$tableHeight('tableModal')
+    }
+  },
+  methods: {
+    _dateChange(data) {
+      this.formObj.ctimeBegin = data[0]
+      this.formObj.ctimeEnd = data[1]
+    },
+    _btnClick(msg, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (msg) {
+          case '完成':
+            this._testEnd()
+            break
+          case '导入检测项目':
+            this._importItem()
+            break
+          case '导入检测项目包':
+            this._importItemPackage()
+            break
+          case '复制历史样品检测项目':
+            this._copyHisItem()
+            break
+          case '删除':
+            this._deleteSelected()
+            break
+        }
+      })
+    },
+    _iconClick(res, data, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (res) {
+          case '编辑':
+            localStorage.setItem('type', data.type)
+            if (data.type === 2) {
+              this._editLY(data.id) // 粮油的编辑页
+            } else {
+              this._editModal(true, data.id)
+            }
+            break
+          case '复制':
+            this._copy(data.id, data.type)
+            break
+          case '删除':
+            this._deleteById(data.id)
+            break
+          case '检测项目':
+            this._itemDetail(data.id)
+            break
+        }
+      })
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'selectData':
+          const selectIds = []
+          for (let i = 0; i < data.length; i++) {
+            selectIds.push(data[i].id)
+          }
+          this.selectIds = selectIds
+          this.selectData = data
+          break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData, data.componentName)
+          break
+        case 'changeSize':
+          this._page()
+          break
+      }
+    },
+    _open(id) {
+      this.formObj.sampleId = id
+      this.showModal = true
+      this._page()
+    },
+
+    _testEnd() {
+      if (this.selectIds.length === 0) {
+        this.$Message.success('请选择完成检测的项目')
+        return false
+      }
+      this._testItemEnd(this.selectIds)
+    },
+    _testItemEnd: async function() {
+      const result = await meterItem.testEnd({
+        ids: this.selectIds,
+        sampleId: this.formObj.sampleId
+      })
+      if (result) {
+        await this._page()
+      }
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      console.log('this.formObj', this.formObj)
+      const result = await meterItem.page(this.formObj)
+      console.log('result', result)
+      if (result) {
+        this.getPage = result
+        this.$refs.pageTable._hideLoading()
+      }
+    },
+    _deleteByIds(ids, content) {
+      this.$Modal.confirm({
+        title: '提示',
+        content: content || '确定删除该记录？',
+        onOk: () => {
+          this.$store.dispatch('FoodSample/deleteByIds', ids).then(() => {
+            this._resultChange('删除成功!')
+          })
+        }
+      })
+    },
+    _deleteById(id) {
+      // 删除一条记录
+      this._deleteByIds([id])
+    },
+    _deleteSelected() {
+      // 批量删除
+      const ids = this.selectIds
+      if (ids.length === 0) {
+        this.$Message.warning('请选择一条或多条数据！')
+      } else {
+        this._deleteByIds(ids, '确定删除 ' + ids.length + ' 条记录？')
+      }
+    },
+    _detailModal(id) {
+      this.currentComponent = 'FoodSampleGovernDetail'
+      this.$nextTick(function() {
+        this.$store.dispatch('FoodSample/getByGovernId', id).then(() => {
+          this.$refs.refModal._open(this.$store.state.FoodSample.governModel)
+        })
+      })
+    },
+    _editModal(edit, id) {
+      this.currentComponent = 'FoodSampleGovernEdit'
+      this.$nextTick(function() {
+        if (edit) {
+          this.$store.dispatch('FoodSample/getByGovernId', id).then(() => {
+            this.$refs.refModal._open(
+              this.$store.state.FoodSample.governModel,
+              this.contractId
+            )
+          })
+        } else {
+          this.$refs.refModal._open('', this.contractId)
+        }
+      })
+    },
+    _editLY(id) {
+      // 粮油的编辑
+      this.currentComponent = 'FoodSampleGovernLYEdit'
+      this.$nextTick(function() {
+        this.$store.dispatch('FoodSample/getByGovernId', id).then(() => {
+          this.$refs.refModal._open(
+            this.$store.state.FoodSample.governModel,
+            this.contractId
+          )
+        })
+      })
+    },
+    _search() {
+      this._page()
+    },
+    _searchParams() {
+      const data = this.$serialize('search-sample-govern')
+      return this.$extend(data, this.pageParams)
+    },
+    _resultChange(msg) {
+      if (this.$store.state.FoodSample.success) {
+        this._page()
+        this.$Message.success(msg)
+      }
+    },
+    _copy(sampleId, type) {
+      this.$refs.refModal._open(sampleId, type)
+    },
+    // 导入样品
+    _importSample() {
+      const data = {
+        importUrl: '/food/v1/sample/government/import_' + this.contractId,
+        downloadUrl: '/food/v1/excel/template/FoodSampleGovernment',
+        title: '导入'
+      }
+      this.$refs.refModal._open(data)
+    },
+    // 导入检测项目
+    _importItem() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选中一条样品数据！')
+      } else {
+        this.$refs.refModal._open(this.selectIds, this.selectData[0])
+      }
+    },
+    _subpackageSample() {
+      if (this.selectData.length === 0) {
+        this.$Message.warning('请至少选中一条样品进行分包！')
+        return false
+      } else {
+        for (let i = 0; i < this.selectData.length; i++) {
+          if (this.selectData[i].jobOut === 1) {
+            this.$Message.warning(
+              '样品编号为' +
+                this.selectData[i].code +
+                '已经分包了，请选择未分包的样品！'
+            )
+            return false
+          }
+        }
+        this._subpackage(this.selectIds)
+      }
+    },
+
+    _importItemPackage() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选中一条样品数据！')
+      } else {
+        this.$refs.refModal._open(this.selectIds, 'batch-rel-package-item')
+      }
+    },
+    _copyHisItem() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选中一条样品数据！')
+      } else {
+        this.$refs.refModal._open(this.selectIds)
+      }
+    },
+    _itemDetail(id) {
+      this.$refs.foodItem._open(id)
+    },
+    _operationRecord(id) {
+      // 操作日志
+      this.$refs.recordModal._open(id)
+    },
+    // 单个填写检测值
+    _handleTestValueEdit: async function(id, testValue) {
+      if (testValue !== '' && undefined !== testValue) {
+        const data = {}
+        data.itemIds = id
+        data.testValue = testValue
+        const result = await meterItem.testValue(data)
+        if (result) {
+          this.$Message.success('保存成功')
+          await this._page()
+        } else {
+          this.$Message.error('保存失败')
+        }
+      }
+    }
+  }
+}
+</script>

pages/meter-entrust/client-online/MeterSampleEdit.vue

+<template>
+  <div>
+    <Modal v-model="showModal" :mask-closable="false" width="600">
+      <p slot="header">{{modalTitle}}</p>
+      <div>
+        <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100">
+          <Form-item label="样品名称" prop="name">
+            <Input v-model="formObj.name" name="name" placeholder="请输入或选择样品名称" @on-result-change="_judgeBasisChange" />
+          </Form-item>
+          <Form-item label="检定依据" prop="verification">
+            <Input v-model="formObj.verification" name="verification" placeholder="请选择检定依据" />
+          </Form-item>
+          <Form-item label="型号规格" prop="spec">
+            <Input v-model="formObj.spec" name="spec" placeholder="请输入型号规格" />
+          </Form-item>
+          <Form-item label="出厂编号" prop="factoryNumber">
+            <Input v-model="formObj.factoryNumber" name="factoryNumber" placeholder="请输入出厂编号" />
+          </Form-item>
+          <Form-item label="数量" prop="quantity">
+            <Input v-model="formObj.quantity" name="quantity" placeholder="请选择数量" />
+          </Form-item>
+
+          <Form-item label="检测类型" prop="type">
+            <Input v-model="formObj.type" name="quantity" placeholder="请选择检测类型" />
+          </Form-item>
+
+          <Form-item label="备注" prop="remark">
+            <Input v-model="formObj.remark" :rows="3" placeholder="请输入备注" type="textarea" name="remark"/>
+          </Form-item>
+        </Form>
+      </div>
+      <div slot="footer">
+        <ModalFooter ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></ModalFooter>
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+/**
+ * 添加编辑环境检测项目包
+ */
+import ModalFooter from '../../../components/base/modalFooter'
+import { meterAptitude } from '../../../api'
+
+export default {
+  components: {
+    ModalFooter
+    // autoComplete
+  },
+  data() {
+    // const validateJudgeBasis = (rule, value, callback) => {
+    //   if (this.formObj.code === '') {
+    //     callback(new Error('判定依据不能为空！'))
+    //   } else if (this.formObj.stdId === '') {
+    //     this.formObj.code = ''
+    //     callback(new Error('请选择已维护过的判定依据！'))
+    //   } else {
+    //     callback()
+    //   }
+    // }
+    return {
+      id: '',
+      modalTitle: '',
+      formObj: {
+        verification: '',
+        name: '',
+        spec: '',
+        factoryNumber: '',
+        type: '',
+        remark: '',
+        quantity: 1,
+        entrustId: ''
+      },
+      showModal: false,
+      aptitudeData: [],
+      ruleValidate: {
+        name: [{ required: true, message: '样品名称不能为空', trigger: 'blur' }]
+      },
+      footerList: [
+        { name: '取消', type: '' },
+        { name: '保存', type: 'primary' }
+      ],
+      typeData: [],
+      judgeBasisData: []
+    }
+  },
+  methods: {
+    _save: async function(data) {
+      const result = await meterAptitude.save(data)
+      console.log(result)
+      if (result) {
+        this._resultChange('添加成功!')
+      }
+    },
+    _edit: async function(data) {
+      const result = await meterAptitude.edit(data)
+      if (result) {
+        this._resultChange('编辑成功!')
+      }
+    },
+    _open(entrustId) {
+      this.formObj.entrustId = entrustId
+      this._getJudgeBasisList()
+      this.$refs.formObj.resetFields()
+      this.id = ''
+      this.modalTitle = '添加样品'
+      this.showModal = true
+    },
+    _typeChange(msg, data) {
+      switch (msg) {
+        case 'select':
+          this.formObj.testType = data.name
+          break
+      }
+    },
+    _ok() {
+      this.$refs.formObj.validate(valid => {
+        if (valid) {
+          const data = this.$serialize('edit-form')
+          if (this.$string(this.id).isEmpty()) {
+            // 添加
+            this._save(data)
+          } else {
+            // 编辑
+            this._edit({ id: this.formObj.id, obj: data })
+          }
+          // if (this.$string(this.id).isEmpty()) {
+          //   // 添加
+          //   this.$store.dispatch('FoodJudgeBasis/add', data).then(() => {
+          //     this._resultChange('添加成功!')
+          //   })
+          // } else {
+          //   // 编辑
+          //   this.$store
+          //     .dispatch('FoodJudgeBasis/edit', { id: this.id, obj: data })
+          //     .then(() => {
+          //       this._resultChange('编辑成功!')
+          //     })
+          // }
+        } else {
+          this.$refs.footerModal._hideLoading()
+          this.$Message.error('表单验证失败!')
+        }
+      })
+    },
+    _footerResult(name) {
+      switch (name) {
+        case '取消':
+          this._cancel()
+          break
+        case '保存':
+          this._ok()
+          break
+      }
+    },
+    _cancel() {
+      this.showModal = false
+    },
+    _resultChange(msg) {
+      this.showModal = false
+      this.$refs.footerModal._hideLoading()
+      this.$Message.success(msg)
+      this.$emit('on-result-change')
+      this.$refs.footerModal._hideLoading()
+    },
+    // 关联
+    _getJudgeBasisList(data) {
+      const obj = { classify: 0 }
+      if (data) {
+        obj.stdNum = data
+      }
+      // this.$store.dispatch('StandardInfo/list', obj).then(() => {
+      //   this.judgeBasisData = this.$store.state.StandardInfo.list
+      // })
+    },
+    _judgeBasisChange(msg, data) {
+      switch (msg) {
+        case 'select':
+          this.formObj.stdId = data.id
+          this.formObj.code = data.stdNum
+          this.formObj.name = data.name
+          this.$refs.formObj.validateField('code')
+          break
+        case 'query':
+          this.formObj.stdId = ''
+          this.formObj.code = data.stdNum
+          this.formObj.name = ''
+          this._getJudgeBasisList(data.stdNum)
+          break
+        case 'focus':
+          this._getJudgeBasisList()
+          break
+        case 'blur':
+          if (this.formObj.stdId === '') {
+            this.formObj.code = ''
+            this._getJudgeBasisList()
+          }
+          this.$refs.formObj.validateField('code')
+      }
+    }
+  }
+}
+</script>

pages/meter-entrust/client-online/MeterSampleManage.vue

+<template>
+  <div>
+    <Modal v-model="showModal" width="1200" class="modal-footer-none">
+      <p slot="header">{{modalTitle}}</p>
+      <div>
+        <!--内容-->
+        <Row>
+          <!--查询-->
+          <Col span="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"/>
+              </Form-item>
+              <Form-item label="样品编号:" class="search-item">
+                <Input v-model="formObj.code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
+              </Form-item>
+              <Form-item class="search-btn" style="margin-left: -10px">
+                <Button type="primary" @click="_formSearch">搜索</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>
+          </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">
+              <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" 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">
+                        {{ item.name }}
+                      </Option>
+                    </Select>
+                  </div>
+                  <div v-else>{{scope.row[item.key]}}</div>
+                </template>
+              </vxe-table-column>
+            </PTVXETable>
+          </Col>
+        </Row>
+      </div>
+    </Modal>
+    <importModal ref="importModal" @on-result-change="_page"></importModal>
+    <MeterSampleManageEdit ref="sampleEditModal" @on-result-change="_page"></MeterSampleManageEdit>
+    <MeterSampleEdit ref="meterSampleEditModal" @on-result-change="_page"></MeterSampleEdit>
+  </div>
+</template>
+<script>
+import { meterSample } from '../../../api'
+import importModal from '../../contract-tab/ContractTab'
+import MeterSampleManageEdit from './MeterItemManage'
+import MeterSampleEdit from './MeterSampleEdit'
+export default {
+  components: {
+    MeterSampleManageEdit,
+    MeterSampleEdit,
+    importModal
+  },
+  data() {
+    return {
+      currentComponent: '',
+      searchOpen: false,
+      iconMsg: [
+        { type: 'compose', id: '', name: '编辑' },
+        { type: 'ios-flask-outline', id: '', name: '管理检测项目' },
+        { type: 'trash-a', id: '', name: '删除' }
+      ],
+      btn: [
+        {
+          type: 'success',
+          id: '',
+          name: '新增'
+        },
+        {
+          type: 'success',
+          id: '',
+          name: '分包'
+        },
+        {
+          type: 'success',
+          id: '',
+          name: '取消分包'
+        },
+        {
+          type: 'success',
+          id: '',
+          name: '导入检测项目'
+        }
+      ],
+      options: [
+        {
+          name: '检定'
+        },
+        {
+          name: '校准'
+        },
+        {
+          name: '外观检查'
+        }
+      ],
+      formId: 'meterReviewSampleManageFormId',
+      showModal: false,
+      modalTitle: '管理样品',
+      selectIds: [],
+      selectData: [],
+      getPage: {},
+      pageColumns: [
+        { 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: {
+        entrustId: undefined,
+        name: undefined,
+        code: undefined,
+        type: undefined
+      }
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      return this.$tableHeight('tableModal')
+    }
+  },
+  methods: {
+    _dateChange(data) {
+      this.formObj.ctimeBegin = data[0]
+      this.formObj.ctimeEnd = data[1]
+    },
+    _btnClick(msg, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (msg) {
+          case '取消分包':
+            this._subpackageCancelBtn()
+            break
+          case '新增':
+            this._addSample(this.formObj.entrustId)
+            break
+          case '导入样品':
+            this._importSample(this.formObj.entrustId)
+            break
+          case '分包':
+            this._subpackageSample()
+            break
+          case '导入检测项目':
+            this._importItem()
+            break
+          case '导入检测项目包':
+            this._importItemPackage()
+            break
+          case '复制历史样品检测项目':
+            this._copyHisItem()
+            break
+          case '删除':
+            this._deleteSelected()
+            break
+        }
+      })
+    },
+
+    _addSample(entrustId) {
+      this.$refs.meterSampleEditModal._open(entrustId)
+    },
+
+    _iconClick(res, data, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (res) {
+          case '管理检测项目':
+            this._sampleEditModal(data)
+            break
+          case '编辑':
+            localStorage.setItem('type', data.type)
+            if (data.type === 2) {
+              this._editLY(data.id) // 粮油的编辑页
+            } else {
+              this._editModal(true, data.id)
+            }
+            break
+          case '复制':
+            this._copy(data.id, data.type)
+            break
+          case '删除':
+            this._deleteById(data.id)
+            break
+          case '检测项目':
+            this._itemDetail(data.id)
+            break
+        }
+      })
+    },
+    _subpackageCancelBtn() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条数据！')
+      } else {
+        const data = {}
+        data.ids = this.selectIds.join(',')
+        this._subpackageCancel(data)
+      }
+    },
+    _subpackageCancel: async function(data) {
+      console.log(data)
+      const result = await meterSample.subpackageCancel(data)
+      if (result) {
+        this.$Message.success('取消成功!')
+        await this._page()
+      }
+    },
+    _sampleEditModal(data) {
+      this.$refs.sampleEditModal._open(data.id)
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'selectData':
+          const selectIds = []
+          for (let i = 0; i < data.length; i++) {
+            selectIds.push(data[i].id)
+          }
+          this.selectIds = selectIds
+          this.selectData = data
+          break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData, data.componentName)
+          break
+        case 'changeSize':
+          this._page()
+          break
+      }
+    },
+    _open(id) {
+      this.formObj.entrustId = id
+      this.showModal = true
+      this._page()
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    _page: async function() {
+      this.selectIds = []
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      console.log('this.formObj', this.formObj)
+      const result = await meterSample.page(this.formObj)
+      if (result) {
+        this.getPage = result
+        this.$refs.pageTable._hideLoading()
+      }
+    },
+    _deleteByIds(ids, content) {
+      this.$Modal.confirm({
+        title: '提示',
+        content: content || '确定删除该记录？',
+        onOk: () => {
+          this.$store.dispatch('FoodSample/deleteByIds', ids).then(() => {
+            this._resultChange('删除成功!')
+          })
+        }
+      })
+    },
+    _deleteById(id) {
+      // 删除一条记录
+      this._deleteByIds([id])
+    },
+    _deleteSelected() {
+      // 批量删除
+      const ids = this.selectIds
+      if (ids.length === 0) {
+        this.$Message.warning('请选择一条或多条数据！')
+      } else {
+        this._deleteByIds(ids, '确定删除 ' + ids.length + ' 条记录？')
+      }
+    },
+    _detailModal(id) {
+      this.currentComponent = 'FoodSampleGovernDetail'
+      this.$nextTick(function() {
+        this.$store.dispatch('FoodSample/getByGovernId', id).then(() => {
+          this.$refs.refModal._open(this.$store.state.FoodSample.governModel)
+        })
+      })
+    },
+    _editModal(edit, id) {
+      this.currentComponent = 'FoodSampleGovernEdit'
+      this.$nextTick(function() {
+        if (edit) {
+          this.$store.dispatch('FoodSample/getByGovernId', id).then(() => {
+            this.$refs.refModal._open(
+              this.$store.state.FoodSample.governModel,
+              this.contractId
+            )
+          })
+        } else {
+          this.$refs.refModal._open('', this.contractId)
+        }
+      })
+    },
+    _editLY(id) {
+      // 粮油的编辑
+      this.currentComponent = 'FoodSampleGovernLYEdit'
+      this.$nextTick(function() {
+        this.$store.dispatch('FoodSample/getByGovernId', id).then(() => {
+          this.$refs.refModal._open(
+            this.$store.state.FoodSample.governModel,
+            this.contractId
+          )
+        })
+      })
+    },
+    _search() {
+      this._page()
+    },
+    _searchParams() {
+      const data = this.$serialize('search-sample-govern')
+      return this.$extend(data, this.pageParams)
+    },
+    _resultChange(msg) {
+      if (this.$store.state.FoodSample.success) {
+        this._page()
+        this.$Message.success(msg)
+      }
+    },
+    // 导入样品
+    _importSample() {
+      const data = {
+        importUrl: '/meter/v1/sample/import_' + this.formObj.entrustId,
+        downloadUrl: '/meter/v1/excel/template/MeterSampleImport',
+        title: '导入'
+      }
+      this.$refs.refModal._open(data)
+    },
+    // 导入检测项目
+    _importItem() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选中一条样品数据！')
+      } else {
+        this.$refs.importModal._open(this.selectIds, this.selectData[0])
+      }
+    },
+    _subpackageSample() {
+      if (this.selectData.length === 0) {
+        this.$Message.warning('请至少选中一条样品进行分包！')
+        return false
+      } else {
+        for (let i = 0; i < this.selectData.length; i++) {
+          if (this.selectData[i].jobOut === 1) {
+            this.$Message.warning(
+              '样品编号为' +
+                this.selectData[i].code +
+                '已经分包了，请选择未分包的样品！'
+            )
+            return false
+          }
+        }
+        this._subpackage(this.selectIds)
+      }
+    },
+    _subpackage: async function(ids) {
+      const result = await meterSample.subpackageSample(ids)
+      if (result) {
+        this.$Message.success('分包成功！')
+        await this._page()
+      }
+    },
+    _itemDetail(id) {
+      this.$refs.foodItem._open(id)
+    },
+    _operationRecord(id) {
+      // 操作日志
+      this.$refs.recordModal._open(id)
+    }
+  }
+}
+</script>

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

@@ -134,11 +134,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {
@@ -208,9 +203,6 @@ export default {
     },
     _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

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

@@ -121,11 +121,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

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

@@ -98,9 +98,6 @@ export default {
 
     _tableResultChange(msg, data) {
       switch (msg) {
-        case 'page':
-          this.getPage = this.$store.state.FoodContractRecord.page
-          break
         case 'changeSize':
           this._page()
           break

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

@@ -398,9 +398,6 @@ export default {
     },
     _tableResultChange(msg, data) {
       switch (msg) {
-        case 'page':
-          // this.getPage = this.$store.state.FoodJudgeBasis.page
-          break
         case 'selectIds':
           // this.selectIds = data
           break

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

@@ -126,11 +126,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {
@@ -203,9 +198,6 @@ export default {
     },
     _tableResultChange(msg, data) {
       switch (msg) {
-        case 'page':
-          this.getPage = this.$store.state.FoodSubcontracter.page
-          break
         case 'selectIds':
           this.selectIds = data
           break

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

@@ -115,11 +115,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

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

@@ -98,9 +98,6 @@ export default {
 
     _tableResultChange(msg, data) {
       switch (msg) {
-        case 'page':
-          this.getPage = this.$store.state.FoodContractRecord.page
-          break
         case 'changeSize':
           this._page()
           break

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

@@ -349,9 +349,6 @@ export default {
     },
     _tableResultChange(msg, data) {
       switch (msg) {
-        case 'page':
-          // this.getPage = this.$store.state.FoodJudgeBasis.page
-          break
         case 'selectIds':
           // this.selectIds = data
           break

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

@@ -176,11 +176,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

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

@@ -124,11 +124,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

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

@@ -170,19 +170,6 @@ export default {
     }
   },
   methods: {
-    _modalResult(data1, data2) {
-      switch (this.currentComponent) {
-        case 'CopyModal':
-          if (data1 === 0) {
-            this._copySample(data2)
-          } else {
-            this._copyAll(data2)
-          }
-          break
-        default:
-          this._search()
-      }
-    },
     _dateChange(data) {
       this.formObj.ctimeBegin = data[0]
       this.formObj.ctimeEnd = data[1]

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

@@ -128,19 +128,6 @@ export default {
     }
   },
   methods: {
-    _modalResult(data1, data2) {
-      switch (this.currentComponent) {
-        case 'CopyModal':
-          if (data1 === 0) {
-            this._copySample(data2)
-          } else {
-            this._copyAll(data2)
-          }
-          break
-        default:
-          this._search()
-      }
-    },
     _dateChange(data) {
       this.formObj.ctimeBegin = data[0]
       this.formObj.ctimeEnd = data[1]

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

@@ -117,11 +117,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

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

@@ -121,11 +121,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

pages/meter-review/MeterReviewEntrust.vue

@@ -149,11 +149,6 @@ export default {
       //   })
       // })
     },
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {
@@ -204,7 +199,7 @@ export default {
       this.$nextTick(function() {
         switch (res) {
           case '样品管理':
-            this._manageSample(data)
+            this._manageSample(data.id)
             break
           case '详情':
             this._detailModal(data)
@@ -229,7 +224,7 @@ export default {
     },
     _manageSample(data) {
       // 管理样品
-      this.$refs.meterSampleManageModal._open(data.id)
+      this.$refs.meterSampleManageModal._open(data)
     },
     _componentResult(data, msg) {
       switch (this.currentComponent) {

pages/meter-review/MeterReviewEntrustHis.vue

@@ -116,11 +116,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

pages/meter-review/MeterReviewItemManage.vue

@@ -121,19 +121,6 @@ export default {
     }
   },
   methods: {
-    _modalResult(data1, data2) {
-      switch (this.currentComponent) {
-        case 'CopyModal':
-          if (data1 === 0) {
-            this._copySample(data2)
-          } else {
-            this._copyAll(data2)
-          }
-          break
-        default:
-          this._search()
-      }
-    },
     _dateChange(data) {
       this.formObj.ctimeBegin = data[0]
       this.formObj.ctimeEnd = data[1]

pages/meter-review/MeterSampleManage.vue

@@ -149,19 +149,6 @@ export default {
     }
   },
   methods: {
-    _modalResult(data1, data2) {
-      switch (this.currentComponent) {
-        case 'CopyModal':
-          if (data1 === 0) {
-            this._copySample(data2)
-          } else {
-            this._copyAll(data2)
-          }
-          break
-        default:
-          this._search()
-      }
-    },
     _dateChange(data) {
       this.formObj.ctimeBegin = data[0]
       this.formObj.ctimeEnd = data[1]

pages/meter-send/receive-sample/MeterReceiveEntrust.vue

@@ -130,24 +130,6 @@ export default {
     _detailModal(data) {
       console.log(data)
       this.$refs.meterSampleEdit._open(data)
-      // 查看
-      // this.$store.dispatch('FoodContract/getById', data.id).then(() => {
-      //   if (data.type === 0) {
-      //     // 企业委托 ’0‘
-      //     this.currentComponent = 'FoodContractCompanyDetail'
-      //   } else {
-      //     // 政府委托 ’1‘
-      //     this.currentComponent = 'FoodContractGovernDetail'
-      //   }
-      //   this.$nextTick(() => {
-      //     this.$refs.refModal._open(this.$store.state.FoodContract.model)
-      //   })
-      // })
-    },
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
     },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
@@ -169,7 +151,7 @@ export default {
       this.$nextTick(function() {
         switch (res) {
           case '样品管理':
-            this._manageSample(data)
+            this._manageSample(data.id)
             break
           case '详情':
             this._detailModal(data)
@@ -194,7 +176,7 @@ export default {
     },
     _manageSample(data) {
       // 管理样品
-      this.$refs.meterSampleManageModal._open(data.id)
+      this.$refs.meterSampleManageModal._open(data)
     },
     _componentResult(data, msg) {
       switch (this.currentComponent) {

pages/meter-send/receive-sample/MeterReceiveEntrustHis.vue

@@ -116,11 +116,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

pages/meter-send/receive-sample/MeterSampleManage.vue

@@ -141,19 +141,6 @@ export default {
     }
   },
   methods: {
-    _modalResult(data1, data2) {
-      switch (this.currentComponent) {
-        case 'CopyModal':
-          if (data1 === 0) {
-            this._copySample(data2)
-          } else {
-            this._copyAll(data2)
-          }
-          break
-        default:
-          this._search()
-      }
-    },
     _cancel() {
       this.showModal = false
       this.$emit('on-result-change')

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

@@ -152,19 +152,6 @@ export default {
     }
   },
   methods: {
-    _modalResult(data1, data2) {
-      switch (this.currentComponent) {
-        case 'CopyModal':
-          if (data1 === 0) {
-            this._copySample(data2)
-          } else {
-            this._copyAll(data2)
-          }
-          break
-        default:
-          this._search()
-      }
-    },
     _dateChange(data) {
       this.formObj.ctimeBegin = data[0]
       this.formObj.ctimeEnd = data[1]

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

@@ -133,11 +133,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

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

@@ -122,11 +122,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

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

@@ -148,19 +148,6 @@ export default {
     }
   },
   methods: {
-    _modalResult(data1, data2) {
-      switch (this.currentComponent) {
-        case 'CopyModal':
-          if (data1 === 0) {
-            this._copySample(data2)
-          } else {
-            this._copyAll(data2)
-          }
-          break
-        default:
-          this._search()
-      }
-    },
     _dateChange(data) {
       this.formObj.ctimeBegin = data[0]
       this.formObj.ctimeEnd = data[1]

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

@@ -159,11 +159,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

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

@@ -124,11 +124,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

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

@@ -143,19 +143,6 @@ export default {
     }
   },
   methods: {
-    _modalResult(data1, data2) {
-      switch (this.currentComponent) {
-        case 'CopyModal':
-          if (data1 === 0) {
-            this._copySample(data2)
-          } else {
-            this._copyAll(data2)
-          }
-          break
-        default:
-          this._search()
-      }
-    },
     _footerResult(name) {
       switch (name) {
         case '关闭':

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

@@ -132,11 +132,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

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

@@ -124,11 +124,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

pages/meter-subcontract/MeterSubSampleQuery.vue

@@ -148,19 +148,6 @@ export default {
     }
   },
   methods: {
-    _modalResult(data1, data2) {
-      switch (this.currentComponent) {
-        case 'CopyModal':
-          if (data1 === 0) {
-            this._copySample(data2)
-          } else {
-            this._copyAll(data2)
-          }
-          break
-        default:
-          this._search()
-      }
-    },
     _dateChange(data) {
       this.formObj.ctimeBegin = data[0]
       this.formObj.ctimeEnd = data[1]

pages/meter-subcontract/subcontractor/MeterSubcontractor.vue

@@ -107,11 +107,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

pages/meter-subcontract/subpackage-input/MeterSubSampleManage.vue

@@ -159,19 +159,6 @@ export default {
     }
   },
   methods: {
-    _modalResult(data1, data2) {
-      switch (this.currentComponent) {
-        case 'CopyModal':
-          if (data1 === 0) {
-            this._copySample(data2)
-          } else {
-            this._copyAll(data2)
-          }
-          break
-        default:
-          this._search()
-      }
-    },
     _dateChange(data) {
       this.formObj.ctimeBegin = data[0]
       this.formObj.ctimeEnd = data[1]

pages/meter-subcontract/subpackage-input/MeterSubpackageInput.vue

@@ -127,11 +127,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

pages/meter-subcontract/subpackage-input/MeterSubpackageInputHis.vue

@@ -117,11 +117,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

pages/meter-subcontract/subpackage-input/SubResultInputEdit.vue

@@ -152,19 +152,6 @@ export default {
     }
   },
   methods: {
-    _modalResult(data1, data2) {
-      switch (this.currentComponent) {
-        case 'CopyModal':
-          if (data1 === 0) {
-            this._copySample(data2)
-          } else {
-            this._copyAll(data2)
-          }
-          break
-        default:
-          this._search()
-      }
-    },
     _dateChange(data) {
       this.formObj.ctimeBegin = data[0]
       this.formObj.ctimeEnd = data[1]

pages/meter-subcontract/subpackage-task/MeterSubSampleManage.vue

@@ -154,19 +154,6 @@ export default {
     }
   },
   methods: {
-    _modalResult(data1, data2) {
-      switch (this.currentComponent) {
-        case 'CopyModal':
-          if (data1 === 0) {
-            this._copySample(data2)
-          } else {
-            this._copyAll(data2)
-          }
-          break
-        default:
-          this._search()
-      }
-    },
     _dateChange(data) {
       this.formObj.ctimeBegin = data[0]
       this.formObj.ctimeEnd = data[1]

pages/meter-subcontract/subpackage-task/MeterSubpackageTask.vue

@@ -128,11 +128,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

pages/meter-subcontract/subpackage-task/MeterSubpackageTaskHis.vue

@@ -103,11 +103,6 @@ export default {
     this._page()
   },
   methods: {
-    _modalResult() {
-      if (this.currentComponent === 'FoodSubcontracterEdit') {
-        this._page()
-      }
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {

router/meter-routes.js

@@ -33,6 +33,7 @@ import MeterContractRegisterIndex from '../pages/meter-contract/contract-registe
 import MeterContractReviewIndex from '../pages/meter-contract/contract-review/MeterContractReviewIndex'
 import MeterContractFileIndex from '../pages/meter-contract/contract-file/MeterContractFileIndex'
 import MeterSampleProgress from '../pages/meter-progress/progress-sample/MeterSampleProgress'
+import MeterClientOnlineEntrustIndex from '../pages/meter-entrust/client-online/MeterClientOnlineEntrustIndex'
 import Blank from '~/pages/blank'
 export default [
   {
@@ -82,6 +83,11 @@ export default [
     component: Blank,
     children: [
       {
+        path: 'client_online',
+        component: MeterClientOnlineEntrustIndex,
+        meta: { title: '客户在线委托单' }
+      },
+      {
         path: 'send_test',
         component: MeterSendEntrustIndex,
         meta: { title: '送检委托登记' }