Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-CLI

src/views/auxiliaryManage/auxiliaryOut/index.vue

@@ -71,8 +71,8 @@
       <div class="page-table-operate">
         <div class="page-table-title"></div>
         <div>
-          <el-button type="primary" :disabled="state.button_state" @click="cancelHandleFn">取消备货</el-button>
+          <el-button type="primary" :disabled="state.button_stateFn" @click="cancelHandleFn" v-loading.fullscreen.lock="state.button_stateFn">取消备货</el-button>
-          <el-button type="primary" :disabled="state.button_state" @click="confimStockUp">确认备货</el-button>
+          <el-button type="primary" :disabled="state.button_stateUp" @click="confimStockUp" v-loading.fullscreen.lock="state.button_stateUp">确认备货</el-button>
         </div>
       </div>
         <div class="vue-element-page-table">
@@ -106,7 +106,7 @@
         </el-form-item>
       </div>
       <div class="page-search-btns">
-        <el-button type="primary" @click="confimStockOut"  :disabled="state.button_state">出库</el-button>
+        <el-button type="primary" @click="confimStockOut"  :disabled="state.button_state" v-loading.fullscreen.lock="state.button_state">出库</el-button>
       </div>
     </el-row>
   </div>
@@ -144,6 +144,8 @@ const state: any = reactive({
   LShipType: '',
   button_state: false,
   button_state2: false,
+  button_stateFn: false,
+  button_stateUp: false,
   STOCKSELECT: [],
   AleardyBooking: false,
   IFCompleteStockUp: false,//用于判断是否完成备货
@@ -463,8 +465,7 @@ function confimStockUp () {
     ElMessageBox.alert('没有单据明细，请确认')
     return
   }
-  state.loading = true
+  state.button_stateUp = true
-  state.button_state = true
   AuxiliaryReserve({
     commitDate : state.commitDate,
     USER : localStorage.get("userId"),
@@ -482,15 +483,13 @@ function confimStockUp () {
         confirmButtonText: 'OK',
       })
     }
+    state.button_stateUp = false
   }).catch((error: any) => {
     ElMessageBox.alert('备货失败，' + error, '提示框', {
       confirmButtonText: 'OK',
     })
-    state.button_state = false;
+    state.button_stateUp = false;
-    state.loading = false;
   });
-  state.button_state = false;
-  state.loading = false;
 }
 
 
@@ -502,8 +501,7 @@ function cancelHandleFn() {
     ElMessageBox.alert('没有单据明细，请确认')
     return
   }
-  state.loading = true
+  state.button_stateFn = true
-  state.button_state = true
   AuxiliaryDessign({
     commitDate : state.commitDate,
     USER : localStorage.get("userId"),
@@ -522,15 +520,13 @@ function cancelHandleFn() {
         confirmButtonText: 'OK',
       })
     }
+    state.button_stateFn = false
   }).catch((error: any) => {
     ElMessageBox.alert('取消备货失败，' + error, '提示框', {
       confirmButtonText: 'OK',
     })
-    state.button_state = false;
+    state.button_stateFn = false;
-    state.loading = false;
   });
-  state.button_state = false;
-  state.loading = false;
 }
 
 function resetQuery() {
@@ -601,7 +597,6 @@ function confimStockOut() {
     ElMessageBox.alert('辅材出库失败，没有出库明细，请确认')
     return
   }
-  state.loading = true
   state.button_state = true
   /*
   state.ReserveParams.SITENAME = localStorage.getItem("siteName") == null ? "SDK" : localStorage.getItem("siteName");
@@ -626,21 +621,17 @@ function confimStockOut() {
         confirmButtonText: 'OK',
       })
     } else {
-      /*state.button_state = false;
-      state.loading = false;*/
       ElMessageBox.alert('辅材出库失败，' + res.message, '', {
         confirmButtonText: 'OK',
       })
     }
+    state.button_state = false;
   }).catch((error: any) => {
     ElMessageBox.alert('辅材出库失败，' + error, '提示框', {
       confirmButtonText: 'OK',
     })
     state.button_state = false;
-    state.loading = false;
   });
-  state.button_state = false;
-  state.loading = false;
 }
 </script>
 

src/views/buildWareHouse/MaturationLibrary/index.vue

@@ -179,7 +179,7 @@
               type="primary"
               @click="submit"
               :disabled="state.button_state"
-              v-loading="state.loadings"
+              v-loading.fullscreen.lock="state.loadings"
               >确认</el-button
             >
           </div>
@@ -608,8 +608,8 @@ function submit() {
       state.button_state = false
       state.loadings = false
     }
