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

 Conflicts:
	pages/meter-business/MeterSampleQuoteManage.vue
	pages/meter-business/accepted/MeterContractAccepted.vue

api/index.js

@@ -33,4 +33,5 @@ export { default as meterManageItem } from './meter/meter-manage-item'
 export { default as meterItem } from './meter/meter-item'
 export { default as meterDevice } from './meter/meter-device'
 export { default as meterContract } from './meter/meter-contract'
+export { default as meterSampleQuote } from './meter/meter-sample-quote'
 export { default as lmsBaseDict } from './lims/lms-base-dict'

api/meter/meter-contract.js

@@ -24,12 +24,22 @@ export default {
 
   pageAccepted: data =>
     http.post('meter/v1/contract/page_accepted', data).then(res => res),
-
+  pageContractRegister: data =>
+    http
+      .post('meter/v1/contract/page_contract_register', data)
+      .then(res => res),
+  pageContractReview: data =>
+    http.post('meter/v1/contract/page_contract_review', data).then(res => res),
   submitQuoteFirstReview: data =>
     http
       .post('meter/v1/contract/submit_to_review_first?ids=' + data)
       .then(res => res),
 
+  submitToContractRegister: data =>
+    http
+      .post('meter/v1/contract/submit_to_contract_register?ids=' + data)
+      .then(res => res),
+
   submitToReviewThird: data =>
     http
       .post('meter/v1/contract/submit_to_review_third?ids=' + data)
@@ -39,6 +49,11 @@ export default {
       .post('meter/v1/contract/submit_to_accepted?ids=' + data)
       .then(res => res),
 
+  submitToContractReview: data =>
+    http
+      .post('meter/v1/contract/submit_to_contract_review?ids=' + data)
+      .then(res => res),
+
   submitToReviewSecond: data =>
     http
       .post('meter/v1/contract/submit_to_review_second?ids=' + data)

api/meter/meter-sample-quote.js

+/**
+ * 工作台
+ */
+import http from '../http'
+export default {
+  // page
+  page: data => http.post('meter/v1/sample_quote/page', data).then(res => res),
+  getById: data => http.get('meter/v1/sample_quote/' + data).then(res => res),
+  deleteById: data =>
+    http.delete('meter/v1/sample_quote/?ids=' + data).then(res => res),
+  // 保存
+  save: data => http.post('meter/v1/sample_quote/', data).then(res => res),
+  // 编辑
+  edit: data =>
+    http.put('meter/v1/sample_quote/' + data.id, data.obj).then(res => res)
+}

pages/meter-business/accepted/MeterSampleManage.vue → pages/meter-business/MeterSampleQuoteManage.vue

@@ -10,24 +10,24 @@
             <Form id="formId" :label-width="80" inline onsubmit="return false">
               <label class="label-sign"></label>
               <Form-item label="样品名称:" class="search-item">
-                <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入样品名称" clearable/>
+                <Input v-model="formObj.name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item label="样品编号:" class="search-item">
-                <Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入样品编号" clearable/>
+                <Input v-model="formObj.code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item class="search-btn" style="margin-left: -10px">
-                <Button @click="_formSearch" type="primary">搜索</Button>
+                <Button type="primary" @click="_formSearch">搜索</Button>
               </Form-item>
             </Form>
           </Col>
           <Col span="24">
 
-            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
-                      class="contHide"></btn-list>
+            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
+                      @on-result-change="_btnClick"></btn-list>
           </Col>
           <Col span="24">
             <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage"
-                        :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
+                        :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"

pages/meter-business/accepted/MeterContractAccepted.vue

@@ -6,24 +6,24 @@
         <Row>
           <!--查询-->
           <Col span="24" style="margin-top: 10px">
-            <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
+            <Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
               <label class="label-sign"></label>
               <Form-item class="search-item" label="实验室名称:">
-                <Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/>
+                <Input v-model="formObj.name" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item class="search-item" label="资质:">
-                <Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
+                <Input v-model="formObj.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item class="search-btn">
-                <Button @click="_formSearch" type="primary">搜索</Button>
+                <Button type="primary" @click="_formSearch">搜索</Button>
               </Form-item>
             </Form>
           </Col>
           <!--操作-->
           <Col span="24">
 
-            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
-                     class="contHide"></btn-list>
+            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
+                     @on-result-change="_btnClick"></btn-list>
           </Col>
           <!--表格-->
           <Col span="24">
@@ -58,7 +58,7 @@ import Reason from '../../../components/base/Reason'
 import MeterSampleManage from './MeterSampleManage'
 import MeterEntrustDetail from './MeterContractAcceptedDetail'
 export default {
-  components: { MeterSampleManage, MeterEntrustDetail, Operation, Reason },
+  components: { MeterSampleManage, MeterEntrustDetail, Operation },
   data() {
     return {
       currentComponent: 'FoodSampleGovern',

pages/meter-contract/MeterSampleQuoteManage.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 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>
+  </div>
+</template>
+<script>
+import { meterSampleQuote } from '../../api'
+export default {
+  components: {
+    // FoodSampleGovernDetail,
+    // CopyModal,
+    // FoodSampleGovernLYEdits
+  },
+  data() {
+    return {
+      currentComponent: '',
+      // btn: [
+      //   {type: 'success', id: '', name: '添加', componentName: 'FoodSampleGovernEdit'},
+      //   {id: 'food-gov-sample-batch-add', name: '批量添加', componentName: 'FoodSampleGovernBatchAdd'},
+      //   {id: '', name: '导入样品', componentName: 'FoodImportSample'},
+      //   {id: '', name: '导入检测项目', componentName: 'RelItem'},
+      //   {id: '', name: '导入检测项目包', componentName: 'RelItemPackage'},
+      //   {id: '', name: '复制历史样品检测项目', componentName: 'CopyHisItem'},
+      //   {id: '', name: '删除'},
+      // ],
+      iconMsg: [
+        // { type: 'compose', id: '', name: '编辑' },
+        // { type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' },
+        // { type: 'trash-a', id: '', name: '删除' }
+      ],
+      btn: [
+        // {
+        //   // meter-review-entrust-pass-btn
+        //   type: 'success',
+        //   id: '',
+        //   name: '分包'
+        // },
+        // // meter-review-entrust-back-btn
+        // {
+        //   type: 'success',
+        //   id: '',
+        //   name: '取消分包'
+        // }
+      ],
+      options: [
+        {
+          name: '检定'
+        },
+        {
+          name: '校准'
+        },
+        {
+          name: '外观检查'
+        }
+      ],
+      searchOpen: false,
+      formId: 'meterReviewSampleManageFormId',
+      showModal: false,
+      modalTitle: '管理样品',
+      selectIds: [],
+      selectData: [],
+      getPage: {},
+      pageColumns: [
+        { title: '名称', key: 'name', width: 160 },
+        { title: '型号', key: 'spec' },
+        { title: '数量', key: 'quantity' },
+        { title: '技术参数', key: 'technicalParameter' },
+        { title: '生产厂家', key: 'manufacturer' },
+        { title: '出厂编号', key: 'factoryNumber' },
+        { title: '上次检定校准日期', key: 'lastTime', date: true },
+        { title: '收费单位', key: 'unit' },
+        { title: '单价/元', key: 'price' },
+        { title: '总价/元', key: 'totalPrice' },
+        { title: '备注', key: 'remark' }
+      ],
+      dateList: [],
+      formObj: {
+        entrustId: undefined,
+        name: undefined,
+        code: undefined,
+        type: undefined
+      }
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      return this.$tableHeight('tableModal')
+    }
+  },
+  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]
+    },
+    _btnClick(msg, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (msg) {
+          case '分包':
+            this._subpackageSample()
+            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.entrustId = id
+      this.showModal = true
+      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 meterSampleQuote.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)
+      }
+    },
+    _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)
+      }
+    },
+    _subpackage: async function(ids) {
+      const result = await meterSampleQuote.subpackageSample(ids)
+      if (result) {
+        this.$Message.success('分包成功！')
+        await this._page()
+      }
+    },
+
+    _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)
+    }
+  }
+}
+</script>

