合同管理

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

@@ -12,9 +12,6 @@
               <Form-item label="样品名称:" class="search-item">
                 <Input v-model="formObj.name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
               </Form-item>
-              <Form-item label="样品编号:" class="search-item">
-                <Input v-model="formObj.code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
-              </Form-item>
               <Form-item class="search-btn" style="margin-left: -10px">
                 <Button type="primary" @click="_formSearch">搜索</Button>
               </Form-item>
@@ -60,7 +57,7 @@
   </div>
 </template>
 <script>
-import { meterSample } from '../../../api'
+import { meterSampleQuote } from '../../api'
 export default {
   components: {
     // FoodSampleGovernDetail,
@@ -80,23 +77,23 @@ export default {
       //   {id: '', name: '删除'},
       // ],
       iconMsg: [
-        { type: 'compose', id: '', name: '编辑' },
-        { type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' },
-        { type: 'trash-a', id: '', name: '删除' }
+        // { 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: '取消分包'
-        }
+        // {
+        //   // meter-review-entrust-pass-btn
+        //   type: 'success',
+        //   id: '',
+        //   name: '分包'
+        // },
+        // // meter-review-entrust-back-btn
+        // {
+        //   type: 'success',
+        //   id: '',
+        //   name: '取消分包'
+        // }
       ],
       options: [
         {
@@ -109,6 +106,7 @@ export default {
           name: '外观检查'
         }
       ],
+      searchOpen: false,
       formId: 'meterReviewSampleManageFormId',
       showModal: false,
       modalTitle: '管理样品',
@@ -116,13 +114,17 @@ export default {
       selectData: [],
       getPage: {},
       pageColumns: [
-        { title: '样品编号', key: 'code', detail: true, width: 120 },
-        { title: '样品名称', key: 'name', width: 140 },
-        { title: '型号规格', key: 'spec', width: 140 },
-        { title: '出厂编号', key: 'factoryNumber', width: 140 },
-        { title: '是否分包', key: 'jobOut', width: 110 },
-        { title: '检测类型', key: 'type', width: 140 },
-        { title: '数量', key: 'quantity', width: 140 }
+        { 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: {
@@ -231,7 +233,7 @@ export default {
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       console.log('this.formObj', this.formObj)
-      const result = await meterSample.page(this.formObj)
+      const result = await meterSampleQuote.page(this.formObj)
       if (result) {
         this.getPage = result
         this.$refs.pageTable._hideLoading()
@@ -312,59 +314,6 @@ export default {
     _copy(sampleId, type) {
       this.$refs.refModal._open(sampleId, type)
     },
-    // 复制样品
-    _copySample(data) {
-      if (data.type === 2) {
-        // 粮油的编辑页
-        this.currentComponent = 'FoodSampleGovernLYEdit'
-        this.$store
-          .dispatch('FoodSample/getByGovernId', data.sampleId)
-          .then(() => {
-            this.$nextTick(function() {
-              this.$refs.refModal._openCopySample(
-                this.$store.state.FoodSample.governModel
-              )
-            })
-          })
-      } else {
-        this.currentComponent = 'FoodSampleGovernEdit'
-        this.$store
-          .dispatch('FoodSample/getByGovernId', data.sampleId)
-          .then(() => {
-            this.$nextTick(function() {
-              this.$refs.refModal._openCopySample(
-                this.$store.state.FoodSample.governModel
-              )
-            })
-          })
-      }
-    },
-    _copyAll(data) {
-      if (data.type === 2) {
-        // 粮油的编辑页
-        this.currentComponent = 'FoodSampleGovernLYEdit'
-        this.$store
-          .dispatch('FoodSample/getByGovernId', data.sampleId)
-          .then(() => {
-            this.$nextTick(function() {
-              this.$refs.refModal._openCopyAll(
-                this.$store.state.FoodSample.governModel
-              )
-            })
-          })
-      } else {
-        this.currentComponent = 'FoodSampleGovernEdit'
-        this.$store
-          .dispatch('FoodSample/getByGovernId', data.sampleId)
-          .then(() => {
-            this.$nextTick(function() {
-              this.$refs.refModal._openCopyAll(
-                this.$store.state.FoodSample.governModel
-              )
-            })
-          })
-      }
-    },
     // 导入样品
     _importSample() {
       const data = {
@@ -401,7 +350,7 @@ export default {
       }
     },
     _subpackage: async function(ids) {
-      const result = await meterSample.subpackageSample(ids)
+      const result = await meterSampleQuote.subpackageSample(ids)
       if (result) {
         this.$Message.success('分包成功！')
         await this._page()

pages/meter-business/accepted/MeterContractAccepted.vue

@@ -51,9 +51,9 @@
   </div>
 </template>
 <script>
-import { meterContract, meterEntrust, meterSubcontractor } from '../../../api'
+import { meterContract, meterSubcontractor } from '../../../api'
 import Operation from '../../../components/operation/Operation'
-import MeterSampleManage from './MeterSampleManage'
+import MeterSampleManage from '../MeterSampleQuoteManage'
 import MeterEntrustDetail from './MeterContractAcceptedDetail'
 export default {
   components: { MeterSampleManage, MeterEntrustDetail, Operation },
@@ -106,11 +106,10 @@ export default {
         { 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: 'odate', width: 120 },
+        { title: '折扣', key: 'discount', width: 120 },
+        { title: '总价', key: 'totalPrice', width: 120 },
+        { title: '折扣价', key: 'discountPrice', width: 120 },
         { title: '备注', key: 'remark' }
       ]
     }
@@ -280,13 +279,12 @@ export default {
     },
 
     _passEntrustReview: async function(ids) {
-      const result = await meterEntrust.passReview(ids)
+      const result = await meterContract.submitToContractRegister(ids)
       if (result) {
         this.$Message.success('提交成功！')
         await this._page()
       }
     },
-
     // 追加项目
     _itemModal(data) {
       this.$refs.refModal._open(data)

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/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/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: '' }
+      }
+    ]
   }
 ]