分包方管理

api/index.js

@@ -19,3 +19,8 @@ export { default as lmsSupplier } from './lims/lms-supplier'
 export { default as flowProcess } from './workflow/flow-process'
 
 export { default as workbench } from './meter/workbench/workbench'
+/**
+ * 计量检定
+ */
+export { default as meterSubcontractor } from './meter/meter-subcontractor'
+export { default as lmsBaseDict } from './lims/lms-base-dict'

api/lims/lms-base-dict.js

+/**
+ * 相关
+ * 用户编组
+ */
+import http from '../http'
+
+export default {
+  getItem: data =>
+    http.get('/res/v1/dict/dict_class_item?classType=' + data).then(res => res),
+  getUserByGroupId: data =>
+    http.post('/res/v1/user_group/page_rel_user', data).then(res => res)
+}

api/meter/meter-subcontractor.js

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

components/table/PTVXETable.vue

@@ -80,6 +80,7 @@ export default {
   name: 'PTVXETable',
   components: { VXEIconList },
   props: {
+    formId: null,
     tableHeight: null,
     getPage: null,
     hidePage: null,
@@ -105,7 +106,6 @@ export default {
   },
   data() {
     return {
-      formId: '',
       extendsData: {},
       loading: false,
       pageParams: {
@@ -202,6 +202,16 @@ export default {
         return this.$extend(data)
       }
     },
+    _searchFormParams() {
+      const data = {}
+      const serData = this.$serialize(this.formId)
+      Object.assign(data, serData, this.extendsData)
+      if (this.hidePage === undefined) {
+        return this.$extend(data, this.pageParams)
+      } else {
+        return this.$extend(data)
+      }
+    },
     _page(formId, uri, extendsData) {
       this.loading = true
       if (this.tableName) {

pages/meter-subcontract/subcontractor/MeterSubcontractor.vue

@@ -6,16 +6,13 @@
         <Row>
           <!--查询-->
           <Col span="24" style="margin-top: 10px">
-            <Form v-show="searchOpen" id="search-form" inline onsubmit="return false" :label-width="90">
+            <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 name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.name" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item class="search-item" label="资质:">
-                <Input name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/>
-              </Form-item>
-              <Form-item class="search-item" label="检测项目:">
-                <Input name="itemName" placeholder="请输入检测项目" clearable @on-enter="_formSearch"/>
+                <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>
@@ -25,12 +22,12 @@
           <!--操作-->
           <Col span="24">
 
-            <BtnList :msg="btn" class="contHide" :open="searchOpen" :show-search-btn="true"
-                     @on-result-change="_btnClick"></BtnList>
+            <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"
+            <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"
@@ -48,21 +45,25 @@
         </Row>
       </div>
     </div>
+
+    <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
   </div>
 </template>
 <script>
+import { meterSubcontractor } from '../../../api'
+import MeterSubcontractorEdit from './MeterSubcontractorEdit'
 export default {
-  components: {},
+  components: { MeterSubcontractorEdit },
   data() {
     return {
       currentComponent: '',
+      formId: 'meterSubcontractorFormId',
       searchOpen: false,
       btn: [
         {
           type: 'success',
-          id: '',
-          name: '添加',
-          componentName: 'FoodSubcontracterEdit'
+          id: 'meter-subcontractor-add-btn',
+          name: '添加'
         }
       ],
       iconMsg: [
@@ -87,6 +88,10 @@ export default {
           componentName: 'FoodSubRecord'
         }
       ],
+      formObj: {
+        name: undefined,
+        aptitude: undefined
+      },
       selectIds: [],
       getPage: {},
       pageColumns: [
@@ -170,8 +175,13 @@ export default {
           break
       }
     },
-    _page() {
-      alert(123)
+    _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)
@@ -197,12 +207,9 @@ export default {
     _editModal(edit, id) {
       if (edit) {
         // 编辑
-        this.$store.dispatch('FoodSubcontracter/getById', id).then(() => {
-          this.$refs.refModal._open(this.$store.state.FoodSubcontracter.model)
-        })
       } else {
         // 添加
-        this.$refs.refModal._open()
+        this.$refs.editSubcontractorModal._open()
       }
     },
     // 追加项目

pages/meter-subcontract/subcontractor/MeterSubcontractorEdit.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="aptitude" class="width-48">
+            <Select v-model="formObj.aptitude" name="aptitude" multiple placeholder="请选择资质">
+              <Option v-for="item in aptitudeData" :key="item.name" :value="item.name">{{item.name}}</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="联系人：" prop="linkman" class="width-48">
+            <Input v-model="formObj.linkman" name="linkman" placeholder="请输入联系人"/>
+          </Form-item>
+          <Form-item label="手机号：" prop="tel" class="width-48">
+            <Input v-model="formObj.tel" name="tel" placeholder="请输入手机号"/>
+          </Form-item>
+          <Form-item label="邮箱：" prop="email" class="width-48">
+            <Input v-model="formObj.email" name="email" placeholder="请输入邮箱"/>
+          </Form-item>
+          <Form-item label="地址：" prop="address" class="width-48">
+            <Input v-model="formObj.address" name="address" placeholder="请输入地址"/>
+          </Form-item>
+          <Form-item label="结算方式:" prop="clearingWay" class="width-48">
+            <AutoCompletes name="clearingWay" :value="formObj.clearingWay" :down-data="clearingWayList"
+                           placeholder="请输入或选择结算方式" @on-result-change="_wayResult"></AutoCompletes>
+          </Form-item>
+          <Form-item label="评价表编号：" prop="assessFormSn" class="width-48">
+            <Input v-model="formObj.assessFormSn" name="assessFormSn" placeholder="请输入评价表编号"/>
+          </Form-item>
+          <Form-item label="评价人员：" prop="assessPerson" class="width-48">
+            <Input v-model="formObj.assessPerson" name="assessPerson" placeholder="请评价人员"/>
+          </Form-item>
+          <Form-item label="人员情况：" prop="personCondition" style="width: 99.8%">
+            <Input v-model="formObj.personCondition" name="personCondition" type="textarea"
+                   :rows="3" placeholder="请输入人员情况"/>
+          </Form-item>
+          <Form-item label="分包范围：" prop="subArea" style="width: 99.8%">
+            <Input v-model="formObj.subArea" name="subArea" type="textarea"
+                   :rows="3" 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 AutoCompletes from '../../../components/base/AutoCompletes'
+import { lmsBaseDict, meterSubcontractor } from '../../../api'
+
+export default {
+  components: {
+    AutoCompletes
+  },
+  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>

plugins/common.js

@@ -802,7 +802,7 @@ Vue.prototype.$optColWidth = function(list) {
   }
   return arrayList.length > 0 ? 85 + width * (arrayList.length - 1) : 0
 }
-
+Vue.prototype.$defRow = 50
 Vue.prototype.$setOptimization = function(msg) {
   // 默认 数据超过200条，启用虚拟加载，每次加载50条
   let result = { gt: 200, oSize: 20, rSize: 50 }