pages/meter-contract/contract-register/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-contract/contract-register/MeterContractRegister.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>{{scope.row[item.key]}}</span>
+                </template>
+              </vxe-table-column>
+            </PTVXETable>
+          </Col>
+        </Row>
+      </div>
+    </div>
+    <FileManage ref="FileManage"></FileManage>
+    <MeterSendOperation ref="operationModal"></MeterSendOperation>
+    <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
+  </div>
+</template>
+<script>
+import { meterContract, meterSubcontractor } from '../../../api'
+import MeterSubcontractorEdit from './MeterContractRegisterEdit'
+import MeterSendOperation from './MeterContractRegisterOperation'
+export default {
+  components: { MeterSubcontractorEdit, MeterSendOperation },
+  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: 200 },
+        { title: '联系人', key: 'person', width: 120 },
+        { title: '联系电话', key: 'tel', width: 120 },
+        { title: '传真', key: 'fax', width: 120 },
+        { title: '详细地址', key: 'address', width: 250 },
+        { title: '要求完成时间', key: 'odate', width: 120 },
+        { title: '折扣', key: 'discount', width: 120 },
+        { title: '总价', key: 'totalPrice', width: 120 },
+        { title: '折扣价', key: 'discountPrice', width: 120 },
+        { title: '备注', key: 'remark' }
+      ]
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      if (this.searchOpen) {
+        return this.$tableHeight('search')
+      } else {
+        return this.$tableHeight('noSearch')
+      }
+    }
+  },
+  mounted() {
+    this._page()
+  },
+  methods: {
+    _modalResult() {
+      if (this.currentComponent === 'FoodSubcontracterEdit') {
+        this._page()
+      }
+    },
+    _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
+        }
+      })
+    },
+    _iconClick(res, data, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (res) {
+          case '编辑':
+            this._editModal(true, data.id)
+            break
+          case '资质项目':
+            this._itemModal(data.id)
+            break
+          case '附件':
+            this._upload(data.id)
+            break
+          case '删除':
+            this._deleteByIds([data.id])
+            break
+          case '操作日志':
+            this._record(data.id)
+            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 = meterContract.submitToContractReview(ids)
+            if (result) {
+              this._resultChange('提交成功')
+              console.log(result)
+            }
+            // })
+          }
+        })
+      }
+    },
+    _resultChange(msg) {
+      this.$Message.success(msg)
+      this._page()
+    },
+    _record(id) {
+      this.$refs.operationModal._open(id)
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'selectIds':
+          this.selectIds = data
+          break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData, data.componentName)
+          break
+        case 'changeSize':
+          this._page()
+          break
+      }
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      console.log('this.formObj', this.formObj)
+      const result = await meterContract.pageContractRegister(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.$refs.editSubcontractorModal._open(id)
+        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 meterContract.getVOById(id)
+      if (result) {
+        this.$refs.editSubcontractorModal._openEdit(result)
+      }
+    },
+    _delete: async function(ids) {
+      const result = await meterSubcontractor.deleteById(ids)
+      if (result) {
+        this._formSearch()
+        this.$Message.success('删除成功！')
+      }
+    }
+  }
+}
+</script>

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

