委托单优化

api/meter/meter-sample.js

@@ -10,6 +10,8 @@ export default {
   page: data => http.post('meter/v1/sample/page', data).then(res => res),
   pageOutDistribute: data =>
     http.post('meter/v1/sample/page_distribute', data).then(res => res),
+  pageOutPersonalTask: data =>
+    http.post('meter/v1/sample/page_out_personal_task', data).then(res => res),
   getById: data => http.get('meter/v1/sample/' + data).then(res => res),
   deleteById: data =>
     http.delete('meter/v1/sample/?ids=' + data).then(res => res),
@@ -17,5 +19,8 @@ export default {
   save: data =>
     https
       .post('meter/v1/sample/add_send_entrust', JSON.stringify(data))
-      .then(res => res)
+      .then(res => res),
+
+  subpackageSample: data =>
+    http.post('meter/v1/sample/subpackage_sample?ids=' + data).then(res => res)
 }

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

@@ -6,24 +6,24 @@
         <Row>
           <!--查询-->
           <Col span="24" style="margin-top: 10px">
-            <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
+            <Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
               <label class="label-sign"></label>
               <Form-item class="search-item" label="实验室名称:">
-                <Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/>
+                <Input v-model="formObj.name" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item class="search-item" label="资质:">
-                <Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
+                <Input v-model="formObj.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item class="search-btn">
-                <Button @click="_formSearch" type="primary">搜索</Button>
+                <Button type="primary" @click="_formSearch">搜索</Button>
               </Form-item>
             </Form>
           </Col>
           <!--操作-->
           <Col span="24">
 
-            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
-                     class="contHide"></btn-list>
+            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
+                     @on-result-change="_btnClick"></btn-list>
           </Col>
           <!--表格-->
           <Col span="24">
@@ -50,7 +50,7 @@
   </div>
 </template>
 <script>
-import { meterEntrust } from '../../../api'
+import { meterSample } from '../../../api'
 import MeterSubcontractorEdit from './MeterGoOutTestEdit'
 export default {
   components: { MeterSubcontractorEdit },
@@ -100,13 +100,12 @@ export default {
         { 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: 'name', width: 160 },
+        { title: '型号规格', key: 'spec' },
+        { title: '出厂编号', key: 'factoryNumber' },
+        { title: '检测类型', key: 'type' },
+        { title: '数量', key: 'quantity' },
         { title: '备注', key: 'remark' }
       ]
     }
@@ -157,7 +156,7 @@ export default {
           title: '提示',
           content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？',
           onOk: () => {
-            const result = meterEntrust.submit(ids)
+            const result = meterSample.submit(ids)
             if (result) {
               console.log(result)
             }
@@ -192,9 +191,6 @@ export default {
     },
     _tableResultChange(msg, data) {
       switch (msg) {
-        case 'page':
-          this.getPage = this.$store.state.FoodSubcontracter.page
-          break
         case 'iconClick':
           this._iconClick(data.name, data.rowData, data.componentName)
           break
@@ -209,7 +205,7 @@ export default {
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       console.log('this.formObj', this.formObj)
-      const result = await meterEntrust.pageGoOutEntrust(this.formObj)
+      const result = await meterSample.pageOutPersonalTask(this.formObj)
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.getPage = result
@@ -248,13 +244,13 @@ export default {
       this.$refs.refModal._open(id, 'subcontractorId')
     },
     _getById: async function(id) {
-      const result = await meterEntrust.getVOById(id)
+      const result = await meterSample.getById(id)
       if (result) {
         this.$refs.editSubcontractorModal._openEdit(result)
       }
     },
     _delete: async function(ids) {
-      const result = await meterEntrust.deleteById(ids)
+      const result = await meterSample.deleteById(ids)
       if (result) {
         this._formSearch()
         this.$Message.success('删除成功！')

pages/meter-review/MeterSampleManage.vue

@@ -10,24 +10,24 @@
             <Form id="formId" :label-width="80" inline onsubmit="return false">
               <label class="label-sign"></label>
               <Form-item label="样品名称:" class="search-item">
-                <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入样品名称" clearable/>
+                <Input v-model="formObj.name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item label="样品编号:" class="search-item">
-                <Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入样品编号" clearable/>
+                <Input v-model="formObj.code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item class="search-btn" style="margin-left: -10px">
-                <Button @click="_formSearch" type="primary">搜索</Button>
+                <Button type="primary" @click="_formSearch">搜索</Button>
               </Form-item>
             </Form>
           </Col>
           <Col span="24">
 
-            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
-                      class="contHide"></btn-list>
+            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
+                      @on-result-change="_btnClick"></btn-list>
           </Col>
           <Col span="24">
             <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage"
-                        :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
+                        :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -160,8 +160,8 @@ export default {
       this.currentComponent = componentName
       this.$nextTick(function() {
         switch (msg) {
-          case '添加':
-            this._editModal(false)
+          case '分包':
+            this._subpackageSample()
             break
           case '导入检测项目':
             this._importItem()
@@ -228,7 +228,7 @@ export default {
     _formSearch() {
       this.$refs.pageTable._pageChange(1)
     },
-    _page: async function(id) {
+    _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       console.log('this.formObj', this.formObj)
       const result = await meterSample.page(this.formObj)
@@ -382,6 +382,32 @@ export default {
         this.$refs.refModal._open(this.selectIds, this.selectData[0])
       }
     },
+    _subpackageSample() {
+      if (this.selectData.length === 0) {
+        this.$Message.warning('请至少选中一条样品进行分包！')
+        return false
+      } else {
+        for (let i = 0; i < this.selectData.length; i++) {
+          if (this.selectData[i].jobOut === 1) {
+            this.$Message.warning(
+              '样品编号为' +
+                this.selectData[i].code +
+                '已经分包了，请选择未分包的样品！'
+            )
+            return false
+          }
+        }
+        this._subpackage(this.selectIds)
+      }
+    },
+    _subpackage: async function(ids) {
+      const result = await meterSample.subpackageSample(ids)
+      if (result) {
+        this.$Message.success('分包成功！')
+        await this._page()
+      }
+    },
+
     _importItemPackage() {
       if (this.selectIds.length === 0) {
         this.$Message.warning('请至少选中一条样品数据！')