借用贴标-手动结束单据及bug修复

src/views/borrow/borrowGet.vue

@@ -213,7 +213,7 @@
               <a-button
                 type="primary"
                 class="actions"
-                v-if="[1].includes(scope.row.SubmitState)&&[1].includes(scope.row.IsHaoCai)"
+                v-if="[1].includes(scope.row.SubmitState)"
                 ghost
                 round
                 size="small"
@@ -223,7 +223,7 @@
               <a-button
                 type="primary"
                 class="actions"
-                v-if="[2].includes(scope.row.SubmitState)&&[1].includes(scope.row.IsHaoCai)"
+                v-if="[2].includes(scope.row.SubmitState)"
                 ghost
                 round
                 size="small"
@@ -1379,24 +1379,50 @@ export default {
       {
         stateName="撤销"  
       }
-      const url = "/api/Borrow/ChangeState" ;
-      this.$confirm("是否"+stateName+"该操作?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(async () => {
-          const { data: res } = await this.$axios.post(url,this.editForm);
-          if (res.Success === true) {
-            this.getQueuData();
-            this.$message.success("已"+stateName);
-          } else {
-            this.$message.error(res.Remark);
-          }
+      //console.log(row)
+      //判断是贴标的则提示手动操作的不会自动生成出入库记录
+      if(row.IsHaoCai==0&&(SubmitState==2||SubmitState==3)){
+       const url = "/api/Borrow/ChangeState" ;
+        this.$confirm("是否确认该操作? 操作贴标的装备将不会自动生成对应的出入库记录", stateName, {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .catch((e) => {
-          this.$message.warning("已取消"+stateName+"操作");
-        });
+          .then(async () => {
+            const { data: res } = await this.$axios.post(url,this.editForm);
+            if (res.Success === true) {
+              this.getQueuData();
+              this.$message.success("已"+stateName);
+            } else {
+              this.$message.error(res.Remark);
+            }
+          })
+          .catch((e) => {
+            this.$message.warning("已取消"+stateName+"操作");
+          });
+
+      }else{
+        const url = "/api/Borrow/ChangeState" ;
+        this.$confirm("是否确认该操作?", stateName, {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(async () => {
+            const { data: res } = await this.$axios.post(url,this.editForm);
+            if (res.Success === true) {
+              this.getQueuData();
+              this.$message.success("已"+stateName);
+            } else {
+              this.$message.error(res.Remark);
+            }
+          })
+          .catch((e) => {
+            this.$message.warning("已取消"+stateName+"操作");
+          });
+  
+      }
+      
     },
   
     ///人员选择

src/views/borrow/repairGet.vue

@@ -1263,12 +1263,13 @@ export default {
       {
         stateName="撤销"  
       }
-      const url = "/api/Borrow/ChangeState" ;
-      this.$confirm("是否"+stateName+"该操作?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
+      
+        const url = "/api/Borrow/ChangeState" ;
+         this.$confirm("是否确认该操作?", stateName, {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
         .then(async () => {
           const { data: res } = await this.$axios.post(url,this.editForm);
           if (res.Success === true) {

src/views/log/outinExceptionHandling.vue

@@ -21,7 +21,7 @@
                       style="width: 205px; float: left; margin-left: 1px"
                       noOptionsText="暂无数据"
                       :options="departOptions"
-                      placeholder="请选择上级部门"
+                      placeholder="请选择部门"
                       :normalizer="normalizer"
                       @select="selectDepart"
                     />
@@ -145,7 +145,7 @@
 
         <span slot="footer" class="dialog-footer">
             <el-button @click="outInExVisible = false">取 消</el-button>
-            <el-button type="primary" @click="submitOutInExForm()"
+            <el-button :subLoading="subLoading" type="primary" @click="submitOutInExForm()"
               >提交</el-button
             >
           </span>
@@ -162,6 +162,7 @@ export default {
   data() {
     return {
       loading: false,
+      subLoading:false,
       input: "",
       form: {},
       DepartName:"",
@@ -338,7 +339,8 @@ export default {
       },
      //提交异常出库
      async submitOutInExForm(){
-       console.log('oooo')
+       //console.log('oooo')
+       
        if(this.outInExForm.submitUsrID==''|| this.outInExForm.submitUsrID==undefined){
          return this.$message.warning('请选择对应的操作人员');
 
@@ -352,13 +354,19 @@ export default {
         this.outInExForm
       );
       //this.getQueuData();
+      //回调上一个弹窗的查看方法toPost-刷新
+      this.$emit('toPost')
       this.outInExVisible=false;
-      if (res.Success !== true) return this.$message.error(res.Remark);
+      this.subLoading=true;
+      if (res.Success !== true){
+          this.subLoading=false; return   this.$message.error(res.Remark);
+      } 
           else
           {
+             this.subLoading=false;
             return this.$message.success('处理成功');
+            
           }
-          
       },
     // 分页功能
     // 每页显示条数发生改变时

src/views/log/outinLog.vue

@@ -244,7 +244,7 @@
         </el-dialog>
 
          <!-- 表单组件-引用异常出库页面 -->
-     <outinExceptionHandling ref="outinExceptionHandling" />
+     <outinExceptionHandling ref="outinExceptionHandling" @toPost="toPost"/>
 
         <!-- 分页功能 -->
         <el-row type="flex" justify="center" align="middle">
@@ -370,7 +370,9 @@ export default {
     onEnterPress() {
       this.getQueuData();
     },
-
+    async toPost(){
+      this.getQueuData();
+    },
     //  stateFormat(row) {
     //   if (row.Type === 0) {
     //     return "入库";