+<template>
+  <div>
+    <Modal v-model="showModal" :mask-closable="false" width="1250">
+      <p slot="header">{{modalTitle}}</p>
+      <div>
+        <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline>
+
+          <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="person" class="width-48">
+            <Input v-model="formObj.person" name="person" placeholder="请输入联系人"/>
+          </Form-item>
+          <Form-item label="联系电话" prop="tel" class="width-48">
+            <Input v-model="formObj.tel" name="tel" placeholder="请输入联系电话"/>
+          </Form-item>
+          <Form-item label="传真" prop="fax" class="width-48">
+            <Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/>
+          </Form-item>
+          <Form-item label="省、市、区" prop="testedCityData" class="width-48">
+            <CityNameCascader :value="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="odate" class="width-48">
+            <Date-picker type="date" split-panels style="width:100%;" placeholder="请选择要求完成时间"
+                         @on-change="_ctimeChange"></Date-picker>
+          </Form-item>
+          <Form-item label="折扣：" prop="discount" class="width-48">
+            <Input v-model="formObj.discount" name="discount" placeholder="折扣"/>
+          </Form-item>
+
+          <Form-item label="检定/校准执行规程/规范：" prop="requirements" style="width: 99.8%">
+            <Input v-model="formObj.requirements" :rows="3" name="requirements" type="textarea"
+                   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" :show-search-btn="true" class="contHide"
+                    @on-result-change="_btnClick"></btn-list>
+        </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>
+                <div v-else-if="item.date">
+                  {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):'' }}
+                </div>
+                <div v-else @click.stop="_handleRow(scope)">
+                  <span> {{ scope.row[item.key] }}</span>
+                </div>
+              </template>
+            </vxe-table-column>
+          </PTVXETable>
+        </Col>
+      </div>
+      <div slot="footer">
+        <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
+      </div>
+    </Modal>
+    <EditModal ref="EditModal" is-change @on-result-change="_backData" />
+    <importModal ref="importModal" aptitude-item   @on-result-change="_inputBack"></importModal>
+  </div>
+</template>
+<script>
+/**
+ * 添加编辑分包商
+ */
+import { lmsBaseDict, meterEntrust, meterContract } from '../../../api'
+import CityNameCascader from '../../../components/base/CityNameCascader'
+import AutoComplete from '../../../components/base/AutoCompletes'
+import importModal from '../../../components/import/DownloadTemplateImport'
+import EditModal from './EditModal'
+
+export default {
+  components: { CityNameCascader, EditModal, AutoComplete, importModal },
+  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: []
+      },
+      searchOpen: true,
+      customerData: [],
+      cityData: [],
+      testedCityData: [],
+      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: 'quantity' },
+        { title: '技术参数', key: 'technicalParameter' },
+        { title: '生产厂家', key: 'manufacturer' },
+        { title: '出厂编号', key: 'factoryNumber' },
+        { title: '上次检定校准日期', key: 'lastTime', date: true },
+        { title: '收费单位', key: 'unit' },
+        { title: '单价/元', key: 'price' },
+        { title: '总价/元', key: 'totalPrice' },
+        { title: '备注', key: 'remark' }
+
+        // {title: '限制范围或说明', key: 'limitDescription'},
+      ],
+      options: [
+        {
+          name: '检定'
+        },
+        {
+          name: '校准'
+        },
+        {
+          name: '外观检查'
+        }
+      ],
+      btn: [
+        {
+          type: 'success',
+          id: '',
+          name: '添加'
+        },
+        {
+          type: 'success',
+          id: '',
+          name: '导入'
+        }
+      ],
+      id: '',
+      modalTitle: '',
+      subcontractorId: '',
+      formObj: {
+        client: '',
+        linkman: '',
+        tel: '',
+        email: '',
+        address: '',
+        remark: '',
+        province: '',
+        city: '',
+        county: '',
+        requirements: '',
+        discount: '',
+        street: '',
+        edate: '',
+        odate: '',
+        person: '',
+        fax: '',
+        testedTemp: {
+          testedProvince: '',
+          testedCity: '',
+          testedCounty: '',
+          testedStreet: ''
+        }
+      },
+
+      ruleValidate: {
+        client: [
+          {
+            required: true,
+            message: '委托单位不能为空',
+            validator: validateClient,
+            trigger: 'blur'
+          }
+        ],
+        person: [
+          { required: true, message: '联系人不能为空', trigger: 'blur' }
+        ],
+        tel: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
+        testedCityData: [
+          {
+            required: true,
+            message: '省市区不能为空',
+            validator: validateRemark,
+            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 {
+        // 编辑的时候选择单位(互不影响)
+        alert('编辑')
+        // this.cusName = data
+        // this.formObj.customer.cname = data
+      }
+    },
+    _customerMatch(data) {
+      // this.formObj.client = data
+      this._getQueryList(data)
+      console.log(data)
+    },
+    _cusNameQuery(query) {
+      alert('query')
+      console.log(query)
+    },
+    _ctimeChange(data) {
+      console.log('时间', data)
+      this.formObj.odate = data
+      // this.formObj.ctimeBegin = data[0]
+      // this.formObj.ctimeEnd = data[1]
+    },
+    _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')
+      }
+    },
+    _selectjudgeBasis(index) {
+      console.log(index)
+      this.index = index
+      this.$refs.EditModal._open()
+    },
+    _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)
+    },
+
+    _inputBack(data) {
+      if (undefined !== data) {
+        for (let i = 0; i < data.length; i++) {
+          this.getPage.records.push(data[i])
+        }
+      }
+    },
+    _add() {
+      const data = {
+        name: '',
+        spec: '',
+        factoryNumber: '',
+        quantity: '',
+        type: ''
+      }
+      this.getPage.records.unshift(data)
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'page':
+          // this.getPage = this.$store.state.FoodJudgeBasis.page
+          break
+        case 'selectIds':
+          // this.selectIds = data
+          break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData, data.rowIndex)
+          break
+      }
+    },
+    _btnClick(msg) {
+      this.$nextTick(function() {
+        switch (msg) {
+          case '导入':
+            this._import()
+            break
+          case '添加':
+            this._add()
+            break
+          case '提交':
+            this._submitToReview()
+            break
+          case 'search':
+            this.searchOpen = !this.searchOpen
+            break
+        }
+      })
+    },
+    _import() {
+      const data = {
+        importUrl: '/meter/v1/sample_quote/import',
+        downloadUrl: '/food/v1/excel/template/FoodAptitudeItem',
+        title: '导入'
+      }
+      this.$refs.importModal._open(data, '资质项目管理导入')
+    },
+    // 省 市 区
+    _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) {
+      // 省、市、区
+      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.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]]
+      }
+    },
+
+    _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
+      }
+    },
+
+    _selectAptitude(data) {
+      console.log(data)
+    },
+    _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
+            console.log('saveData-------', saveData)
+            this._save(saveData)
+          } else {
+            // 编辑
+            // this._edit({ id: this.formObj.id, obj: data })
+            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(formObj) {
+      this.showModal = true
+      this._getList()
+      this.$refs.formObj.resetFields()
+      this._emptyProvince()
+      this._hideLoading()
+      if (this.$string(formObj).isEmpty()) {
+        this.getPage.records = []
+        this.id = ''
+        this.modalTitle = '报价单新增'
+      } else {
+        this.id = formObj.id
+        this.formObj = formObj
+        this.modalTitle = '报价单编辑'
+        this._showTime(formObj)
+      }
+    },
+    _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
+    },
+    _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)
+      }
+    },
+    _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.person = result[0].contact
+        this.formObj.tel = result[0].mobile
+        this.formObj.fax = result[0].fax
+        this.testedCityData = [
+          result[0].province,
+          result[0].city,
+          result[0].area
+        ]
+      }
+    },
+    _getAptitudeList: async function() {
+      const result = await lmsBaseDict.getItem('subcontractorAptitude')
+      if (result) {
+        this.aptitudeData = result
+      }
+    },
+    _showTime(formObj) {
+      // 回显资质类型
+    },
+    _save: async function(data) {
+      const result = await meterContract.addQuote(data)
+      console.log(result)
+      if (result) {
+        this._resultChange('添加成功!')
+      }
+    },
+    _edit: async function(data) {
+      const result = await meterEntrust.editDTO(data)
+      console.log('修改后')
+      console.log(result)
+      if (result) {
+        this._resultChange('编辑成功!')
+      }
+    }
+  }
+}
+</script>

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

+<template>
+  <div>
+    <!--内容-->
+    <div class="layout-content-padding">
+      <div class="layout-content-main">
+        <Row>
+          <!--查询-->
+          <Col span="24" style="margin-top: 10px">
+            <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
+              <label class="label-sign"></label>
+              <Form-item class="search-item" label="实验室名称:">
+                <Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/>
+              </Form-item>
+              <Form-item class="search-item" label="资质:">
+                <Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
+              </Form-item>
+              <Form-item class="search-btn">
+                <Button @click="_formSearch" type="primary">搜索</Button>
+              </Form-item>
+            </Form>
+          </Col>
+          <!--操作-->
+          <Col span="24">
+
+            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
+                     class="contHide"></btn-list>
+          </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" hide-checkbox>
+              <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>{{scope.row[item.key]}}</span>
+                </template>
+              </vxe-table-column>
+            </PTVXETable>
+          </Col>
+        </Row>
+      </div>
+    </div>
+
+    <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
+  </div>
+</template>
+<script>
+import { meterEntrust, meterSubcontractor } from '../../../api'
+import MeterSubcontractorEdit from './MeterContractRegisterEdit'
+export default {
+  components: { MeterSubcontractorEdit },
+  data() {
+    return {
+      currentComponent: '',
+      formId: 'meterSubcontractorFormId',
+      searchOpen: false,
+      btn: [
+        {
+          type: 'success',
+          id: 'meter-subcontractor-add-btn',
+          name: '添加'
+        }
+      ],
+      iconMsg: [
+        {
+          type: 'ios-clock',
+          id: '',
+          name: '编辑'
+        },
+        {
+          type: 'ios-clock',
+          id: '',
+          name: '资质项目'
+        },
+        { type: 'ios-clock', id: '', name: '附件' },
+        { type: 'ios-clock', id: '', name: '删除' },
+        {
+          type: 'ios-clock',
+          id: '',
+          name: '操作日志'
+        }
+      ],
+      formObj: {
+        name: undefined,
+        aptitude: undefined
+      },
+      selectIds: [],
+      getPage: {},
+      pageColumns: [
+        { title: '委托单位', key: 'client', width: 200 },
+        { title: '联系人', key: 'person', width: 120 },
+        { title: '联系电话', key: 'tel', width: 120 },
+        { title: '传真', key: 'fax', width: 120 },
+        { title: '详细地址', key: 'address', width: 250 },
+        { title: '邮编', key: 'postcode' },
+        { title: 'E-mail', key: 'email', width: 120 },
+        { title: '委托日期', key: 'edate', width: 120 },
+        { title: '费用合计', key: 'fee', width: 120 },
+        { title: '合同号', key: 'contractCode', width: 120 },
+        { title: '备注', key: 'remark' }
+      ]
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      if (this.searchOpen) {
+        return this.$tableHeight('search')
+      } else {
+        return this.$tableHeight('noSearch')
+      }
+    }
+  },
+  mounted() {
+    this._page()
+  },
+  methods: {
+    _modalResult() {
+      if (this.currentComponent === 'FoodSubcontracterEdit') {
+        this._page()
+      }
+    },
+    _btnClick(msg, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (msg) {
+          case '添加':
+            this._editModal(false)
+            break
+          case 'search':
+            this.searchOpen = !this.searchOpen
+            break
+        }
+      })
+    },
+    _iconClick(res, data, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (res) {
+          case '编辑':
+            this._editModal(true, data.id)
+            break
+          case '资质项目':
+            this._itemModal(data.id)
+            break
+          case '附件':
+            this._upload(data.id)
+            break
+          case '删除':
+            this._deleteByIds([data.id])
+            break
+          case '操作日志':
+            this._record(data.id)
+            break
+        }
+      })
+    },
+    _record(id) {
+      this.$refs.refModal._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 'changeSize':
+          this._page()
+          break
+      }
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      console.log('this.formObj', this.formObj)
+      const result = await meterEntrust.pageSendEntrust(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.$refs.editSubcontractorModal._open(id)
+        this._getById(id)
+      } else {
+        // 添加
+        this.$refs.editSubcontractorModal._open()
+      }
+    },
+    // 追加项目
+    _itemModal(data) {
+      this.$refs.refModal._open(data)
+    },
+
+    _upload(id) {
+      // 上传文件
+      this.$refs.refModal._open(id, 'subcontractorId')
+    },
+    _getById: async function(id) {
+      const result = await meterSubcontractor.getById(id)
+      if (result) {
+        this.$refs.editSubcontractorModal._open(result)
+      }
+    },
+    _delete: async function(ids) {
+      const result = await meterSubcontractor.deleteById(ids)
+      if (result) {
+        this._formSearch()
+        this.$Message.success('删除成功！')
+      }
+    }
+  }
+}
+</script>

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

