仪器领用

api/index.js

@@ -31,4 +31,5 @@ export { default as meterEntrust } from './meter/meter-entrust'
 export { default as meterSample } from './meter/meter-sample'
 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 lmsBaseDict } from './lims/lms-base-dict'

api/meter/meter-device.js

+/**
+ * 工作台
+ */
+
+import http from '../http'
+import { https } from '../https'
+
+export default {
+  // page
+  page: data => http.post('meter/v1/test_device/page', data).then(res => res),
+  getById: data => http.get('meter/v1/test_device/' + data).then(res => res),
+  deleteById: data =>
+    http.delete('meter/v1/test_device/?ids=' + data).then(res => res),
+  // 保存
+  save: data => http.post('meter/v1/test_device/', data).then(res => res),
+  addEquipUse: data =>
+    https
+      .post('meter/v1/test_device/equip_user', JSON.stringify(data))
+      .then(res => res),
+  // 编辑
+  edit: data =>
+    http.put('meter/v1/test_device/' + data.id, data.obj).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">
@@ -45,14 +45,14 @@
         </Row>
       </div>
     </div>
-    <SelEquip ref="SelEquip"></SelEquip>
+    <SelEquip ref="SelEquip" @on-result-change="_equipSelectBack"></SelEquip>
     <CarManage ref="carEdit"></CarManage>
     <MeterPersonItemTaskManage ref="personModal"></MeterPersonItemTaskManage>
     <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
   </div>
 </template>
 <script>
-import { meterSample } from '../../../api'
+import { meterDevice, meterSample } from '../../../api'
 import SelEquip from '../../../components/select-equip/SelEquip'
 import MeterSubcontractorEdit from './MeterGoOutTestEdit'
 import CarManage from './CarManage'
@@ -175,7 +175,11 @@ export default {
       this.$refs.carEdit._open()
     },
     _receiveApparatus() {
-      this.$refs.SelEquip._open('sample-input')
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条数据！')
+      } else {
+        this.$refs.SelEquip._open('sample-input')
+      }
     },
     _submitToReview() {
       this._submitByContractIds('委托评审')
@@ -224,6 +228,19 @@ export default {
       console.log(data)
       this.$refs.personModal._open(data.id)
     },
+    _equipSelectBack(data) {
+      alert(this.selectIds)
+      console.log(data)
+      this._addEquipUse({ sampleIds: this.selectIds, devicesList: data })
+    },
+
+    _addEquipUse: async function(data) {
+      const result = await meterDevice.addEquipUse(data)
+      if (result) {
+        await this._page()
+      }
+    },
+
     _record(id) {
       this.$refs.refModal._open(id)
     },