修改了开土制备的查询

api/soil/soil-test.js

@@ -22,6 +22,8 @@ export default {
   // 试验任务按样品分配-试验项目分配操作
   allotExp: data =>
     http.post('soil/v1/experiment/allot_exp', data).then(res => res),
+  changeExpAllot: data =>
+    http.post('soil/v1/experiment/change_exp_allot', data).then(res => res),
   // 试验任务分配样品对应检测项目分页列表
   pageAllot: data =>
     http.post('soil/v1/experiment/page_allot', data).then(res => res),

pages/soil-sample-manage/SoilSampleManage.vue

@@ -153,6 +153,9 @@ export default {
       }
     }
   },
+  mounted() {
+    this.$refs.pageTable._showLoading()
+  },
   methods: {
     _inputChange: async function(info) {
       const result = await soilEntrust.sampleEdit({
@@ -396,8 +399,8 @@ export default {
         this.$serializeForm(this.formObj)
       )
       if (result) {
-        this.$refs.pageTable._hideLoading()
         this.getPage = result
+        this.$refs.pageTable._hideLoading()
       }
     },
     _deleteByIds(ids, content) {

pages/soil-sample-manage/sample-preparation/Preparation.vue

@@ -5,7 +5,7 @@
       <Row>
         <!--操作-->
         <Col span="24">
-          <btn-list :msg="btn" class="contHide" @on-result-change="_btnClick"></btn-list>
+          <btn-list :msg="btn" @on-result-change="_btnClick" class="contHide"></btn-list>
         </Col>
         <!--内容-->
         <Col span="24">
@@ -14,10 +14,10 @@
             :table-height="tableHeight"
             :get-page="getPage"
             :form-id="formId"
+            @on-result-change="_tableResultChange"
             select-data
             is-edit
-            hide-page
-            @on-result-change="_tableResultChange">
+            hide-page>
             <vxe-table-column
               v-for="item in pageColumns"
               :key="item.key"
@@ -32,8 +32,8 @@
               <template v-slot:edit="scope">
                 <div v-if="item.key==='prepareWay'" @click="_handleRow(scope)">
                   <AutoComplete v-model="scope.row.prepareWay" :down-data="preparationWayData" :way-data="wayData"
-                                 :handle-obj="scope" clearable placeholder="输入或选择制备方式"
-                                 @on-result-change="_preparationChange"></AutoComplete>
+                                 :handle-obj="scope" @on-result-change="_preparationChange" clearable
+                                 placeholder="输入或选择制备方式"></AutoComplete>
                 </div>
                 <div v-else-if="item.key==='unit'" @click="_handleRow(scope)">
                   <el-input v-model="scope.row.unit" name="unit" placeholder="输入或选择单位">
@@ -46,13 +46,13 @@
                 <span v-else-if="item.key==='type'">{{ scope.row[item.key]===0? '检样':'备样' }}</span>
                 <div v-else-if="item.key==='keepWay'" @click="_handleRow(scope)">
                   <AutoComplete v-model="scope.row.keepWay" :handle-obj="scope" :down-data="saveWayData"
-                                clearable placeholder="输入或选择保存方式"
-                                show-key="name" @on-result-change="_saveChange"></AutoComplete>
+                                @on-result-change="_saveChange" clearable
+                                placeholder="输入或选择保存方式" show-key="name"></AutoComplete>
                 </div>
                 <div v-else-if="item.key==='keepContainer'" @click="_handleRow(scope)">
                   <AutoComplete v-model="scope.row.keepContainer" :handle-obj="scope" :down-data="packList"
-                                clearable placeholder="输入或选择保存容器"
-                                show-key="name" @on-result-change="_packSaveChange"></AutoComplete>
+                                @on-result-change="_packSaveChange" clearable
+                                placeholder="输入或选择保存容器" show-key="name"></AutoComplete>
                 </div>
 <!--                <div v-else-if="item.key==='prepareDate'" @click="_handleTimeRow(scope)">-->
 <!--                  <el-date-picker-->
@@ -62,16 +62,16 @@
 <!--                  </el-date-picker>-->
 <!--                </div>-->
                 <div v-else-if="item.key==='prepareDate'" @click="_handleRow(scope)">
-                  <el-date-picker v-model="scope.row.prepareDate" type="datetime" format="yyyy-MM-dd HH:mm" style="width:100%;" placeholder="请选择日期"
-                               @change="timeChange(scope.row)"></el-date-picker>
+                  <el-date-picker v-model="scope.row.prepareDate" @change="timeChange(scope.row)" type="datetime" format="yyyy-MM-dd HH:mm" style="width:100%;"
+                               placeholder="请选择日期"></el-date-picker>
                 </div>
                 <div v-else-if="item.key==='preparer'" @click="_handleRow(scope)">
-                  <el-input v-model="scope.row.preparer" placeholder="制备人"
-                            size="small" name="preparer" @focus="_handleRow(scope)"></el-input>
+                  <el-input v-model="scope.row.preparer" @focus="_handleRow(scope)"
+                            placeholder="制备人" size="small" name="preparer"></el-input>
                 </div>
                 <div v-else-if="item.key==='remark'" @click="_handleRow(scope)">
-                  <el-input v-model="scope.row.remark" placeholder="备注" size="small"
-                            @focus="_handleRow(scope)"></el-input>
+                  <el-input v-model="scope.row.remark" @focus="_handleRow(scope)" placeholder="备注"
+                            size="small"></el-input>
                 </div>
                 <span v-else>{{scope.row[item.key]}}</span>
               </template>
@@ -197,6 +197,9 @@ export default {
       isAccurate: ''
     }
   },
+  mounted() {
+    this.$refs.pageTable._showLoading()
+  },
   methods: {
     // 获取存储位置
     _locationChange(msg, data, handleObj) {
@@ -300,6 +303,7 @@ export default {
       this.currentRow.keepContainer = data.name
     },
     _open(sampleIds) {
+      this.$refs.pageTable._showLoading()
       this.sampleIds = sampleIds
       console.log(this.sampleIds)
       this.showModal = true
@@ -318,13 +322,13 @@ export default {
       const result = await soilEntrust.preparePage(this.sampleIds)
       if (result) {
         console.log(result)
-        this.$refs.pageTable._hideLoading()
         this.getPage.records = result
         for (let j = 0; j < result.length; j++) {
           console.log(result[j].prepareDate)
           console.log(new Date(result[j].prepareDate))
           this.getPage.records[j].prepareDate = new Date(result[j].prepareDate)
         }
+        this.$refs.pageTable._hideLoading()
       }
     },
     _footerResult(name) {

pages/soil-sample-manage/sample-preparation/SoilSampleItemManageEdit.vue

@@ -15,7 +15,7 @@
               <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入检测项目" clearable />
             </Form-item>
             <Form-item label="是否已添加科室:" class="search-item">
-              <Select v-model="formObj.haveGroup" clearable name="groupId" style="width:150px" placeholder="请选择是否">
+              <Select v-model="formObj.grouped" clearable name="groupId" style="width:150px" placeholder="请选择是否">
                 <Option v-for="(item,index) in itemData" :value="item.value" :key="index">{{item.name}}</Option>
               </Select>
             </Form-item>
@@ -207,7 +207,7 @@ export default {
         groupName: undefined,
         sampleCode: undefined,
         entrustId: undefined,
-        haveGroup: undefined
+        grouped: undefined
       }
     }
   },

pages/soil-test-manage/test-task-manage-his/AllotByEntrust.vue

@@ -59,11 +59,6 @@
     </div>
     <!--组件加载-->
     <!--选择领样人-->
-<!--    <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>-->
-<!--    <SampleManage ref="sampleManageModal" @on-result-change="_page"></SampleManage>-->
-<!--    <ItemManage ref="itemManageModal" @on-result-change="_page"></ItemManage>-->
-<!--    <Operation ref="operation"></Operation>-->
-<!--    <FileManage ref="FileManage"></FileManage>-->
     <keep-alive>
       <!-- eslint-disable-next-line vue/require-component-is -->
       <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>

pages/soil-test-manage/test-task-manage-his/entrust-sample-manage/sample-tabs/SampleRightList.vue

@@ -85,7 +85,7 @@ export default {
         { key: 'tester', name: '主检人', placeholder: '请输入主检人' },
         { key: 'detectType', name: '样品类别', placeholder: '请输入样品类别' }
       ],
-      btn: [{ type: 'success', id: '', name: '试验项目分配' }],
+      btn: [{ type: 'success', id: '', name: '调整试验项目检测人' }],
       getPage: {},
       pageColumns: [
         { title: '试验名称', key: 'name', width: 160 },
@@ -251,7 +251,7 @@ export default {
     },
     async _btnClick(msg) {
       switch (msg) {
-        case '试验项目分配':
+        case '调整试验项目检测人':
           this._userAssign()
           break
         case '按组分配':
@@ -376,37 +376,6 @@ export default {
       const user = Global.getUserInfo('userInfo')
       console.log(user)
       this.$refs.personModal._openGoup('分配人员', 'itemTree')
-      // if (this.defaultPlanDate) {
-      //   // 有字典
-      //   if (this.sampleNames === '') {
-      //     // 有计划完成时间
-      //     const user = Global.getUserInfo('userInfo')
-      //     this.currentComponent = 'AssignPerson'
-      //     this.$nextTick(function() {
-      //       this.$refs.refModal._openGoupByUserId(
-      //         '分配人员',
-      //         user.id,
-      //         'itemTree'
-      //       )
-      //     })
-      //   } else {
-      //     // 有字典，无计划完成时间的
-      //     this.$Modal.confirm({
-      //       title: '提示',
-      //       content:
-      //         '所选项目中含有未设置计划完成时间的' +
-      //         `${this._reportDueDate()}` +
-      //         '请确认！',
-      //       onOk: () => {}
-      //     })
-      //   }
-      // } else {
-      //   // 无字典
-      //   this.currentComponent = 'EndDateModal'
-      //   this.$nextTick(() => {
-      //     this._endDate()
-      //   })
-      // }
     },
     // 遍历出计划时间为空的样品名
     _reportDueDate() {
@@ -497,7 +466,7 @@ export default {
       this._allotItems(tempData)
     },
     _allotItems: async function(data) {
-      const result = await soilTest.allotExp(data)
+      const result = await soilTest.changeExpAllot(data)
       if (result) {
         this._resultChange('分配成功')
       }