+<template>
+  <div>
+    <!--内容-->
+    <div class="layout-content-padding">
+      <div class="layout-content-main">
+        <Row>
+          <!--查询-->
+          <Col span="24" style="margin-top: 10px">
+            <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
+              <label class="label-sign"></label>
+              <Form-item class="search-item" label="实验室名称:">
+                <Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/>
+              </Form-item>
+              <Form-item class="search-item" label="资质:">
+                <Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
+              </Form-item>
+              <Form-item class="search-btn">
+                <Button @click="_formSearch" type="primary">搜索</Button>
+              </Form-item>
+            </Form>
+          </Col>
+          <!--操作-->
+          <Col span="24">
+
+            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
+                     class="contHide"></btn-list>
+          </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" hide-checkbox>
+              <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>{{scope.row[item.key]}}</span>
+                </template>
+              </vxe-table-column>
+            </PTVXETable>
+          </Col>
+        </Row>
+      </div>
+    </div>
+
+    <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
+  </div>
+</template>
+<script>
+import { meterEntrust, meterSubcontractor } from '../../../api'
+import MeterSubcontractorEdit from './MeterContractRegisterEdit'
+export default {
+  components: { MeterSubcontractorEdit },
+  data() {
+    return {
+      currentComponent: '',
+      formId: 'meterSubcontractorFormId',
+      searchOpen: false,
+      btn: [
+        {
+          type: 'success',
+          id: 'meter-subcontractor-add-btn',
+          name: '添加'
+        }
+      ],
+      iconMsg: [
+        {
+          type: 'ios-clock',
+          id: '',
+          name: '编辑'
+        },
+        {
+          type: 'ios-clock',
+          id: '',
+          name: '资质项目'
+        },
+        { type: 'ios-clock', id: '', name: '附件' },
+        { type: 'ios-clock', id: '', name: '删除' },
+        {
+          type: 'ios-clock',
+          id: '',
+          name: '操作日志'
+        }
+      ],
+      formObj: {
+        name: undefined,
+        aptitude: undefined
+      },
+      selectIds: [],
+      getPage: {},
+      pageColumns: [
+        { title: '委托单位', key: 'client', width: 200 },
+        { title: '联系人', key: 'person', width: 120 },
+        { title: '联系电话', key: 'tel', width: 120 },
+        { title: '传真', key: 'fax', width: 120 },
+        { title: '详细地址', key: 'address', width: 250 },
+        { title: '邮编', key: 'postcode' },
+        { title: 'E-mail', key: 'email', width: 120 },
+        { title: '委托日期', key: 'edate', width: 120 },
+        { title: '费用合计', key: 'fee', width: 120 },
+        { title: '合同号', key: 'contractCode', width: 120 },
+        { title: '备注', key: 'remark' }
+      ]
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      if (this.searchOpen) {
+        return this.$tableHeight('search')
+      } else {
+        return this.$tableHeight('noSearch')
+      }
+    }
+  },
+  mounted() {
+    this._page()
+  },
+  methods: {
+    _modalResult() {
+      if (this.currentComponent === 'FoodSubcontracterEdit') {
+        this._page()
+      }
+    },
+    _btnClick(msg, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (msg) {
+          case '添加':
+            this._editModal(false)
+            break
+          case 'search':
+            this.searchOpen = !this.searchOpen
+            break
+        }
+      })
+    },
+    _iconClick(res, data, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (res) {
+          case '编辑':
+            this._editModal(true, data.id)
+            break
+          case '资质项目':
+            this._itemModal(data.id)
+            break
+          case '附件':
+            this._upload(data.id)
+            break
+          case '删除':
+            this._deleteByIds([data.id])
+            break
+          case '操作日志':
+            this._record(data.id)
+            break
+        }
+      })
+    },
+    _record(id) {
+      this.$refs.refModal._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 'changeSize':
+          this._page()
+          break
+      }
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      console.log('this.formObj', this.formObj)
+      const result = await meterEntrust.pageSendEntrust(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.$refs.editSubcontractorModal._open(id)
+        this._getById(id)
+      } else {
+        // 添加
+        this.$refs.editSubcontractorModal._open()
+      }
+    },
+    // 追加项目
+    _itemModal(data) {
+      this.$refs.refModal._open(data)
+    },
+
+    _upload(id) {
+      // 上传文件
+      this.$refs.refModal._open(id, 'subcontractorId')
+    },
+    _getById: async function(id) {
+      const result = await meterSubcontractor.getById(id)
+      if (result) {
+        this.$refs.editSubcontractorModal._open(result)
+      }
+    },
+    _delete: async function(ids) {
+      const result = await meterSubcontractor.deleteById(ids)
+      if (result) {
+        this._formSearch()
+        this.$Message.success('删除成功！')
+      }
+    }
+  }
+}
+</script>

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

+<template>
+  <div>
+    <div class="layout-content-padding">
+      <div class="layout-content-main">
+        <el-tabs v-model="activeName">
+          <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>
+        </el-tabs>
+      </div>
+    </div>
+  </div>
+</template>
+
+<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'
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

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

