xgload

CallCenterWeb.UI/RMYY/src/components/button/orderList.vue

@@ -10,7 +10,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_zixingjiejue = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('errorDoneForm')">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('errorDoneForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 返修 -->
@@ -29,7 +29,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_fanxiu = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('returnWorkForm')">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('returnWorkForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 故障报修评价 -->
@@ -70,7 +70,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_pingjia = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('evaluateForm')">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('evaluateForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 综合调度评价 -->
@@ -92,7 +92,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_zhdd_pingjia = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('schedulingEvaluateForm')">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('schedulingEvaluateForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 故障保修指派 -->
@@ -113,7 +113,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_zhipai = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('transferForm')">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('transferForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 综合调度指派 -->
@@ -161,7 +161,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_zhdd_zhipai = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('zhddtransferForm')">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('zhddtransferForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 咨询预约处理 -->
@@ -180,7 +180,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_ywzx_chuli = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('appointmentForm')">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('appointmentForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 确认耗材 -->
@@ -314,7 +314,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_gongdantuihui = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('gzbxBackWorkForm')">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('gzbxBackWorkForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 综合调度退回 -->
@@ -333,7 +333,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_dispatch_tuihui = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('backWorkForm')">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('backWorkForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 综合调度工单列表退回 -->
@@ -346,7 +346,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_zhdd_tuihui = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('zhddbackWorkForm')">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('zhddbackWorkForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 业务咨询退回 -->
@@ -365,7 +365,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_ywzx_tuihui = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('ywzxbackWorkForm')">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('ywzxbackWorkForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 故障报修撤回 -->
@@ -378,7 +378,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_chehui = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('gzbxRecallForm')">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('gzbxRecallForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 故障报修申请人撤回  -->
@@ -391,7 +391,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_mychehui = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('gzbxUserRecallForm')">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('gzbxUserRecallForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!-- <工单列表-综合调度-撤回 -->
@@ -410,7 +410,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_schchehui = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('zhddBackForm')">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('zhddBackForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 综合调度送达 -->
@@ -472,7 +472,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_dispatch_daoda = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('dealWorkForm')">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('dealWorkForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 送达的编辑 -->
@@ -583,7 +583,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_cldu_pingjia = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('carEvaluteForm')">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('carEvaluteForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!--催单-->
@@ -596,7 +596,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_ywzx_cuidan = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('cuidanForm')">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('cuidanForm')">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog :visible.sync="dialogStatus.dialog_ywzx_cuidanOL" title="催单">
@@ -608,7 +608,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_ywzx_cuidanOL = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('cuidanQLForm')">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('cuidanQLForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 完成 -->
@@ -621,7 +621,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_ywzx_finish = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('finishForm')">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('finishForm')">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 综合调度菜单-指派 -->
@@ -643,7 +643,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_dispatch_zhuanpai = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('dispatchtransferForm')">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('dispatchtransferForm')">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog :visible.sync="dialogImgVisible" title="查看图片" width="50%" append-to-body>
@@ -666,7 +666,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogStatus.dialog_dispatch_zhuantongshi = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('zhddToColleagueForm')">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="loading" type="primary" @click="submitForm('zhddToColleagueForm')">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -734,6 +734,7 @@
     props: {},
     data() {
       return {
+        loading: false,
         isxylx: "",
         xylxdatas: [],
         FileUrl: [],
@@ -1444,66 +1445,7 @@
               this.transferForm.todept = conf.autodept;
               this.getClassUser(conf.autodept, conf.autousercode);
             }
-
-            //院区id遍历
-            // for (var i = 0; i < autoData.length; i++) {
-            //   if (autoData[i].autoyq == applyHos) {
-            //     //有院区
-            //     this.deptidArr =
-            //       this.$store.getters.deptmap[parseInt(autoData[i].autodept)].ids;
-            //     this.transferForm.todept = autoData[i].autodept;
-            //     console.log(1, 'getClassUser');
-            //     this.getClassUser(autoData[i].autodept);
-            //     this.transferForm.tousercode = autoData[i].autousercode;
-            //     return;
-            //   } else if (autoData[i].autoyq == "0") {
-            //     //全部
-            //     this.deptidArr =
-            //       this.$store.getters.deptmap[parseInt(autoData[i].autodept)].ids;
-            //     this.transferForm.todept = autoData[i].autodept;
-            //     console.log(2, 'getClassUser');
-            //     this.getClassUser(autoData[i].autodept);
-            //     this.transferForm.tousercode = autoData[i].autousercode;
-            //   }
-            // }
           }
