委托单

api/index.js

@@ -23,4 +23,5 @@ export { default as workbench } from './meter/workbench/workbench'
  * 计量检定
  */
 export { default as meterSubcontractor } from './meter/meter-subcontractor'
+export { default as meterEntrust } from './meter/meter-entrust'
 export { default as lmsBaseDict } from './lims/lms-base-dict'

api/meter/meter-entrust.js

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

api/meter/meter-subcontractor.js

@@ -8,6 +8,8 @@ export default {
   // page
   page: data => http.post('meter/v1/subcontractor/page', data).then(res => res),
   getById: data => http.get('meter/v1/subcontractor/' + data).then(res => res),
+  deleteById: data =>
+    http.delete('meter/v1/subcontractor/?ids=' + data).then(res => res),
   // 保存
   save: data => http.post('meter/v1/subcontractor/', data).then(res => res),
   // 编辑

pages/meter-entrust/send-test/MeterSendEntrust.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" inline onsubmit="return false" :label-width="90">
+              <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" class="contHide" :open="searchOpen" :show-search-btn="true"
+                     @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" hide-checkbox @on-result-change="_tableResultChange">
+              <vxe-table-column
+                v-for="item in pageColumns"
+                :key="item.key"
+                sortable
+                :field="item.key"
+                :title="item.title"
+                :min-width="item.width?item.width:200" :fixed="item.fixed?item.fixed:undefined">
+                <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 { meterSubcontractor } from '../../../api'
+import MeterSubcontractorEdit from './MeterSendTestEdit'
+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: 200 },
+        { title: '联系电话', key: 'tel', width: 90 },
+        { title: '传真', key: 'fax', width: 120 },
+        { title: '详细地址', key: 'address', width: 150 },
+        { 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 meterSubcontractor.page(this.formObj)
+      if (result) {
+        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-entrust/send-test/MeterSendTestEdit.vue

+<template>
+  <div>
+    <Modal v-model="showModal" :mask-closable="false" width="1000">
+      <p slot="header">{{modalTitle}}</p>
+      <div>
+        <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline>
+
+          <Form-item label="委托方是否第一次送检" prop="name" class="width-48">
+            <Input v-model="formObj.name" name="name" placeholder="请输入实验室名称"/>
+          </Form-item>
+          <Form-item label="委托单位" prop="name" class="width-48">
+            <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>
+          </Form-item>
+          <Form-item label="联系人" prop="name" class="width-48">
+            <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>
+          </Form-item>
+          <Form-item label="联系电话" prop="name" class="width-48">
+            <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>
+          </Form-item>
+          <Form-item label="传真" prop="name" class="width-48">
+            <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>
+          </Form-item>
+          <Form-item label="省、市、区" prop="name" class="width-48">
+            <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>
+          </Form-item>
+          <Form-item label="街道" prop="name" class="width-48">
+            <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>
+          </Form-item>
+          <Form-item label="邮编" prop="name" class="width-48">
+            <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>
+          </Form-item>
+
+          <Form-item label="E-mail" prop="name" class="width-48">
+            <Input v-model="formObj.name" name="name" placeholder="请输入实验室名称"/>
+          </Form-item>
+          <Form-item label="委托日期：" prop="linkman" class="width-48">
+            <Input v-model="formObj.linkman" name="linkman" placeholder="请输入联系人"/>
+          </Form-item>
+          <Form-item label="合同号：" prop="linkman" class="width-48">
+            <Input v-model="formObj.linkman" name="linkman" placeholder="请输入联系人"/>
+          </Form-item>
+          <Form-item label="备注：" prop="remark" style="width: 99.8%">
+            <Input v-model="formObj.remark" name="remark" type="textarea" :rows="3"
+                   placeholder="请输入备注"/>
+          </Form-item>
+        </Form>
+      </div>
+      <div slot="footer">
+        <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+/**
+ * 添加编辑分包商
+ */
+import { lmsBaseDict, meterSubcontractor } from '../../../api'
+
+export default {
+  components: {},
+  data() {
+    return {
+      id: '',
+      modalTitle: '',
+      subcontractorId: '',
+      formObj: {
+        name: '',
+        linkman: '',
+        tel: '',
+        email: '',
+        address: '',
+        remark: '',
+        clearingWay: '',
+        aptitude: [],
+        assessFormSn: '',
+        subArea: '',
+        personCondition: '',
+        assessPerson: ''
+      },
+      ruleValidate: {
+        name: [
+          { required: true, message: '实验室名称不能为空', trigger: 'blur' }
+        ]
+      },
+      clearingWayList: ['款到后测试', '先测试后付款', '其他情况（）'],
+      clearingWayListTemp: ['款到后测试', '先测试后付款', '其他情况（）'],
+      showModal: false,
+      footerList: [
+        { id: '', name: '取消', type: '' },
+        { id: '', name: '保存', type: 'primary' }
+      ],
+      aptitudeData: []
+    }
+  },
+  methods: {
+    /** *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')
+          this.$extend(data, { aptitude: this.formObj.aptitude.toString() })
+          if (this.$string(this.id).isEmpty()) {
+            // 添加
+            this._save(data)
+          } else {
+            // 编辑
+            this._edit({ id: this.formObj.id, obj: data })
+          }
+        } 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.$refs.formObj.resetFields()
+      this._hideLoading()
+      this._getAptitudeList()
+      if (this.$string(formObj).isEmpty()) {
+        this.id = ''
+        this.formObj.aptitude = []
+        this.modalTitle = '分包商管理新增'
+      } else {
+        this.id = formObj.id
+        this.formObj = formObj
+        this.modalTitle = '分包商管理编辑'
+        this._showTime(formObj)
+      }
+    },
+    _getAptitudeList: async function() {
+      const result = await lmsBaseDict.getItem('subcontractorAptitude')
+      if (result) {
+        this.aptitudeData = result
+      }
+    },
+    _showTime(formObj) {
+      // 回显资质类型
+      if (formObj.aptitude !== undefined || '') {
+        this.formObj.aptitude = formObj.aptitude.split(',')
+      } else {
+        this.formObj.aptitude = []
+      }
+    },
+    _save: async function(data) {
+      const result = await meterSubcontractor.save(data)
+      console.log(result)
+      if (result) {
+        this._resultChange('添加成功!')
+      }
+    },
+    _edit: async function(data) {
+      const result = await meterSubcontractor.edit(data)
+      if (result) {
+        this._resultChange('编辑成功!')
+      }
+    }
+  }
+}
+</script>

pages/meter-subcontract/subcontractor/MeterSubcontractor.vue

@@ -189,14 +189,7 @@ export default {
         title: '提示',
         content: content || '确定删除该记录？',
         onOk: () => {
-          this.$store
-            .dispatch('FoodSubcontracter/deleteByIds', ids)
-            .then(() => {
-              if (this.$store.state.FoodSubcontracter.success) {
-                this._page()
-                this.$Message.success('删除成功！')
-              }
-            })
+          this._delete(ids)
         }
       })
     },
@@ -225,6 +218,13 @@ export default {
       if (result) {
         this.$refs.editSubcontractorModal._open(result)
       }
+    },
+    _delete: async function(ids) {
+      const result = await meterSubcontractor.deleteById(ids)
+      if (result) {
+        this._formSearch()
+        this.$Message.success('删除成功！')
+      }
     }
   }
 }

router/meter-routes.js

@@ -10,6 +10,7 @@ import workbench from '../pages/workbench/workbench'
 import MeterAptitudeManage from '../pages/meter-aptitude/manage/MeterAptitudeManage'
 import MeterAptitudeStandard from '../pages/meter-aptitude/standard/MeterAptitudeStandard'
 import MeterSubcontractor from '../pages/meter-subcontract/subcontractor/MeterSubcontractor'
+import MeterSendEntrust from '../pages/meter-entrust/send-test/MeterSendEntrust'
 import Blank from '~/pages/blank'
 export default [
   {
@@ -43,5 +44,16 @@ export default [
         meta: { title: '分包方管理' }
       }
     ]
+  },
+  {
+    path: 'entrust',
+    component: Blank,
+    children: [
+      {
+        path: 'send_test',
+        component: MeterSendEntrust,
+        meta: { title: '送检委托登记' }
+      }
+    ]
   }
 ]