Merge branch 'debelop' of http://192.168.1.222:3000/zhoufan/RMYY_CallCenter_UI into debelop

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

       dispatchhaocaiarrError: [
         {
           F_DicId: "",
-          F_Number: 1,
+          F_Number: 0,
           F_ReceiveUser: "",
         },
       ],
       dispatchhaocaiarrEdit:[
         {
           F_DicId: '',
-          F_Number: 1,
+          F_Number: 0,
           F_ReceiveUser: "",
         },
       ],
       });
     },
     zhddToColleagueFormChange(data) {
-      console.log(data, "zhddToColleagueFormChange");
       this.zhddToColleagueForm.ToUserCode = data;
     },
     removeItem(index) {
-      console.log(index);
       this.dispatchhaocaiarrError.splice(index, 1);
     },
     removeItemEdit(index) {
-      console.log(index);
       this.dispatchhaocaiarrEdit.splice(index, 1);
     },
     handleChange(data, index) {
-      const obj = this.$refs["cascaderbb"][index].getCheckedNodes();
-      this.dispatchhaocaiarrError[index].F_DicId = data;
-      this.dispatchhaocaiarrError[index].F_DicName = obj[0].data.text;
+      if(data){
+        const obj = this.$refs["cascaderbb"][index].getCheckedNodes();
+        this.dispatchhaocaiarrError[index].F_DicId = data;
+        this.dispatchhaocaiarrError[index].F_DicName = obj[0].data.text;
+      }else{
+        this.dispatchhaocaiarrError[index].F_DicId = ""
+        this.dispatchhaocaiarrError[index].F_DicName = ""
+      }
     },
     handleChangeEdit(data, index) {
-      const obj = this.$refs["cascaderbbedit"][index].getCheckedNodes();
-      this.dispatchhaocaiarrEdit[index].F_DicId = data;
-      this.dispatchhaocaiarrEdit[index].F_DicName = obj[0].data.text;
+      if(data){
+        const obj = this.$refs["cascaderbbedit"][index].getCheckedNodes();
+        this.dispatchhaocaiarrEdit[index].F_DicId = data;
+        this.dispatchhaocaiarrEdit[index].F_DicName = obj[0].data.text;
+      }else{
+        this.dispatchhaocaiarrEdit[index].F_DicId = ""
+        this.dispatchhaocaiarrEdit[index].F_DicName = ""
+      }
     },
     handleChange1(data) {
       this.returnWorkForm.key = data.split(",")[0];
       this.imgrepairUrl = url;
     },
     submitForm(formName) {
+      // console.log(this.dispatchhaocaiarrError)
+      // return;
+      if(formName === "dealWorkForm"){
+        if(this.dispatchhaocaiarrError.length>0){
+          const index = this.dispatchhaocaiarrError.findIndex((o) => {
+            return !o.F_ReceiveUser || !o.F_DicName || !o.F_Number;
+          });
+          if (index >= 0) {
+            this.$message.error("请选择对应物资信息");
+            return;
+          }
+        }
+      }
+      if(formName === "dealEditWorkForm"){
+        if(this.dispatchhaocaiarrEdit.length>0){
+          const index = this.dispatchhaocaiarrEdit.findIndex((o) => {
+            return !o.F_ReceiveUser || !o.F_DicName || !o.F_Number;
+          });
+          if (index >= 0) {
+            this.$message.error("请选择对应物资信息");
+            return;
+          }
+        }
+      }
       if (formName === "zhddtransferForm") {
         const arrlist = [];
         this.xylxdatas.forEach(function (v, n) {

CallCenterWeb.UI/RMYY/src/components/workOrder/dispatching/addOrEditDispatch.vue

       });
     },
     handleChange(data, index) {
-      const obj = this.$refs["cascaderbb"][index].getCheckedNodes();
-      this.devList[index].devname = obj[0].data.text + "," + data;
+      if(data){
+        const obj = this.$refs["cascaderbb"][index].getCheckedNodes();
+        this.devList[index].devname = obj[0].data.text + "," + data;
+      }else{
+        this.devList[index].devname = ""
+      }
     },
     handleDeptChange(data, index) {
-      const obj = this.$refs["cascaderdept"][index].getCheckedNodes();
-      if (obj) {
+      if(data){
+        const obj = this.$refs["cascaderdept"][index].getCheckedNodes();
         this.devList[index].F_ToDept = obj[0].data.id;
+      }else{
+        this.devList[index].F_ToDept = ""
       }
     },
     getUserData() {

CallCenterWeb.UI/RMYY/src/views/comDispatch/components/dispatchdetail.vue

                 res.PSInfo[i].F_DicName = "";
               }
             }
+            for (var i = 0; i < res.SDInfo.length; i++) {
+              if (
+                this.$store.getters.bbxxTypeMap[parseInt(res.SDInfo[i].F_DicId)]
+              ) {
+                res.SDInfo[i].F_DicName =
+                  this.$store.getters.bbxxTypeMap[
+                    parseInt(res.SDInfo[i].F_DicId)
+                  ].text;
+              } else {
+                res.SDInfo[i].F_DicName = "";
+              }
+            }
           }
         }
       });