-
-          // const deptid = this.$store.getters.workTypeMap[parseInt(row.F_SonType)].autoDept
-          // const typeArr = this.$store.getters.workTypeMap[parseInt(row.F_SonType)].ids
-          // const worktypeInfo = this.$store.getters.workTypeMap[parseInt(typeArr[1])].tag
-          // const assignDeptArr = this.$store.getters.deptmap[parseInt(row.F_ProposerDept)].ids
-          // console.log(deptid,worktypeInfo, assignDeptArr)
-          // if (worktypeInfo != 'gzbx_jjhq') {
-          //   if(deptid){
-          //     this.transferForm.todept = deptid
-          //     this.deptidArr = this.$store.getters.deptmap[parseInt(deptid)].ids
-          //     this.getClassUser(deptid)
-          //   }
-          // }
-          // if ((worktypeInfo == 'gzbx_jjhq' && assignDeptArr[0] != '1') && (worktypeInfo == 'gzbx_jjhq' && assignDeptArr[
-          //     0] != '4005')) {
-          //   if (assignDeptArr[0] == '2') {
-          //     this.getDeptByCode(this.deptMents, 'fenyuanqu')
-          //   }
-          //   if (assignDeptArr[0] == '3') {
-          //     this.getDeptByCode(this.deptMents, 'xiyuanqu')
-          //   }
-          //   if (assignDeptArr[0] == '4004') {
-          //     this.getDeptByCode(this.deptMents, 'JJHQ_DYQBZZ')
-          //   }
-          //   if (assignDeptArr[0] == '4006') {
-          //     this.getDeptByCode(this.deptMents, 'JJHQ_NYQBZZ')
-          //   }
-          //   if (assignDeptArr[0] == '4008') {
-          //     this.getDeptByCode(this.deptMents, 'JJHQ_BYQBZZ')
-          //   }
-          // } else {
-          //   if(deptid){
-          //     this.transferForm.todept = deptid
-          //     this.deptidArr = this.$store.getters.deptmap[parseInt(deptid)].ids
-          //     this.getClassUser(deptid)
-          //   }
-          // }
         }
         if (name === "zhdd_zhipai") {
           this.zhdddeptidArr = [];
@@ -1815,6 +1757,7 @@
       submitForm(formName) {
         // console.log(this.dispatchhaocaiarrError)
         // return;
+        this.loading = true //打开loading
         if (formName === "transferForm"){
           this.transferForm.datetime = this.getNowDate()
         }
@@ -1826,6 +1769,7 @@
               });
               if (index >= 0) {
                 this.$message.error("请选择对应物资信息");
+                this.loading = false // 关闭loading
                 return;
               }
             }
@@ -1840,6 +1784,7 @@
               });
               if (index >= 0) {
                 this.$message.error("请选择对应物资信息");
+                this.loading = false // 关闭loading
                 return;
               }
             }