+<template>
+  <div>
+    <Modal v-model="showModal" width="900" class="modal-footer-none zIndex-1100">
+      <p slot="header">操作日志</p>
+      <div>
+        <Row>
+          <!--查询-->
+          <Col span="24">
+            <Form id="search-contract-record" :label-width="70" inline onsubmit="return false">
+              <label class="label-sign"></label>
+              <Form-item label="操作阶段:">
+                <Input v-model="formObj.origin" @on-enter="_search" placeholder="请输入操作阶段"
+                       style="width: 200px" clearable/>
+              </Form-item>
+              <Form-item class="search-btn">
+                <Button @click="_search" type="primary">搜索</Button>
+              </Form-item>
+            </Form>
+          </Col>
+          <!-- 表格 -->
+          <Col span="24">
+            <PTVXETable ref="pageTable" :tableHeight="tableHeight"
+                        @on-result-change="_tableResultChange" :getPage="getPage" hide-checkbox>
+              <vxe-table-column
+                :field="item.key"
+                :title="item.title"
+                :min-width="item.width?item.width:200"
+                :fixed="item.fixed?item.fixed:undefined"
+                v-for="item in pageColumns" :key="item.key">
+                <template slot-scope="scope">
+                <span v-if="item.key==='type'">
+                  {{scope.row[item.key] === 0 ? '流转' : scope.row[item.key] === 1 ? '退回': scope.row[item.key] === 2 ?'更新' :
+                  scope.row[item.key] === 3 ? '转发':'文件'}}
+                </span>
+                  <span v-else-if="item.key==='ctime'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):''}}</span>
+                  <span v-else>{{scope.row[item.key]}}</span>
+                </template>
+              </vxe-table-column>
+            </PTVXETable>
+          </Col>
+        </Row>
+      </div>
+    </Modal>
+
+  </div>
+</template>
+<script>
+/**
+ * 操作日志-委托
+ */
+import { meterEntrust } from '../../../api'
+export default {
+  data() {
+    return {
+      showModal: false,
+      getPage: {},
+      pageColumns: [
+        { title: '操作类型', key: 'type', width: 80 },
+        { title: '操作阶段', key: 'origin', width: 120 },
+        { title: '目标阶段', key: 'target', width: 120 },
+        { title: '操作人', key: 'operator', width: 80 },
+        { title: '操作时间', key: 'ctime', width: 150 },
+        { title: '操作原因', key: 'remark' },
+        { title: '责任人', key: 'liable', width: 80 }
+      ],
+      formObj: {
+        origin: '',
+        contractId: ''
+      }
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      return this.$tableHeight('tableModal')
+    }
+  },
+  methods: {
+    _open(contractId) {
+      this.showModal = true
+      this.formObj.contractId = contractId
+      this.formObj.origin = ''
+      this._page()
+    },
+    _page: async function() {
+      console.log('要传的参数')
+      console.log(this.formObj)
+      const result = await meterEntrust.pageOutTaskOperation(this.formObj)
+      console.log(result)
+      if (result) {
+        this.getPage = result
+      }
+      // this.$refs.pageTable._page(
+      //   'search-contract-record',
+      //   'FoodContractRecord/page',
+      //   this.$serializeFormSearch(this.formObj)
+      // )
+    },
+
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'page':
+          this.getPage = this.$store.state.FoodContractRecord.page
+          break
+        case 'changeSize':
+          this._page()
+          break
+      }
+    },
+    _search() {
+      this.$refs.pageTable._pageChange(1)
+    }
+  }
+}
+</script>

pages/meter-contract/contract-review/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-contract/contract-review/MeterContractReview.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>{{scope.row[item.key]}}</span>
+                </template>
+              </vxe-table-column>
+            </PTVXETable>
+          </Col>
+        </Row>
+      </div>
+    </div>
+    <FileManage ref="FileManage"></FileManage>
+    <MeterSendOperation ref="operationModal"></MeterSendOperation>
+    <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
+  </div>
+</template>
+<script>
+import { meterContract, meterSubcontractor } from '../../../api'
+import MeterSubcontractorEdit from './MeterContractReviewEdit'
+import MeterSendOperation from './MeterContractReviewOperation'
+export default {
+  components: { MeterSubcontractorEdit, MeterSendOperation },
+  data() {
+    return {
+      currentComponent: '',
+      formId: 'meterSubcontractorFormId',
+      searchOpen: false,
+      btn: [
+        // {
+        //   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: 200 },
+        { title: '联系人', key: 'person', width: 120 },
+        { title: '联系电话', key: 'tel', width: 120 },
+        { title: '传真', key: 'fax', width: 120 },
+        { title: '详细地址', key: 'address', width: 250 },
+        { title: '要求完成时间', key: 'odate', width: 120 },
+        { title: '折扣', key: 'discount', width: 120 },
+        { title: '总价', key: 'totalPrice', width: 120 },
+        { title: '折扣价', key: 'discountPrice', width: 120 },
+        { title: '备注', key: 'remark' }
+      ]
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      if (this.searchOpen) {
+        return this.$tableHeight('search')
+      } else {
+        return this.$tableHeight('noSearch')
+      }
+    }
+  },
+  mounted() {
+    this._page()
+  },
+  methods: {
+    _modalResult() {
+      if (this.currentComponent === 'FoodSubcontracterEdit') {
+        this._page()
+      }
+    },
+    _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
+        }
+      })
+    },
+    _iconClick(res, data, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (res) {
+          case '编辑':
+            this._editModal(true, data.id)
+            break
+          case '资质项目':
+            this._itemModal(data.id)
+            break
+          case '附件':
+            this._upload(data.id)
+            break
+          case '删除':
+            this._deleteByIds([data.id])
+            break
+          case '操作日志':
+            this._record(data.id)
+            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 = meterContract.submitToContractReview(ids)
+            if (result) {
+              this._resultChange('提交成功')
+              console.log(result)
+            }
+            // })
+          }
+        })
+      }
+    },
+    _resultChange(msg) {
+      this.$Message.success(msg)
+      this._page()
+    },
+    _record(id) {
+      this.$refs.operationModal._open(id)
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'selectIds':
+          this.selectIds = data
+          break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData, data.componentName)
+          break
+        case 'changeSize':
+          this._page()
+          break
+      }
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      console.log('this.formObj', this.formObj)
+      const result = await meterContract.pageContractReview(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.$refs.editSubcontractorModal._open(id)
+        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 meterContract.getVOById(id)
+      if (result) {
+        this.$refs.editSubcontractorModal._openEdit(result)
+      }
+    },
+    _delete: async function(ids) {
+      const result = await meterSubcontractor.deleteById(ids)
+      if (result) {
+        this._formSearch()
+        this.$Message.success('删除成功！')
+      }
+    }
+  }
+}
+</script>

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

