分包优化

api/meter/meter-sample.js

@@ -57,6 +57,10 @@ export default {
       .post('meter/v1/sample/report_generate', JSON.stringify(data))
       .then(res => res),
 
+  subpackageInfoReg: data =>
+    http
+      .post('meter/v1/sample/subpackage_info_reg?ids=' + data.ids, data.reg)
+      .then(res => res),
   distributeOutSample: data =>
     http
       .post(

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">
@@ -238,9 +238,19 @@ export default {
       this.$refs.personModal._open(data.id)
     },
     _equipSelectBack(data) {
-      alert(this.selectIds)
-      console.log(data)
-      this._addEquipUse({ sampleIds: this.selectIds, devicesList: data })
+      console.log('_equipSelectBack', data)
+      const equipData = []
+      for (let i = 0; i < data.length; i++) {
+        const object = data[i]
+        const obj = {}
+        obj.name = object.name
+        obj.certificateNo = object.ceNum
+        obj.measuringRange = object.range
+        obj.uncertaintyAccuray = object.uncertainty
+        obj.validUntil = object.effectDate
+        equipData.push(obj)
+      }
+      this._addEquipUse({ sampleIds: this.selectIds, devicesList: equipData })
     },
 
     _addEquipUse: async function(data) {

pages/meter-subcontract/subpackage-task/MeterSubSampleEdit.vue

@@ -4,29 +4,29 @@
       <p slot="header">分包信息</p>
       <div>
         <Form id="batch-edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90">
-          <Form-item label="分包价格：" prop="price">
-            <InputNumber :min="0" :step="1" v-model.number="formObj.price"
-                         name="price" style="width:100%" placeholder="留白默认所选分包商对应的检测项目报价">
+          <Form-item label="分包价格：" prop="outFee">
+            <InputNumber v-model.number="formObj.outFee" :min="0" :step="1"
+                         name="outFee" style="width:100%" placeholder="">
             </InputNumber>
           </Form-item>
-          <Form-item label="分包实验室：" prop="subcontractorName">
+          <Form-item label="分包实验室：" prop="subcontractor">
             <div style="display: flex">
-              <AutoCompletes :value="formObj.subcontractorName" :downData="labList" @on-result-change="_labChange"
-                             name="subcontractorName"
-                             show-key="name" placeholder="请输入或选择分包实验室" style="width: 94%"></AutoCompletes>
-              <Icon @click="_labSel" type="ios-arrow-forward" size="24"  color="#00a0e9" style="margin-top: 5px;margin-left: 5px"/>
+              <AutoCompletes :value="formObj.subcontractor" :down-data="labList" name="subcontractorName"
+                             show-key="name"
+                             placeholder="请输入或选择分包实验室" style="width: 94%" @on-result-change="_labChange"></AutoCompletes>
+              <Icon type="ios-arrow-forward" size="24" color="#00a0e9"  style="margin-top: 5px;margin-left: 5px" @click="_labSel"/>
             </div>
             <input v-model="formObj.subcontractorId" type="hidden" name="subcontractorId"/>
           </Form-item>
-          <Form-item label="分包原因" prop="epibolyReason">
-            <Input :rows="3" v-model="formObj.epibolyReason" type="textarea"
-                   name="epibolyReason"
+          <Form-item label="分包原因" prop="outReason">
+            <Input v-model="formObj.outReason" :rows="3" type="textarea"
+                   name="outReason"
                    placeholder="请输入分包原因"/>
           </Form-item>
         </Form>
       </div>
       <div slot="footer">
-        <ModalFooter ref="footerModal" @on-result-change="_footerResult" :footer="footerList"></ModalFooter>
+        <ModalFooter ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></ModalFooter>
       </div>
     </Modal>
     <!--选择实验室-->
@@ -36,18 +36,16 @@
 <script>
 import ModalFooter from '../../../components/base/modalFooter'
 import AutoCompletes from '../../../components/base/AutoCompletes'
-import { meterSubcontractor } from '../../../api'
+import { meterSample, meterSubcontractor } from '../../../api'
 import EditLabSelect from './EditLabSelect'
 /**
  * 添加编辑分包信息
  */
 const defVal = {
-  price: '',
-  subcontractorId: 0,
-  subcontractorName: '',
-  epibolyReason: ''
-  // page: 1,
-  // rows: 50
+  subcontractor: undefined,
+  subcontractorId: undefined,
+  outReason: undefined,
+  outFee: undefined
 }
 export default {
   components: {
@@ -86,30 +84,31 @@ export default {
       this.$refs.footerModal._hideLoading()
     },
     _ok() {
-      console.log(this.formObj)
+      console.log('_ok----', this.formObj)
+      console.log('_ok----', this.ids)
+      this._subpackageInfoReg({ ids: this.ids, reg: this.formObj })
       this._hideLoading()
-      // this.$refs.formObj.validate(valid => {
-      //   if (valid) {
-      //     const data = this.$serialize('batch-edit-form')
-      //     Object.assign(data, { ids: this.ids.join(',') })
-      //     this.$store.dispatch('FoodItem/batchEpiboly', data).then(() => {
-      //       if (this.$store.state.FoodItem.success) {
-      //         this.showModal = false
-      //         this.$Message.success('保存成功！')
-      //         this.$emit('on-result-change')
-      //       }
-      //       this._hideLoading()
-      //     })
-      //   } else {
-      //     this._hideLoading()
-      //     this.$Message.error('表单验证失败!')
-      //   }
-      // })
+    },
+
+    _subpackageInfoReg: async function(data) {
+      const result = await meterSample.subpackageInfoReg(data)
+      if (result) {
+        this.$Message.success('登记成功！')
+        this._hideLoading()
+        this.$emit('on-result-change')
+        this.showModal = false
+      }
     },
     _cancel() {
       this.showModal = false
     },
     _open(ids, selectData) {
+      this.formObj = {
+        subcontractor: undefined,
+        subcontractorId: undefined,
+        outReason: undefined,
+        outFee: undefined
+      }
       this._getLab()
       this._hideLoading()
       this.$refs.formObj.resetFields()
@@ -121,11 +120,11 @@ export default {
     _labChange(msg, data) {
       switch (msg) {
         case 'select':
-          this.formObj.subcontractorName = data.name
+          this.formObj.subcontractor = data.name
           this.formObj.subcontractorId = data.id
           break
         case 'query':
-          this.formObj.subcontractorName = data.name
+          this.formObj.subcontractor = data.name
           this._getLab(data.name)
           break
       }
@@ -160,7 +159,7 @@ export default {
     },
     _labResult(result) {
       this.formObj.subcontractorId = result.id
-      this.formObj.subcontractorName = result.name
+      this.formObj.subcontractor = result.name
     }
   }
 }

pages/meter-subcontract/subpackage-task/MeterSubSampleManage.vue

@@ -42,13 +42,13 @@
                   <div v-else-if="item.key==='jobOut'">
                      {{scope.row[item.key]===1?'是':'否'}}
                   </div>
-                  <div v-else-if="item.key==='type'">
-                    <Select v-model="scope.row.type">
-                      <Option v-for="(item,index) in options" :key="item.name" :value="index">
-                        {{ item.name }}
-                      </Option>
-                    </Select>
-                  </div>
+<!--                  <div v-else-if="item.key==='type'">-->
+<!--                    <Select v-model="scope.row.type">-->
+<!--                      <Option v-for="(item,index) in options" :key="item.name" :value="index">-->
+<!--                        {{ item.name }}-->
+<!--                      </Option>-->
+<!--                    </Select>-->
+<!--                  </div>-->
                   <div v-else>{{scope.row[item.key]}}</div>
                 </template>
               </vxe-table-column>
@@ -125,6 +125,9 @@ export default {
         { title: '型号规格', key: 'spec', width: 140 },
         { title: '出厂编号', key: 'factoryNumber', width: 140 },
         { title: '是否分包', key: 'jobOut', width: 110 },
+        { title: '分包费用', key: 'outFee', width: 110 },
+        { title: '分包原因', key: 'outReason', width: 110 },
+        { title: '分包方', key: 'subcontractor', width: 110 },
         { title: '检测类型', key: 'type', width: 140 },
         { title: '数量', key: 'quantity', width: 140 }
       ],