@@ -1862,6 +1807,7 @@
         if (formName === "evaluateForm") {
           if (this.evaluateForm.Attitude == 0 || this.evaluateForm.Quality == 0 || this.evaluateForm.Efficiency == 0) {
             this.$message.warning("请选择星级评价");
+            this.loading = false // 关闭loading
             return;
           }
           if (
@@ -1871,6 +1817,7 @@
           ) {
             if (this.evaluateForm.EvaluateContent === "") {
               this.$message.warning("请输入文字评价");
+              this.loading = false // 关闭loading
               return;
             }
           }
@@ -1879,6 +1826,7 @@
           if (this.schedulingEvaluateForm.Attitude == 0 || this.schedulingEvaluateForm.Quality == 0 || this
             .schedulingEvaluateForm.Efficiency == 0) {
             this.$message.warning("请选择星级评价");
+            this.loading = false // 关闭loading
             return;
           }
           if (
@@ -1888,6 +1836,7 @@
           ) {
             if (this.schedulingEvaluateForm.EvaluateContent === "") {
               this.$message.warning("请输入文字评价");
+              this.loading = false // 关闭loading
               return;
             }
           }
@@ -1896,6 +1845,7 @@
           if (this.carEvaluteForm.Attitude == 0 || this.carEvaluteForm.Quality == 0 || this.carEvaluteForm.Efficiency ==
             0) {
             this.$message.warning("请选择星级评价");
+            this.loading = false // 关闭loading
             return;
           }
           if (
@@ -1905,6 +1855,7 @@
           ) {
             if (this.carEvaluteForm.Evaluation === "") {
               this.$message.warning("请输入文字评价");
+              this.loading = false // 关闭loading
               return;
             }
           }
@@ -1914,12 +1865,14 @@
             if (this.consumablesConfirmForm.Attitude == 0 || this.consumablesConfirmForm.Quality == 0 || this
               .consumablesConfirmForm.Efficiency == 0) {
               this.$message.warning("请选择星级评价");
+              this.loading = false // 关闭loading
               return;
             }
             if (this.consumablesConfirmForm.Attitude < 3 || this.consumablesConfirmForm.Quality < 3 || this
               .consumablesConfirmForm.Efficiency < 3) {
               if (this.consumablesConfirmForm.EvaluateContent === "") {
                 this.$message.warning("请输入文字评价");
+                this.loading = false // 关闭loading
                 return;
               }
             }
@@ -1997,11 +1950,13 @@
             if (formName === "returnWorkForm") {
               if (!this.returnWorkForm.value) {
                 this.$message.warning("请选择原因");
+                this.loading = false // 关闭loading
                 return;
               }
               if (this.returnWorkForm.value === "其他") {
                 if (!this.returnWorkForm.returnReason) {
                   this.$message.warning("请输入其他原因");
+                  this.loading = false // 关闭loading
                   return;
                 }
               }
@@ -2009,11 +1964,13 @@
             if (formName === "backWorkForm") {
               if (!this.backWorkForm.value) {
                 this.$message.warning("请选择原因");
+                this.loading = false // 关闭loading
                 return;
               }
               if (this.backWorkForm.value === "其他") {
                 if (!this.backWorkForm.BackReason) {
                   this.$message.warning("请输入其他原因");
+                  this.loading = false // 关闭loading
                   return;
                 }
               }
@@ -2021,11 +1978,13 @@
             if (formName === "ywzxbackWorkForm") {
               if (!this.ywzxbackWorkForm.value) {
                 this.$message.warning("请选择原因");
+                this.loading = false // 关闭loading
                 return;
               }
               if (this.ywzxbackWorkForm.value === "其他") {
                 if (!this.ywzxbackWorkForm.reason) {
                   this.$message.warning("请输入其他原因");
+                  this.loading = false // 关闭loading
                   return;
                 }
               }
@@ -2125,8 +2084,9 @@
             if (this.postEvent) {
               new Promise((resolve) => {
                 this.postEvent(params).then((response) => {
-                  console.log("处理结果", this.optionName);
+                  console.log("处理结果", this.optionName,response.state);
                   if (response.state === "success") {
+                    this.loading = false //关闭loading
                     this.$message({
                       type: "success",
                       message: "操作成功!",
@@ -2267,15 +2227,23 @@
                     }
                     this.$emit("refList", {});
                   } else {
+                    this.loading = false //关闭loading
                     this.$message({
                       type: "info",
                       message: response.message,
                     });
                   }
-                });
+                })
+                .catch((err)=>{
+                  console.log(err)
+                  this.loading = false //关闭loading
+                })
                 resolve();
               });
             }
+          }else{
+            console.log(111)
+            this.loading = false //关闭loading
           }
         });
       },

CallCenterWeb.UI/RMYY/src/components/workOrder/information/addOrEditInfOrder.vue