+<template>
+  <div>
+    <Modal v-model="showModal" :mask-closable="false" width="1250">
+      <p slot="header">{{modalTitle}}</p>
+      <div>
+        <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline>
+
+          <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="person" class="width-48">
+            <Input v-model="formObj.person" name="person" placeholder="请输入联系人"/>
+          </Form-item>
+          <Form-item label="联系电话" prop="tel" class="width-48">
+            <Input v-model="formObj.tel" name="tel" placeholder="请输入联系电话"/>
+          </Form-item>
+          <Form-item label="传真" prop="fax" class="width-48">
+            <Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/>
+          </Form-item>
+          <Form-item label="省、市、区" prop="testedCityData" class="width-48">
+            <CityNameCascader :value="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="odate" class="width-48">
+            <Date-picker type="date" split-panels style="width:100%;" placeholder="请选择要求完成时间"
+                         @on-change="_ctimeChange"></Date-picker>
+          </Form-item>
+          <Form-item label="折扣：" prop="discount" class="width-48">
+            <Input v-model="formObj.discount" name="discount" placeholder="折扣"/>
+          </Form-item>
+
+          <Form-item label="检定/校准执行规程/规范：" prop="requirements" style="width: 99.8%">
+            <Input v-model="formObj.requirements" :rows="3" name="requirements" type="textarea"
+                   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" :show-search-btn="true" class="contHide"
+                    @on-result-change="_btnClick"></btn-list>
+        </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>
+                <div v-else-if="item.date">
+                  {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):'' }}
+                </div>
+                <div v-else @click.stop="_handleRow(scope)">
+                  <span> {{ scope.row[item.key] }}</span>
+                </div>
+              </template>
+            </vxe-table-column>
+          </PTVXETable>
+        </Col>
+      </div>
+      <div slot="footer">
+        <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
+      </div>
+    </Modal>
+    <EditModal ref="EditModal" is-change @on-result-change="_backData" />
+    <importModal ref="importModal" aptitude-item   @on-result-change="_inputBack"></importModal>
+  </div>
+</template>
+<script>
+/**
+ * 添加编辑分包商
+ */
+import { lmsBaseDict, meterEntrust, meterContract } from '../../../api'
+import CityNameCascader from '../../../components/base/CityNameCascader'
+import AutoComplete from '../../../components/base/AutoCompletes'
+import importModal from '../../../components/import/DownloadTemplateImport'
+import EditModal from './EditModal'
+
+export default {
+  components: { CityNameCascader, EditModal, AutoComplete, importModal },
+  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: []
+      },
+      searchOpen: true,
+      customerData: [],
+      cityData: [],
+      testedCityData: [],
+      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: 'quantity' },
+        { title: '技术参数', key: 'technicalParameter' },
+        { title: '生产厂家', key: 'manufacturer' },
+        { title: '出厂编号', key: 'factoryNumber' },
+        { title: '上次检定校准日期', key: 'lastTime', date: true },
+        { title: '收费单位', key: 'unit' },
+        { title: '单价/元', key: 'price' },
+        { title: '总价/元', key: 'totalPrice' },
+        { title: '备注', key: 'remark' }
+
+        // {title: '限制范围或说明', key: 'limitDescription'},
+      ],
+      options: [
+        {
+          name: '检定'
+        },
+        {
+          name: '校准'
+        },
+        {
+          name: '外观检查'
+        }
+      ],
+      btn: [
+        {
+          type: 'success',
+          id: '',
+          name: '添加'
+        },
+        {
+          type: 'success',
+          id: '',
+          name: '导入'
+        }
+      ],
+      id: '',
+      modalTitle: '',
+      subcontractorId: '',
+      formObj: {
+        client: '',
+        linkman: '',
+        tel: '',
+        email: '',
+        address: '',
+        remark: '',
+        province: '',
+        city: '',
+        county: '',
+        requirements: '',
+        discount: '',
+        street: '',
+        edate: '',
+        odate: '',
+        person: '',
+        fax: '',
+        testedTemp: {
+          testedProvince: '',
+          testedCity: '',
+          testedCounty: '',
+          testedStreet: ''
+        }
+      },
+
+      ruleValidate: {
+        client: [
+          {
+            required: true,
+            message: '委托单位不能为空',
+            validator: validateClient,
+            trigger: 'blur'
+          }
+        ],
+        person: [
+          { required: true, message: '联系人不能为空', trigger: 'blur' }
+        ],
+        tel: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
+        testedCityData: [
+          {
+            required: true,
+            message: '省市区不能为空',
+            validator: validateRemark,
+            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 {
+        // 编辑的时候选择单位(互不影响)
+        alert('编辑')
+        // this.cusName = data
+        // this.formObj.customer.cname = data
+      }
+    },
+    _customerMatch(data) {
+      // this.formObj.client = data
+      this._getQueryList(data)
+      console.log(data)
+    },
+    _cusNameQuery(query) {
+      alert('query')
+      console.log(query)
+    },
+    _ctimeChange(data) {
+      console.log('时间', data)
+      this.formObj.odate = data
+      // this.formObj.ctimeBegin = data[0]
+      // this.formObj.ctimeEnd = data[1]
+    },
+    _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')
+      }
+    },
+    _selectjudgeBasis(index) {
+      console.log(index)
+      this.index = index
+      this.$refs.EditModal._open()
+    },
+    _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)
+    },
+
+    _inputBack(data) {
+      if (undefined !== data) {
+        for (let i = 0; i < data.length; i++) {
+          this.getPage.records.push(data[i])
+        }
+      }
+    },
+    _add() {
+      const data = {
+        name: '',
+        spec: '',
+        factoryNumber: '',
+        quantity: '',
+        type: ''
+      }
+      this.getPage.records.unshift(data)
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'page':
+          // this.getPage = this.$store.state.FoodJudgeBasis.page
+          break
+        case 'selectIds':
+          // this.selectIds = data
+          break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData, data.rowIndex)
+          break
+      }
+    },
+    _btnClick(msg) {
+      this.$nextTick(function() {
+        switch (msg) {
+          case '导入':
+            this._import()
+            break
+          case '添加':
+            this._add()
+            break
+          case '提交':
+            this._submitToReview()
+            break
+          case 'search':
+            this.searchOpen = !this.searchOpen
+            break
+        }
+      })
+    },
+    _import() {
+      const data = {
+        importUrl: '/meter/v1/sample_quote/import',
+        downloadUrl: '/food/v1/excel/template/FoodAptitudeItem',
+        title: '导入'
+      }
+      this.$refs.importModal._open(data, '资质项目管理导入')
+    },
+    // 省 市 区
+    _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) {
+      // 省、市、区
+      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.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]]
+      }
+    },
+
+    _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
+      }
+    },
+
+    _selectAptitude(data) {
+      console.log(data)
+    },
+    _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
+            console.log('saveData-------', saveData)
+            this._save(saveData)
+          } else {
+            // 编辑
+            // this._edit({ id: this.formObj.id, obj: data })
+            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(formObj) {
+      this.showModal = true
+      this._getList()
+      this.$refs.formObj.resetFields()
+      this._emptyProvince()
+      this._hideLoading()
+      if (this.$string(formObj).isEmpty()) {
+        this.getPage.records = []
+        this.id = ''
+        this.modalTitle = '报价单新增'
+      } else {
+        this.id = formObj.id
+        this.formObj = formObj
+        this.modalTitle = '报价单编辑'
+        this._showTime(formObj)
+      }
+    },
+    _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
+    },
+    _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)
+      }
+    },
+    _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.person = result[0].contact
+        this.formObj.tel = result[0].mobile
+        this.formObj.fax = result[0].fax
+        this.testedCityData = [
+          result[0].province,
+          result[0].city,
+          result[0].area
+        ]
+      }
+    },
+    _getAptitudeList: async function() {
+      const result = await lmsBaseDict.getItem('subcontractorAptitude')
+      if (result) {
+        this.aptitudeData = result
+      }
+    },
+    _showTime(formObj) {
+      // 回显资质类型
+    },
+    _save: async function(data) {
+      const result = await meterContract.addQuote(data)
+      console.log(result)
+      if (result) {
+        this._resultChange('添加成功!')
+      }
+    },
+    _edit: async function(data) {
+      const result = await meterEntrust.editDTO(data)
+      console.log('修改后')
+      console.log(result)
+      if (result) {
+        this._resultChange('编辑成功!')
+      }
+    }
+  }
+}
+</script>

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

