Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/components/DilCommonUI/packages/table/src/table.js

@@ -68,8 +68,9 @@ export default {
             data[key] = val;
           }
         }
-        // 发送请求
+        //判断是否是带分页查询
         if(this.isKuang){
+          // 发送请求
           this.axios
           .post(url, data, {
             // 请求地址 中
@@ -88,6 +89,7 @@ export default {
             this.isShow = true;
           });
         }else{
+          // 发送请求
           this.axios
             .post(url, data, {
               // 请求地址 中
@@ -301,12 +303,10 @@ export default {
     requestQuery: {
       deep: true,
       handler(val, oldVal) {
-        console.log(val,"val22222222222222222222222")
         let q = this.dataRequestQuery;
         for (const key in val) {
           q[key] = val[key] ? val[key] : undefined;
         }
-
         this.setDataRequestQuery(q);
       }
     },

src/components/DilCommonUI/packages/table/src/table.vue

@@ -116,6 +116,10 @@ export default {
   name: "DilTable",
   extends: table,
   props: {
+    drawer:{
+      default:false,
+    },
+    //判断是否带分页查询
     isKuang:{
       default:false,
     },
@@ -223,6 +227,11 @@ export default {
   watch:{
     requestUrl(){
       this.refreshData();
+    },
+    drawer(val){
+      if(val){
+        this.dataRadioId = null;
+      }
     }
   },
   methods: {

src/views/TMS/components/importedFuel/transportReserveRanAdd.vue

@@ -136,6 +136,7 @@
           @radio-change="currentRadioChange1"
           :isKuang="isKuang"
           @func="func"
+          :drawer="drawer"
         ></dilTable>
       </div>
       <div v-else-if="onDrawerNumber == 2">
@@ -144,6 +145,7 @@
           @radio-change="currentRadioChange2"
           :isKuang="isKuang"
           @func="func"
+          :drawer="drawer"
         ></dilTable>
       </div>
       <div v-else-if="onDrawerNumber == 3">
@@ -152,6 +154,7 @@
           @selection-change="currentRadioChange3"
           :isKuang="isKuang"
           @func="func"
+          :drawer="drawer"
         ></dilTable>
       </div>
       <div v-else-if="onDrawerNumber == 4">
@@ -160,6 +163,7 @@
           @radio-change="currentRadioChange4"
           :isKuang="isKuang"
           @func="func"
+          :drawer="drawer"
         ></dilTable>
       </div>
       <div v-else-if="onDrawerNumber == 5">
@@ -168,6 +172,7 @@
           @radio-change="currentRadioChange5"
           :isKuang="isKuang"
           @func="func"
+          :drawer="drawer"
         ></dilTable>
       </div>
       <div v-else-if="onDrawerNumber == 6">
@@ -176,6 +181,7 @@
           @radio-change="currentRadioChange6"
           :isKuang="isKuang"
           @func="func"
+          :drawer="drawer"
         ></dilTable>
       </div>
     </el-drawer>
@@ -291,7 +297,7 @@ export default {
   },
   watch: {
     drawer(val) {
-      if (!val) {
+      if (val) {
         this.input = null;
       }
     },
@@ -353,8 +359,8 @@ export default {
       this.isKuang = false;
     },
     onclick() {
-      this.isKuang = true;
       if(this.input){
+        this.isKuang = true;
         if (this.onDrawerNumber == 1) {
           this.frist.requestUrl = "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" + this.input;
         } else if (this.onDrawerNumber == 2) {

src/views/TMS/components/purchaseChemicalMaterials/transportationReservationAdd.vue

@@ -136,6 +136,7 @@
           @radio-change="currentRadioChange1"
           :isKuang="isKuang"
           @func="func"
+          :drawer="drawer"
         ></dilTable>
       </div>
       <div v-show="onDrawerNumber == 2">
@@ -144,6 +145,7 @@
           @radio-change="currentRadioChange2"
           :isKuang="isKuang"
           @func="func"
+          :drawer="drawer"
         ></dilTable>
       </div>
       <div v-show="onDrawerNumber == 3">
@@ -152,6 +154,7 @@
           @selection-change="currentRadioChange3"
           :isKuang="isKuang"
           @func="func"
+          :drawer="drawer"
         ></dilTable>
       </div>
       <div v-show="onDrawerNumber == 4">
@@ -160,6 +163,7 @@
           @radio-change="currentRadioChange4"
           :isKuang="isKuang"
           @func="func"
+          :drawer="drawer"
         ></dilTable>
       </div>
       <div v-show="onDrawerNumber == 5">
@@ -168,6 +172,7 @@
           @radio-change="currentRadioChange5"
           :isKuang="isKuang"
           @func="func"
+          :drawer="drawer"
         ></dilTable>
       </div>
       <div v-show="onDrawerNumber == 6">
@@ -176,6 +181,7 @@
           @radio-change="currentRadioChange6"
           :isKuang="isKuang"
           @func="func"
+          :drawer="drawer"
         ></dilTable>
       </div>
     </el-drawer>
@@ -291,7 +297,7 @@ export default {
   },
   watch: {
     drawer(val) {
-      if (!val) {
+      if (val) {
         this.input = null;
       }
     },
@@ -350,8 +356,8 @@ export default {
       }
     },
     onclick() {
-      this.isKuang = true;
       if(this.input){
+        this.isKuang = true;
         if (this.onDrawerNumber == 1) {
           this.frist.requestUrl = "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" + this.input;
         } else if (this.onDrawerNumber == 2) {