二级库-仓库管理bug修改

src/xt_pages/data/druguseTemplate.vue

@@ -310,7 +310,7 @@
             </el-dialog>
 
             <!-- 新增子药 -->
-            <el-dialog :title="dialogTitle" :visible.sync="templateFormVisible" width="854px">
+            <el-dialog :title="dialogTitle" :before-close="closeform" :visible.sync="templateFormVisible" width="854px" >
               <el-form
                 ref="templateForm"
                 :rules="templateRules"
@@ -321,25 +321,6 @@
                 <el-row >
                   <el-col :span="24">
                     <el-form-item label="医嘱内容:" required prop="advice_name">
-                      <!-- <el-input v-model="templateForm.advice_name"></el-input> -->
-
-                      <!-- <el-select
-                        v-model="templateForm.advice_name"
-                        filterable
-                        clearable
-                        allow-create
-                        placeholder="请选择(输入可搜索)"
-                        style="width:100%"
-                        @change="changeDrugName"
-                    >
-                      <el-option
-                        v-for="(item,index) in all_drug"
-                        :key="index"
-                        :label="item.drug_name"
-                        :value="item.drug_name"
-                      ></el-option>
-                     </el-select> -->
-
                       <el-autocomplete
                           style="width:100%;"
                           class="inline-input"
@@ -357,23 +338,7 @@
                   <el-col :span="15">
                     <el-form-item label="药品规格 :" prop="advice_desc">
                       <el-col :span="8">
-                        <!-- <el-input v-model="templateForm.advice_desc"></el-input> -->
-                         <!-- <el-select
-                          v-model="templateForm.advice_desc"
-                          filterable
-                          clearable
-                          allow-create
-                          placeholder="请选择(输入可搜索)"
-                          style="width:150px"
-                          @change="changeDrugDesc"
-                        >
-                        <el-option
-                          v-for="item in drugSpec"
-                          :key="item.id"
-                          :label="item.drug_spec"
-                          :value="item.drug_spec"
-                        ></el-option>
-                        </el-select> -->
+
 
                        <el-autocomplete
                          style="width:100px;"
@@ -526,7 +491,7 @@
                 </el-row>
               </el-form>
               <div slot="footer" class="dialog-footer">
-                <el-button @click="cancelHandle('templateForm')">取消</el-button>
+                <el-button @click="cancelHandle('templateForm'),closeform()">取消</el-button>
                 <el-button type="primary" @click="submitTemplate('templateForm')">保 存</el-button>
               </div>
             </el-dialog>
@@ -1613,6 +1578,7 @@
         this.templateTableVisible = true
       },
       newRecordAction() {
+        console.log("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")
         this.dialogTitle = '新增医嘱内容'
         this.advice_content_name = '医嘱内容'
         this.isEdit = false
@@ -1621,7 +1587,8 @@
         this.templateTableVisible = false
         this.templateFormVisible = true
 
-      }, deleteRecordAction: function() {
+      },
+      deleteRecordAction: function() {
         if (this.table_current_index == -1) {
           this.$message.error('请选择一条医嘱记录')
           return
@@ -1635,7 +1602,8 @@
           this.table_current_index = -1
         }).catch(() => {
         })
-      }, tableRow({ row, rowIndex }) {
+      },
+      tableRow({ row, rowIndex }) {
         // 把每一行的索引放进row
         row.index = rowIndex
       },
@@ -1683,11 +1651,11 @@
         const params = {
           'data': this.adviceTableData
         }
-       
+
         let name = encodeURIComponent(this.form.name)
         console.log("params",params)
         let sort = this.form.sort
