xzt-782,230,787,785

src/views/material/changeApply/add.vue

@@ -153,7 +153,7 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="药品" prop="drug"
-                            :rules="{ required: !isControl, message: '请选择是否药品', trigger: 'change' }">
+                            :rules="{ required: !isControl, message: '请选择是否药品', trigger: 'blur' }">
                 <el-select v-model="basicForm2.drug" placeholder="请选择" clearable :disabled="disable || isControl">
                   <el-option v-for="dict in dict.type.sys_medicine" :key="dict.value" :label="dict.label"
                              :value="dict.value"/>
@@ -187,7 +187,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="剂型" prop="dosageFrom"
-                            :rules="{ required: !isControl, message: '请选择剂型', trigger: 'change' }">
+                            :rules="{ required: !isControl, message: '请选择剂型', trigger: 'blur' }">
                 <el-select ref="doses" v-model="basicForm2.dosageFrom" placeholder="请选择" clearable
                            :disabled="disable || isControl" @focus="chooseDose">
                   <el-option v-for="item in doseOptions" :key="item.id" :label="item.name" :value="item.id"/>
@@ -590,14 +590,18 @@
           if (valid) {
             this.$refs['basic2'].validate(valid => {
               if (valid) {
+                this.$modal.loading("保存中...");
                 addChangeList(sparams).then(res => {
                   if (res.code === 200) {
                     this.$message({
                       message: res.msg,
                       type: 'success'
                     });
+                    this.$modal.closeLoading();
                     this.back()
                   }
+                }).catch(err => {
+                this.$modal.closeLoading();
                 })
               }
             })
@@ -613,14 +617,18 @@
           if (valid) {
             this.$refs['basic2'].validate(valid => {
               if (valid) {
+                this.$modal.loading("提交中...");
                 editChangeList(sparams).then(res => {
                   if (res.code === 200) {
                     this.$message({
                       message: res.msg,
                       type: 'success'
                     });
+                    this.$modal.closeLoading();
                     this.back()
                   }
+                }).catch(err => {
+                this.$modal.closeLoading();
                 })
               }
             })
@@ -629,11 +637,11 @@
       },
       back() {
         this.$emit('jugislist', true)
-        let queryParams = {
-          pageNum: 1,
-          pageSize: 10
-        }
-        this.$emit('refresh', queryParams)
+        // let queryParams = {
+        //   pageNum: 1,
+        //   pageSize: 10
+        // }
+        this.$emit('refresh')
       },
       // 子表增删行
       // handleSelectionChange(val) {

src/views/material/requisition/add.vue

@@ -481,7 +481,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="剂型" prop="dosageFrom"
-                :rules="{ required: !isControl, message: '请选择剂型', trigger: 'change' }">
+                :rules="{ required: !isControl, message: '请选择剂型', trigger: 'blur' }">
                 <el-select ref="doses" v-model="basicForm2.dosageFrom" placeholder="请选择" clearable
                   :disabled="disable || isControl" @focus="chooseDose">
                   <el-option v-for="item in doseOptions" :key="item.id" :label="item.name" :value="item.id" />
@@ -1097,6 +1097,8 @@ export default {
       console.log('val1111111', val)
       if (val == '0') {
         this.isControl = false
+        this.basicForm2.dosageFrom = '0001A11000000000BX7Z'
+        this.getDoseDetails(this.basicForm2.dosageFrom)
       } else {
         this.basicForm2.isDrug = ''
         this.basicForm2.registrationNo = ''
@@ -1300,14 +1302,18 @@ export default {
           })
         })
         Promise.all([form1, form2]).then(() => {
+          this.$modal.loading("保存中...");
           editReq(sparams).then(res => {
             if (res.code === 200) {
               this.$message({
                 message: res.msg,
                 type: 'success'
               });
+              this.$modal.closeLoading();
               this.back()
             }
+          }).catch(err => {
+            this.$modal.closeLoading();
           })
         })
       } else {
@@ -1334,14 +1340,18 @@ export default {
           })
         })
         Promise.all([form1, form2]).then(() => {
+          this.$modal.loading("保存中...");
           addReq(sparams).then(res => {
             if (res.code === 200) {
               this.$message({
                 message: res.msg,
                 type: 'success'
               });
+              this.$modal.closeLoading();
               this.back()
             }
+          }).catch(err => {
+            this.$modal.closeLoading();
           })
         })
       }
