Kaynağa Gözat

Merge branch '20250121-分批还原,快速报工权限修改等' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_vue into 20250121-分批还原,快速报工权限修改等

ezhizao_zx 4 ay önce
ebeveyn
işleme
2f9765be4a

+ 8 - 6
src/views/business/inventoryCheck/OutsourceCheckFom.vue

@@ -38,9 +38,9 @@
           />
         </el-form-item>
 
-        <el-form-item label="外协单号:">
+        <el-form-item label="发出单号:">
           <el-input
-            placeholder="请输入外协单号"
+            placeholder="请输入发出单号"
             v-model.trim="queryTaksParams.outsourceFormNo"
             @keydown.enter.prevent
             clearable
@@ -80,7 +80,7 @@
               width="48"
             />
             <el-table-column
-              label="外协单号"
+              label="发出单号"
               align="center"
               prop="outsourceFormNo"
               width="110"
@@ -274,10 +274,12 @@ function handleSelectionChange(selection) {
 
 //一键盘点
 function handleInventory() {
-  loading.value = true;
+
   //弹出确认框,确认用户是否确认盘点
-  ElMessageBox.confirm("是否确认一键盘点,将会盘点所有未收回的批次?")
+  proxy.$modal
+  .confirm("是否确认一键盘点,将会盘点所有未收回的批次?")
     .then(() => {
+      loading.value = true;
       saveOutsourceInfo({ takeStockPeriodId: detailInfo.value.id }).then(
         (res) => {
           if (res.code == 200) {
@@ -288,10 +290,10 @@ function handleInventory() {
           } else {
             proxy.$modal.msgError("操作失败");
           }
+          loading.value = false;
         }
       );
     })
-    .catch(() => {});
 }
 
 function getList() {