-    state.button_state = false
+    // state.button_state = false
-    state.loadings = false
+    // state.loadings = false
   } catch (error) {
     ElMessageBox.alert('运行错误', '提醒框', {
       confirmButtonText: 'OK'
@@ -617,9 +617,9 @@ function submit() {
     state.button_state = false
     state.loadings = false
   } finally {
-    state.loading = false
+    // state.loading = false
-    state.button_state = false
+    // state.button_state = false
-    state.loadings = false
+    // state.loadings = false
   }
 }
 </script>

src/views/buildWareHouse/MaturationLibraryToERP/index.vue

@@ -187,7 +187,7 @@
         <el-col :span="2">
           <div class="page-search-btns" style="float: right">
             <el-button
-                    v-loading="state.loading2"
+                    v-loading.fullscreen.lock="state.loading2"
                     type="primary"
                     @click="submit"
                     :disabled="state.Button_state"

src/views/buildWareHouse/locationMove/index.vue

@@ -105,7 +105,7 @@
         </el-row>
       </el-form>
       <div class="page-search-btns">
-        <el-button type="primary" v-loading="state.loading2" @click="submit"  :disabled="state.button_state">提交</el-button>
+        <el-button type="primary" v-loading.fullscreen.lock="state.loading2" @click="submit"  :disabled="state.button_state">提交</el-button>
       </div>
     </el-row>
   </div>
@@ -496,8 +496,6 @@ function submit() {
     state.button_state = false
     state.loading2 = false
   }
-  state.loading2 = false
-  state.button_state = false
 }
 //查询库区
 const handQuery = () => {

src/views/stockOut/PurReturn/index.vue

@@ -71,11 +71,11 @@
           </div>
         </el-col>
         <el-col :span="2" class="transfer-switch">
-          <el-button :disabled="loading" type="primary" @click="LeftIn"><el-icon>
+          <el-button :disabled="loading" type="primary" @click="LeftIn" v-loading.fullscreen.lock="loading"><el-icon>
               <ArrowRight />
             </el-icon></el-button>
             <!-- v-loading="loading2" -->
-          <el-button :disabled="loading2" type="primary" @click="RightIn"><el-icon>
+          <el-button :disabled="loading2" type="primary" @click="RightIn" v-loading.fullscreen.lock="loading2"><el-icon>
               <ArrowLeft />
             </el-icon></el-button>
         </el-col>
@@ -435,6 +435,7 @@ async function LeftIn() {
     };
     AssignAndDessign(param).then((res: any) => {
       if (IFTRUE(res)) {
+        state.MaterialPackingList = []
         handle(tempRow, tempevent, tempcolumn);
         handleQuery();
         state.loading = false;
@@ -442,7 +443,7 @@ async function LeftIn() {
         ElMessageBox.alert(res.data.RETURNCODE + '->' + res.data.RETURNMESSAGE, '', {
           confirmButtonText: 'OK',
         })
-        state.loading2 = false;
+        state.loading = false;
       }
 
 
@@ -459,7 +460,7 @@ async function LeftIn() {
     })
   }
 
-  state.loading = false;
+  // state.loading = false;
 
 }
 
@@ -483,6 +484,7 @@ async function RightIn() {
     };
     AssignAndDessign(param).then((res: any) => {
       if (IFTRUE(res)) {
+        state.MaterialPackingUsername = []
         handle(tempRow, tempevent, tempcolumn);
         handleQuery();
         state.loading2 = false;
@@ -529,8 +531,6 @@ async function handleStockOut() {
       // handleQuery();
       console.log(res)
       if (IFTRUE(res)) {
-        state.loading = false;
-        state.loading2 = false;
         ElMessageBox.alert('出库完成', '提示框', {
           confirmButtonText: 'OK',
         })
@@ -549,15 +549,9 @@ async function handleStockOut() {
         ElMessageBox.alert(error, '提示框', {
           confirmButtonText: 'OK',
         })
-        state.loading = false
-        state.loading2 = false;
         state.button_state = false
         state.button_loadings = false;
       });
-    state.loading = false;
-    state.loading2 = false;
-    state.button_state = false
-    state.button_loadings = false;
   } else {
     ElMessageBox.alert("请先选择要采购退货的标签", '提示框', {
       confirmButtonText: 'OK',
@@ -565,8 +559,6 @@ async function handleStockOut() {
     state.button_state = false
     state.button_loadings = false;
   }
-  state.button_state = false
-  state.button_loadings = false;
 }
 
 

src/views/stockOut/shipRequestByTC/index.vue

@@ -634,7 +634,7 @@ async function LeftIn() {
       confirmButtonText: 'OK',
     })
   }
-  state.loading = false;
+  // state.loading = false;
   // if (state.MaterialPackingList.length > 0 && state.column4.length > 0) {
 
   //   state.loading = true;
@@ -882,7 +882,7 @@ async function RightIn() {
       confirmButtonText: 'OK',
     })
   }
-  state.loading2 = false;
+  // state.loading2 = false;
   // if (state.column3.length > 0) {
   //   state.loading2 = true;
   //   state.ChangeParams.header.MESSAGENAME = 'DeassignShipRequestFromBox';

src/views/stocked/MoveLibrary/index.vue

@@ -188,7 +188,7 @@
             type="primary"
             @click="handleReserve"
             :disabled="state.Button_state"
-            v-loading="state.button_loading"
+            v-loading.fullscreen.lock="state.button_loading"
             >确定</el-button
           >
         </div>
@@ -500,8 +500,6 @@ async function handleReserve() {
     state.button_loading = false
   }
   state.loading = false
-  state.Button_state = false
-  state.button_loading = false
 }
 
 function handleSelectionChange(selection: any) {
@@ -596,7 +594,6 @@ async function LeftIn() {
     })
   }
 
-  state.loading3 = false
 }
 
 async function RightIn() {

src/views/stocked/MoveTransformation/index.vue

@@ -585,29 +585,28 @@ async function RightIn() {
       materialSpecName: state.queryParams.params.MATERIALSPECNAME,
       opType: 'Dessign',
     };
-    state.loading = true;
+    state.loading2 = true;
     AssignOrDessignShipRequest(params).then((res: any) => {
       if (res.code == 200) {
         handleQuery();
-        state.loading = false;
+        state.loading2 = false;
       } else {
         ElMessageBox.alert('操作失败：' + res.message, '提醒框', {
           confirmButtonText: 'OK',
         })
-        state.loading = false;
+        state.loading2 = false;
       }
     }).catch((err: any) => {
       ElMessageBox.alert('操作失败:' + err.response.data.message, '提醒框', {
         confirmButtonText: 'OK',
       })
-      state.loading = false;
+      state.loading2 = false;
     })
   } else {
     ElMessageBox.alert('勾选的数据不能为空！', '提示框', {
       confirmButtonText: 'OK',
     })
   }
