7/1 单据管理 按钮 loading

src/views/basic/business/stockOrderQRCodeDetail.vue

@@ -4,8 +4,8 @@
       <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="100px">
         <el-row type="flex" justify="end">
           <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;">
-            <el-button type="primary" @click.native="generateQRCodeText()" :loading="loading">生成内部码</el-button>
+            <el-button type="primary" @click.native="generateQRCodeText()" :loading="generateQRCodeTextLoading">生成内部码</el-button>
-            <el-button type="primary" @click.native="printStockOrderDetailPDF()" :loading="loading">标签打印全部</el-button>
+            <el-button type="primary" @click.native="printStockOrderDetailPDF()" :loading="printStockOrderDetailPDFLoading">标签打印全部</el-button>
             <el-button type="primary" @click.native="printStockOrderDetailStatementPDF()" :loading="loading">报表打印全部</el-button>
             <el-switch style="margin-left: 50px;" v-model="filterUDIType" active-text="过滤已有UDI码的产品"></el-switch>
           </el-button-group>
@@ -201,6 +201,8 @@ export default {
       codeArray: [],
       total: 0,
       loading: false,
+      generateQRCodeTextLoading: false,
+      printStockOrderDetailPDFLoading: false,
       index: null,
       formLoading: false,
       formVisible: false,
@@ -300,10 +302,10 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
-        this.loading = true;
+        this.generateQRCodeTextLoading = true;
         generateInCodeQRCodeText({orderIdFk: this.formData.billNo, chack: this.filterUDIType})
           .then(response => {
-            this.loading = false;
+            this.generateQRCodeTextLoading = false;
             if (response.code === 20000) {
               this.$message.success("生成成功！");
               this.getOrderQRCodeTextList();
@@ -313,7 +315,7 @@ export default {
             }
           })
           .catch(() => {
-            this.loading = false;
+            this.generateQRCodeTextLoading = false;
           })
       }).catch(() => {
 
@@ -335,8 +337,9 @@ export default {
         tQuery.queryId = row.id;
       }
 
-      this.loading = true;
+      this.printStockOrderDetailPDFLoading = true;
       inspectionStockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
+        this.printStockOrderDetailPDFLoading = false
         if (response.code === 20000) {
           if (row != null) {
             tQuery.id = row.id;
@@ -374,11 +377,11 @@ export default {
                   printCodeIdFk: tQuery.queryId,
                   stockOrderFk: tQuery.orderId,
                 }
-                this.loading = false;
+                this.printStockOrderDetailPDFLoading = false;
                 this.$message.warning("打印文件正在生成中，请点击刷新按钮查看进度，请勿关闭按钮重复打印！");
               }
             }).catch(() => {
-              this.loading = false;
+              this.printStockOrderDetailPDFLoading = false;
             });
 
           } else
