土工试验Lims

api/soil/soil-test.js

@@ -79,6 +79,26 @@ export default {
         JSON.stringify(data.obj)
       )
       .then(res => res),
+  pageExperimentCheckBath: data =>
+    https
+      .post(
+        'soil/v1/experiment/page_exp_check_bath?page=' +
+          data.page +
+          '&rows=' +
+          data.rows,
+        JSON.stringify(data.obj)
+      )
+      .then(res => res),
+  pageExperimentAuditBath: data =>
+    https
+      .post(
+        'soil/v1/experiment/page_exp_audit_bath?page=' +
+          data.page +
+          '&rows=' +
+          data.rows,
+        JSON.stringify(data.obj)
+      )
+      .then(res => res),
   pageExpPrepareBath: data =>
     https
       .post(

pages/soil-test-manage/test-data-audit/item-tabs/ItemLeftList.vue

@@ -18,9 +18,9 @@
       </Col>
       <!-- 表格 -->
       <Col span="24">
-      <PTVXETable ref="pageTable" :isRadio="true" :pageColumns="pageColumns" :table-name="tableName"
+      <PTVXETable ref="pageTable"  :pageColumns="pageColumns" :table-name="tableName"
                   :tableHeight="tableHeight"
-                    @on-result-change="_tableResultChange" :getPage="getPage" :hide-checkbox="true"  select-data>
+                    @on-result-change="_tableResultChange" :getPage="getPage"   select-data>
         <vxe-table-column
           v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
           :key="item.key"
@@ -52,6 +52,7 @@ export default {
       formObj: {
         name: undefined
       },
+      selectDataName: [],
       tableName: 'food-task-assign-item-left',
       // 用户自己选中的列
       userColumns: [],
@@ -111,11 +112,12 @@ export default {
     _tableResultChange(msg, data) {
       console.log(msg, data)
       switch (msg) {
-        case 'page':
-          this.getPage = this.$store.state.FoodItem.page
-          break
         case 'selectData':
-          this.$emit('on-result-change', data)
+          this.selectDataName = []
+          for (let i = 0; i < data.length; i++) {
+            this.selectDataName.push(data[i].name)
+          }
+          this.$emit('on-result-change', this.selectDataName)
           break
         case 'singleSelect':
           this.$emit('on-result-change', data)

pages/soil-test-manage/test-data-audit/item-tabs/ItemRightList.vue

@@ -80,7 +80,11 @@ export default {
         entrustId: '',
         name: '',
         testMethod: '',
-        testBasis: ''
+        testBasis: '',
+        obj: {
+          entrustId: '',
+          nameList: []
+        }
       },
       entrustId: '',
       // 用户自己选中的列
@@ -500,19 +504,17 @@ export default {
       return obj
     },
     _page: async function() {
-      // const saveName = []
-      // const saveMethod = []
-      // for (let i = 0; i < this.leftSelectData.length; i++) {
-      //   saveName.push(this.leftSelectData[i].name)
-      //   saveMethod.push(this.leftSelectData[i].testMethod)
-      // }
-      // const data = this.$serialize('task-assign-item-right')
-      // console.log(data)
+      this.formObj.obj.nameList = []
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
-      this.formObj.entrustId = this.entrustId
-      this.formObj.name = this.leftSelectData.name
-      this.formObj.testMethod = this.leftSelectData.testMethod
-      const result = await soilTest.pageExpByAudit(
+      this.formObj.obj.entrustId = this.entrustId
+
+      console.log('-----this.leftSelectData-------', this.leftSelectData)
+      this.formObj.obj.nameList = this.leftSelectData
+      // alert(this.formObj.obj.nameList.length)
+      // if (this.formObj.obj.nameList.length === 0) {
+      //   return false
+      // }
+      const result = await soilTest.pageExperimentAuditBath(
         this.$serializeForm(this.formObj)
       )
       if (result) {

pages/soil-test-manage/test-data-check/item-tabs/ItemLeftList.vue

@@ -18,9 +18,9 @@
       </Col>
       <!-- 表格 -->
       <Col span="24">
-      <PTVXETable ref="pageTable" :isRadio="true" :pageColumns="pageColumns" :table-name="tableName"
+      <PTVXETable ref="pageTable"  :pageColumns="pageColumns" :table-name="tableName"
                   :tableHeight="tableHeight"
-                    @on-result-change="_tableResultChange" :getPage="getPage" :hide-checkbox="true"  select-data>
+                    @on-result-change="_tableResultChange" :getPage="getPage"   select-data>
         <vxe-table-column
           v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
           :key="item.key"
@@ -52,6 +52,7 @@ export default {
       formObj: {
         name: undefined
       },
+      selectDataName: [],
       tableName: 'food-task-assign-item-left',
       // 用户自己选中的列
       userColumns: [],
@@ -111,11 +112,13 @@ export default {
     _tableResultChange(msg, data) {
       console.log(msg, data)
       switch (msg) {
-        case 'page':
-          this.getPage = this.$store.state.FoodItem.page
-          break
         case 'selectData':
-          this.$emit('on-result-change', data)
+          this.selectDataName = []
+          for (let i = 0; i < data.length; i++) {
+            this.selectDataName.push(data[i].name)
+          }
+          console.log('selectDataName', this.selectDataName)
+          this.$emit('on-result-change', this.selectDataName)
           break
         case 'singleSelect':
           this.$emit('on-result-change', data)

pages/soil-test-manage/test-data-check/item-tabs/ItemRightList.vue

@@ -6,21 +6,21 @@
         <Form id="task-assign-item-right" :label-width="70" inline onsubmit="return false">
           <label class="label-sign"></label>
           <Form-item class="search-item" label="试样编号:">
-            <Input @on-enter="_formSearch" v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入试样编号" clearable></Input>
+            <Input v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入试样编号" clearable @on-enter="_formSearch"></Input>
           </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" @on-result-change="_btnClick" class="contHide"></btn-list>
+        <btn-list :msg="btn" class="contHide" @on-result-change="_btnClick"></btn-list>
       </Col>
       <!-- 表格 -->
       <Col span="24">
-        <PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight"
-                    @on-result-change="_tableResultChange" :getPage="getPage" :icon-msg="iconMsg" :table-name="tableName"  is-task select-data>
+        <PTVXETable ref="pageTable" :page-columns="pageColumns" :table-height="tableHeight"
+                    :get-page="getPage" :icon-msg="iconMsg" :table-name="tableName" is-task  select-data @on-result-change="_tableResultChange">
           <vxe-table-column
             v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
             :key="item.key"
@@ -41,8 +41,8 @@
               <span v-else>{{scope.row[item.key]}}</span>
             </template>
           </vxe-table-column>
-          <VXESettingCol slot="setting" :pageColumns="pageColumns" :userColumns="userColumns"
-                         @on-result-change="_resetColumn" :table-name="tableName"></VXESettingCol>
+          <VXESettingCol slot="setting" :page-columns="pageColumns" :user-columns="userColumns"
+                         :table-name="tableName" @on-result-change="_resetColumn"></VXESettingCol>
         </PTVXETable>
       </Col>
     </Row>
@@ -80,7 +80,11 @@ export default {
         entrustId: '',
         name: '',
         testMethod: '',
-        testBasis: ''
+        testBasis: '',
+        obj: {
+          entrustId: '',
+          nameList: []
+        }
       },
       entrustId: '',
       // 用户自己选中的列
@@ -500,19 +504,12 @@ export default {
       return obj
     },
     _page: async function() {
-      // const saveName = []
-      // const saveMethod = []
-      // for (let i = 0; i < this.leftSelectData.length; i++) {
-      //   saveName.push(this.leftSelectData[i].name)
-      //   saveMethod.push(this.leftSelectData[i].testMethod)
-      // }
-      // const data = this.$serialize('task-assign-item-right')
-      // console.log(data)
+      this.formObj.obj.nameList = []
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
-      this.formObj.entrustId = this.entrustId
-      this.formObj.name = this.leftSelectData.name
-      this.formObj.testMethod = this.leftSelectData.testMethod
-      const result = await soilTest.pageExpByCheck(
+      this.formObj.obj.entrustId = this.entrustId
+
+      this.formObj.obj.nameList = this.leftSelectData
+      const result = await soilTest.pageExperimentCheckBath(
         this.$serializeForm(this.formObj)
       )
       if (result) {