Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!427

src/views/material/basicFile/details.vue

@@ -143,6 +143,7 @@
                   :inline="true"
                   label-position="right"
                   :model="basicData.value"
+                  :key="basicData.value.id"
                   ref="basicMessageRef"
                   :rules="rules"
                 >

src/views/purchase/PurchaseDemandList/index.vue

@@ -209,7 +209,7 @@
             <el-button type="text" size="mini" @click="check(scope.row)">查看</el-button>
             <el-button type="text" size="mini" v-if="scope.row.status == '0' || scope.row.status == '3'" @click="edit(scope.row)">编辑</el-button>
             <el-button type="text" size="mini" v-if="scope.row.status == '0' || scope.row.status == '3'" @click="commit(scope.row)">提交</el-button>
-            <el-button type="text" size="mini" v-if="scope.row.status == '1' && scope.row.flowId" @click="reback(scope.row)">收回</el-button>
+            <!-- <el-button type="text" size="mini" v-if="scope.row.status == '1' && scope.row.flowId" @click="reback(scope.row)">收回</el-button> -->
             <el-button type="text" size="mini" v-if="scope.row.status == '0' || scope.row.status == '3'" @click="deleteids(scope.row)">删除</el-button>
           </template>
         </el-table-column>

src/views/purchase/purchase-order/add/index.vue

@@ -31,6 +31,7 @@ export default {
     return {
       visible: false,
       loading:false,
+      tabLoading:false,
       columns: NewColumns,
       rules: initRules(NewColumns),
       count:0,
@@ -533,6 +534,7 @@ export default {
         let {code,data} = await orderApi.orderImport(formData);
 
         if(code == 200) {
+          this.tabLoading = true;
           // puOrderExecuteList puOrderItemList
 
           let size = 20;
@@ -543,11 +545,19 @@ export default {
           
           let intervalPush = setInterval(()=>{
 
-            if(num > total) clearInterval(intervalPush);
+            if(num > total){
+              
+              clearInterval(intervalPush);
+
+              this.tabLoading = false;
+            
+              this.handleGetPrice();
+            } 
     
             for (const key in resultData) {
 
               resultData[key].slice(size*(num-1), (size*num) ).forEach(item =>{
+            
 
                 this.params[key].push(item);
 
@@ -559,13 +569,19 @@ export default {
 
           },200);
 
+          // for (const key in data) {
+
+          //   this.params[key].push(...data[key]);
+
+          // }
+
           
           let {setVisible} =  this.$refs.batchImport;
           
           setVisible(false);
           
+            
           
-          if(num > total) this.handleGetPrice();
         }
         
       } catch (error) {
@@ -770,7 +786,7 @@ export default {
         }"
         style="margin: 10px"
       >
-        <el-tabs v-model="tabName" style="width: 100%">
+        <el-tabs v-model="tabName" style="width: 100%" v-loading="tabLoading">
           <el-tab-pane
             v-for="(column, index) in tabColumns"
             :key="index"

src/views/purchase/purchase-order/edit/index.vue

@@ -15,6 +15,7 @@ export default {
       size: "mini",
       visible: false,
       loading: false,
+      tabLoading:false,
       columns: editColumns,
       rules: initRules(editColumns),
       params: {
@@ -512,6 +513,7 @@ export default {
         let {code,data} = await orderApi.orderImport(formData);
 
         if(code == 200) {
+          this.tabLoading = true;
           // puOrderExecuteList puOrderItemList
 
           let size = 20;
@@ -522,7 +524,14 @@ export default {
           
           let intervalPush = setInterval(()=>{
 
-            if(num > total) clearInterval(intervalPush);
+            if(num > total){
+              
+              clearInterval(intervalPush);
+
+              this.tabLoading = false;
+            
+              this.handleGetPrice();
+            } 
 
             for (const key in resultData) {
 
@@ -538,13 +547,18 @@ export default {
 
           },200);
 
+          // for (const key in data) {
+
+          //   this.params[key].push(...data[key]);
+
+          // }
           
           let {setVisible} =  this.$refs.batchImport;
           
           setVisible(false);
           
-          
           if(num > total) this.handleGetPrice();
+          
         }
         
       } catch (error) {
@@ -714,7 +728,7 @@ export default {
         'flex-wrap': 'wrap',
         position: 'relative',
       }" style="margin: 10px">
-        <el-tabs v-model="tabName" style="width: 100%">
+        <el-tabs v-model="tabName" style="width: 100%" v-loading="tabLoading">
           <el-tab-pane 
             v-for="(column, index) in tabColumns" 
             :key="index" 

src/views/purchase/purchase-order/index.vue

@@ -35,7 +35,7 @@ export default {
     return {
       loading: false,
       tabLoading:false,
-      page: { pageNum: 1, pageSize: 100, total: 0 },
+      page: { pageNum: 1, pageSize: 10, total: 0 },
       searchColumns: SearchColumns,
       params: initParams(SearchColumns),
       tableColumns: TableColumns,