-        
+
         postAdviceTemplate(params, name,sort, this.form.advice_type).then(response => {
 
           if (response.data.state == 0) {
@@ -1870,10 +1838,10 @@
               CreateSubAdvice(templateFormTwo).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
+                  this.closeform()
                   return false
                 } else {
                   this.$message.success('添加成功')
-
                   var spliceIndex = -1
                   for (let index = this.adviceTemplates.length - 1; ; index--) {
                     if (this.adviceTemplates[index].parent_id === templateFormTwo.parent_id) {
@@ -1884,7 +1852,6 @@
                       break
                     }
                   }
-
                   if (spliceIndex > -1) {
                     spliceIndex += 1
                     if (spliceIndex === this.adviceTemplates.length) {
@@ -1902,6 +1869,7 @@
                   this.handleSpanTempArr()
                   this.templateFormVisible = false
                   this.resetForm(formName)
+                  this.closeform()
                   return false
                 }
               })
@@ -2383,7 +2351,7 @@
         }
         this.templateForm.way = 1
         console.log("编辑模板",this.templateForm)
-      
+
         // 编辑创建医嘱模版
         CreateSingleAdviceTemplate(this.templateForm).then(response => {
           if (response.data.state == 0) {
@@ -2486,7 +2454,7 @@
             return 'success-row'
           }
         }
-      }, 
+      },
       cellMouseEnter: function(row, column, cell, event) {
         if (column.label == '模版名称') {
           this.sameRowArr.forEach((arr, i) => {
@@ -2653,21 +2621,8 @@
         this.templateFormVisible = true
         this.dialogTitle = '新增子药'
         this.advice_content_name = '子药名称'
-      }, deleteRecordAction: function() {
-        if (this.table_current_index == -1) {
-          this.$message.error('请选择一条医嘱记录')
-          return
-        }
-        this.$confirm('删除记录', '是否删除该医嘱记录', {
-          confirmButtonText: '确 定',
-          cancelButtonText: '取 消',
-          type: 'warning'
-        }).then(() => {
-          this.adviceTableData.splice(this.table_current_index, 1)
-          this.table_current_index = -1
-        }).catch(() => {
-        })
-      }, handleSpanTempArr() {
+      },
+      handleSpanTempArr() {
         this.tempArr = []
 
         for (let i = 0; i < this.adviceTemplates.length; i++) {
@@ -2703,7 +2658,7 @@
         this.sameRowArr = sameRowArr
       },
        handleUpdateAdviceTemplate(row, index) {
-       
+
         this.current_template_id = row.template_id
         this.current_template_name = row.name
         this.form.name = row.name
@@ -2715,7 +2670,7 @@
         }
         this.templateTableTwoVisible = true
         this.adviceTableDataTwo = []
-      
+
         for (let i = 0; i < this.adviceTemplates.length; i++) {
           if (this.adviceTemplates[i].template_id == row.template_id) {
             this.adviceTableDataTwo.push(this.adviceTemplates[i])
@@ -2729,7 +2684,7 @@
           template_id: this.current_template_id,
           sort:this.form.sort,
         }
-      
+
         updateTemplateName(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -2962,9 +2917,31 @@
        return a.sort - b.sort
      },
      hangleSelectChange(val){
+       this.templateForm.advice_desc=this.drugSpec[0].drug_spec
+       this.templateForm.drug_spec_unit=this.drugSpec[0].min_unit
+       this.templateForm.prescribing_number=this.drugSpec[0].prescribing_number
+       this.templateForm.prescribing_number_unit=this.drugSpec[0].prescribing_number_unit
+       this.templateForm.single_dose=this.drugSpec[0].single_dose
+       this.templateForm.single_dose_unit=this.drugSpec[0].min_unit
+       this.templateForm.delivery_way=this.drugSpec[0].delivery_way
+       this.templateForm.execution_frequency=this.drugSpec[0].execution_frequency
+       // console.log("templateForm2222222222",this.templateForm)
+       // console.log("all_drug",this.all_drug)
+       // console.log("drugSpec2222222",this.drugSpec)
       this.templateForm.way = 1
       this.templateForm.drug_id = val.id
-    }
+    },
+      closeform(){//清除表单数据
+        this.templateForm.advice_name=""
+        this.templateForm.advice_desc=""
+        this.templateForm.drug_spec_unit=""
+        this.templateForm.prescribing_number=""
+        this.templateForm.prescribing_number_unit=""
+        this.templateForm.single_dose=""
+        this.templateForm.single_dose_unit=""
+        this.templateForm.delivery_way=""
+        this.templateForm.execution_frequency=""
+      }
     }
   }
 </script>

src/xt_pages/stock/warehouseManage/components/AddWareHouse.vue

@@ -71,7 +71,7 @@ export default {
         date2: "",
         delivery: false,
         type: [],
-        status: "",
+        status: 1,
         address: "",
       },
       //表单验证规则
@@ -171,7 +171,7 @@ export default {
       this.ruleForm.date1 = "";
       this.ruleForm.date2 = "";
       this.ruleForm.type = [];
-      this.ruleForm.status = "";
+      this.ruleForm.status = 1;
       this.ruleForm.address = "";
     },
 
@@ -194,13 +194,14 @@ export default {
                 this.$emit("init");
               } else {
                 this.$message.error("新增失败：" + res.data.msg);
-                setTimeout(() => {
-                  this.closePop();
-                }, 2000);
+                // setTimeout(() => {
+                //   this.closePop();
+                // }, 2000);
+                this.dialogVisible = true
               }
             });
           } else {
-            return false;
+            // return false;
           }
         });
       } else if (this.show_type == 2) {

src/xt_pages/supply/components/addSupply.vue

@@ -436,9 +436,10 @@ export default {
                     this.$emit("init");
                   } else {
                     this.$message.error("新增失败：" + res.data.msg);
-                    setTimeout(() => {
-                      this.closePop();
-                    }, 2000);
+                    // setTimeout(() => {
+                    //   this.closePop();
+                    // }, 2000);
+                    // return true;
                   }
                 });
               } else {
@@ -449,7 +450,8 @@ export default {
             return false;
           }
         });
-      } else if (this.show_type == 2) {
+      }
+      else if (this.show_type == 2) {
         this.$refs[supplier].validate((valid) => {
           if (valid) {
             this.$refs[formName].validate((valid) => {