@@ -394,14 +397,15 @@ export default {
               this.loading = false;
               window.open(url);//打开新标签页，预览pdf。
             }).catch(() => {
-              this.loading = false;
+              this.printStockOrderDetailPDFLoading = false;
             });
         } else {
-          this.loading = false;
+          this.printStockOrderDetailPDFLoading = false;
           this.$message.error(response.message);
         }
       }).catch(() => {
         this.loading = false;
+        this.printStockOrderDetailPDFLoading = false;
       });
     },
     printStockOrderDetailStatementPDF(row) {

src/views/inout/DialogCheck.vue

@@ -300,7 +300,9 @@ export default {
   },
   methods: {
     submitUpload() {
+      this.loading = true
       updateBizById(this.inputQuery).then((res) => {
+        this.loading = false
         if (res.code == 20000) {
           this.$message({
             type: "success",
@@ -308,7 +310,8 @@ export default {
           });
           this.closeDialog();
         }
-
+      }).catch(() => {
+        this.loading = false
       })
 
 

src/views/inout/DialogCreateOrder.vue

@@ -19,21 +19,21 @@
               @click.native="OptionalDocument()"
             >选入预验收入库单
             </el-button>
-            <el-button size="mini" type="primary" @click.native="saveOrder()"
+            <el-button size="mini" type="primary" @click.native="saveOrder()" :loading="saveLoading"
             >草稿保存
             </el-button>
-            <el-button size="mini" type="primary" @click.native="submit()"
+            <el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
                        v-if="viewType != 7"
             >立即提交
             </el-button>
 
-            <el-button type="primary" @click="submit(1)"
+            <el-button type="primary" @click="submit(1)" :loading="checkLoading"
                        v-if="viewType == 7">校验结果提交
             </el-button>
-            <el-button type="primary" @click="submit(2)"
+            <el-button type="primary" @click="submit(2)" :loading="codeLoading"
                        v-if="viewType == 7">扫码结果提交
             </el-button>
-            <el-button size="mini" type="primary" @click.native="revokeBill()"
+            <el-button size="mini" type="primary" @click.native="revokeBill()" :loading="retractLoading"
                        v-if="viewType == 7">撤回单据
             </el-button>
 
@@ -820,7 +820,11 @@ export default {
       checkTipDialogVisible: false,
       checkTip: null,
       enableSick: false,
-
+      saveLoading: false,
+      submitLoading: false,
+      checkLoading: false,
+      codeLoading: false,
+      retractLoading: false,
 
       //库存选入
       selectInvProductVisible: false,
@@ -1473,9 +1477,10 @@ export default {
       })
         .then(() => {
           let query = {billNo: this.orderFormData.billNo};
-
+          this.retractLoading = true
           rollbackWaitcheck(query)
             .then((response) => {
+              this.retractLoading = false
               if (response.code == 20000) {
                 this.$message.success("撤回成功！");
                 this.closeDialog();
@@ -1484,6 +1489,7 @@ export default {
               }
             })
             .catch(() => {
+              this.retractLoading = false
             });
         })
         .catch(() => {
@@ -1498,6 +1504,7 @@ export default {
     //待校验以扫码结果为准
     submitCodeResult(query) {
       submitCodeResult(query).then((response) => {
+        this.codeLoading = false
         if (response.code === 20000) {
           this.$message.success("提交成功");
           this.closeDialog();
@@ -1510,6 +1517,7 @@ export default {
     //待校验以正确结果为准
     submitCheckResult(query) {
       submitCheckResult(query).then((response) => {
+        this.checkLoading = false
         if (response.code === 20000) {
           this.$message.success("提交成功");
           this.closeDialog();
@@ -1548,8 +1556,27 @@ export default {
       );
       tQuery.orderId = this.orderFormData.billNo;
       console.log(tQuery.orderId);
+      if (val == 1){
+        //校验btn
+        this.checkLoading = true
+      }else if (val == 2){
+        //扫码btn
+        this.codeLoading = true
+      }else {
+        this.submitLoading = true
+      }
       if (this.viewType == 2) {   //扫码单据立即提交
         submitCodes(tQuery).then((response) => {
+          if (val == 1){
+            //校验btn
+            this.checkLoading = false
+          }else if (val == 2){
+            //扫码btn
+            this.codeLoading = false
+          }else {
+            this.submitLoading = false
+          }
+
           if (response.code === 20000) {
             this.$message.success("提交成功,等待处理，请刷新后查看！");
             this.closeDialog();
@@ -1563,6 +1590,15 @@ export default {
         else
           tQuery.fromVailPi = 1;
         submitBiz(tQuery).then((response) => {
+          if (val == 1){
+            //校验btn
+            this.checkLoading = false
+          }else if (val == 2){
+            //扫码btn
+            this.codeLoading = false
+          }else {
+            this.submitLoading = false
+          }
           if (response.code === 20000) {
             this.$message.success("提交成功");
             this.closeDialog();
@@ -1572,6 +1608,16 @@ export default {
         });
       } else if (this.viewType == 4) {
         submitAllocateBiz(tQuery).then((response) => {
+          if (val == 1){
+            //校验btn
+            this.checkLoading = false
+          }else if (val == 2){
+            //扫码btn
+            this.codeLoading = false
+          }else {
+            this.submitLoading = false
+          }
+
           if (response.code === 20000) {
             this.$message.success("提交成功");
             this.closeDialog();
@@ -1587,9 +1633,11 @@ export default {
             type: "warning",
           })
             .then(() => {
+              this.checkLoading = true
               this.submitCheckResult(tQuery);
             })
             .catch(() => {
+              this.this.checkLoading = false
             });
 
         } else {
@@ -1599,14 +1647,17 @@ export default {
             type: "warning",
           })
             .then(() => {
+              this.codeLoading = true
               this.submitCodeResult(tQuery);
             })
             .catch(() => {
+              this.codeLoading = false
             });
 
         }
       } else {   //配货拣货后后提交
         submitOrderWeb(tQuery).then((response) => {
+          this.submitLoading = false
           if (response.code === 20000) {
             this.$message.success("提交成功");
             this.closeDialog();
@@ -1627,13 +1678,16 @@ export default {
         this.$message.error("请先录入单据信息！");
         return;
       }
+      this.saveLoading = true
       saveOrderWeb(tQuery).then((response) => {
+        this.saveLoading = false
         if (response.code === 20000) {
           this.closeDialog();
         } else {
           this.$message.error(response.message);
         }
         this.loading = false;
+        this.saveLoading = false
       });
     },
 

src/views/inout/DialogCreateOrderSelect.vue

@@ -465,6 +465,7 @@ export default {
       multipleSelection: [],
       selectbox: [],
       selectRow: null,
+      combineLoading: false
     };
   },
   components: {},
@@ -504,8 +505,10 @@ export default {
     },
     //选入
     combine() {
+      this.combineLoading = true
       this.closeDialogtwo();
       this.$emit("giveselectbox", this.selectbox);
+      this.combineLoading = false
     },
 
     //选择框根据已选入判断禁用方法

src/views/inout/DialogEditCode.vue

@@ -62,7 +62,7 @@
       </el-row>
       <div style="text-align: right;margin-top: 20px">
         <el-button @click="cancelDialog">取 消</el-button>
-        <el-button type="primary" @click="saveCode()">确 定</el-button>
+        <el-button type="primary" @click="saveCode()" :loading="determineLoading">确 定</el-button>
       </div>
     </el-form>
   </div>
@@ -108,15 +108,18 @@ export default {
       isExpireDate: false,
       isBatchNo: false,
       isSerialNo: false,
+      determineLoading: false,
     };
   },
 
   methods: {
     saveCode() {
+      this.determineLoading = true
       if (this.editType == 1) {
         //校验该单有没有存在同序列号的码
         if (!isBlank(this.editData.serialNo)) {
           checkTempCode(this.editData).then((response) => {
+            this.determineLoading = false
             if (response.code === 20000) {
               this.repeatAddCode(this.editData);
               return
@@ -126,6 +129,7 @@ export default {
             }
           });
         } else {
+          this.determineLoading = false
           this.repeatAddCode(this.editData);
         }
 
@@ -143,6 +147,7 @@ export default {
       } else {
         saveCode(this.editData)
           .then((response) => {
+            this.determineLoading = false
             console.log(response)
             if (response.code === 20000) {
               this.$message.success("提交成功");
@@ -152,6 +157,7 @@ export default {
               this.$message.error(response.message);
             }
             this.loading = false;
+            this.determineLoading = false
           });
       }
 

src/views/inout/DialogNewReviewOrder.vue

@@ -6,12 +6,14 @@
           <el-button
             type="primary"
             @click.native="checkFinish()"
+            :loading="finishLoading"
           >完成审核
           </el-button
           >
           <el-button
             type="primary"
             @click.native="renewAccept()"
+            :loading="renewAcceptLoading"
           >重新审核
           </el-button
           >
@@ -182,6 +184,8 @@ export default {
       },
 
       isEntrust: false,
+      finishLoading: false,
+      renewAcceptLoading: false,
     }
   },
 
@@ -371,9 +375,9 @@ export default {
         type: 'warning'
       }).then(() => {
         this.postAccept();
-
       }).catch(() => {
         // this.$message.info('回退失败');
+        this.finishLoading = false
       });
 
     },
@@ -382,9 +386,11 @@ export default {
         orderId: this.orderQuery.billNo,
         entrust: this.isEntrust,
       };
+      this.finishLoading = true
       if (this.reviewType != null && this.reviewType == 2) {
         thirdUpdateStatus(query)
           .then((response) => {
+            this.finishLoading = false
             if (response.code == 20000) {
               this.$message.success("核对成功！");
               this.closeDialog();
@@ -394,11 +400,13 @@ export default {
             }
           })
           .catch(() => {
+            this.finishLoading = false
           });
 
       } else {
         updateStatus(query)
           .then((response) => {
+            this.finishLoading = false
             if (response.code == 20000) {
               this.$message.success("审核成功！");
               this.closeDialog();
@@ -408,6 +416,7 @@ export default {
             }
           })
           .catch(() => {
+            this.finishLoading = false
           });
       }
     },
@@ -416,13 +425,16 @@ export default {
       let query = {
         billNo: this.orderQuery.billNo,
       }
+      this.renewAcceptLoading = true
       acceptClear(query)
         .then((response) => {
+          this.renewAcceptLoading = false
           this.detailLoading = false;
           this.detailList = response.data.orderDetailEntities || [];
           this.formData = response.data.orderEntity;
         })
         .catch(() => {
+          this.renewAcceptLoading = false
           this.detailLoading = false;
           this.detailList = [];
         });

src/views/inout/DialogReviewOrder.vue

@@ -6,12 +6,14 @@
           <el-button
             type="primary"
             @click.native="checkFinish()"
+            :loading="finishLoading"
           >完成审核
           </el-button
           >
           <el-button
             type="primary"
             @click.native="renewAccept()"
+            :loading="renewAcceptLoading"
           >重新审核
           </el-button
           >
@@ -117,6 +119,7 @@
 import A from "../../plugins/KeyScaner"
 import {updateStatus, enterCodeWeb, thirdUpdateStatus} from "@/api/inout/order";
 import {getAcceptOrder, acceptClear, acceptAddCode, getAcceptStatus} from "@/api/inout/acceptOrder";
+import fa from 'element-ui/src/locale/lang/fa'
 
 
 export default {
@@ -152,6 +155,8 @@ export default {
         page: 1,
         limit: 10,
       },
+      finishLoading: false,
+      renewAcceptLoading: false,
     }
   },
 
@@ -324,6 +329,7 @@ export default {
 
       }).catch(() => {
         // this.$message.info('回退失败');
+        this.finishLoading = false
       });
 
     },
@@ -331,9 +337,11 @@ export default {
       let query = {
         orderId: this.orderQuery.billNo,
       };
+      this.finishLoading = true
       if (this.reviewType != null && this.reviewType == 2) {
         thirdUpdateStatus(query)
           .then((response) => {
+            this.finishLoading = false
             if (response.code == 20000) {
               this.$message.success("核对成功！");
               this.closeDialog();
@@ -343,11 +351,13 @@ export default {
             }
           })
           .catch(() => {
+            this.finishLoading = false
           });
 
       } else {
         updateStatus(query)
           .then((response) => {
+            this.finishLoading = false
             if (response.code == 20000) {
               this.$message.success("审核成功！");
               this.closeDialog();
@@ -357,6 +367,7 @@ export default {
             }
           })
           .catch(() => {
+            this.finishLoading = false
           });
       }
     },
@@ -365,12 +376,15 @@ export default {
       let query = {
         billNo: this.orderQuery.billNo,
       }
+      this.renewAcceptLoading = true
       acceptClear(query)
         .then((response) => {
+          this.renewAcceptLoading = false
           this.detailLoading = false;
           this.detailList = response.data.orderDetailEntities || [];
         })
         .catch(() => {
+          this.renewAcceptLoading = false
           this.detailLoading = false;
           this.detailList = [];
         });

src/views/inout/DialogSelectThrOrder.vue

@@ -86,7 +86,7 @@
             >重置
             </el-button>
             <el-button type="primary" icon="el-icon-search" @click="submitFind">查询</el-button>
-            <el-button type="primary" icon="el-icon-check" @click="combine"
+            <el-button type="primary" icon="el-icon-check" @click="combine" :loading="determineLoading"
             >确定
             </el-button
             >
@@ -235,6 +235,7 @@ export default {
           },
         ],
       },
+      determineLoading: false,
     };
   },
   methods: {
@@ -330,8 +331,10 @@ export default {
         locStorageCode: this.curLocInv,
         invWarehouseCode: this.currentRow.invWarehouseCode,
       }
+      this.determineLoading = true
       addThrOrder(tQuery)
         .then((response) => {
+          this.determineLoading = false
           if (response.code === 20000) {
             this.closeDialog();
           } else {
@@ -339,6 +342,7 @@ export default {
           }
         })
         .catch(() => {
+          this.determineLoading = false
         });
     },
     hideSearch() {

src/views/inout/InvoiceRegistrationDetermine.vue

@@ -5,7 +5,7 @@
 
         <el-row type="flex" justify="end">
           <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: 10px">
-            <el-button type="primary" @click.native="determineBtn()" :loading="loading">确认</el-button>
+            <el-button type="primary" @click.native="determineBtn()" :loading="determineLoading">确认</el-button>
             <el-button type="primary" @click.native="closeDialog(false)" :loading="loading">取消</el-button>
           </el-button-group>
         </el-row>
@@ -299,6 +299,7 @@ export default {
       list: [],
       total: 0,
       loading: false,
+      determineLoading: false,
       index: null,
       enableDept: false,
       showSup: false,
@@ -465,18 +466,23 @@ export default {
           cancelButtonText: "取消",
           type: "warning",
         }).then(() => {
+          this.determineLoading = true
           updateOrder(data).then((res) => {
+            this.determineLoading = false
             this.closeDialog();
           }).catch((error) => {
           })
         }).catch(() => {
-
+          this.determineLoading = false
         })
 
       } else {
+        this.determineLoading = true
         updateOrder(data).then((res) => {
+          this.determineLoading = false
           this.closeDialog();
         }).catch((error) => {
+          this.determineLoading = false
         })
       }
 

src/views/inout/IoDepartmentOrder.vue

@@ -176,7 +176,7 @@
 
         <el-form-item style="text-align: center;">
           <el-button-group>
-            <el-button type="primary" @click="onInfoSubmit"
+            <el-button type="primary" @click="onInfoSubmit" :loading="submitLoading"
             >提交
             </el-button>
           </el-button-group>
@@ -289,6 +289,7 @@ export default {
         ],
       },
       actDateRange: [],
+      submitLoading: false
     }
   },
   computed: {
@@ -395,8 +396,9 @@ export default {
         this.$message.error('住院号不能为空')
         return
       }
-
+      this.submitLoading = true
       addInfoSkSicker(this.addInfo).then((response) => {
+        this.submitLoading = false
         if (response.code === 20000) {
           this.$message.success(response.data)
           this.addInfo = {
@@ -419,7 +421,7 @@ export default {
       })
         .catch((error) => {
           this.$message.error(error.message)
-
+          this.submitLoading = false
         })
     },
     enterPatientInfo() {

src/views/inout/IoEditOrderCodeDetail.vue

@@ -81,7 +81,7 @@
       </el-form>
 
       <div style="text-align: right; margin-top: 10px;">
-        <el-button type="primary" size="small" icon="search" @click="updateOrderInfo"
+        <el-button type="primary" size="small" icon="search" @click="updateOrderInfo" :loading="updateOrderInfoLoading"
         >提交
         </el-button
         >
@@ -149,7 +149,8 @@ export default {
           let nowDate = new Date(time).getTime();
           return (nowDate > endDate);
         }
-      }
+      },
+      updateOrderInfoLoading: false
     };
   },
   components: {},
@@ -207,13 +208,16 @@ export default {
         auditTime: this.auditTime,
         orderIds: [this.filterQuery.orderId]
       };
+      this.updateOrderInfoLoading = true
       updateOrderInfo(params).then((res) => {
+        this.updateOrderInfoLoading = false
         if (res.code === 20000) {
           this.$message.success("修改成功");
           this.getList();
           this.getOrderList();
         }
       }).catch((error) => {
+        this.updateOrderInfoLoading = false
         this.$message.error(error.message);
       })
     },

src/views/inout/muti/ioOrderMutiAuditDialog.vue

@@ -3,8 +3,8 @@
     <el-card style="margin: 5px;">
       <el-form :model="inputQuery" label-width="110px" style="margin-bottom: -15px">
         <el-button-group style="display: flex; margin: 0px 0 15px 75%; height: 35px">
-          <el-button size="mini" type="primary" @click.native="saveOrder(2)">审核通过</el-button>
+          <el-button size="mini" type="primary" @click.native="saveOrder(2)" :loading="passLoading">审核通过</el-button>
-          <el-button size="mini" type="primary" @click.native="saveOrder(3)">审核拒绝</el-button>
+          <el-button size="mini" type="primary" @click.native="saveOrder(3)" :loading="noPassLoading">审核拒绝</el-button>
         </el-button-group>
         <el-row>
           <el-col :span="17">
@@ -130,6 +130,8 @@ export default {
       fromInvOptions: [],
       busTypes: [],
       detailList: [],
+      passLoading: false,
+      noPassLoading: false,
     }
   },
   methods: {
@@ -182,7 +184,17 @@ export default {
         id:this.pId,
         status:status
       }
+      if (status === 2){
+        this.passLoading = true
+      }else {
+        this.noPassLoading = true
+      }
       auditMuti(query).then((response) => {
+        if (status === 2){
+          this.passLoading = false
+        }else {
+          this.noPassLoading = false
+        }
         if (response.code == 20000) {
           this.closeDialog()
         } else {

src/views/inout/muti/ioOrderMutiEditDialog.vue

@@ -3,8 +3,8 @@
     <el-card style="margin: 5px;">
       <el-form :model="inputQuery" label-width="110px" style="margin-bottom: -15px">
         <el-button-group style="display: flex; margin: 0px 0 15px 75%; height: 35px">
-          <el-button size="mini" type="primary" @click.native="saveOrder(0)">草稿保存</el-button>
+          <el-button size="mini" type="primary" @click.native="saveOrder(0)" :loading="draftLoading">草稿保存</el-button>
-          <el-button size="mini" type="primary" @click.native="saveOrder(1)">立即提交</el-button>
+          <el-button size="mini" type="primary" @click.native="saveOrder(1)" :loading="submitLoading">立即提交</el-button>
         </el-button-group>
         <el-row>
           <el-col :span="17">
@@ -166,6 +166,8 @@ export default {
       nextTime: '',// 上次时间、最新时间
       lastCode: '',
       nextCode: '',// 上次按键、最新按键
+      draftLoading: false,
+      submitLoading: false,
     }
   },
   mounted() {
@@ -403,7 +405,17 @@ export default {
         totalCount: this.inputQuery.totalCount,
         status: status
       }
+      if (status === 0){
+        this.draftLoading = true
+      }else {
+        this.submitLoading = true
+      }
       updateOrderMuti(query).then((response) => {
+        if (status == 0){
+          this.draftLoading = false
+        }else {
+          this.submitLoading = false
+        }
         if (response.code == 20000) {
           this.closeDialog()
         } else {

src/views/inout/muti/ioOrderMutiSetDialog.vue

@@ -174,7 +174,7 @@
       </template>
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
           <el-button  @click="closeDialog">取消</el-button>
-          <el-button type="primary" @click="submitInv">提交</el-button>
+          <el-button type="primary" @click="submitInv" :loading="submitLoading">提交</el-button>
         </div>
       </el-form>
     </el-card>
@@ -220,6 +220,7 @@ export default {
       },
       fromInvOptions: [],
       busTypes: [],
+      submitLoading: false,
     }
   },
   methods: {
@@ -267,8 +268,10 @@ export default {
         this.$message.error("生成单据类型不能为空！");
         return
       }
+      this.submitLoading = true
       if(this.formName==1){
         addMuti(this.inputQuery).then((response) => {
+          this.submitLoading = false
           if(response.code == 20000){
             this.closeDialog();
           }else{
@@ -277,10 +280,12 @@ export default {
 
         })
           .catch(() => {
+            this.submitLoading = false
             this.$message.error("添加失败");
           });
       }else{
         updateMuti(this.inputQuery).then((response) => {
+          this.submitLoading = false
           if(response.code == 20000){
             this.closeDialog();
           }else{
@@ -289,6 +294,7 @@ export default {
 
         })
           .catch(() => {
+            this.submitLoading = false
             this.$message.error("添加失败");
           });
       }