修改了试验项目分配

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

@@ -6,21 +6,21 @@
         <Form id="task-assign-sample-right" :label-width="70" inline onsubmit="return false">
           <label class="label-sign"></label>
           <Form-item class="search-item" label="试验名称:">
-            <Input v-model="formObj.name" placeholder="请输入试验名称" clearable @on-enter="_formSearch"></Input>
+            <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入试验名称" clearable></Input>
           </Form-item>
           <Form-item class="search-btn">
-            <Button type="primary" @click="_formSearch">搜索</Button>
+            <Button @click="_formSearch" type="primary">搜索</Button>
           </Form-item>
         </Form>
       </Col>
       <!--操作-->
       <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">
         <PTVXETable ref="pageTable" :page-columns="pageColumns" :table-height="tableHeight"
-                    :get-page="getPage" :table-name="tableName"  is-task select-data @on-result-change="_tableResultChange">
+                    :get-page="getPage" :table-name="tableName"  @on-result-change="_tableResultChange" is-task select-data>
           <vxe-table-column
             v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
             :key="item.key"

pages/soil-test-manage/test-task-manage/entrust-sample-manage/SampleManage.vue

@@ -68,9 +68,11 @@ export default {
       if (tab.name === 'alreadyIssued') {
         // this._issuedPage()
       } else if (tab.name === 'waitReceive') {
+        this.$refs.waitScanModal._clearTab()
         // this._waitPage()
         this.$refs.waitReceiveModal._open(this.entrustId)
       } else if (tab.name === 'waitScan') {
+        this.$refs.waitReceiveModal._clearTab()
         this.$refs.waitScanModal._open(this.entrustId)
         // this._waitSend()
       }

pages/soil-test-manage/test-task-manage/entrust-sample-manage/item-tabs/ItemRightList.vue

@@ -415,6 +415,11 @@ export default {
         this._resultChange('分配成功')
       }
     },
+    _clearPage() {
+      this.leftSelectData = []
+      this.formObj.sampleCode = ''
+      this.getPage = {}
+    },
     _userAssign() {
       const user = Global.getUserInfo('userInfo')
       console.log(user)

pages/soil-test-manage/test-task-manage/entrust-sample-manage/item-tabs/ItemTabs.vue

@@ -40,6 +40,9 @@ export default {
       console.log(id)
       this.$refs.leftModal._open(this.id)
       // this.$refs.rightModal._getColumn()
+    },
+    _clearTab() {
+      this.$refs.rightModal._clearPage()
     }
   }
 }

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

@@ -187,6 +187,11 @@ export default {
           break
       }
     },
+    _clearPage() {
+      this.formObj.name = ''
+      this.getPage = {}
+      this.sampleIds = []
+    },
     _modalResult(data) {
       switch (this.currentComponent) {
         case 'AssignPerson':

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

@@ -35,6 +35,9 @@ export default {
     _open(id) {
       this.$refs.SampleleftModal._open(id)
       // this.$refs.rightModal._getColumn()
+    },
+    _clearTab() {
+      this.$refs.SamplerightModal._clearPage()
     }
   }
 }