@@ -745,6 +745,7 @@ export default {
               this.firstOrderTypeParam.name = res.typename1
               this.$emit('r2type', res.F_type2)
               this.ruleForm.F_Type2 = res.F_type2 // 工单子类
+              console.log(this.ruleForm.F_Type2,'this.ruleForm.F_Type2')
               this.F_Type2 = res.F_type2
               if (res.F_type2) {
                 this.ruleForm.type2Arr =
@@ -805,16 +806,15 @@ export default {
         this.$message('请挂断后再提交工单')
         return
       }
-      // console.log(this.ruleForm.F_Type2, 'this.ruleForm.F_type2')
       if (!this.ruleForm.F_Type2 && !this.wid) {
         this.$message.error('请选择工单类别')
         return
       }
-      var resTypeArr = this.$store.getters.workTypeMap[parseInt(this.ruleForm.F_Type2)].ids
-      if(resTypeArr[0] != 1000){
-        this.$message.error('业务类别与工单类别不匹配，请重新选择')
-        return
-      }
+      // var resTypeArr = this.$store.getters.workTypeMap[parseInt(this.ruleForm.F_Type2)].ids
+      // if(resTypeArr[0] != 1000){
+      //   this.$message.error('业务类别与工单类别不匹配，请重新选择')
+      //   return
+      // }
       // console.log(resTypeArr)
       // return
       if (this.iswomanage == 1) {

CallCenterWeb.UI/RMYY/src/views/faultRepairManagement/repairList/index.vue

@@ -218,7 +218,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogZuzhang = false">取 消</el-button>
-        <el-button type="primary" @click="dialogTransferZuzhang">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="isloading" type="primary" @click="dialogTransferZuzhang">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog :visible.sync="dialogZhiban" title="转值班">
@@ -232,7 +232,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogZhiban = false">取 消</el-button>
-        <el-button type="primary" @click="dialogTransferZhiban">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="isloading" type="primary" @click="dialogTransferZhiban">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog :visible.sync="dialogDiaoDu" title="转调度">
@@ -244,7 +244,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogDiaoDu = false">取 消</el-button>
-        <el-button type="primary" @click="dialogTransferDiaoDu">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="isloading" type="primary" @click="dialogTransferDiaoDu">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog :visible.sync="dialogHangUp" title="挂起">
@@ -267,7 +267,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogHangUp = false">取 消</el-button>
-        <el-button type="primary" @click="postHangUp">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="isloading" type="primary" @click="postHangUp">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog :visible.sync="dialogDelay" title="延期">
@@ -294,7 +294,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogDelay = false">取 消</el-button>
-        <el-button type="primary" @click="postDelay">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="isloading" type="primary" @click="postDelay">确 定</el-button>
       </div>
     </el-dialog>
 
@@ -313,7 +313,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogBackOrder = false">取 消</el-button>
-        <el-button type="primary" @click="postBackOrder">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="isloading" type="primary" @click="postBackOrder">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog :visible.sync="dialogCooperation" title="协作">
@@ -346,7 +346,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogCooperation = false">取 消</el-button>
-        <el-button type="primary" @click="postCooperationOrder">
+        <el-button v-loading.fullscreen.lock="isloading" type="primary" @click="postCooperationOrder">
           确 定
         </el-button>
       </div>
@@ -375,7 +375,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogCooperationIn = false">取 消</el-button>
-        <el-button type="primary" @click="postCooperationOrderIn">
+        <el-button v-loading.fullscreen.lock="isloading" type="primary" @click="postCooperationOrderIn">
           确 定
         </el-button>
       </div>
@@ -414,7 +414,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogCooperationOut = false">取 消</el-button>
-        <el-button type="primary" @click="postCooperationOrderOut">
+        <el-button v-loading.fullscreen.lock="isloading" type="primary" @click="postCooperationOrderOut">
           确 定
         </el-button>
       </div>
@@ -437,7 +437,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogredeploy = false">取 消</el-button>
-        <el-button type="primary" @click="postRedeployOrder">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="isloading" type="primary" @click="postRedeployOrder">确 定</el-button>
       </div>
     </el-dialog>
 
@@ -455,7 +455,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogdept = false">取 消</el-button>
-        <el-button type="primary" @click="postRedeployDeptOrder">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="isloading" type="primary" @click="postRedeployDeptOrder">确 定</el-button>
       </div>
     </el-dialog>
 
@@ -470,7 +470,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogtongshi = false">取 消</el-button>
-        <el-button type="primary" @click="postRedeployTongshiOrder">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="isloading" type="primary" @click="postRedeployTongshiOrder">确 定</el-button>
       </div>
     </el-dialog>
 
@@ -546,7 +546,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogDone = false">取 消</el-button>
-        <el-button type="primary" @click="postDoneOrder">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="isloading" type="primary" @click="postDoneOrder">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog :visible.sync="dialogVisible">
@@ -602,7 +602,8 @@
       selectGzbxDeptTree
     },
     data() {
-      return {
+      return {
+        isloading: false,
         applyHos: "",
         loading: false,
         dialogZuzhang: false,
@@ -1051,14 +1052,17 @@
         this.dialogDelay = true;
         this.rowdata = row;
       },
-      postDelay() {
+      postDelay() {
+        this.isloading = true
         if (!this.delayForm.value) {
-          this.$message.warning("请选择原因");
+          this.$message.warning("请选择原因");
+          this.isloading = false
           return;
         }
         if (this.delayForm.value === "其他") {
           if (!this.delayForm.delayReason) {
-            this.$message.warning("请输入其他原因");
+            this.$message.warning("请输入其他原因");
+            this.isloading = false
             return;
           }
         }
@@ -1072,7 +1076,8 @@
           reason: this.delayForm.delayReason,
         };
         postDelayOrder(params).then((res) => {
-          if (res.state.toLowerCase() === "success") {
+          if (res.state.toLowerCase() === "success") {
+            this.isloading = false
             this.$message.success("延期成功");
             this.delayForm = {};
             this.delayForm.key = "";
@@ -1083,7 +1088,11 @@
             this.reasonarr1 = [];
             this.dialogDelay = false;
           }
-        });
+        })
+        .catch((err)=>{
+          console.log(err)
+          this.isloading = false //关闭loading
+        })
       },
       hadndleOrderCode(ordercode) {
         this.$layer.iframe({
@@ -1177,7 +1186,8 @@
         this.dialogDone = true;
         this.doneForm.workordercode = code;
       },
-      postDoneOrder() {
+      postDoneOrder() {
+        this.isloading = true
         // 完工
         var equiplist = [];
         this.equipmodellist.find((item) => {
@@ -1208,6 +1218,7 @@
               type: "error",
               message: "请选择耗材信息！",
             });
+            this.isloading = false
             return
           }
         }
@@ -1235,9 +1246,10 @@
               const params = this.doneForm;
               postDealWorkOrder(params).then((response) => {
                 if (response.state === "success") {
+                  this.isloading = false
                   this.$message({
                     type: "success",
-                    message: "操作成功!",
+                    message: "操作成功!",
                   });
                   this.dialogDone = false;
                   this.closeDialogDone();
@@ -1248,7 +1260,11 @@
                     message: response.message,
                   });
                 }
-              });
+              })
+              .catch((err)=>{
+                console.log(err)
+                this.isloading = false //关闭loading
+              })
               resolve();
             });
           }