@@ -1368,14 +1378,18 @@ export default {
       Promise.all([form1, form2]).then(() => {
         // 提交时候要维护物料类别
         if (this.sysMaterialMedcineItemApply.length !== 0) {
+          this.$modal.loading("提交中...");
           editReq(sparams).then(res => {
             if (res.code === 200) {
               this.$message({
                 message: res.msg,
                 type: 'success'
               });
+              this.$modal.closeLoading();
               this.back()
             }
+          }).catch(err => {
+            this.$modal.closeLoading();
           })
         } else {
           this.$message({
@@ -1387,11 +1401,11 @@ export default {
     },
     back() {
       this.$emit('jugislist', true)
-      let queryParams = {
-        pageNum: 1,
-        pageSize: 10
-      }
-      this.$emit('refresh', queryParams)
+      // let queryParams = {
+      //   pageNum: 1,
+      //   pageSize: 10
+      // }
+      this.$emit('refresh')
     },
     // 子表增删行
     handleSelectionChange(val) {

src/views/purchase/MaterialClassDivision/add.vue

@@ -145,6 +145,7 @@
                   :disabled="disable"
                   v-model="basicForm.orderPersonal"
                   clearable
+                  @clear="clean('订单员')"
                   @focus="chooseRefer('CONTACTS_PARAM', true, '订单员')"
                 >
                   <el-option
@@ -177,6 +178,7 @@
                   :disabled="disable"
                   v-model="basicForm.buyer"
                   clearable
+                  @clear="clean('采购员')"
                   @focus="chooseRefer('CONTACTS_PARAM', true, '采购员')"
                 >
                   <el-option
@@ -335,27 +337,35 @@ export default {
   methods: {
     save() {
       if(this.pageStu == 'add') {
+        this.$modal.loading("保存中...");
         addDivision(this.basicForm).then(res => {
           if (res.code === 200) {
             this.$modal.msgSuccess("保存成功");
+            this.$modal.closeLoading();
             this.back()
           }
+        }).catch(err => {
+          this.$modal.closeLoading();
         })
       } else if(this.pageStu == 'edit') {
+        this.$modal.loading("保存中...");
         editDivision(this.basicForm).then(res => {
           this.$modal.msgSuccess("编辑成功");
+          this.$modal.closeLoading();
           this.back()
+        }).catch(err => {
+          this.$modal.closeLoading();
         })
       }
     },
     submit() {},
     back() {
       this.$emit('jugislist', true)
-      let queryParams = {
-        pageNum: 1,
-        pageSize: 10
-      }
-      this.$emit('refresh', queryParams)
+      // let queryParams = {
+      //   pageNum: 1,
+      //   pageSize: 10
+      // }
+      this.$emit('refresh')
     },
     // 如果需要回显则调用详情接口
     getDetails(row) {
@@ -443,6 +453,17 @@ export default {
         }
       })
     },
+    // 清空采购员，订单员
+    clean(title) {
+      if (title == '订单员') {
+        this.basicForm.orderPersonal = ''
+        this.basicForm.orderPersonalName = ''
+      }
+      if (title == '采购员') {
+        this.basicForm.buyer = ''
+        this.basicForm.buyerName = ''
+      }
+    }
   }
 }
 </script>

src/views/purchase/deliveryAddress/add.vue

@@ -217,29 +217,37 @@ export default {
   methods: {
     save() {
       if(this.pageStu == 'add') {
+        this.$modal.loading("保存中...");
         addAddress(this.basicForm).then(res => {
           if (res.code === 200) {
             this.$modal.msgSuccess("保存成功");
+            this.$modal.closeLoading();
             this.back()
           }
+        }).catch(err => {
+          this.$modal.closeLoading();
         })
       } else if (this.pageStu == 'edit') {
+        this.$modal.loading("保存中...");
         editAddress(this.basicForm).then(res => {
           if (res.code === 200) {
             this.$modal.msgSuccess("编辑成功");
+            this.$modal.closeLoading();
             this.back()
           }
+        }).catch(err => {
+          this.$modal.closeLoading();
         })
       }
     },
     submit() {},
     back() {
       this.$emit('jugislist', true)
-      let queryParams = {
-        pageNum: 1,
-        pageSize: 10
-      }
-      this.$emit('refresh', queryParams)
+      // let queryParams = {
+      //   pageNum: 1,
+      //   pageSize: 10
+      // }
+      this.$emit('refresh')
     },
     // 如果需要回显则调用详情接口
     getDetails(row) {

src/views/purchase/transferOrder/add.vue

@@ -863,6 +863,8 @@ export default {
           this.$modal.msgSuccess("提交成功");
           this.back()
         }
+      }).catch(err => {
+        this.$modal.closeLoading();
       })
     },
     save() {
@@ -873,27 +875,30 @@ export default {
           this.basicForm.stAllotReceiveDeliverList = this.receiveInfo
           this.basicForm.stAllotReceiveExecuteList = this.priceList
           this.basicForm.stAllotReceiveExpenseList = this.resultList
+          this.$modal.loading("保存中...");
           addOrder(this.basicForm).then(res => {
             if (res.code === 200) {
               this.$modal.msgSuccess("保存成功");
-              this.$emit('jugislist', true)
-              let queryParams = {
-                pageNum: 1,
-                pageSize: 5
-              }
-              this.$emit('refresh', queryParams)
+              this.$modal.closeLoading();
+              this.back()
             }
+          }).catch(err => {
+            this.$modal.closeLoading();
           })
         } else if (this.sonPageStu == 'edit') {
           this.basicForm.stAllotMaterialList = this.materialInfo
           this.basicForm.stAllotReceiveDeliverList = this.receiveInfo
           this.basicForm.stAllotReceiveExecuteList = this.priceList
           this.basicForm.stAllotReceiveExpenseList = this.resultList
+          this.$modal.loading("保存中...");
           editOrder(this.basicForm).then(res => {
             if (res.code === 200) {
               this.$modal.msgSuccess("编辑成功");
+              this.$modal.closeLoading();
               this.back()
             }
+          }).catch(err => {
+            this.$modal.closeLoading();
           })
         }
       } else {
@@ -906,7 +911,7 @@ export default {
       //   pageNum: 1,
       //   pageSize: 5
       // }
-      // this.$emit('refresh', queryParams)
+      this.$emit('refresh')
     },
     // 如果需要回显则调用详情接口
     getDetails(row) {