+<template>
+  <div>
+    <!--内容-->
+    <div class="layout-content-padding">
+      <div class="layout-content-main">
+        <Row>
+          <!--查询-->
+          <Col span="24" style="margin-top: 10px">
+            <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
+              <label class="label-sign"></label>
+              <Form-item class="search-item" label="实验室名称:">
+                <Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/>
+              </Form-item>
+              <Form-item class="search-item" label="资质:">
+                <Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
+              </Form-item>
+              <Form-item class="search-btn">
+                <Button @click="_formSearch" type="primary">搜索</Button>
+              </Form-item>
+            </Form>
+          </Col>
+          <!--操作-->
+          <Col span="24">
+
+            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
+                     class="contHide"></btn-list>
+          </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" hide-checkbox>
+              <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>{{scope.row[item.key]}}</span>
+                </template>
+              </vxe-table-column>
+            </PTVXETable>
+          </Col>
+        </Row>
+      </div>
+    </div>
+
+    <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
+  </div>
+</template>
+<script>
+import { meterEntrust, meterSubcontractor } from '../../../api'
+import MeterSubcontractorEdit from './MeterContractReviewEdit'
+export default {
+  components: { MeterSubcontractorEdit },
+  data() {
+    return {
+      currentComponent: '',
+      formId: 'meterSubcontractorFormId',
+      searchOpen: false,
+      btn: [
+        {
+          type: 'success',
+          id: 'meter-subcontractor-add-btn',
+          name: '添加'
+        }
+      ],
+      iconMsg: [
+        {
+          type: 'ios-clock',
+          id: '',
+          name: '编辑'
+        },
+        {
+          type: 'ios-clock',
+          id: '',
+          name: '资质项目'
+        },
+        { type: 'ios-clock', id: '', name: '附件' },
+        { type: 'ios-clock', id: '', name: '删除' },
+        {
+          type: 'ios-clock',
+          id: '',
+          name: '操作日志'
+        }
+      ],
+      formObj: {
+        name: undefined,
+        aptitude: undefined
+      },
+      selectIds: [],
+      getPage: {},
+      pageColumns: [
+        { title: '委托单位', key: 'client', width: 200 },
+        { title: '联系人', key: 'person', width: 120 },
+        { title: '联系电话', key: 'tel', width: 120 },
+        { title: '传真', key: 'fax', width: 120 },
+        { title: '详细地址', key: 'address', width: 250 },
+        { title: '邮编', key: 'postcode' },
+        { title: 'E-mail', key: 'email', width: 120 },
+        { title: '委托日期', key: 'edate', width: 120 },
+        { title: '费用合计', key: 'fee', width: 120 },
+        { title: '合同号', key: 'contractCode', width: 120 },
+        { title: '备注', key: 'remark' }
+      ]
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      if (this.searchOpen) {
+        return this.$tableHeight('search')
+      } else {
+        return this.$tableHeight('noSearch')
+      }
+    }
+  },
+  mounted() {
+    this._page()
+  },
+  methods: {
+    _modalResult() {
+      if (this.currentComponent === 'FoodSubcontracterEdit') {
+        this._page()
+      }
+    },
+    _btnClick(msg, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (msg) {
+          case '添加':
+            this._editModal(false)
+            break
+          case 'search':
+            this.searchOpen = !this.searchOpen
+            break
+        }
+      })
+    },
+    _iconClick(res, data, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (res) {
+          case '编辑':
+            this._editModal(true, data.id)
+            break
+          case '资质项目':
+            this._itemModal(data.id)
+            break
+          case '附件':
+            this._upload(data.id)
+            break
+          case '删除':
+            this._deleteByIds([data.id])
+            break
+          case '操作日志':
+            this._record(data.id)
+            break
+        }
+      })
+    },
+    _record(id) {
+      this.$refs.refModal._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 'changeSize':
+          this._page()
+          break
+      }
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      console.log('this.formObj', this.formObj)
+      const result = await meterEntrust.pageSendEntrust(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.$refs.editSubcontractorModal._open(id)
+        this._getById(id)
+      } else {
+        // 添加
+        this.$refs.editSubcontractorModal._open()
+      }
+    },
+    // 追加项目
+    _itemModal(data) {
+      this.$refs.refModal._open(data)
+    },
+
+    _upload(id) {
+      // 上传文件
+      this.$refs.refModal._open(id, 'subcontractorId')
+    },
+    _getById: async function(id) {
+      const result = await meterSubcontractor.getById(id)
+      if (result) {
+        this.$refs.editSubcontractorModal._open(result)
+      }
+    },
+    _delete: async function(ids) {
+      const result = await meterSubcontractor.deleteById(ids)
+      if (result) {
+        this._formSearch()
+        this.$Message.success('删除成功！')
+      }
+    }
+  }
+}
+</script>

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

+<template>
+  <div>
+    <!--内容-->
+    <div class="layout-content-padding">
+      <div class="layout-content-main">
+        <Row>
+          <!--查询-->
+          <Col span="24" style="margin-top: 10px">
+            <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
+              <label class="label-sign"></label>
+              <Form-item class="search-item" label="实验室名称:">
+                <Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/>
+              </Form-item>
+              <Form-item class="search-item" label="资质:">
+                <Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
+              </Form-item>
+              <Form-item class="search-btn">
+                <Button @click="_formSearch" type="primary">搜索</Button>
+              </Form-item>
+            </Form>
+          </Col>
+          <!--操作-->
+          <Col span="24">
+
+            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
+                     class="contHide"></btn-list>
+          </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" hide-checkbox>
+              <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>{{scope.row[item.key]}}</span>
+                </template>
+              </vxe-table-column>
+            </PTVXETable>
+          </Col>
+        </Row>
+      </div>
+    </div>
+
+    <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
+  </div>
+</template>
+<script>
+import { meterEntrust, meterSubcontractor } from '../../../api'
+import MeterSubcontractorEdit from './MeterContractReviewEdit'
+export default {
+  components: { MeterSubcontractorEdit },
+  data() {
+    return {
+      currentComponent: '',
+      formId: 'meterSubcontractorFormId',
+      searchOpen: false,
+      btn: [
+        {
+          type: 'success',
+          id: 'meter-subcontractor-add-btn',
+          name: '添加'
+        }
+      ],
+      iconMsg: [
+        {
+          type: 'ios-clock',
+          id: '',
+          name: '编辑'
+        },
+        {
+          type: 'ios-clock',
+          id: '',
+          name: '资质项目'
+        },
+        { type: 'ios-clock', id: '', name: '附件' },
+        { type: 'ios-clock', id: '', name: '删除' },
+        {
+          type: 'ios-clock',
+          id: '',
+          name: '操作日志'
+        }
+      ],
+      formObj: {
+        name: undefined,
+        aptitude: undefined
+      },
+      selectIds: [],
+      getPage: {},
+      pageColumns: [
+        { title: '委托单位', key: 'client', width: 200 },
+        { title: '联系人', key: 'person', width: 120 },
+        { title: '联系电话', key: 'tel', width: 120 },
+        { title: '传真', key: 'fax', width: 120 },
+        { title: '详细地址', key: 'address', width: 250 },
+        { title: '邮编', key: 'postcode' },
+        { title: 'E-mail', key: 'email', width: 120 },
+        { title: '委托日期', key: 'edate', width: 120 },
+        { title: '费用合计', key: 'fee', width: 120 },
+        { title: '合同号', key: 'contractCode', width: 120 },
+        { title: '备注', key: 'remark' }
+      ]
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      if (this.searchOpen) {
+        return this.$tableHeight('search')
+      } else {
+        return this.$tableHeight('noSearch')
+      }
+    }
+  },
+  mounted() {
+    this._page()
+  },
+  methods: {
+    _modalResult() {
+      if (this.currentComponent === 'FoodSubcontracterEdit') {
+        this._page()
+      }
+    },
+    _btnClick(msg, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (msg) {
+          case '添加':
+            this._editModal(false)
+            break
+          case 'search':
+            this.searchOpen = !this.searchOpen
+            break
+        }
+      })
+    },
+    _iconClick(res, data, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (res) {
+          case '编辑':
+            this._editModal(true, data.id)
+            break
+          case '资质项目':
+            this._itemModal(data.id)
+            break
+          case '附件':
+            this._upload(data.id)
+            break
+          case '删除':
+            this._deleteByIds([data.id])
+            break
+          case '操作日志':
+            this._record(data.id)
+            break
+        }
+      })
+    },
+    _record(id) {
+      this.$refs.refModal._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 'changeSize':
+          this._page()
+          break
+      }
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      console.log('this.formObj', this.formObj)
+      const result = await meterEntrust.pageSendEntrust(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.$refs.editSubcontractorModal._open(id)
+        this._getById(id)
+      } else {
+        // 添加
+        this.$refs.editSubcontractorModal._open()
+      }
+    },
+    // 追加项目
+    _itemModal(data) {
+      this.$refs.refModal._open(data)
+    },
+
+    _upload(id) {
+      // 上传文件
+      this.$refs.refModal._open(id, 'subcontractorId')
+    },
+    _getById: async function(id) {
+      const result = await meterSubcontractor.getById(id)
+      if (result) {
+        this.$refs.editSubcontractorModal._open(result)
+      }
+    },
+    _delete: async function(ids) {
+      const result = await meterSubcontractor.deleteById(ids)
+      if (result) {
+        this._formSearch()
+        this.$Message.success('删除成功！')
+      }
+    }
+  }
+}
+</script>

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