@@ -1338,9 +1354,11 @@
         this.zuzhangcode = code;
       },
       dialogTransferZuzhang() {
+        this.isloading = true
         if(this.zuzhangForm.reason == "其他"){
           if(!this.zuzhangForm.value){
             this.$message.warning('请输入其他原因')
+            this.isloading = false
             return
           }
         }
@@ -1362,9 +1380,10 @@
         };
         postTransfer(params).then((response) => {
           if (response.state === "success") {
+            this.isloading = false
             this.$message({
               type: "success",
-              message: "操作成功!",
+              message: "操作成功!",
             });
             this.dialogZuzhang = false;
             this.zuzhangForm.reason = "";
@@ -1378,7 +1397,11 @@
               message: response.message,
             });
           }
-        });
+        })
+        .catch((err)=>{
+          console.log(err)
+          this.isloading = false //关闭loading
+        })
       },
       redeployZhiban(code) {
         this.getReason("ZUZHANG");
@@ -1389,7 +1412,8 @@
         this.dialogDiaoDu = true;
         this.diaoducode = code;
       },
-      dialogTransferZhiban() {
+      dialogTransferZhiban() {
+        this.isloading = true
         const params = {
           workordercode: this.zhibancode,
           toUserCode: null,
@@ -1398,9 +1422,10 @@
         };
         postTransfer(params).then((response) => {
           if (response.state === "success") {
+            this.isloading = false
             this.$message({
               type: "success",
-              message: "操作成功!",
+              message: "操作成功!",
             });
             this.dialogZhiban = false;
             this.zhibanForm.reason = "";
@@ -1411,9 +1436,14 @@
               message: response.message,
             });
           }
-        });
+        })
+        .catch((err)=>{
+          console.log(err)
+          this.isloading = false //关闭loading
+        })
       },