-  state.loading = false;
 }
 
 function handleStockOut() {

src/views/stocked/NoOrMoveLibrary/index.vue

@@ -273,7 +273,7 @@
         <el-col :span="2">
           <div class="page-search-btns" style="float: right">
             <el-button
-              v-loading="state.loading2"
+              v-loading.fullscreen.lock="state.loading2"
               type="primary"
               @click="submit"
               :disabled="state.Button_state"

src/views/stocked/NoOrMoveLibraryWork/index.vue

@@ -273,7 +273,7 @@
         <el-col :span="2">
           <div class="page-search-btns" style="float: right">
             <el-button
-              v-loading="state.loading2"
+              v-loading.fullscreen.lock="state.loading2"
               type="primary"
               @click="submit"
               :disabled="state.Button_state"

src/views/stocked/holdAndRelease/index.vue

@@ -85,9 +85,9 @@
         </el-row>
       </el-form>
       <div class="page-search-btns">
-        <el-button type="primary" v-loading="state.loading2" @click="Hold()"
+        <el-button type="primary" v-loading.fullscreen.lock="state.loading2" @click="Hold()"
           :disabled="state.Button_state">冻结</el-button>
-        <el-button type="primary" v-loading="state.loading3" @click="Release()"
+        <el-button type="primary" v-loading.fullscreen.lock="state.loading3" @click="Release()"
           :disabled="state.Button_state2">释放</el-button>
       </div>
     </el-row>
@@ -389,8 +389,6 @@ function Release() {
         state.Button_state2 = false
         state.loading3 = false
       });
-    state.loading3 = false
-    state.Button_state2 = false
   }
 function resetQuery() {
   queryFormRef.value.resetFields();

src/views/stocked/locationMovePage/index.vue

@@ -244,7 +244,7 @@
       <div class="page-search-btns">
         <el-button
           type="primary"
-          v-loading="state.loading2"
+          v-loading.fullscreen.lock="state.loading2"
           @click="submit"
           :disabled="state.Button_state"
           >提交</el-button
@@ -716,7 +716,6 @@ async function submit() {
       confirmButtonText: 'OK'
     })
   }
-  state.loading2 = false
   state.Button_state = false
 }
 /*