修改了备样和余样批量填写存放信息

api/soil/soil-sample.js

@@ -134,11 +134,26 @@ export default {
     http.post('res/v1/dict/dict_query?type=' + data).then(res => res),
   editBackup: data =>
     http.put('soil/v1/sample_backup/' + data.id, data.obj).then(res => res),
+  bathUpdateBackupInfo: data =>
+    http
+      .post(
+        'soil/v1/sample_backup/bath_update_backup_info/?ids=' + data.id,
+        data.obj
+      )
+      .then(res => res),
   editItem: data =>
     http.post('soil/v1/experiment/bath_update_info', data).then(res => res),
   // 余样编辑
   editPrepare: data =>
     http.put('soil/v1/prepare/' + data.id, data.obj).then(res => res),
+  // 批量填写余样信息
+  bathUpdateSurplusInfo: data =>
+    http
+      .post(
+        'soil/v1/prepare/bath_update_surplus_info/?ids=' + data.id,
+        data.obj
+      )
+      .then(res => res),
   getUserList: data => http.post('/base/v1/user/page').then(res => res),
   scanTakeSample: data =>
     http

pages/soil-sample-manage/backups-manage/SampleParpareBatchEdit.vue

@@ -3,7 +3,7 @@
     <Modal v-model="showModal" :mask-closable="false">
       <p slot="header">填写存放信息</p>
       <div>
-        <Form id="storage-location-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100">
+        <Form id="storage-location-form" ref="formObj" :model="formObj" :label-width="100">
           <Form-item label="存储条件:">
             <el-select :value="formObj.conditions" @change="selCondi" style="width:100%" size="small">
               <el-option v-for="item in conditionList" :value="item.name" :key="item.name">{{ item.name }}
@@ -88,9 +88,6 @@ export default {
         this.getPage.records[this.currentIndex].backupUser = ''
       }
       this.formObj.backupUserId = data
-      // this.$forceUpdate()
-      // this.getPage.records[this.currentIndex].backupUser = data
-      // this.getPage.records[this.currentIndex].backupUser = data
     },
     // 存储条件 回调
     _locChangeCondition(msg, data) {
@@ -150,7 +147,7 @@ export default {
     _ok() {
       this.$refs.formObj.validate(valid => {
         if (valid) {
-          const data = this.formObj
+          const data = this.$serializeForm(this.formObj)
           this._saveInfo({ id: this.ids.join(','), obj: data })
         } else {
           this.$Message.error('表单验证失败!')
@@ -159,9 +156,11 @@ export default {
       })
     },
     _saveInfo: async function(data) {
-      const result = await soilSample.editBackup(data)
+      const result = await soilSample.bathUpdateBackupInfo(data)
       if (result) {
         this.$Message.success('保存成功')
+        this.$emit('on-result-change')
+        this.showModal = false
       }
     }
   }

pages/soil-sample-manage/backups-manage/tab/SampleBackupsManage.vue

@@ -93,7 +93,7 @@
     </div>
     <SampleParpareApply ref="applyModal" @on-result-change="_page"></SampleParpareApply>
     <Operation ref="recordModal"></Operation>
-    <SampleParpareBatchEdit ref="batchEdit"></SampleParpareBatchEdit>
+    <SampleParpareBatchEdit ref="batchEdit" @on-result-change="_page"></SampleParpareBatchEdit>
   </div>
 </template>
 <script>

pages/soil-sample-manage/surplus-manage/SampleSurplusBatchEdit.vue

@@ -5,10 +5,9 @@
       <div>
         <Form id="storage-location-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100">
           <Form-item label="保存容器:" prop="keepContainer">
-            <el-select v-model="formObj.keepContainer" clearable style="width:100%" size="small">
-              <el-option v-for="item in containerList" :value="item.name" :key="item.name">{{ item.name }}
-              </el-option>
-            </el-select>
+            <AutoCompletes v-model="formObj.keepContainer" :downData="containerList"
+                           @on-result-change="_containerChange" name="keepContainer"  placeholder="输入或选择保存容器"
+            ></AutoCompletes>
           </Form-item>
           <Form-item label="制备数量">
             <Input v-model="formObj.quantity" clearable placeholder="请输入备样数量"></Input>
@@ -26,9 +25,10 @@
 </template>
 <script>
 import { soilSample } from '../../../api'
+import AutoCompletes from '../../../components/base/AutoCompletes'
 
 export default {
-  components: {},
+  components: { AutoCompletes },
   data() {
     return {
       ids: [], // 委托ids
@@ -56,7 +56,19 @@ export default {
     _getContainerList: async function() {
       const result = await soilSample.getDictList('保存容器')
       if (result) {
-        this.containerList = result
+        for (let i = 0; i < result.length; i++) {
+          this.containerList.push(result[i].name)
+        }
+      }
+    },
+    _containerChange(msg, data) {
+      switch (msg) {
+        case 'select':
+          this.formObj.keepContainer = data
+          break
+        case 'query':
+          this.formObj.keepContainer = data
+          break
       }
     },
     _locChange(msg, data) {
@@ -155,7 +167,7 @@ export default {
       })
     },
     _saveInfo: async function(data) {
-      const result = await soilSample.editPrepare(data)
+      const result = await soilSample.bathUpdateSurplusInfo(data)
       if (result) {
         this.$Message.success('保存成功')
         this.$emit('on-result-change')

pages/soil-sample-manage/surplus-manage/tab/SampleSurplusManage.vue

@@ -42,11 +42,16 @@
                   <div v-else-if="item.key==='keepContainer'">
                     <div v-if="editIndex!==scope.rowIndex">{{scope.row[item.key]}}</div>
                     <div v-else>
-                      <el-select v-model="scope.row.keepContainer" clearable style="width:100%" size="small">
-                        <el-option v-for="item in containerList" :value="item.name" :key="item.name">{{ item.name }}
-                        </el-option>
-                      </el-select>
+                      <AutoCompletes v-model="scope.row.keepContainer" :downData="containerList"
+                                    @on-result-change="_containerChange" name="keepContainer"  placeholder="输入或选择保存容器"
+                      ></AutoCompletes>
                     </div>
+<!--                    <div v-else>-->
+<!--                      <el-select v-model="scope.row.keepContainer" clearable style="width:100%" size="small">-->
+<!--                        <el-option v-for="item in containerList" :value="item.name" :key="item.name">{{ item.name }}-->
+<!--                        </el-option>-->
+<!--                      </el-select>-->
+<!--                    </div>-->
                   </div>
                   <div v-else-if="item.key==='quantity'">
                     <div v-if="editIndex!==scope.rowIndex">{{scope.row[item.key]}}</div>
@@ -90,11 +95,13 @@ import SampleSurplusBatchEdit from '../SampleSurplusBatchEdit'
 import http from '../../../../api/http'
 import { soilSample } from '../../../../api'
 import Operation from '../../../../components/operation/Operation'
+import AutoCompletes from '../../../../components/base/AutoCompletes'
 export default {
   components: {
     SampleParpareApply,
     Operation,
-    SampleSurplusBatchEdit
+    SampleSurplusBatchEdit,
+    AutoCompletes
   },
   data() {
     return {
@@ -213,7 +220,9 @@ export default {
     _getContainerList: async function() {
       const result = await soilSample.getDictList('保存容器')
       if (result) {
-        this.containerList = result
+        for (let i = 0; i < result.length; i++) {
+          this.containerList.push(result[i].name)
+        }
       }
     },
     // 查询卡片备样数量
@@ -226,6 +235,16 @@ export default {
         }
       })
     },
+    _containerChange(msg, data) {
+      switch (msg) {
+        case 'select':
+          this.getPage.records[this.currentIndex].keepContainer = data
+          break
+        case 'query':
+          this.getPage.records[this.currentIndex].keepContainer = data
+          break
+      }
+    },
     // 选择时间
     _endDateChange(data) {
       this.getPage.records[this.currentIndex].endDate = data