-      dialogTransferDiaoDu() {
+      dialogTransferDiaoDu() {
+        this.isloading = true
         const params = {
           workordercode: this.diaoducode,
           toUserCode: null,
@@ -1422,9 +1452,10 @@
         };
         postTransfer(params).then((response) => {
           if (response.state === "success") {
+            this.isloading = false
             this.$message({
               type: "success",
-              message: "操作成功!",
+              message: "操作成功!",
             });
             this.dialogDiaoDu = false;
             this.diaoduForm.reason = "";
@@ -1435,9 +1466,14 @@
               message: response.message,
             });
           }
-        });
+        })
+        .catch((err)=>{
+          console.log(err)
+          this.isloading = false //关闭loading
+        })
       },
-      postRedeployTongshiOrder() {
+      postRedeployTongshiOrder() {
+        this.isloading = true
         // 转同事
         this.$refs["redeploytongshiForm"].validate((valid) => {
           if (valid) {
@@ -1445,9 +1481,10 @@
               const params = this.redeploytongshiForm;
               postTransfer(params).then((response) => {
                 if (response.state === "success") {
+                  this.isloading = false
                   this.$message({
                     type: "success",
-                    message: "操作成功!",
+                    message: "操作成功!",
                   });
                   this.dialogtongshi = false;
                   this.$refs["redeploytongshiForm"].resetFields();
@@ -1458,13 +1495,18 @@
                     message: response.message,
                   });
                 }
-              });
+              })
+              .catch((err)=>{
+                console.log(err)
+                this.isloading = false //关闭loading
+              })
               resolve();
             });
           }
         });
       },
-      postRedeployDeptOrder() {
+      postRedeployDeptOrder() {
+        this.isloading = true
         //转部门
         this.$refs["redeploydeptForm"].validate((valid) => {
           if (valid) {
@@ -1472,9 +1514,10 @@
               const params = this.redeploydeptForm;
               postTransferDept(params).then((response) => {
                 if (response.state === "success") {
+                  this.isloading = false
                   this.$message({
                     type: "success",
-                    message: "操作成功!",
+                    message: "操作成功!",
                   });
                   this.dialogdept = false;
                   this.$refs["redeploydeptForm"].resetFields();
@@ -1486,13 +1529,18 @@
                     message: response.message,
                   });
                 }
-              });
+              })
+              .catch((err)=>{
+                console.log(err)
+                this.isloading = false //关闭loading
+              })
               resolve();
             });
           }
         });
       },
-      postRedeployOrder() {
+      postRedeployOrder() {
+        this.isloading = true
         // 转派
         this.$refs["redeployForm"].validate((valid) => {
           if (valid) {
@@ -1500,9 +1548,10 @@
               const params = this.redeployForm;
               postTransfer(params).then((response) => {
                 if (response.state === "success") {
+                  this.isloading = false
                   this.$message({
                     type: "success",
-                    message: "操作成功!",
+                    message: "操作成功!",
                   });
                   this.dialogredeploy = false;
                   this.$refs["redeployForm"].resetFields();
@@ -1513,7 +1562,11 @@
                     message: response.message,
                   });
                 }
-              });
+              })
+              .catch((err)=>{
+                console.log(err)
+                this.isloading = false //关闭loading
+              })
               resolve();
             });
           }