+<template>
+  <div>
+    <div class="layout-content-padding">
+      <div class="layout-content-main">
+        <el-tabs v-model="activeName">
+          <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>
+        </el-tabs>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import MeterSendEntrust from './MeterContractReview'
+import MeterSendEntrustFinish from './MeterContractReviewFinish'
+import MeterSendEntrustHis from './MeterContractReviewHis'
+export default {
+  name: 'MeterSendEntrustIndex',
+  components: {
+    MeterSendEntrust,
+    MeterSendEntrustFinish,
+    MeterSendEntrustHis
+  },
+  data() {
+    return {
+      activeName: 'wait'
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

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

+<template>
+  <div>
+    <Modal v-model="showModal" width="900" class="modal-footer-none zIndex-1100">
+      <p slot="header">操作日志</p>
+      <div>
+        <Row>
+          <!--查询-->
+          <Col span="24">
+            <Form id="search-contract-record" :label-width="70" inline onsubmit="return false">
+              <label class="label-sign"></label>
+              <Form-item label="操作阶段:">
+                <Input v-model="formObj.origin" @on-enter="_search" placeholder="请输入操作阶段"
+                       style="width: 200px" clearable/>
+              </Form-item>
+              <Form-item class="search-btn">
+                <Button @click="_search" type="primary">搜索</Button>
+              </Form-item>
+            </Form>
+          </Col>
+          <!-- 表格 -->
+          <Col span="24">
+            <PTVXETable ref="pageTable" :tableHeight="tableHeight"
+                        @on-result-change="_tableResultChange" :getPage="getPage" hide-checkbox>
+              <vxe-table-column
+                :field="item.key"
+                :title="item.title"
+                :min-width="item.width?item.width:200"
+                :fixed="item.fixed?item.fixed:undefined"
+                v-for="item in pageColumns" :key="item.key">
+                <template slot-scope="scope">
+                <span v-if="item.key==='type'">
+                  {{scope.row[item.key] === 0 ? '流转' : scope.row[item.key] === 1 ? '退回': scope.row[item.key] === 2 ?'更新' :
+                  scope.row[item.key] === 3 ? '转发':'文件'}}
+                </span>
+                  <span v-else-if="item.key==='ctime'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):''}}</span>
+                  <span v-else>{{scope.row[item.key]}}</span>
+                </template>
+              </vxe-table-column>
+            </PTVXETable>
+          </Col>
+        </Row>
+      </div>
+    </Modal>
+
+  </div>
+</template>
+<script>
+/**
+ * 操作日志-委托
+ */
+import { meterEntrust } from '../../../api'
+export default {
+  data() {
+    return {
+      showModal: false,
+      getPage: {},
+      pageColumns: [
+        { title: '操作类型', key: 'type', width: 80 },
+        { title: '操作阶段', key: 'origin', width: 120 },
+        { title: '目标阶段', key: 'target', width: 120 },
+        { title: '操作人', key: 'operator', width: 80 },
+        { title: '操作时间', key: 'ctime', width: 150 },
+        { title: '操作原因', key: 'remark' },
+        { title: '责任人', key: 'liable', width: 80 }
+      ],
+      formObj: {
+        origin: '',
+        contractId: ''
+      }
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      return this.$tableHeight('tableModal')
+    }
+  },
+  methods: {
+    _open(contractId) {
+      this.showModal = true
+      this.formObj.contractId = contractId
+      this.formObj.origin = ''
+      this._page()
+    },
+    _page: async function() {
+      console.log('要传的参数')
+      console.log(this.formObj)
+      const result = await meterEntrust.pageOutTaskOperation(this.formObj)
+      console.log(result)
+      if (result) {
+        this.getPage = result
+      }
+      // this.$refs.pageTable._page(
+      //   'search-contract-record',
+      //   'FoodContractRecord/page',
+      //   this.$serializeFormSearch(this.formObj)
+      // )
+    },
+
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'page':
+          this.getPage = this.$store.state.FoodContractRecord.page
+          break
+        case 'changeSize':
+          this._page()
+          break
+      }
+    },
+    _search() {
+      this.$refs.pageTable._pageChange(1)
+    }
+  }
+}
+</script>

pages/meter-review/contract-tab/SelectInput.vue

@@ -3,10 +3,18 @@
 
     <!--有时间组件-->
     <div v-if="date === true && multiple === false" class="search-item-select-date">
+
+
+
       <Select slot="prepend" v-model="key" @on-change="_selKeyChange" style="width:90px">
-        <Option v-for="item in optionList" :value="item.key" :key="item.key" v-if="compareKey!==item.key">
+
+
+     <span v-for="item in optionList"  v-bind:key="item.key">
+        <Option :value="item.key" :key="item.key" v-if="compareKey!==item.key">
           {{item.name}}
         </Option>
+      </span>
+
       </Select>
       <template v-if="dateToMin">
         <Date-picker :placeholder="msg" :editable="false"
@@ -25,9 +33,13 @@
     <!--结果判定单选组件-->
     <div v-else-if="date === false && multiple === true" class="search-item-select-date">
       <Select slot="prepend" v-model="key" @on-change="_selKeyChange" style="width:90px">
-        <Option v-for="item in optionList" :value="item.key" :key="item.key" v-if="compareKey!==item.key">
+        <span v-for="item in optionList" v-bind:key="item.key">
+          <Option :value="item.key" :key="item.key" v-if="compareKey!==item.key">
           {{item.name}}
-        </Option>
+          </Option>
+        </span>
+
+
       </Select>
       <el-select v-model="qualifiedValue" :placeholder="msg" size="small" clearable>
         <el-option :label="item.name" :value="item.value" v-for="item in judgeList"
@@ -39,7 +51,7 @@
            style="width: 275px">
     <Select slot="prepend" v-model="key" @on-change="_selKeyChange" style="width:90px">
       <!--:key  渲染时key很有用，不写可能渲染错-->
-      <div v-for="item in optionList" v-key="item">
+      <div v-for="item in optionList" v-bind:key="item.key">
         <Option  :value="item.key" :key="item.key" v-if="compareKey!==item.key">
           {{item.name}}
         </Option>

router/meter-routes.js

@@ -29,6 +29,8 @@ import MeterContractCheckIndex from '../pages/meter-business/quote-check/MeterCo
 import MeterContractCheckSecondIndex from '../pages/meter-business/quote-check-second/MeterContractCheckSecondIndex'
 import MeterContractApprovalIndex from '../pages/meter-business/quote-approval/MeterContractApprovalIndex'
 import MeterContractAcceptedIndex from '../pages/meter-business/accepted/MeterContractAcceptedIndex'
+import MeterContractRegisterIndex from '../pages/meter-contract/contract-register/MeterContractRegisterIndex'
+import MeterContractReviewIndex from '../pages/meter-contract/contract-review/MeterContractReviewIndex'
 import Blank from '~/pages/blank'
 export default [
   {
@@ -181,5 +183,21 @@ export default [
         meta: { title: '业务受理' }
       }
     ]
+  },
+  {
+    path: 'contract',
+    component: Blank,
+    children: [
+      {
+        path: 'contract_register',
+        component: MeterContractRegisterIndex,
+        meta: { title: '' }
+      },
+      {
+        path: 'contract_review',
+        component: MeterContractReviewIndex,
+        meta: { title: '' }
+      }
+    ]
   }
 ]