@@ -1719,15 +1772,18 @@
         }
         // this.getRepairman();
       },
-      postBackOrder() {
+      postBackOrder() {
+        this.isloading = true
         // 退回
         if (!this.backOrderForm.value) {
-          this.$message.warning("请选择原因");
+          this.$message.warning("请选择原因");
+          this.isloading = false
           return;
         }
         if (this.backOrderForm.value === "其他") {
           if (!this.backOrderForm.BackReason) {
-            this.$message.warning("请输入其他原因");
+            this.$message.warning("请输入其他原因");
+            this.isloading = false
             return;
           }
         }
@@ -1737,9 +1793,10 @@
               const params = this.backOrderForm;
               postBackWorkOrder(params).then((response) => {
                 if (response.state === "success") {
+                  this.isloading = false
                   this.$message({
                     type: "success",
-                    message: "操作成功!",
+                    message: "操作成功!",
                   });
                   this.dialogBackOrder = false;
                   this.$refs["backOrderForm"].resetFields();
@@ -1757,7 +1814,11 @@
                     message: response.message,
                   });
                 }
-              });
+              })
+              .catch((err)=>{
+                console.log(err)
+                this.isloading = false //关闭loading
+              })
               resolve();
             });
           }
@@ -1811,27 +1872,32 @@
         this.dialogHangUp = true;
         this.hangupForm.workordercode = code;
       },
-      postHangUp() {
+      postHangUp() {
+        this.isloading = true
         if (!this.hangupForm.value) {
-          this.$message.warning("请选择原因");
+          this.$message.warning("请选择原因");
+          this.isloading = false
           return;
         }
         if (!this.hangupForm.expectfinishtime) {
-          this.$message.warning("请选择挂起时间");
+          this.$message.warning("请选择挂起时间");
+          this.isloading = false
           return;
         }
         if (this.hangupForm.value === "其他") {
           if (!this.hangupForm.reason) {
-            this.$message.warning("请输入其他原因");
+            this.$message.warning("请输入其他原因");
+            this.isloading = false
             return;
           }
         }
         const params = this.hangupForm;
         postHangUpWorkOrder(params).then((res) => {
           if (res.state === "success") {
+            this.isloading = false
             this.$message({
               type: "success",
-              message: "挂起成功!",
+              message: "挂起成功!",
             });
             this.dialogHangUp = false;
             this.hangupForm = {};
@@ -1844,7 +1910,11 @@
             this.reasonarr1 = [];
             this.getListTask();
           }
-        });
+        })
+        .catch((err)=>{
+          console.log(err)
+          this.isloading = false //关闭loading
+        })
       },
       arriveOrder(code) {
         // 到达

CallCenterWeb.UI/RMYYAPP/manifest.json

@@ -2,8 +2,8 @@
     "name" : "郑州人民医院综合服务保障调度平台",
     "appid" : "__UNI__5A5207D",
     "description" : "",
-    "versionName" : "1.2.66",
-    "versionCode" : 166,
+    "versionName" : "1.2.67",
+    "versionCode" : 167,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

CallCenterWeb.UI/RMYYAPP/pages/myTask/comDispatch/applicantList/applicantList.vue

@@ -148,6 +148,9 @@
 				})
 			},
 			getList(optioin) {
+				uni.showLoading({
+				    title: '加载中'
+				});
 				const params = {
 					page: optioin.page,
 					pagesize: optioin.pagesize,
@@ -155,6 +158,7 @@
 				}
 				this.$http.get(url[this.urlIndex], params).then((response) => {
 					if (response.state.toLowerCase() === "success") {
+						uni.hideLoading();
 						let data = response.rows
 						this.total = response.total
 						uni.stopPullDownRefresh();

CallCenterWeb.UI/RMYYAPP/pages/myTask/comDispatch/comDispatchDetail/dealDetail/dealDetail.vue

@@ -200,9 +200,9 @@ export default {
       // 	}
       // })
       const result = await this.$http.get("GongDanType/GetList", params);
-      if (result.state.toLowerCase() === "success") {
-        this.orderTypeList = result.data;
-      }
+      // if (result.state.toLowerCase() === "success") {
+        this.orderTypeList = JSON.parse(result)
+      // }
     },
     getGongDanTypeBBXX() {
       let dataOrderType = [];

CallCenterWeb.UI/RMYYAPP/pages/myTask/consultList/consultList.vue

@@ -129,6 +129,9 @@
 				})
 			},
 			getList(optioin) {
+				uni.showLoading({
+				    title: '加载中'
+				});
 				this.$mHelper.getOrderId('1000', (id) => {
 					const params = {
 						pageindex: optioin.pageindex,
@@ -139,6 +142,7 @@
 					}
 					this.$http.get('WorkCommon/GetSubmitList', params).then((response) => {
 						if (response.state.toLowerCase() === "success") {
+							uni.hideLoading();
 							let data = response.rows
 							this.total = response.total
 							uni.stopPullDownRefresh();

CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/myRepairOrderList/myRepairOrderList.vue

@@ -134,7 +134,9 @@
 				})
 			},
 			getList(optioin) {
-				
+				uni.showLoading({
+				    title: '加载中'
+				});
 				this.$mHelper.getOrderId('3000', (id) => {
 					const params = {
 						pageindex: optioin.pageindex,
@@ -145,6 +147,7 @@
 					}
 					this.$http.get(urlData[this.urlIndex], params).then((response) => {
 						if (response.state.toLowerCase() === "success") {
+							uni.hideLoading();
 							let data = response.rows
 							this.total = response.total
 							uni.stopPullDownRefresh();

CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/repairList.vue

@@ -331,6 +331,9 @@
 			// 	})
 			// },
 			getList(optioin) {
+				uni.showLoading({
+				    title: '加载中'
+				});
 				if (this.tabName == '紧急') {
 					optioin.emergency = '紧急'
 					optioin.urge = ''
@@ -359,6 +362,7 @@
 				}
 				this.$http.get("FaultRepair/MaintenancerList", params).then((response) => {
 					if (response.state.toLowerCase() === "success") {
+						uni.hideLoading();
 						let data = response.rows
 						this.total = response.total
 						uni.stopPullDownRefresh();

CallCenterWeb.UI/RMYYAPP/pages/myTask/vehicleSchedulList/vehicleSchedulList.vue

@@ -123,6 +123,9 @@
 				
 			},
 			getApplicantsList(optioin){
+				uni.showLoading({
+				    title: '加载中'
+				});
 				const params = {
 					pageindex: optioin.pageindex,
 					pagesize: optioin.pagesize,
@@ -131,6 +134,7 @@
 				}
 				this.$http.get("T_Car_WorkOrder/GetList", params).then((response) => {
 					if (response.state.toLowerCase() === "success") {
+						uni.hideLoading();
 						uni.stopPullDownRefresh();
 						let data = response.rows
 						this.listData = this.listData.concat(data)
@@ -145,6 +149,9 @@
 				})
 			},
 			getDriverList(optioin){
+				uni.showLoading({
+				    title: '加载中'
+				});
 				const params = {
 					pageindex: optioin.pageindex,
 					pagesize: optioin.pagesize,
@@ -153,6 +160,7 @@
 				}
 				this.$http.get("T_Car_WorkOrder/GetCarList", params).then((response) => {
 					if (response.state.toLowerCase() === "success") {
+						uni.hideLoading();
 						let data = response.rows
 						this.total = response.total
 						uni.stopPullDownRefresh();

CallCenterWeb.UI/RMYYAPP/pages/myTask/workOrderDetail/consultList.vue

@@ -114,9 +114,9 @@
 					flag:1
 				}
 				this.$http.get("GongDanType/GetList",params).then((res)=>{
-					if(res.state.toLowerCase() ==="success"){
-						this.orderTypeList = res.data
-					}
+					// if(res.state.toLowerCase() ==="success"){
+						this.orderTypeList = JSON.parse(res)
+					// }
 				})
 			},
 			getList(optioin) {

CallCenterWeb.UI/RMYYAPP/unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/fb982b10-3595-11ee-baa2-75c6cd81a413
+https://ide.dcloud.net.cn/build/download/2bec7a10-365e-11ee-afff-7709d68cb5e7