Merge branch 'superman' of http://git.shengws.com:3000/zhangbj/xt_vue into superman

src/xt_pages/data/components/table.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="" style="margin-right:20px;">  
+  <div class="" style="margin-right:20px;">
     <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row @current-change="handleRowChange"
       >
       <el-table-column  align="center" label="名称">
@@ -211,16 +211,13 @@ export default {
             const result = response.data.data.dataconfig
             // 更新store
             store.dispatch('updateConfigList',result).then(() => {
-           
+
             })
 
             this.dialogFormVisible = false
-            this.$notify({
-              title: '成功',
-              message: '创建成功',
-              type: 'success',
-              duration: 2000
-            })
+
+            this.$message.success("创建成功")
+
           })
         }
       })
@@ -248,23 +245,17 @@ export default {
               }
             }
             this.dialogFormVisible = false
-            this.$notify({
-              title: '成功',
-              message: '更新成功',
-              type: 'success',
-              duration: 2000
-            })
+
+            this.$message.success("更新成功")
+
           })
         }
       })
     },
     handleDelete(row) {
-      this.$notify({
-        title: '成功',
-        message: '删除成功',
-        type: 'success',
-        duration: 2000
-      })
+
+      this.$message.success("删除成功")
+
       const index = this.list.indexOf(row)
       this.list.splice(index, 1)
     },

src/xt_pages/data/components/tableson.vue

@@ -4,7 +4,7 @@
       <el-button class="filter-item" size="small" :disabled="addState"  @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
     </div>
 
-    <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row 
+    <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row
       style="width: 100%;min-height:500px;">
       <el-table-column  align="center" label="名称">
         <template slot-scope="scope">
@@ -22,7 +22,7 @@
           <el-button icon="el-icon-delete" v-if="scope.row.status!='deleted'" size="small" type="danger" @click="handleModifyStatus(scope.row,'deleted')">
           </el-button>
          </el-tooltip>
-         
+
         </template>
       </el-table-column>
     </el-table>
@@ -291,16 +291,11 @@ export default {
             // this.list.unshift(tempval)
             // 更新store
             store.dispatch("updateChildConfigList", [result, "create"]).then(() => {
-               
+
             });
 
             this.dialogFormVisible = false;
-            this.$notify({
-              title: "成功",
-              message: "创建成功",
-              type: "success",
-              duration: 2000
-            });
+           this.$message.success("创建成功")
           });
         }
       });
@@ -328,27 +323,19 @@ export default {
 
             const result = response.data.data.dataconfig;
             store.dispatch("updateChildConfigList", [result, "update"]).then(() => {
-             
+
             });
 
             this.dialogFormVisible = false;
-            this.$notify({
-              title: "成功",
-              message: "更新成功",
-              type: "success",
-              duration: 2000
-            });
+
+            this.$message.success("更新成功")
+
           });
         }
       });
     },
     handleDelete(row) {
-      this.$notify({
-        title: "成功",
-        message: "删除成功",
-        type: "success",
-        duration: 2000
-      });
+      this.$message.success("删除成功")
       const index = this.list.indexOf(row);
       this.list.splice(index, 1);
     },

src/xt_pages/data/components/templateTable.vue

@@ -29,7 +29,7 @@
             <el-button icon="el-icon-delete" v-if="scope.row.status!='deleted'" size="small" type="danger" @click="handleModifyStatus(scope.row,'deleted')">
             </el-button>
           </el-tooltip>
-          
+
 
         </template>
       </el-table-column>
@@ -258,16 +258,12 @@ export default {
             const result = response.data.data.dataconfig
             // 更新store
             store.dispatch('updateConfigList',result).then(() => {
-           
+
             })
 
             this.dialogFormVisible = false
-            this.$notify({
-              title: '成功',
-              message: '创建成功',
-              type: 'success',
-              duration: 2000
-            })
+
+            this.$message.success("创建成功")
           })
         }
       })
@@ -299,23 +295,16 @@ export default {
               });
 
             this.dialogFormVisible = false;
-            this.$notify({
-              title: "成功",
-              message: "更新成功",
-              type: "success",
-              duration: 2000
-            });
+
+            this.$message.success("更新成功")
           });
         }
       });
     },
     handleDelete(row) {
-      this.$notify({
-        title: '成功',
-        message: '删除成功',
-        type: 'success',
-        duration: 2000
-      })
+
+      this.$message.success("删除成功")
+
       const index = this.list.indexOf(row)
       this.list.splice(index, 1)
     },

src/xt_pages/data/druguseTemplate.vue

@@ -1203,6 +1203,7 @@
         this.isEdit = false;
         this.parent_id = 0;
         this.isAddChild = false
+        this.templateTableVisible = false
         this.templateFormVisible = true;
 
       }, deleteRecordAction: function () {
@@ -1271,12 +1272,9 @@
             return false;
           } else {
 
-            this.$notify({
-              title: "成功",
-              message: "添加模版成功",
-              type: "success",
-              duration: 2000
-            });
+
+            this.$message.success("添加模版成功")
+
 
             var template = response.data.data.template
             if (template.DoctorAdviceTemplate.length > 0) {
@@ -1318,12 +1316,7 @@
                 this.$message.error(response.data.msg);
                 return false;
               } else {
-                this.$notify({
-                  title: "成功",
-                  message: "医嘱模板已经删除",
-                  type: "success",
-                  duration: 2000
-                });
+                this.$message.success("删除成功")
                 this.drugdics.splice(index, 1);
               }
             });
@@ -1343,12 +1336,8 @@
                 this.$message.error(response.data.msg);
                 return false;
               } else {
-                this.$notify({
-                  title: "成功",
-                  message: "医嘱模板已经删除",
-                  type: "success",
-                  duration: 2000
-                });
+                
+                this.$message.success("删除成功")
 
                 // console.log(this.adviceTemplates.length)
                 // for(let i = 0;i < this.adviceTemplates.length; i++){
@@ -1373,12 +1362,9 @@
                     this.$message.error(response.data.msg);
                     return false;
                   } else {
-                    this.$notify({
-                      title: "成功",
-                      message: "修改成功",
-                      type: "success",
-                      duration: 2000
-                    });
+
+                    this.$message.success("修改成功")
+
                     this.drugdicFormVisible = false;
                     this.resetForm(formName);
                     var drugdic = response.data.data.drugdic;
@@ -1402,12 +1388,9 @@
                   this.$message.error(response.data.msg);
                   return false;
                 } else {
-                  this.$notify({
-                    title: "成功",
-                    message: "添加成功",
-                    type: "success",
-                    duration: 2000
-                  });
+
+                  this.$message.success("添加成功")
+
                   this.drugdicFormVisible = false;
                   this.resetForm(formName);
                   this.drugdics.unshift(response.data.data.drugdic);
@@ -1451,12 +1434,8 @@
                   this.$message.error(response.data.msg);
                   return false;
                 } else {
-                  this.$notify({
-                    title: "成功",
-                    message: "添加成功",
-                    type: "success",
-                    duration: 2000
-                  });
+
+                  this.$message.success("添加成功")
 
                   var spliceIndex = -1;
                   for (let index = this.adviceTemplates.length - 1; ; index--) {
@@ -1564,12 +1543,9 @@
                     this.$message.error(response.data.msg);
                     return false;
                   } else {
-                    this.$notify({
-                      title: "成功",
-                      message: "修改成功",
-                      type: "success",
-                      duration: 2000
-                    });
+
+                    this.$message.success("修改成功")
+
                     this.drugwayFormVisible = false;
                     this.resetForm(formName);
                     var drugway = response.data.data.drugway;
@@ -1587,12 +1563,8 @@
                   this.$message.error(response.data.msg);
                   return false;
                 } else {
-                  this.$notify({
-                    title: "成功",
-                    message: "添加成功",
-                    type: "success",
-                    duration: 2000
-                  });
+
+                  this.$message.success("添加成功")
                   this.drugwayFormVisible = false;
                   this.resetForm(formName);
                   this.drugways.unshift(response.data.data.drugway);
@@ -1615,12 +1587,9 @@
                 this.$message.error(response.data.msg);
                 return false;
               } else {
-                this.$notify({
-                  title: "成功",
-                  message: "给药途径已经删除",
-                  type: "success",
-                  duration: 2000
-                });
+
+                this.$message.success("删除成功")
+
                 this.drugways.splice(index, 1);
               }
             });
@@ -1658,12 +1627,9 @@
                     this.$message.error(response.data.msg);
                     return false;
                   } else {
-                    this.$notify({
-                      title: "成功",
-                      message: "修改成功",
-                      type: "success",
-                      duration: 2000
-                    });
+
+                    this.$message.success("修改成功")
+
                     this.efFormVisible = false;
                     this.resetForm(formName);
                     var ef = response.data.data.ef;
@@ -1683,12 +1649,9 @@
                   this.$message.error(response.data.msg);
                   return false;
                 } else {
-                  this.$notify({
-                    title: "成功",
-                    message: "添加成功",
-                    type: "success",
-                    duration: 2000
-                  });
+
+                  this.$message.error("添加成功");
+
                   this.efFormVisible = false;
                   this.resetForm(formName);
                   this.executionFrequencyOptions.unshift(response.data.data.ef);
@@ -1711,12 +1674,9 @@
                 this.$message.error(response.data.msg);
                 return false;
               } else {
-                this.$notify({
-                  title: "成功",
-                  message: "执行频率已经删除",
-                  type: "success",
-                  duration: 2000
-                });
+
+                this.$message.error("删除成功");
+
                 this.executionFrequencyOptions.splice(index, 1);
               }
             });
@@ -1771,6 +1731,7 @@
         }
         return true;
       }, cancelEditHandle() {
+        this.templateTableVisible = true
         this.templateEditFormVisible = false;
       }, submitEditTemplate(formName) {
         this.$refs[formName].validate(valid => {
@@ -1790,12 +1751,8 @@
                   this.$message.error(response.data.msg);
                   return false;
                 } else {
-                  this.$notify({
-                    title: "成功",
-                    message: "修改成功",
-                    type: "success",
-                    duration: 2000
-                  });
+
+                  this.$message.success("修改成功")
                   this.templateEditFormVisible = false;
                   this.resetForm(formName);
                   var template = response.data.data.template;
@@ -1860,12 +1817,10 @@
               this.$message.error(response.data.msg);
               return false;
             } else {
-              this.$notify({
-                title: "成功",
-                message: "医嘱模板已经删除",
-                type: "success",
-                duration: 2000
-              });
+
+
+              this.$message.success("删除成功")
+
 
               for (let i = 0; i < this.adviceTemplates.length; i++) {
                 console.log(this.adviceTemplates[i].id)
@@ -1939,12 +1894,9 @@
             this.resetForm(formName);
             this.templateFormTwoVisible = false
 
-            this.$notify({
-              title: "成功",
-              message: "添加成功",
-              type: "success",
-              duration: 2000
-            });
+
+            this.$message.success("添加成功")
+
 
             return false;
           }
@@ -1973,12 +1925,10 @@
                   this.$message.error(response.data.msg);
                   return false;
                 } else {
-                  this.$notify({
-                    title: "成功",
-                    message: "修改成功",
-                    type: "success",
-                    duration: 2000
-                  });
+
+                  this.$message.success("修改成功")
+
+
                   this.templateEditFormTwoVisible = false;
                   this.resetForm(formName);
                   var template = response.data.data.template;
@@ -2102,12 +2052,9 @@
               this.$message.error(response.data.msg);
               return false;
             } else {
-              this.$notify({
-                title: "成功",
-                message: "医嘱已经删除",
-                type: "success",
-                duration: 2000
-              });
+
+              this.$message.success("删除成功")
+
 
               if (row.parent_id > 0) { //删除子医嘱
                 this.adviceTemplates.splice(index, 1)
@@ -2162,12 +2109,9 @@
               this.$message.error(response.data.msg);
               return false;
             } else {
-              this.$notify({
-                title: "成功",
-                message: "医嘱已经删除",
-                type: "success",
-                duration: 2000
-              });
+
+              this.$message.success("删除成功")
+
 
               if (row.parent_id > 0) { //删除子医嘱
                 this.adviceTemplates.splice(index, 1)
@@ -2294,12 +2238,9 @@
             this.$message.error(response.data.msg);
             return false;
           } else {
-            this.$notify({
-              title: "成功",
-              message: "修改成功",
-              type: "success",
-              duration: 2000
-            });
+
+            this.$message.success("修改成功")
+
             this.templateTableTwoVisible = false;
 
             for (let i = 0; i < this.adviceTemplates.length; i++) {

src/xt_pages/data/index.vue

@@ -2,7 +2,6 @@
 <div class="main-contain">
   <div class="position">
     <bread-crumb :crumbs='crumbs'></bread-crumb>
-
   </div>
   <div class="app-container">
     <el-tabs  v-model="activeName" >
@@ -47,7 +46,7 @@ export default {
   methods: {
     showCreatedTimes() {
       this.createdTimes = this.createdTimes + 1
-    }
+    },
   }
 }
 </script>

src/xt_pages/device/components/device_info/device_info_form.vue

@@ -374,7 +374,7 @@ export default {
         }
     },
     created() {
-        
+
     },
     methods: {
         clear() {
@@ -405,7 +405,8 @@ export default {
             this.form.reverse_osmosis_mode = ''
         },
         set_device_id: function(device_id) {
-            if (device_id > 0) {
+
+          if (device_id > 0) {
                 this.device_id = device_id
                 getDeviceBaseInfo(device_id).then(rs => {
                     var resp = rs.data
@@ -436,7 +437,7 @@ export default {
                         this.form.working_time = device_info.working_time == 0 ? '' : device_info.working_time
                         if (this.form.device_type == 1) {
                             // treatment_mode: []
-                            
+
                         } else if (this.form.device_type == 2) {
                             // reverse_osmosis_mode: ''
                         }
@@ -445,7 +446,7 @@ export default {
                         this.$message.error(resp.msg)
                     }
                 })
-                
+
             } else {
                 this.clear()
             }

src/xt_pages/device/components/device_info/device_info_pane.vue

@@ -1,8 +1,8 @@
 <template>
     <div>
-        <div style="padding-top: 10px;">
-            <device-info-form ref="device_info_form" :device_numbers="device_numbers" @did_update="did_update_device"></device-info-form>
-        </div>
+      <div style="padding-top: 10px;">
+         <device-info-form ref="device_info_form" :device_numbers="device_numbers" @did_update="did_update_device"></device-info-form>
+      </div>
         <div style="text-align: right; padding-right: 25px; padding-top: 10px; padding-bottom: 10px;">
             <el-button type="primary" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" @click="modify_submit">保 存</el-button>
         </div>
@@ -25,7 +25,7 @@ export default {
     },
     methods: {
         set_device_id: function(device_id) {
-            this.$refs.device_info_form.set_device_id(device_id)
+          this.$refs.device_info_form.set_device_id(device_id)
         },
         modify_submit: function() {
             this.$refs.device_info_form.update_device_submit()
@@ -58,7 +58,7 @@ export default {
     height: 32px;
     line-height: 32px;
     display: block;
-    
+
 }
 .required_span {
     color: red;

src/xt_pages/device/components/device_info/edit_device_info_form.vue

@@ -0,0 +1,599 @@
+<template>
+  <div class="main">
+    <!-- 第一行 -->
+    <el-row>
+      <el-col :span="8">
+        <div class="col_div">
+          <el-col :span="layout.first_line_label">
+            <span class="col_label_span"><span class="required_span">*&nbsp;</span>序列号:</span>
+          </el-col>
+          <el-col :span="layout.first_line_content">
+            <el-input size="small" v-model="form.serial_number"></el-input>
+          </el-col>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="col_div">
+          <el-col :span="layout.second_line_label">
+            <span class="col_label_span"><span class="required_span">*&nbsp;</span>设备类型:</span>
+          </el-col>
+          <el-col :span="layout.second_line_content" >
+            <el-select v-model="form.device_type" size="small" :disabled="device_id != 0" style="width:100%;">
+              <el-option v-for="item in device_types" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-col>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="col_div">
+          <el-col :span="layout.third_line_label">
+            <span class="col_label_span">床位号:</span>
+          </el-col>
+          <el-col :span="layout.third_line_content">
+            <el-select v-model="form.device_number_id" clearable size="small" style="width:100%;">
+              <el-option v-for="item in device_numbers" :key="item.id" :label="item.number" :value="item.id"></el-option>
+            </el-select>
+          </el-col>
+        </div>
+      </el-col>
+    </el-row>
+    <!-- 第二行 -->
+    <el-row>
+      <el-col :span="8">
+        <div class="col_div">
+          <el-col :span="layout.first_line_label">
+            <span class="col_label_span"><span class="required_span">*&nbsp;</span>设备名称:</span>
+          </el-col>
+          <el-col :span="layout.first_line_content">
+            <el-input size="small" v-model="form.name"></el-input>
+          </el-col>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="col_div">
+          <el-col :span="layout.second_line_label">
+            <span class="col_label_span">生产厂家:</span>
+          </el-col>
+          <el-col :span="layout.second_line_content">
+            <el-input size="small" v-model="form.manufacturer"></el-input>
+          </el-col>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="col_div">
+          <el-col :span="layout.third_line_label">
+            <span class="col_label_span">维修厂家:</span>
+          </el-col>
+          <el-col :span="layout.third_line_content">
+            <el-input size="small" v-model="form.repair_factory"></el-input>
+          </el-col>
+        </div>
+      </el-col>
+    </el-row>
+    <!-- 第三行 -->
+    <el-row>
+      <el-col :span="8">
+        <div class="col_div">
+          <el-col :span="layout.first_line_label">
+            <span class="col_label_span">设备型号:</span>
+          </el-col>
+          <el-col :span="layout.first_line_content">
+            <el-input size="small" v-model="form.model"></el-input>
+          </el-col>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="col_div">
+          <el-col :span="layout.second_line_label">
+            <span class="col_label_span">使用科室:</span>
+          </el-col>
+          <el-col :span="layout.second_line_content">
+            <el-input size="small" v-model="form.department"></el-input>
+          </el-col>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="col_div">
+          <el-col :span="layout.third_line_label">
+            <span class="col_label_span">科室编号:</span>
+          </el-col>
+          <el-col :span="layout.third_line_content">
+            <el-input size="small" v-model="form.department_number"></el-input>
+          </el-col>
+        </div>
+      </el-col>
+    </el-row>
+    <!-- 第四行 -->
+    <el-row>
+      <el-col :span="8">
+        <div class="col_div">
+          <el-col :span="layout.first_line_label">
+            <span class="col_label_span">购买日期:</span>
+          </el-col>
+          <el-col :span="layout.first_line_content">
+            <el-date-picker v-model="form.purchase_date" type="date" value-format="timestamp" size="small" style="width: 100%;"></el-date-picker>
+          </el-col>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="col_div">
+          <el-col :span="layout.second_line_label">
+            <span class="col_label_span">安装日期:</span>
+          </el-col>
+          <el-col :span="layout.second_line_content">
+            <el-date-picker v-model="form.install_date" type="date" value-format="timestamp" size="small" style="width: 100%;"></el-date-picker>
+          </el-col>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="col_div">
+          <el-col :span="layout.third_line_label">
+            <span class="col_label_span">启用日期:</span>
+          </el-col>
+          <el-col :span="layout.third_line_content">
+            <el-date-picker v-model="form.commissioning_date" value-format="timestamp" type="date" size="small" style="width: 100%;"></el-date-picker>
+          </el-col>
+        </div>
+      </el-col>
+    </el-row>
+    <!-- 第五行 -->
+    <el-row>
+      <el-col :span="8">
+        <div class="col_div">
+          <el-col :span="layout.first_line_label">
+            <span class="col_label_span">维修工程师:</span>
+          </el-col>
+          <el-col :span="layout.first_line_content">
+            <el-input size="small" v-model="form.maintainer"></el-input>
+          </el-col>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="col_div">
+          <el-col :span="layout.second_line_label">
+            <span class="col_label_span">联系电话:</span>
+          </el-col>
+          <el-col :span="layout.second_line_content">
+            <el-input size="small" v-model="form.maintenance_call"></el-input>
+          </el-col>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="col_div">
+          <el-col :span="layout.third_line_label">
+            <span class="col_label_span">保修期限:</span>
+          </el-col>
+          <el-col :span="layout.third_line_content">
+            <el-input size="small" v-model="form.warranty_period"></el-input>
+          </el-col>
+        </div>
+      </el-col>
+    </el-row>
+    <!-- 第六行 -->
+    <!-- <el-row>
+        <el-col :span="8">
+            <div class="col_div">
+                <el-col :span="9">
+                    <span class="col_label_span">机器状态:</span>
+                </el-col>
+                <el-col :span="15">
+                    <el-select v-model="form.device_status" clearable size="small">
+                        <el-option v-for="item in device_states" :key="item.state" :label="item.name" :value="item.state"></el-option>
+                    </el-select>
+                </el-col>
+            </div>
+        </el-col>
+        <el-col :span="8">
+            <div class="col_div">
+                <el-col :span="10">
+                    <span class="col_label_span">初始使用次数:</span>
+                </el-col>
+                <el-col :span="14">
+                    <el-input v-model="form.initial_use_times" style="width: 100%;"></el-input>
+                </el-col>
+            </div>
+        </el-col>
+        <el-col :span="8">
+            <div class="col_div">
+                <el-col :span="7">
+                    <span class="col_label_span">备&nbsp;&nbsp;&nbsp;注:</span>
+                </el-col>
+                <el-col :span="17">
+                    <el-input size="small" v-model="form.mark"></el-input>
+                </el-col>
+            </div>
+        </el-col>
+    </el-row> -->
+    <!-- 第七行 -->
+    <!-- <el-row>
+        <el-col :span="7">
+            <div class="col_div">
+                <el-col :span="8">
+                    <span class="col_label_span">报废日期:</span>
+                </el-col>
+                <el-col :span="16">
+                    <el-date-picker v-model="form.retirement_date" type="date" value-format="timestamp" size="small" style="width: 140px;"></el-date-picker>
+                </el-col>
+            </div>
+        </el-col>
+        <el-col :span="7">
+            <div class="col_div">
+                <el-col :span="8">
+                    <span class="col_label_span">报废原因:</span>
+                </el-col>
+                <el-col :span="16">
+                    <el-select v-model="form.retirement_reason" clearable size="small">
+                        <el-option v-for="item in retirement_reasons" :key="item.id" :label="item.reason" :value="item.reason"></el-option>
+                    </el-select>
+                </el-col>
+            </div>
+        </el-col>
+        <el-col :span="5">
+            <div class="col_div">
+                <el-col :span="15">
+                    <span class="col_label_span">使用年限(年):</span>
+                </el-col>
+                <el-col :span="9">
+                    <el-input size="small" v-model="form.service_life"></el-input>
+                </el-col>
+            </div>
+        </el-col>
+        <el-col :span="5">
+            <div class="col_div">
+                <el-col :span="14">
+                    <span class="col_label_span">工作时长(h):</span>
+                </el-col>
+                <el-col :span="10">
+                    <el-input size="small" v-model="form.working_time"></el-input>
+                </el-col>
+            </div>
+        </el-col>
+    </el-row> -->
+    <!-- 治疗模式 -->
+    <el-row v-show="false && form.device_type === 1">
+      <el-col :span="24">
+        <div class="col_div">
+          <el-col :span="3">
+            <div style="padding-left: 5px;">
+              <span class="col_label_span" style="line-height: auto; padding-left: 0; text-align: left;">治疗模式:</span>
+              <el-checkbox label="全选"></el-checkbox>
+            </div>
+          </el-col>
+          <el-col :span="21">
+            <div style="margin-top: 6px;"></div>
+            <el-checkbox-group v-model="form.treatment_mode">
+              <el-checkbox v-for="item in cure_types" :label="item.id" :key="item.id" :value="item.id">{{ item.name }}</el-checkbox>
+            </el-checkbox-group>
+          </el-col>
+        </div>
+      </el-col>
+    </el-row>
+    <!-- 反渗模式 -->
+    <el-row v-show="false && form.device_type === 2">
+      <el-col :span="8">
+        <div class="col_div">
+          <el-col :span="layout.first_line_label">
+            <span class="col_label_span">反渗模式:</span>
+          </el-col>
+          <el-col :span="layout.first_line_content">
+            <el-select v-model="form.reverse_osmosis_mode" clearable size="small">
+              <el-option v-for="item in reverse_osmosises" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-col>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import {getDeviceBaseInfo, createDevice, modifyDeviceBaseInfo} from '@/api/device/device'
+
+  export default {
+    name: "EditDeviceInfoForm",
+    data() {
+      return {
+        layout: {
+          first_line_label: 8,
+          first_line_content: 16,
+          second_line_label: 8,
+          second_line_content: 16,
+          third_line_label: 8,
+          third_line_content: 16,
+        },
+        device_id: 0,
+        form: {
+          device_type: 1,
+          serial_number: '',
+          name: '',
+          device_number_id: '',
+          manufacturer: '',
+          repair_factory: '',
+          model: '',
+          department: '',
+          department_number: '',
+          purchase_date: '',
+          install_date: '',
+          commissioning_date: '',
+          maintainer: '',
+          maintenance_call: '',
+          warranty_period: '',
+          device_status: '',
+          initial_use_times: '',
+          mark: '',
+          retirement_date: '',
+          retirement_reason: '',
+          service_life: '',
+          working_time: '',
+          treatment_mode: [], // 治疗模式
+          reverse_osmosis_mode: '', // 反渗模式
+        },
+        device_types: [
+          { id: 1, name: "透析机" },
+          // { id: 2, name: "水处理机" },
+        ],
+        cure_types: [ // 治疗模式
+          // { id:1, name: "HD" },
+          // { id:2, name: "HDF" },
+          // { id:3, name: "HD+HP" },
+          // { id:4, name: "HP" },
+          // { id:5, name: "HF" },
+          // { id:10, name: "HD" },
+          // { id:20, name: "HDF" },
+          // { id:30, name: "HD+HP" },
+          // { id:40, name: "HP" },
+          // { id:50, name: "HF" },
+          // { id:300, name: "HD+HP" },
+        ],
+        reverse_osmosises: [ // 反渗模式
+          // { id:1, name: "单级反渗" }
+        ],
+        device_states: [
+          { state: 1, name: '使用机' },
+          { state: 2, name: '备用机' },
+          { state: 3, name: '急诊机' },
+          { state: 4, name: '报废机' },
+        ],
+        retirement_reasons: [
+          { id: 1, reason: '报废原因1' },
+          { id: 2, reason: '报废原因2' },
+          { id: 3, reason: '报废原因3' },
+          { id: 4, reason: '报废原因4' },
+          { id: 5, reason: '其他' },
+        ]
+      }
+    },
+    props: {
+      // device_id: {
+      //     type: Number,
+      //     require: false,
+      // },
+      device_numbers: {
+        type: Array,
+        require: true,
+      }
+    },
+    created() {
+
+    },
+    methods: {
+      clear() {
+        this.device_id = 0
+        this.form.device_type = 1
+        this.form.serial_number = ''
+        this.form.name = ''
+        this.form.device_number_id = ''
+        this.form.manufacturer = ''
+        this.form.repair_factory = ''
+        this.form.model = ''
+        this.form.department = ''
+        this.form.department_number = ''
+        this.form.purchase_date = 0
+        this.form.install_date = 0
+        this.form.commissioning_date = 0
+        this.form.maintainer = ''
+        this.form.maintenance_call = ''
+        this.form.warranty_period = ''
+        this.form.device_status = ''
+        this.form.initial_use_times = ''
+        this.form.mark = ''
+        this.form.retirement_date = 0
+        this.form.retirement_reason = ''
+        this.form.service_life = ''
+        this.form.working_time = ''
+        this.form.treatment_mode = []
+        this.form.reverse_osmosis_mode = ''
+      },
+      set_device_id: function(device_id) {
+        console.log(device_id+"-----")
+        if (device_id > 0) {
+          this.device_id = device_id
+          getDeviceBaseInfo(device_id).then(rs => {
+            var resp = rs.data
+            if (resp.state === 1) {
+              this.form.device_type = resp.data.device_type
+              this.form.device_number_id = resp.data.device_number_id == 0 ? '' : resp.data.device_number_id
+
+              var device_info = resp.data.device_info
+              this.form.serial_number = device_info.serial_number
+              this.form.name = device_info.name
+              this.form.manufacturer = device_info.manufacturer
+              this.form.repair_factory = device_info.repair_factory
+              this.form.model = device_info.model
+              this.form.department = device_info.department
+              this.form.department_number = device_info.department_number
+              this.form.purchase_date = device_info.purchase_date == 0 ? '' : (device_info.purchase_date * 1000)
+              this.form.install_date = device_info.install_date == 0 ? '' : (device_info.install_date * 1000)
+              this.form.commissioning_date = device_info.commissioning_date == 0 ? '' : (device_info.commissioning_date * 1000)
+              this.form.maintainer = device_info.maintainer
+              this.form.maintenance_call = device_info.maintenance_call
+              this.form.warranty_period = device_info.warranty_period
+              this.form.device_status = device_info.device_status == 0 ? '' : device_info.device_status
+              this.form.initial_use_times = device_info.initial_use_times == 0 ? '' : device_info.initial_use_times
+              this.form.mark = device_info.mark
+              this.form.retirement_date = device_info.retirement_date == 0 ? '' : (device_info.retirement_date * 1000)
+              this.form.retirement_reason = device_info.retirement_reason
+              this.form.service_life = device_info.service_life == 0 ? '' : device_info.service_life
+              this.form.working_time = device_info.working_time == 0 ? '' : device_info.working_time
+              if (this.form.device_type == 1) {
+                // treatment_mode: []
+
+              } else if (this.form.device_type == 2) {
+                // reverse_osmosis_mode: ''
+              }
+
+            } else {
+              this.$message.error(resp.msg)
+            }
+          })
+
+        } else {
+          this.clear()
+        }
+      },
+      create_device_submit() {
+        var checkErr = this._check_submit()
+        if (checkErr.length > 0) {
+          this.$message.error(checkErr)
+          return
+        }
+
+        var params = new Object()
+        params.type = this.form.device_type
+        params.serial_number = this.form.serial_number
+        params.name = this.form.name
+        params.device_number_id = this.form.device_number_id
+        params.manufacturer = this.form.manufacturer
+        params.repair_factory = this.form.repair_factory
+        params.model = this.form.model
+        params.department = this.form.department
+        params.department_number = this.form.department_number
+        params.purchase_date = typeof this.form.purchase_date == 'string' ? 0 : (this.form.purchase_date / 1000)
+        params.install_date = typeof this.form.install_date == 'string' ? 0 : (this.form.install_date / 1000)
+        params.commissioning_date = typeof this.form.commissioning_date == 'string' ? 0 : (this.form.commissioning_date / 1000)
+        params.maintainer = this.form.maintainer
+        params.maintenance_call = this.form.maintenance_call
+        params.warranty_period = this.form.warranty_period
+        params.device_status = this.form.device_status
+        params.initial_use_times = this.form.initial_use_times
+        params.mark = this.form.mark
+        params.retirement_date = typeof this.form.retirement_date == 'string' ? 0 : (this.form.retirement_date / 1000)
+        params.retirement_reason = this.form.retirement_reason
+        params.service_life = this.form.service_life
+        params.working_time = this.form.working_time
+        // params.treatment_mode = this.form.treatment_mode
+        // params.reverse_osmosis_mode = this.form.reverse_osmosis_mode
+        createDevice(params).then(rs => {
+          var resp = rs.data
+          if (resp.state === 1) {
+            var device = resp.data.device
+            this.$emit('did_create', device)
+            this.$message({message: "创建成功", type: "success"})
+
+          } else {
+            this.$message.error(resp.msg)
+          }
+        })
+      },
+      update_device_submit() {
+        var checkErr = this._check_submit()
+        if (checkErr.length > 0) {
+          this.$message.error(checkErr)
+          return
+        }
+
+        var params = new Object()
+        params.device_id = this.device_id
+        params.serial_number = this.form.serial_number
+        params.name = this.form.name
+        params.device_number_id = this.form.device_number_id
+        params.manufacturer = this.form.manufacturer
+        params.repair_factory = this.form.repair_factory
+        params.model = this.form.model
+        params.department = this.form.department
+        params.department_number = this.form.department_number
+        params.purchase_date = typeof this.form.purchase_date == 'string' ? 0 : (this.form.purchase_date / 1000)
+        params.install_date = typeof this.form.install_date == 'string' ? 0 : (this.form.install_date / 1000)
+        params.commissioning_date = typeof this.form.commissioning_date == 'string' ? 0 : (this.form.commissioning_date / 1000)
+        params.maintainer = this.form.maintainer
+        params.maintenance_call = this.form.maintenance_call
+        params.warranty_period = this.form.warranty_period
+        params.device_status = this.form.device_status
+        params.initial_use_times = this.form.initial_use_times
+        params.mark = this.form.mark
+        params.retirement_date = typeof this.form.retirement_date == 'string' ? 0 : (this.form.retirement_date / 1000)
+        params.retirement_reason = this.form.retirement_reason
+        params.service_life = this.form.service_life
+        params.working_time = this.form.working_time
+        // params.treatment_mode = this.form.treatment_mode
+        // params.reverse_osmosis_mode = this.form.reverse_osmosis_mode
+        modifyDeviceBaseInfo(params).then(rs => {
+          var resp = rs.data
+          if (resp.state === 1) {
+            var device = resp.data.device
+            this.$emit('did_update', device)
+            this.$message({message: "保存成功", type: "success"})
+
+          } else {
+            this.$message.error(resp.msg)
+          }
+        })
+      },
+      _check_submit() {
+        if (this.form.serial_number.length == 0) {
+          return "请填写设备序列号"
+        }
+        if (this.form.device_type !== 1 && this.form.device_type !== 2) {
+          return "请选择设备类型"
+        }
+        if (this.form.name.length == 0) {
+          return "请填写设备名"
+        }
+        if (this.form.maintenance_call.length > 0) {
+          if (/^(0\d{2,3}-?\d{7,8}$)|(1\d{10}$)/.test(this.form.maintenance_call) == false) {
+            return "联系电话格式错误"
+          }
+        }
+        return ""
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .main {
+    width: 100%;
+  }
+  .main .el-row {
+    /* border-bottom: 1px solid rgb(233, 233, 233); */
+    /* padding-left: 5px; */
+    padding-right: 5px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+  }
+  .col_div {
+    width: 100%;
+  }
+  .col_label_span {
+    padding-left: 0px;
+    padding-right: 5px;
+    font-size: 14px;
+    height: 32px;
+    line-height: 32px;
+    /* display: block; */
+    display: inline-block;
+    width: 100%;
+    text-align: right;
+    /* padding-right: 5px; */
+  }
+  .required_span {
+    color: red;
+  }
+
+  .el-checkbox {
+    margin-bottom: 5px;
+  }
+  .el-checkbox+.el-checkbox {
+    margin-left: 15px;
+  }
+</style>

src/xt_pages/device/components/device_list.vue

@@ -1,154 +1,182 @@
 <template>
-    <div>
-        <el-row>
-            <el-col :span="24">
-                    <el-button size="small" icon="el-icon-circle-plus-outline" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="add_device_action">新增</el-button>
-                    <el-button size="small" icon="el-icon-delete" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="danger" @click="delete_device_action">删除</el-button>
-            </el-col>
-        </el-row>
+  <div>
+    <el-row>
+      <el-col :span="24">
+        <el-table :data="devices" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+                  :highlight-current-row="true">
+          <el-table-column label="序列号" prop="serial_number" align="center" header-align="center"></el-table-column>
+          <el-table-column label="设备名" prop="name" align="center" header-align="center"></el-table-column>
+          <el-table-column label="型号" prop="model" align="center" header-align="center"></el-table-column>
+          <el-table-column label="操作" align="center" fixed="right" width="150">
+            <template slot-scope="scope">
+              <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+                <el-button
+                  size="small"
+                  type="primary"
+                  icon="el-icon-edit-outline"
+                  @click="handleEdit(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                <el-button
+                  size="small"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click="delete_device_action(scope.$index, scope.row)">
+                </el-button>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
 
-        <el-row>
-            <el-col :span="24">
-                <el-table :data="devices" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :highlight-current-row="true" @row-click="select_row">
-                    <el-table-column label="序列号" prop="serial_number" align="center" header-align="center"></el-table-column>
-                    <el-table-column label="设备名" prop="name" align="center" header-align="center"></el-table-column>
-                    <el-table-column label="型号" prop="model" align="center" header-align="center"></el-table-column>
-                </el-table>
-            </el-col>
-        </el-row>
+    <add-device-dialog ref="new_device_dialog" :device_numbers="device_numbers"
+                       @did_create_device="didCreateDevice"></add-device-dialog>
+    <edit-device-dialog ref="edit_device_dialog" :device_numbers="device_numbers"
+                        @did_update="update_device"></edit-device-dialog>
+    <partition-dialog ref="new_partition_dialog" :zones="zones" :device_numbers="device_numbers"
+                      :groups="groups"></partition-dialog>
+  </div>
 
-        <add-device-dialog ref="new_device_dialog" :device_numbers="device_numbers" @did_create_device="didCreateDevice"></add-device-dialog> 
-        <partition-dialog ref="new_partition_dialog" :zones="zones" :device_numbers="device_numbers" :groups="groups"></partition-dialog> 
-    </div>
- 
 </template>
 
 <script>
-import AddDeviceDialog from "./add_device_dialog"
-import PartitionDialog from "./partition_dialog"
-import { getDevices, disableDevice } from '@/api/device/device'
+  import AddDeviceDialog from './add_device_dialog'
+  import PartitionDialog from './partition_dialog'
+  import { disableDevice, getDevices } from '@/api/device/device'
+  import EditDeviceDialog from './edit_device_dialog'
 
-export default {
+  export default {
     name: 'DeviceList',
     components: {
-        AddDeviceDialog,
-        PartitionDialog,
+      EditDeviceDialog,
+      AddDeviceDialog,
+      PartitionDialog
     },
     data() {
-        return {
-            filter_form: {
-                zone: '',
-                schedule: '',
-                device_type: '',
-            },
-            schedules: [
-                { id:1, name:'上午' },
-                { id:2, name:'下午' },
-                { id:3, name:'晚上' },
-            ],
-            device_types: [
-                { id:1, name:'透析机' },
-                { id:2, name:'水处理机' },
-            ],
-            devices: [],
+      return {
+        edit_device_numbers: [],
+        filter_form: {
+          zone: '',
+          schedule: '',
+          device_type: ''
+        },
+        schedules: [
+          { id: 1, name: '上午' },
+          { id: 2, name: '下午' },
+          { id: 3, name: '晚上' }
+        ],
+        device_types: [
+          { id: 1, name: '透析机' },
+          { id: 2, name: '水处理机' }
+        ],
+        devices: [],
 
-            current_select_device: null,
-        }
+        current_select_device: null
+      }
     },
     props: {
-        zones: {
-            type: Array,
-            require: true,
-        },
-        groups: {
-            type: Array,
-            require: true,
-        },
-        device_numbers: {
-            type: Array,
-            require: true,
-        },
+      zones: {
+        type: Array,
+        require: true
+      },
+      groups: {
+        type: Array,
+        require: true
+      },
+      device_numbers: {
+        type: Array,
+        require: true
+      }
     },
     created() {
-        this._get_devices()
+      this._get_devices()
     },
     methods: {
-        add_device_action: function() {
-            this.$refs.new_device_dialog.show()
-        },
-        partition_dialog_action: function() {
-            this.$refs.new_partition_dialog.show()
-        },
-        filter_devices: function() {
-            this.$emit("did_select_device", null)
-            this._get_devices()
-        },
-        _get_devices: function() {
-            getDevices(this.filter_form.device_type, this.filter_form.zone).then(rs => {
+      handleEdit: function(index, row) {
+        this.$refs.edit_device_dialog.show()
+        this.$refs.edit_device_dialog.set_device_id(row.id)
+      },
+      add_device_action: function() {
+        this.$refs.new_device_dialog.show()
+      },
+      partition_dialog_action: function() {
+        this.$refs.new_partition_dialog.show()
+      },
+      filter_devices: function() {
+        this.$emit('did_select_device', null)
+        this._get_devices()
+      },
+      _get_devices: function() {
+        getDevices(this.filter_form.device_type, this.filter_form.zone).then(rs => {
+          var resp = rs.data
+          if (resp.state === 1) {
+            // console.log(resp)
+            this.devices.splice(0, this.devices.length)
+            this.devices.push(...resp.data.devices)
+
+          } else {
+            this.$message.error(resp.msg)
+          }
+        })
+      }, didCreateDevice: function(newDevice) {
+        this.$refs.new_device_dialog.hide()
+        this.devices.push(newDevice)
+      },
+      select_row: function(row, event, column) {
+        // console.log(row)
+        this.current_select_device = row
+        this.$emit('did_select_device', row)
+      },
+      update_device: function(device) {
+        if (device !== undefined) {
+          for (let index = 0; index < this.devices.length; index++) {
+            const _device = this.devices[index]
+            if (_device.id == device.id) {
+              _device.name = device.name
+              _device.model = device.model
+              _device.serial_number = device.serial_number
+              _device.device_group_id = device.device_group_id
+              _device.device_number = device.device_number
+              _device.device_number_id = device.device_number_id
+              _device.device_zone_id = device.device_zone_id
+              break
+            }
+          }
+        }
+        this.$refs.edit_device_dialog.hide()
+
+      },
+      delete_device_action: function(index, row) {
+        this.current_select_device = row
+        console.log(this.current_select_device)
+        if (this.current_select_device != null) {
+          this.$confirm('删除后将无法恢复，确定继续删除吗', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' })
+            .then(() => {
+              disableDevice(this.current_select_device.id).then(rs => {
                 var resp = rs.data
-                if (resp.state === 1) {
-                    // console.log(resp)
-                    this.devices.splice(0, this.devices.length)
-                    this.devices.push(...resp.data.devices)
-                    
+                if (resp.state == 1) {
+                  var index = this.devices.indexOf(this.current_select_device)
+                  if (index > -1) {
+                    this.devices.splice(index, 1)
+                  }
+                  this.current_select_device = null
+                  this.$emit('did_select_device', null)
+
                 } else {
-                    this.$message.error(resp.msg)
+                  this.$message.error(resp.msg)
                 }
+              })
             })
-        },
-        didCreateDevice: function(newDevice) {
-            this.$refs.new_device_dialog.hide()
-            this.devices.push(newDevice)
-        },
-        select_row: function(row, event, column) {
-            // console.log(row)
-            this.current_select_device = row
-            this.$emit("did_select_device", row)
-        },
-        update_device: function(device) {
-            if (device !== undefined) {
-                for (let index = 0; index < this.devices.length; index++) {
-                    const _device = this.devices[index];
-                    if (_device.id == device.id) {
-                        _device.name = device.name
-                        _device.model = device.model
-                        _device.serial_number = device.serial_number
-                        _device.device_group_id = device.device_group_id
-                        _device.device_number = device.device_number
-                        _device.device_number_id = device.device_number_id
-                        _device.device_zone_id = device.device_zone_id
-                        break
-                    }
-                }
-            }
-        },
-        delete_device_action: function() {
-            if (this.current_select_device != null) {
-                this.$confirm("删除后将无法恢复，确定继续删除吗", '提示', {confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning'})
-                .then(() => {
-                    disableDevice(this.current_select_device.id).then(rs => {
-                        var resp = rs.data
-                        if (resp.state == 1) {
-                            var index = this.devices.indexOf(this.current_select_device)
-                            if (index > -1) {
-                                this.devices.splice(index, 1)
-                            }
-                            this.current_select_device = null
-                            this.$emit("did_select_device", null)
-                            
-                        } else {
-                            this.$message.error(resp.msg)
-                        }
-                    })
-                })
-            }
-        },
+        }
+      }
     }
-}
+  }
 </script>
 
 <style scoped>
-.header {
+  .header {
     /* background-color: rgb(223, 249, 255); */
     background-color: rgb(236, 245, 255);
     border-style: solid;
@@ -157,14 +185,17 @@ export default {
     border-width: 1px;
     padding: 20px 20px 0px 20px;
     margin-bottom: 10px;
-}
-.el-row {
+  }
+
+  .el-row {
     margin-bottom: 15px;
-}
-.el-form-item {
+  }
+
+  .el-form-item {
     margin-bottom: 5px;
-}
-.header .item_title {
+  }
+
+  .header .item_title {
     font-size: 14px;
-}
+  }
 </style>

src/xt_pages/device/components/edit_device_dialog.vue

@@ -0,0 +1,628 @@
+<template>
+  <el-dialog title="编辑设备" width="854px" top="15vh" :visible.sync="visible" :before-close="_close">
+    <div>
+      <div class="main">
+        <!-- 第一行 -->
+        <el-row>
+          <el-col :span="8">
+            <div class="col_div">
+              <el-col :span="layout.first_line_label">
+                <span class="col_label_span"><span class="required_span">*&nbsp;</span>序列号:</span>
+              </el-col>
+              <el-col :span="layout.first_line_content">
+                <el-input size="small" v-model="form.serial_number"></el-input>
+              </el-col>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="col_div">
+              <el-col :span="layout.second_line_label">
+                <span class="col_label_span"><span class="required_span">*&nbsp;</span>设备类型:</span>
+              </el-col>
+              <el-col :span="layout.second_line_content" >
+                <el-select v-model="form.device_type" size="small" :disabled="device_id != 0" style="width:100%;">
+                  <el-option v-for="item in device_types" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+              </el-col>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="col_div">
+              <el-col :span="layout.third_line_label">
+                <span class="col_label_span">床位号:</span>
+              </el-col>
+              <el-col :span="layout.third_line_content">
+                <el-select v-model="form.device_number_id" clearable size="small" style="width:100%;">
+                  <el-option v-for="item in device_numbers" :key="item.id" :label="item.number" :value="item.id"></el-option>
+                </el-select>
+              </el-col>
+            </div>
+          </el-col>
+        </el-row>
+        <!-- 第二行 -->
+        <el-row>
+          <el-col :span="8">
+            <div class="col_div">
+              <el-col :span="layout.first_line_label">
+                <span class="col_label_span"><span class="required_span">*&nbsp;</span>设备名称:</span>
+              </el-col>
+              <el-col :span="layout.first_line_content">
+                <el-input size="small" v-model="form.name"></el-input>
+              </el-col>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="col_div">
+              <el-col :span="layout.second_line_label">
+                <span class="col_label_span">生产厂家:</span>
+              </el-col>
+              <el-col :span="layout.second_line_content">
+                <el-input size="small" v-model="form.manufacturer"></el-input>
+              </el-col>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="col_div">
+              <el-col :span="layout.third_line_label">
+                <span class="col_label_span">维修厂家:</span>
+              </el-col>
+              <el-col :span="layout.third_line_content">
+                <el-input size="small" v-model="form.repair_factory"></el-input>
+              </el-col>
+            </div>
+          </el-col>
+        </el-row>
+        <!-- 第三行 -->
+        <el-row>
+          <el-col :span="8">
+            <div class="col_div">
+              <el-col :span="layout.first_line_label">
+                <span class="col_label_span">设备型号:</span>
+              </el-col>
+              <el-col :span="layout.first_line_content">
+                <el-input size="small" v-model="form.model"></el-input>
+              </el-col>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="col_div">
+              <el-col :span="layout.second_line_label">
+                <span class="col_label_span">使用科室:</span>
+              </el-col>
+              <el-col :span="layout.second_line_content">
+                <el-input size="small" v-model="form.department"></el-input>
+              </el-col>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="col_div">
+              <el-col :span="layout.third_line_label">
+                <span class="col_label_span">科室编号:</span>
+              </el-col>
+              <el-col :span="layout.third_line_content">
+                <el-input size="small" v-model="form.department_number"></el-input>
+              </el-col>
+            </div>
+          </el-col>
+        </el-row>
+        <!-- 第四行 -->
+        <el-row>
+          <el-col :span="8">
+            <div class="col_div">
+              <el-col :span="layout.first_line_label">
+                <span class="col_label_span">购买日期:</span>
+              </el-col>
+              <el-col :span="layout.first_line_content">
+                <el-date-picker v-model="form.purchase_date" type="date" value-format="timestamp" size="small" style="width: 100%;"></el-date-picker>
+              </el-col>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="col_div">
+              <el-col :span="layout.second_line_label">
+                <span class="col_label_span">安装日期:</span>
+              </el-col>
+              <el-col :span="layout.second_line_content">
+                <el-date-picker v-model="form.install_date" type="date" value-format="timestamp" size="small" style="width: 100%;"></el-date-picker>
+              </el-col>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="col_div">
+              <el-col :span="layout.third_line_label">
+                <span class="col_label_span">启用日期:</span>
+              </el-col>
+              <el-col :span="layout.third_line_content">
+                <el-date-picker v-model="form.commissioning_date" value-format="timestamp" type="date" size="small" style="width: 100%;"></el-date-picker>
+              </el-col>
+            </div>
+          </el-col>
+        </el-row>
+        <!-- 第五行 -->
+        <el-row>
+          <el-col :span="8">
+            <div class="col_div">
+              <el-col :span="layout.first_line_label">
+                <span class="col_label_span">维修工程师:</span>
+              </el-col>
+              <el-col :span="layout.first_line_content">
+                <el-input size="small" v-model="form.maintainer"></el-input>
+              </el-col>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="col_div">
+              <el-col :span="layout.second_line_label">
+                <span class="col_label_span">联系电话:</span>
+              </el-col>
+              <el-col :span="layout.second_line_content">
+                <el-input size="small" v-model="form.maintenance_call"></el-input>
+              </el-col>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="col_div">
+              <el-col :span="layout.third_line_label">
+                <span class="col_label_span">保修期限:</span>
+              </el-col>
+              <el-col :span="layout.third_line_content">
+                <el-input size="small" v-model="form.warranty_period"></el-input>
+              </el-col>
+            </div>
+          </el-col>
+        </el-row>
+        <!-- 第六行 -->
+        <!-- <el-row>
+            <el-col :span="8">
+                <div class="col_div">
+                    <el-col :span="9">
+                        <span class="col_label_span">机器状态:</span>
+                    </el-col>
+                    <el-col :span="15">
+                        <el-select v-model="form.device_status" clearable size="small">
+                            <el-option v-for="item in device_states" :key="item.state" :label="item.name" :value="item.state"></el-option>
+                        </el-select>
+                    </el-col>
+                </div>
+            </el-col>
+            <el-col :span="8">
+                <div class="col_div">
+                    <el-col :span="10">
+                        <span class="col_label_span">初始使用次数:</span>
+                    </el-col>
+                    <el-col :span="14">
+                        <el-input v-model="form.initial_use_times" style="width: 100%;"></el-input>
+                    </el-col>
+                </div>
+            </el-col>
+            <el-col :span="8">
+                <div class="col_div">
+                    <el-col :span="7">
+                        <span class="col_label_span">备&nbsp;&nbsp;&nbsp;注:</span>
+                    </el-col>
+                    <el-col :span="17">
+                        <el-input size="small" v-model="form.mark"></el-input>
+                    </el-col>
+                </div>
+            </el-col>
+        </el-row> -->
+        <!-- 第七行 -->
+        <!-- <el-row>
+            <el-col :span="7">
+                <div class="col_div">
+                    <el-col :span="8">
+                        <span class="col_label_span">报废日期:</span>
+                    </el-col>
+                    <el-col :span="16">
+                        <el-date-picker v-model="form.retirement_date" type="date" value-format="timestamp" size="small" style="width: 140px;"></el-date-picker>
+                    </el-col>
+                </div>
+            </el-col>
+            <el-col :span="7">
+                <div class="col_div">
+                    <el-col :span="8">
+                        <span class="col_label_span">报废原因:</span>
+                    </el-col>
+                    <el-col :span="16">
+                        <el-select v-model="form.retirement_reason" clearable size="small">
+                            <el-option v-for="item in retirement_reasons" :key="item.id" :label="item.reason" :value="item.reason"></el-option>
+                        </el-select>
+                    </el-col>
+                </div>
+            </el-col>
+            <el-col :span="5">
+                <div class="col_div">
+                    <el-col :span="15">
+                        <span class="col_label_span">使用年限(年):</span>
+                    </el-col>
+                    <el-col :span="9">
+                        <el-input size="small" v-model="form.service_life"></el-input>
+                    </el-col>
+                </div>
+            </el-col>
+            <el-col :span="5">
+                <div class="col_div">
+                    <el-col :span="14">
+                        <span class="col_label_span">工作时长(h):</span>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-input size="small" v-model="form.working_time"></el-input>
+                    </el-col>
+                </div>
+            </el-col>
+        </el-row> -->
+        <!-- 治疗模式 -->
+        <el-row v-show="false && form.device_type === 1">
+          <el-col :span="24">
+            <div class="col_div">
+              <el-col :span="3">
+                <div style="padding-left: 5px;">
+                  <span class="col_label_span" style="line-height: auto; padding-left: 0; text-align: left;">治疗模式:</span>
+                  <el-checkbox label="全选"></el-checkbox>
+                </div>
+              </el-col>
+              <el-col :span="21">
+                <div style="margin-top: 6px;"></div>
+                <el-checkbox-group v-model="form.treatment_mode">
+                  <el-checkbox v-for="item in cure_types" :label="item.id" :key="item.id" :value="item.id">{{ item.name }}</el-checkbox>
+                </el-checkbox-group>
+              </el-col>
+            </div>
+          </el-col>
+        </el-row>
+        <!-- 反渗模式 -->
+        <el-row v-show="false && form.device_type === 2">
+          <el-col :span="8">
+            <div class="col_div">
+              <el-col :span="layout.first_line_label">
+                <span class="col_label_span">反渗模式:</span>
+              </el-col>
+              <el-col :span="layout.first_line_content">
+                <el-select v-model="form.reverse_osmosis_mode" clearable size="small">
+                  <el-option v-for="item in reverse_osmosises" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+              </el-col>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+
+
+
+
+      <div style="text-align: right; padding-right: 25px; padding-top: 10px; padding-bottom: 10px;">
+        <el-button type="primary" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" @click="update_device_submit">保 存</el-button>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import DeviceInfoPane from './device_info/device_info_pane'
+  import DeviceInfoForm from './device_info/device_info_form'
+  import EditDeviceInfoForm from './device_info/edit_device_info_form'
+  import {getDeviceBaseInfo, createDevice, modifyDeviceBaseInfo} from '@/api/device/device'
+
+  export default {
+    name: "EditDeviceDialog",
+    components: {
+      EditDeviceInfoForm,
+      DeviceInfoForm,
+      DeviceInfoPane
+
+    },
+    data() {
+      return {
+        visible: false,
+        layout: {
+          first_line_label: 8,
+          first_line_content: 16,
+          second_line_label: 8,
+          second_line_content: 16,
+          third_line_label: 8,
+          third_line_content: 16,
+        },
+        device_id: 0,
+        form: {
+          device_type: 1,
+          serial_number: '',
+          name: '',
+          device_number_id: '',
+          manufacturer: '',
+          repair_factory: '',
+          model: '',
+          department: '',
+          department_number: '',
+          purchase_date: '',
+          install_date: '',
+          commissioning_date: '',
+          maintainer: '',
+          maintenance_call: '',
+          warranty_period: '',
+          device_status: '',
+          initial_use_times: '',
+          mark: '',
+          retirement_date: '',
+          retirement_reason: '',
+          service_life: '',
+          working_time: '',
+          treatment_mode: [], // 治疗模式
+          reverse_osmosis_mode: '', // 反渗模式
+        },
+        device_types: [
+          { id: 1, name: "透析机" },
+          // { id: 2, name: "水处理机" },
+        ],
+        cure_types: [ // 治疗模式
+          // { id:1, name: "HD" },
+          // { id:2, name: "HDF" },
+          // { id:3, name: "HD+HP" },
+          // { id:4, name: "HP" },
+          // { id:5, name: "HF" },
+          // { id:10, name: "HD" },
+          // { id:20, name: "HDF" },
+          // { id:30, name: "HD+HP" },
+          // { id:40, name: "HP" },
+          // { id:50, name: "HF" },
+          // { id:300, name: "HD+HP" },
+        ],
+        reverse_osmosises: [ // 反渗模式
+          // { id:1, name: "单级反渗" }
+        ],
+        device_states: [
+          { state: 1, name: '使用机' },
+          { state: 2, name: '备用机' },
+          { state: 3, name: '急诊机' },
+          { state: 4, name: '报废机' },
+        ],
+        retirement_reasons: [
+          { id: 1, reason: '报废原因1' },
+          { id: 2, reason: '报废原因2' },
+          { id: 3, reason: '报废原因3' },
+          { id: 4, reason: '报废原因4' },
+          { id: 5, reason: '其他' },
+        ]
+      }
+    },
+    props: {
+      device_numbers: {
+        type: Array,
+        require: true,
+      }
+    },
+    methods: {
+      _close: function(done) {
+        this.clear()
+        done()
+      },
+      clear: function() {
+
+      },
+      show() {
+        this.clear()
+        this.visible = true
+      },
+      hide() {
+        this.clear()
+        this.visible = false
+      },  clear() {
+        this.device_id = 0
+        this.form.device_type = 1
+        this.form.serial_number = ''
+        this.form.name = ''
+        this.form.device_number_id = ''
+        this.form.manufacturer = ''
+        this.form.repair_factory = ''
+        this.form.model = ''
+        this.form.department = ''
+        this.form.department_number = ''
+        this.form.purchase_date = 0
+        this.form.install_date = 0
+        this.form.commissioning_date = 0
+        this.form.maintainer = ''
+        this.form.maintenance_call = ''
+        this.form.warranty_period = ''
+        this.form.device_status = ''
+        this.form.initial_use_times = ''
+        this.form.mark = ''
+        this.form.retirement_date = 0
+        this.form.retirement_reason = ''
+        this.form.service_life = ''
+        this.form.working_time = ''
+        this.form.treatment_mode = []
+        this.form.reverse_osmosis_mode = ''
+      },
+      set_device_id: function(device_id) {
+        if (device_id > 0) {
+          this.device_id = device_id
+          getDeviceBaseInfo(device_id).then(rs => {
+            var resp = rs.data
+            if (resp.state === 1) {
+              this.form.device_type = resp.data.device_type
+              this.form.device_number_id = resp.data.device_number_id == 0 ? '' : resp.data.device_number_id
+
+              var device_info = resp.data.device_info
+              this.form.serial_number = device_info.serial_number
+              this.form.name = device_info.name
+              this.form.manufacturer = device_info.manufacturer
+              this.form.repair_factory = device_info.repair_factory
+              this.form.model = device_info.model
+              this.form.department = device_info.department
+              this.form.department_number = device_info.department_number
+              this.form.purchase_date = device_info.purchase_date == 0 ? '' : (device_info.purchase_date * 1000)
+              this.form.install_date = device_info.install_date == 0 ? '' : (device_info.install_date * 1000)
+              this.form.commissioning_date = device_info.commissioning_date == 0 ? '' : (device_info.commissioning_date * 1000)
+              this.form.maintainer = device_info.maintainer
+              this.form.maintenance_call = device_info.maintenance_call
+              this.form.warranty_period = device_info.warranty_period
+              this.form.device_status = device_info.device_status == 0 ? '' : device_info.device_status
+              this.form.initial_use_times = device_info.initial_use_times == 0 ? '' : device_info.initial_use_times
+              this.form.mark = device_info.mark
+              this.form.retirement_date = device_info.retirement_date == 0 ? '' : (device_info.retirement_date * 1000)
+              this.form.retirement_reason = device_info.retirement_reason
+              this.form.service_life = device_info.service_life == 0 ? '' : device_info.service_life
+              this.form.working_time = device_info.working_time == 0 ? '' : device_info.working_time
+              if (this.form.device_type == 1) {
+                // treatment_mode: []
+
+              } else if (this.form.device_type == 2) {
+                // reverse_osmosis_mode: ''
+              }
+
+            } else {
+              this.$message.error(resp.msg)
+            }
+          })
+
+        } else {
+          this.clear()
+        }
+      },
+      create_device_submit() {
+        var checkErr = this._check_submit()
+        if (checkErr.length > 0) {
+          this.$message.error(checkErr)
+          return
+        }
+
+        var params = new Object()
+        params.type = this.form.device_type
+        params.serial_number = this.form.serial_number
+        params.name = this.form.name
+        params.device_number_id = this.form.device_number_id
+        params.manufacturer = this.form.manufacturer
+        params.repair_factory = this.form.repair_factory
+        params.model = this.form.model
+        params.department = this.form.department
+        params.department_number = this.form.department_number
+        params.purchase_date = typeof this.form.purchase_date == 'string' ? 0 : (this.form.purchase_date / 1000)
+        params.install_date = typeof this.form.install_date == 'string' ? 0 : (this.form.install_date / 1000)
+        params.commissioning_date = typeof this.form.commissioning_date == 'string' ? 0 : (this.form.commissioning_date / 1000)
+        params.maintainer = this.form.maintainer
+        params.maintenance_call = this.form.maintenance_call
+        params.warranty_period = this.form.warranty_period
+        params.device_status = this.form.device_status
+        params.initial_use_times = this.form.initial_use_times
+        params.mark = this.form.mark
+        params.retirement_date = typeof this.form.retirement_date == 'string' ? 0 : (this.form.retirement_date / 1000)
+        params.retirement_reason = this.form.retirement_reason
+        params.service_life = this.form.service_life
+        params.working_time = this.form.working_time
+        // params.treatment_mode = this.form.treatment_mode
+        // params.reverse_osmosis_mode = this.form.reverse_osmosis_mode
+        createDevice(params).then(rs => {
+          var resp = rs.data
+          if (resp.state === 1) {
+            var device = resp.data.device
+            this.$emit('did_create', device)
+            this.$message({message: "创建成功", type: "success"})
+
+          } else {
+            this.$message.error(resp.msg)
+          }
+        })
+      },
+      update_device_submit() {
+        var checkErr = this._check_submit()
+        if (checkErr.length > 0) {
+          this.$message.error(checkErr)
+          return
+        }
+
+        var params = new Object()
+        params.device_id = this.device_id
+        params.serial_number = this.form.serial_number
+        params.name = this.form.name
+        params.device_number_id = this.form.device_number_id
+        params.manufacturer = this.form.manufacturer
+        params.repair_factory = this.form.repair_factory
+        params.model = this.form.model
+        params.department = this.form.department
+        params.department_number = this.form.department_number
+        params.purchase_date = typeof this.form.purchase_date == 'string' ? 0 : (this.form.purchase_date / 1000)
+        params.install_date = typeof this.form.install_date == 'string' ? 0 : (this.form.install_date / 1000)
+        params.commissioning_date = typeof this.form.commissioning_date == 'string' ? 0 : (this.form.commissioning_date / 1000)
+        params.maintainer = this.form.maintainer
+        params.maintenance_call = this.form.maintenance_call
+        params.warranty_period = this.form.warranty_period
+        params.device_status = this.form.device_status
+        params.initial_use_times = this.form.initial_use_times
+        params.mark = this.form.mark
+        params.retirement_date = typeof this.form.retirement_date == 'string' ? 0 : (this.form.retirement_date / 1000)
+        params.retirement_reason = this.form.retirement_reason
+        params.service_life = this.form.service_life
+        params.working_time = this.form.working_time
+        // params.treatment_mode = this.form.treatment_mode
+        // params.reverse_osmosis_mode = this.form.reverse_osmosis_mode
+        modifyDeviceBaseInfo(params).then(rs => {
+          var resp = rs.data
+          if (resp.state === 1) {
+            var device = resp.data.device
+            this.$emit('did_update', device)
+            this.$message({message: "保存成功", type: "success"})
+
+          } else {
+            this.$message.error(resp.msg)
+          }
+        })
+      },
+      _check_submit() {
+        if (this.form.serial_number.length == 0) {
+          return "请填写设备序列号"
+        }
+        if (this.form.device_type !== 1 && this.form.device_type !== 2) {
+          return "请选择设备类型"
+        }
+        if (this.form.name.length == 0) {
+          return "请填写设备名"
+        }
+        if (this.form.maintenance_call.length > 0) {
+          if (/^(0\d{2,3}-?\d{7,8}$)|(1\d{10}$)/.test(this.form.maintenance_call) == false) {
+            return "联系电话格式错误"
+          }
+        }
+        return ""
+      }
+
+    }
+  }
+
+</script>
+
+<style scoped>
+  .main {
+    width: 100%;
+  }
+  .main .el-row {
+    /* border-bottom: 1px solid rgb(233, 233, 233); */
+    /* padding-left: 5px; */
+    padding-right: 5px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+  }
+  .col_div {
+    width: 100%;
+  }
+  .col_label_span {
+    padding-left: 0px;
+    padding-right: 5px;
+    font-size: 14px;
+    height: 32px;
+    line-height: 32px;
+    /* display: block; */
+    display: inline-block;
+    width: 100%;
+    text-align: right;
+    /* padding-right: 5px; */
+  }
+  .required_span {
+    color: red;
+  }
+
+  .el-checkbox {
+    margin-bottom: 5px;
+  }
+  .el-checkbox+.el-checkbox {
+    margin-left: 15px;
+  }
+</style>

src/xt_pages/device/main.vue

@@ -1,73 +1,77 @@
 <template>
-<div class="main-contain">
-     <div class="position">
-       <bread-crumb :crumbs='crumbs'></bread-crumb>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button size="small" icon="el-icon-circle-plus-outline"
+                 :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary"
+                 @click="add_device_action">新增
+      </el-button>
 
-     </div>
+
+    </div>
     <div class="app-container">
-        <el-row :gutter="15">
-            <el-col :span="7">
-                <device-list ref="device_list" :zones="zones" :groups="groups" :device_numbers="device_numbers" @did_select_device="did_select_device"></device-list>
-            </el-col>
-            <el-col :span="17">
-                <device-detail ref="device_detail" :device_numbers="device_numbers" @did_update_device="did_update_device"></device-detail>
-            </el-col>
-        </el-row>
+      <device-list ref="device_list" :zones="zones" :groups="groups" :device_numbers="device_numbers"
+                   @did_select_device="did_select_device"></device-list>
+      <!--<el-col :span="17">-->
+      <!--<device-detail ref="device_detail" :device_numbers="device_numbers" @did_update_device="did_update_device"></device-detail>-->
+      <!--</el-col>-->
     </div>
-</div>
+  </div>
 
 </template>
 
 <script>
-import DeviceList from './components/device_list'
-import DeviceDetail from './components/device_detail'
-import {getDeviceInitData} from '@/api/device/device'
-import BreadCrumb from "@/xt_pages/components/bread-crumb";
+  import DeviceList from './components/device_list'
+  import DeviceDetail from './components/device_detail'
+  import { getDeviceInitData } from '@/api/device/device'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
 
-export default {
-    name: "DeviceManage",
+  export default {
+    name: 'DeviceManage',
     components: {
-        DeviceList,
-        DeviceDetail,
-        BreadCrumb
+      DeviceList,
+      DeviceDetail,
+      BreadCrumb
     },
     data() {
-        return {
-          crumbs: [
-            { path: false, name: '设备管理' },
-            { path: '/device/main', name: '透析机管理' },
-          ],
-            zones: [],
-            groups: [],
-            device_numbers: [],
-        }
+      return {
+        crumbs: [
+          { path: false, name: '设备管理' },
+          { path: '/device/main', name: '透析机管理' }
+        ],
+        zones: [],
+        groups: [],
+        device_numbers: []
+      }
     },
     created() {
-        getDeviceInitData().then(rs => {
-            var resp = rs.data
-            if (resp.state === 1) {
-                // console.log(resp)
-                this.zones.push(...resp.data.zones)
-                this.groups.push(...resp.data.groups)
-                this.device_numbers.push(...resp.data.numbers)
+      getDeviceInitData().then(rs => {
+        var resp = rs.data
+        if (resp.state === 1) {
+          // console.log(resp)
+          this.zones.push(...resp.data.zones)
+          this.groups.push(...resp.data.groups)
+          this.device_numbers.push(...resp.data.numbers)
 
-            } else {
-                this.$message.error(resp.msg)
-            }
-        })
+        } else {
+          this.$message.error(resp.msg)
+        }
+      })
     },
     methods: {
-        did_select_device: function(device) {
-            if (device) {
-                this.$refs.device_detail.set_device(device.id, device.device_type)
-            } else {
-                this.$refs.device_detail.set_device(0, 1)
-            }
-
-        },
-        did_update_device: function(device) {
-            this.$refs.device_list.update_device(device)
+      did_select_device: function(device) {
+        if (device) {
+          this.$refs.device_detail.set_device(device.id, device.device_type)
+        } else {
+          this.$refs.device_detail.set_device(0, 1)
         }
+
+      },
+      did_update_device: function(device) {
+        this.$refs.device_list.update_device(device)
+      }, add_device_action: function() {
+        this.$refs.device_list.add_device_action()
+      }
     }
-}
+  }
 </script>

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog width="854px" :title="titles" :visible.sync="visibility" :show-close="isClose" :close-on-click-modal="isClose"
+  <el-dialog width="854px" :title="titles" :visible.sync="visibility" :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
     <el-form class="demo-form-inline"
@@ -130,6 +130,7 @@
         good_unit: '',
         isClose: false,
         size: 11,
+        visibility:false,
         form: {
           good_id: '',
           specification_name: '',
@@ -155,10 +156,7 @@
       }
     },
     props: {
-      visibility: {
-        type: Boolean,
-        default: false
-      },
+
       titles: {
         type: String,
         default: ''
@@ -174,6 +172,12 @@
 
     },
     methods: {
+      show:function(){
+        this.visibility = true
+
+      },hide:function(){
+        this.visibility = false
+      },
       cancle: function(formName) {
         this.$emit('dialog-cancle', this.getValue())
       },

src/xt_pages/stock/Dialog/goodTypeDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog width="430px" :title="titles" :visible.sync="visibility" :show-close="isClose" :close-on-click-modal="isClose"
+  <el-dialog width="430px" :title="titles" :visible.sync="visibility"  :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
     <el-form :rules="rules" ref="formValue" :model="formValue" label-width="80px">
       <el-row>
@@ -17,7 +17,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      
+
 
     </el-form>
 
@@ -37,6 +37,7 @@ export default {
   name: "goodTypeDialog",
   data() {
     return {
+      visibility:false,
       isClose: false,
       labelPosition: 'right',
       resetForm: {
@@ -51,10 +52,6 @@ export default {
     };
   },
   props: {
-    visibility: {
-      type: Boolean,
-      default: false
-    },
     titles: {
       type: String,
       default: ""
@@ -68,6 +65,12 @@ export default {
     }
   },
   methods: {
+    show:function(){
+      this.visibility = true
+
+    },hide:function(){
+      this.visibility = false
+    },
     cancle: function(formName) {
       this.$emit("dialog-cancle");
       this.$refs[formName].resetFields();

src/xt_pages/stock/Dialog/manufacturerOrDealerDialog.vue

@@ -1,6 +1,6 @@
 <template>
-  <el-dialog width="854px" :title="titles" :visible.sync="visibility" :show-close="isClose" :close-on-click-modal="isClose"
-             :close-on-press-escape="isClose">  
+  <el-dialog width="854px" :title="titles" :visible.sync="visibility" :close-on-click-modal="isClose"
+             :close-on-press-escape="isClose" >
 
     <el-form :model="formValue" :rules="rules" ref="formValue" class="demo-form-inline"
              :label-position="labelPosition"
@@ -32,7 +32,7 @@
     </el-row>
 
 
-    <el-row>    
+    <el-row>
       <el-col :span="8">
         <el-form-item label="联系地址">
           <el-input  v-model="formValue.contact_address"></el-input>
@@ -51,7 +51,7 @@
         </el-form-item>
       </el-col>
     </el-row>
-    
+
       <el-col>
         <el-form-item label="备注">
           <el-input  type="textarea" :row="5" v-model="formValue.remark"
@@ -85,6 +85,7 @@
 
 
       return {
+        visibility:false,
         labelPosition: 'right',
         isClose: false,
         form: {
@@ -120,10 +121,7 @@
       }
     },
     props: {
-      visibility: {
-        type: Boolean,
-        default: false
-      },
+
       titles: {
         type: String,
         default: "",
@@ -143,7 +141,14 @@
       }
     },
     methods: {
+      show:function(){
+        this.visibility = true
+
+      },hide:function(){
+        this.visibility = false
+      },
       cancle: function (formName) {
+        console.log("11111")
         this.$emit('dialog-cancle', this.getValue());
         this.$refs['formValue'].resetFields();
       },
@@ -165,7 +170,7 @@
         form['type'] = this.type
         form['isCreated'] = this.isCreated
         return form
-      },
+      }
     },
 
   }

src/xt_pages/stock/Dialog/salesReturnDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="propForm.title" :visible.sync="visibility" :show-close="isClose" :close-on-click-modal="isClose"
+  <el-dialog title="选择商品" :visible.sync="visibility"  :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
     <div class="filter-container">
@@ -70,6 +70,7 @@
     name: 'salesReturnDialog',
     data() {
       return {
+        visibility:false,
         goodInfo: [],
         goodInfoTableData: [],
         keywords: '',
@@ -82,13 +83,15 @@
       propForm: {
         type: Object
       },
-      visibility: {
-        type: Boolean,
-        default: false
-      }
 
     },
     methods: {
+      hide:function(){
+        this.visibility = false
+      },
+      show:function(){
+        this.visibility = true
+      },
       goodTypeTableChange: function(currentRow, oldCurrentRow) {
         this.currentGoodTypeId = currentRow.id
 

src/xt_pages/stock/Dialog/stockInDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="propForm.title" :visible.sync="visibility" :show-close="isClose" :close-on-click-modal="isClose"
+  <el-dialog title="选择商品" :visible.sync="visibility" :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
     <div class="filter-container">
@@ -77,20 +77,22 @@
         keywords: '',
         multipleSelection: [],
         currentGoodTypeId: 0,
-        isClose: false
+        isClose: false,
+        visibility: false,
       }
     },
     props: {
       propForm: {
         type: Object
       },
-      visibility: {
-        type: Boolean,
-        default: false
-      }
-
     },
     methods: {
+      hide:function(){
+        this.visibility = false
+      },
+      show:function(){
+        this.visibility = true
+      },
       goodTypeTableChange: function(currentRow, oldCurrentRow) {
         this.currentGoodTypeId = currentRow.id
         const params = {

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -10,7 +10,7 @@
 
   <div class="app-container">
 
-    <sales-return-dialog :propForm="propForm"
+    <sales-return-dialog ref="dialog" :propForm="propForm"
                          :visibility="isVisibility"
                          v-on:dialog-comfirm="comfirm"
                          v-on:dialog-cancle="cancle"></sales-return-dialog>
@@ -26,7 +26,7 @@
                           value-format="yyyy-MM-dd"></el-date-picker>
         </div>
         <div class="cell clearfix">
-          <label class="title"><span class="name">厂商</span> : </label>
+          <label class="title"><span class="name">厂商<span style="color: red;margin-left: -15px">*</span></span> : </label>
           <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商" @change="changeManufacturer()">
             <el-option
               v-for="(option, index) in manufacturer"
@@ -183,7 +183,7 @@
     },
     methods: {
       comfirm: function(val) {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ;i--) {
             if (i == 0) {
@@ -194,14 +194,19 @@
               tempForm['good_type_id'] = val.goodTypeId
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['return_count'] = ''
-              this.recordInfo.recordData.push(tempForm)
+              // this.recordInfo.recordData.push(tempForm)
+              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
+
+
+
             }
           }
         }
 
         this.currentIndex = -1
       }, cancle: function() {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
       }, GetConfigInfo: function() {
         const params = {
           type: this.$route.query.type
@@ -292,7 +297,7 @@
           this.$message.error('请先选择厂商')
           return
         } else {
-          this.isVisibility = true
+          this.$refs.dialog.show()
           console.log(this.form.manufacturer)
           for (let i = 0; i < this.propForm.goodInfo.length; i++) {
             if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -8,7 +8,7 @@
       </div>
     </div>
     <div class="app-container">
-      <sales-return-dialog :propForm="propForm"
+      <sales-return-dialog ref="dialog" :propForm="propForm"
                            :visibility="isVisibility"
                            v-on:dialog-comfirm="comfirm"
                            v-on:dialog-cancle="cancle"></sales-return-dialog>
@@ -166,7 +166,8 @@
     },
     methods: {
       comfirm: function(val) {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ; i--) {
             if (i == 0) {
@@ -178,14 +179,16 @@
               tempForm['good_type_id'] = val.goodTypeId
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['count'] = ''
-              this.recordInfo.recordData.push(tempForm)
+              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
+
             }
           }
         }
 
         this.currentIndex = -1
       }, cancle: function() {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
       }, GetConfigInfo: function() {
         const params = {
           type: this.$route.query.type
@@ -252,12 +255,8 @@
                 this.$message.error(response.data.msg)
                 return false
               } else {
-                this.$notify({
-                  title: '成功',
-                  message: '删除成功',
-                  type: 'success',
-                  duration: 2000
-                })
+
+                this.$message.success("删除成功")
                 this.recordInfo.recordData.splice(index, 1)
               }
             })
@@ -272,9 +271,6 @@
         }
       }, showDialog(index, row) {
         this.currentIndex = index
-
-        this.isVisibility = true
-        console.log(this.form.manufacturer)
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {
           if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
             this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
@@ -285,6 +281,7 @@
           obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
           return cur
         }, [])
+        this.$refs.dialog.show()
       }, back() {
         this.$router.go(-1)
       }, submit() {
@@ -310,12 +307,9 @@
                 this.$message.error(response.data.msg)
                 return false
               } else {
-                this.$notify({
-                  title: '成功',
-                  message: '退库成功',
-                  type: 'success',
-                  duration: 2000
-                })
+
+                this.$message.success('退库成功')
+
                 this.$router.back(-1)
               }
             })

src/xt_pages/stock/config/dealer.vue

@@ -2,7 +2,7 @@
 
   <div class=" sign-and-weigh-box" style="background: white">
 
-    <manufacturer-or-dealer-dialog :titles="dealerDialog.titles" :formValue="dealerDialog.formValue"
+    <manufacturer-or-dealer-dialog ref="dialog" :titles="dealerDialog.titles" :formValue="dealerDialog.formValue"
                                    :visibility="dealerDialog.isVisibility"
                                    :type="dealerDialog.type" :isCreated="dealerDialog.isCreated"
                                    v-on:dialog-comfirm="manufacturerDialogComfirm"
@@ -20,35 +20,34 @@
 
         <!--<el-button style="float:right;margin-bottom: 10px" type="primary" @click="showDialog">新增经销商</el-button>-->
 
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="dealerData" :class="signAndWeighBoxPatients" style="width: 100%" border
+        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="dealerData"  style="width: 100%" border
                   v-loading="loading"
         >
 
-          <el-table-column type="index" label="序号" min-width="20" align="center"></el-table-column>
-          <el-table-column label="经销商编码" min-width="30" align="center">
+          <el-table-column label="经销商编码"  align="center">
             <template slot-scope="scope">
               {{scope.row.dealer_code}}
             </template>
           </el-table-column>
-          <el-table-column label="经销商名称" min-width="30" align="center">
+          <el-table-column label="经销商名称" align="center">
             <template slot-scope="scope">
               {{scope.row.dealer_name}}
 
             </template>
           </el-table-column>
-          <el-table-column label="联系人" min-width="30" align="center">
+          <el-table-column label="联系人" align="center">
             <template slot-scope="scope">
               {{scope.row.contact}}
 
             </template>
           </el-table-column>
-          <el-table-column label="联系人电话" min-width="30" align="center">
+          <el-table-column label="联系人电话"  align="center">
             <template slot-scope="scope">
               {{scope.row.contact_phone}}
 
             </template>
           </el-table-column>
-          <el-table-column label="联系地址" min-width="70" align="center">
+          <el-table-column label="联系地址"  align="center">
             <template slot-scope="scope">
               {{scope.row.contact_address}}
             </template>
@@ -72,11 +71,6 @@
                 </el-button>
               </el-tooltip>
 
-              <!--<el-button-->
-                <!--size="mini"-->
-                <!--type="primary"-->
-                <!--@click="showDetails(scope.$index, scope.row)">查看详情-->
-              <!--</el-button>-->
             </template>
           </el-table-column>
 
@@ -186,7 +180,8 @@
             this.dealerDialog.formValue.contact_address = response.data.data.dealer.contact_address
             this.dealerDialog.formValue.remark = response.data.data.dealer.remark
             this.dealerDialog.isCreated = 2
-            this.dealerDialog.isVisibility = true
+            this.$refs.dialog.show()
+
             this.dealer_code = response.data.data.dealer.dealer_code
 
           }
@@ -211,12 +206,8 @@
               return false;
             } else {
               this.dealerData.splice(index, 1);
-              this.$notify({
-                title: "成功",
-                message: "经销商信息已经删除",
-                type: "success",
-                duration: 2000
-              });
+
+              this.$message.success("删除成功")
             }
           });
         }).catch(() => {
@@ -246,7 +237,8 @@
         });
       },
       manufacturerDialogComfirm: function (val) {
-        this.dealerDialog.isVisibility = false
+        this.$refs.dialog.hide()
+
 
         if (val.isCreated == 2) { //修改
           let params = {
@@ -273,12 +265,9 @@
               this.dealerData[this.editIndex].contact_address = response.data.data.dealer.contact_address
               this.dealerData[this.editIndex].remark = response.data.data.dealer.remark
               this.dealerData[this.editIndex].dealer_code = response.data.data.dealer.dealer_code
-              this.$notify({
-                title: "成功",
-                message: "修改成功",
-                type: "success",
-                duration: 2000
-              });
+
+              this.$message.success("修改成功")
+
 
             }
           });
@@ -290,12 +279,9 @@
               return false;
             } else {
               this.dealerData.unshift(response.data.data.dealer)
-              this.$notify({
-                title: "成功",
-                message: "新增成功",
-                type: "success",
-                duration: 2000
-              });
+
+              this.$message.success("新增成功")
+
 
             }
           });
@@ -305,12 +291,14 @@
 
       },
       manufacturerDialogCancle: function () {
-        this.dealerDialog.isVisibility = false
+        this.$refs.dialog.hide()
+
       },
       showDialog: function () {
         // this.manufacturerDialog.formValue = {}
         this.dealerDialog.formValue = Object.assign({}, this.dealerDialog.resetForm)
-        this.dealerDialog.isVisibility = true
+        this.$refs.dialog.show()
+
         this.dealerDialog.isCreated = 1
 
       }, handleSizeChange(val) {

src/xt_pages/stock/config/goodInfo.vue

@@ -3,7 +3,7 @@
   <div class=" sign-and-weigh-box" style="background: white">
 
 
-    <good-info-dailog :titles="goodInfo.goodInfoDialog.goodInfoTitle" :formValue="goodInfo.goodInfoDialog.formValue"
+    <good-info-dailog ref="dialog" :titles="goodInfo.goodInfoDialog.goodInfoTitle" :formValue="goodInfo.goodInfoDialog.formValue"
                       :visibility="goodInfo.goodInfoDialog.isVisibility"
                       :isCreated="goodInfo.goodInfoDialog.isCreated" v-on:dialog-comfirm="goodInfoDialogComfirm"
                       v-on:dialog-cancle="goodInfoDialogCancle"></good-info-dailog>
@@ -17,43 +17,43 @@
           <el-button size="small" icon="el-icon-circle-plus-outline" style="float: right;margin-bottom: 15px" type="primary" @click="showInfoDialog">新增</el-button>
         </div>
 
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="goodInfo.goodInfoData" :class="signAndWeighBoxPatients" style="width: 100%" border
+        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="goodInfo.goodInfoData"  style="width: 100%" border
                   v-loading="goodInfo.loading"
         >
-          <el-table-column label="商品编码" min-width="30" align="center">
+          <el-table-column label="商品编码"  align="center">
             <template slot-scope="scope">
               {{scope.row.good_code}}
             </template>
           </el-table-column>
-          <el-table-column label="规格名称" min-width="30" align="center">
+          <el-table-column label="规格名称"  align="center">
             <template slot-scope="scope">
               {{scope.row.specification_name}}
 
             </template>
           </el-table-column>
 
-          <el-table-column label="进价" min-width="30" align="center">
+          <el-table-column label="进价"  align="center">
             <template slot-scope="scope">
               {{scope.row.buy_price}}
 
             </template>
           </el-table-column>
-          <el-table-column label="出货价" min-width="30" align="center">
+          <el-table-column label="出货价"  align="center">
             <template slot-scope="scope">
               {{scope.row.sell_price}}
             </template>
           </el-table-column>
-          <el-table-column label="有效期预警" min-width="30" align="center">
+          <el-table-column label="有效期预警"  align="center">
             <template slot-scope="scope">
               {{scope.row.expiry_date_warn_day_count}}
             </template>
           </el-table-column>
-          <el-table-column label="库存预警" min-width="30" align="center">
+          <el-table-column label="库存预警" align="center">
             <template slot-scope="scope">
               {{scope.row.stock_warn_count}}
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" min-width="100">
+          <el-table-column label="操作" align="center" >
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                 <el-button
@@ -72,11 +72,6 @@
                 </el-button>
               </el-tooltip>
 
-              <!--<el-button-->
-                <!--size="mini"-->
-                <!--type="primary"-->
-                <!--@click="showGoodInfoDetails(scope.$index, scope.row)">详情-->
-              <!--</el-button>-->
             </template>
           </el-table-column>
 
@@ -216,9 +211,10 @@
             this.goodInfo.goodInfoDialog.formValue.is_reuse = response.data.data.goodInfo.is_reuse.toString()
             this.goodInfo.goodInfoDialog.formValue.remark = response.data.data.goodInfo.remark
             this.goodInfo.goodInfoDialog.isCreated = 2
-            this.goodInfo.goodInfoDialog.isVisibility = true
             this.goodInfo.good_code = response.data.data.goodInfo.good_code
             this.goodInfo.goodInfoDialog.formValue.good_id =response.data.data.goodInfo.good_type_id
+            this.$refs.dialog.show()
+
           }
         });
 
@@ -242,12 +238,7 @@
               return false;
             } else {
               this.goodInfo.goodInfoData.splice(index, 1);
-              this.$notify({
-                title: "成功",
-                message: "商品信息已经删除",
-                type: "success",
-                duration: 2000
-              });
+              this.$message.success("删除成功")
             }
           });
         }).catch(() => {
@@ -327,7 +318,8 @@
         });
 
       }, goodInfoDialogComfirm: function (val) {
-        this.goodInfo.goodInfoDialog.isVisibility = false
+        this.$refs.dialog.hide()
+
         if (val.isCreated == 2) { //修改
           val['id'] = this.goodInfo.editGoodId
           val['good_code'] = this.goodInfo.good_code
@@ -343,12 +335,9 @@
               this.goodInfo.goodInfoData[this.goodInfo.editGoodIndex].sell_price = response.data.data.goodInfo.sell_price.toString()
               this.goodInfo.goodInfoData[this.goodInfo.editGoodIndex].expiry_date_warn_day_count = response.data.data.goodInfo.expiry_date_warn_day_count.toString()
               this.goodInfo.goodInfoData[this.goodInfo.editGoodIndex].stock_warn_count = response.data.data.goodInfo.stock_warn_count.toString()
-              this.$notify({
-                title: "成功",
-                message: "修改成功",
-                type: "success",
-                duration: 2000
-              });
+
+              this.$message.success("修改成功")
+
 
             }
           });
@@ -360,12 +349,9 @@
               return false;
             } else {
               this.goodInfo.goodInfoData.unshift(response.data.data.goodInfo)
-              this.$notify({
-                title: "成功",
-                message: "新增成功",
-                type: "success",
-                duration: 2000
-              });
+
+              this.$message.success("新增成功")
+
 
             }
           });
@@ -374,9 +360,11 @@
 
       },
       goodInfoDialogCancle: function () {
-        this.goodInfo.goodInfoDialog.isVisibility = false
+        this.$refs.dialog.hide()
+
 
       }, showInfoDialog: function () {
+        this.$refs.dialog.show()
         this.getAllDealer()
         this.getAllManufacturer()
         this.goodInfo.goodInfoDialog.formValue.goodType = []

src/xt_pages/stock/config/goodType.vue

@@ -1,7 +1,7 @@
 <template>
 
   <div class=" sign-and-weigh-box" style="background: white">
-    <good-type-dialog :titles="goodType.goodTypeDialog.goodTypeTitle" :formValue="goodType.goodTypeDialog.formValue"
+    <good-type-dialog ref="dialog" :titles="goodType.goodTypeDialog.goodTypeTitle" :formValue="goodType.goodTypeDialog.formValue"
                       :visibility="goodType.goodTypeDialog.isVisibility"
                       :isCreated="goodType.goodTypeDialog.isCreated" v-on:dialog-comfirm="goodTypeDialogComfirm"
                       v-on:dialog-cancle="goodTypeDialogCancle"></good-type-dialog>
@@ -18,23 +18,23 @@
 
         <div style="margin-bottom: 10px;">
         </div>
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="goodType.goodTypeData" :class="signAndWeighBoxPatients" style="width: 100%" border
+        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="goodType.goodTypeData"  style="width: 100%" border
                   highlight-current-row
                   @row-click="onRowClick"
                   :row-class-name="tableRowClassName"
                   v-loading="goodType.loading"
         >
-          <el-table-column label="类型编码" min-width="30" align="center">
+          <el-table-column label="类型编码" align="center">
             <template slot-scope="scope">
               {{scope.row.type_code}}
             </template>
           </el-table-column>
-          <el-table-column label="类型名称" min-width="30" align="center">
+          <el-table-column label="类型名称" align="center">
             <template slot-scope="scope">
               {{scope.row.type_name}}
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" min-width="70">
+          <el-table-column label="操作" align="center" >
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                 <el-button
@@ -208,7 +208,7 @@
             this.goodType.goodTypeDialog.formValue.remark = response.data.data.goodType.remark
             this.goodType.goodTypeDialog.formValue.type_name = response.data.data.goodType.type_name
             this.goodType.goodTypeDialog.isCreated = 2
-            this.goodType.goodTypeDialog.isVisibility = true
+            this.$refs.dialog.show()
             this.goodType.type_code = response.data.data.goodType.type_code
 
           }
@@ -233,12 +233,8 @@
             } else {
               this.goodType.goodTypeData.splice(index, 1);
               this.goodType.tableCurrentIndex = -1
-              this.$notify({
-                title: "成功",
-                message: "商品类型已经删除",
-                type: "success",
-                duration: 2000
-              });
+
+              this.$message.success("删除成功")
             }
           });
         }).catch(() => {
@@ -265,7 +261,7 @@
 
 
       goodTypeDialogComfirm: function (val) {
-        this.goodType.goodTypeDialog.isVisibility = false
+        this.$refs.dialog.hide()
 
         if (val.isCreated == 2) { //修改
           let params = {
@@ -283,12 +279,9 @@
             } else {
               this.goodType.goodTypeData[this.goodType.editTypeIndex].type_name = response.data.data.goodTypes.type_name
               this.goodType.goodTypeData[this.goodType.editTypeIndex].remark = response.data.data.goodTypes.remark
-              this.$notify({
-                title: "成功",
-                message: "修改成功",
-                type: "success",
-                duration: 2000
-              });
+
+              this.$message.success("修改成功")
+
 
             }
           });
@@ -300,12 +293,9 @@
               return false;
             } else {
               this.goodType.goodTypeData.unshift(response.data.data.goodTypes)
-              this.$notify({
-                title: "成功",
-                message: "新增成功",
-                type: "success",
-                duration: 2000
-              });
+
+              this.$message.success("新增成功")
+
 
             }
           });
@@ -314,11 +304,13 @@
 
       },
       goodTypeDialogCancle: function () {
-        this.goodType.goodTypeDialog.isVisibility = false
+        this.$refs.dialog.hide()
+
 
 
       }, showDialog: function () {
-        this.goodType.goodTypeDialog.isVisibility = true
+        this.$refs.dialog.show()
+
 
       }, getList() {
         this.goodType.loading = true

src/xt_pages/stock/config/manufacturer.vue

@@ -1,97 +1,97 @@
 <template>
-<div class="main-contain">
-  <div class=" sign-and-weigh-box" style="background: white">
-
-    <manufacturer-or-dealer-dialog :titles="manufacturerDialog.titles" :formValue="manufacturerDialog.formValue"
-                                   :visibility="manufacturerDialog.isVisibility"
-                                   :type="manufacturerDialog.type" :isCreated="manufacturerDialog.isCreated"
-                                   v-on:dialog-comfirm="manufacturerDialogComfirm"
-                                   v-on:dialog-cancle="manufacturerDialogCancle"></manufacturer-or-dealer-dialog>
-
-    <el-row>
-      <el-col>
-
-        <div>
-          <el-button size="small" icon="el-icon-circle-plus-outline" style="float: right;margin-bottom: 15px" type="primary" @click="showDialog">新增</el-button>
-        </div>
-
-        <!--<div class="dataTitle"></div>-->
-
-        <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="manufacturerData" :class="signAndWeighBoxPatients" style="width: 100%" border
-                  v-loading="loading"
-        >
-          <el-table-column type="index" label="序号" min-width="20" align="center"></el-table-column>
-          <el-table-column label="厂家编码" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{scope.row.manufacturer_code}}
-            </template>
-          </el-table-column>
-          <el-table-column label="厂家名称" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{scope.row.manufacturer_name}}
-
-            </template>
-          </el-table-column>
-          <el-table-column label="联系人" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{scope.row.contact}}
-
-            </template>
-          </el-table-column>
-          <el-table-column label="联系人电话" min-width="30" align="center">
-            <template slot-scope="scope">
-              {{scope.row.contact_phone}}
-
-            </template>
-          </el-table-column>
-          <el-table-column label="联系地址" min-width="70" align="center">
-            <template slot-scope="scope">
-              {{scope.row.contact_address}}
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-tooltip class="item" effect="dark" content="编辑" placement="top">
-                <el-button
-                  size="small"
-                  type="primary"
-                  icon="el-icon-edit-outline"
-                  @click="handleEdit(scope.$index, scope.row)">
-                </el-button>
-              </el-tooltip>
-              <el-tooltip class="item" effect="dark" content="删除" placement="top">
-                <el-button
-                  size="small"
-                  type="danger"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.$index, scope.row)">
-                </el-button>
-              </el-tooltip>
-              <!--<el-button-->
+  <div class="main-contain">
+    <div class=" sign-and-weigh-box" style="background: white">
+
+      <manufacturer-or-dealer-dialog ref="dialog" :titles="manufacturerDialog.titles" :formValue="manufacturerDialog.formValue"
+                                     :visibility="manufacturerDialog.isVisibility"
+                                     :type="manufacturerDialog.type" :isCreated="manufacturerDialog.isCreated"
+                                     v-on:dialog-comfirm="manufacturerDialogComfirm"
+                                     v-on:dialog-cancle="manufacturerDialogCancle"></manufacturer-or-dealer-dialog>
+
+      <el-row :gutter="15">
+        <el-col>
+
+          <div>
+            <el-button size="small" icon="el-icon-circle-plus-outline" style="float: right;margin-bottom: 15px"
+                       type="primary" @click="showDialog">新增
+            </el-button>
+          </div>
+
+
+          <el-table :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" :data="manufacturerData"
+                    style="width: 100%" border
+                    v-loading="loading"
+          >
+            <el-table-column label="厂家编码" align="center">
+              <template slot-scope="scope">
+                {{scope.row.manufacturer_code}}
+              </template>
+            </el-table-column>
+            <el-table-column label="厂家名称" align="center">
+              <template slot-scope="scope">
+                {{scope.row.manufacturer_name}}
+
+              </template>
+            </el-table-column>
+            <el-table-column label="联系人" align="center">
+              <template slot-scope="scope">
+                {{scope.row.contact}}
+
+              </template>
+            </el-table-column>
+            <el-table-column label="联系人电话" align="center">
+              <template slot-scope="scope">
+                {{scope.row.contact_phone}}
+
+              </template>
+            </el-table-column>
+            <el-table-column label="联系地址" align="center">
+              <template slot-scope="scope">
+                {{scope.row.contact_address}}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+                  <el-button
+                    size="small"
+                    type="primary"
+                    icon="el-icon-edit-outline"
+                    @click="handleEdit(scope.$index, scope.row)">
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                  <el-button
+                    size="small"
+                    type="danger"
+                    icon="el-icon-delete"
+                    @click="handleDelete(scope.$index, scope.row)">
+                  </el-button>
+                </el-tooltip>
+                <!--<el-button-->
                 <!--size="mini"-->
                 <!--type="primary"-->
                 <!--@click="showDetails(scope.$index, scope.row)">查看详情-->
-              <!--</el-button>-->
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :page-sizes="[7]"
-          :page-size="7"
-          background
-          align="right"
-          style="margin-top:20px;"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total">
-        </el-pagination>
-
-      </el-col>
-    </el-row>
+                <!--</el-button>-->
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[7]"
+            :page-size="7"
+            background
+            align="right"
+            style="margin-top:20px;"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total">
+          </el-pagination>
+          </el-col>
+      </el-row>
+    </div>
   </div>
-</div>
 
 </template>
 
@@ -99,17 +99,17 @@
   import manufacturerOrDealerDialog from '../Dialog/manufacturerOrDealerDialog'
   import {
     createManufacturer,
-    modifyManufacturer,
-    getManufacturerList,
     deleteManufacturer,
-    GetManufacturer
-  } from "@/api/stock";
+    GetManufacturer,
+    getManufacturerList,
+    modifyManufacturer
+  } from '@/api/stock'
 
   export default {
     components: {
-      manufacturerOrDealerDialog,
+      manufacturerOrDealerDialog
     },
-    name: "manufacturer",
+    name: 'manufacturer',
     data() {
       return {
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
@@ -120,11 +120,11 @@
 
         page: 1,
         limit: 7,
-        loading:false,
+        loading: false,
 
         manufacturer_code: '',
         editId: '',
-        editIndex:'',
+        editIndex: '',
         manufacturerDialog: {
           titles: '新增厂家',
           isVisibility: false,
@@ -138,7 +138,7 @@
             platform_number: '',
             email: '',
             contact_address: '',
-            remark: '',
+            remark: ''
           },
           resetForm: {
             manufacturer_name: '',
@@ -148,15 +148,14 @@
             platform_number: '',
             email: '',
             contact_address: '',
-            remark: '',
-          },
+            remark: ''
+          }
         }
 
-
-      };
+      }
     },
     methods: {
-      handleEdit: function (index, row) {
+      handleEdit: function(index, row) {
         this.editId = row.id
         this.editIndex = index
         let params = {
@@ -164,8 +163,8 @@
         }
         GetManufacturer(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
+            this.$message.error(response.data.msg)
+            return false
           } else {
             this.manufacturerDialog.formValue.manufacturer_name = response.data.data.manufacturer.manufacturer_name
             this.manufacturerDialog.formValue.contact = response.data.data.manufacturer.contact
@@ -175,15 +174,14 @@
             this.manufacturerDialog.formValue.contact_address = response.data.data.manufacturer.contact_address
             this.manufacturerDialog.formValue.remark = response.data.data.manufacturer.remark
             this.manufacturerDialog.isCreated = 2
-            this.manufacturerDialog.isVisibility = true
+            this.$refs.dialog.show()
             this.manufacturer_code = response.data.data.manufacturer.manufacturer_code
 
           }
-        });
+        })
 
       },
-      handleDelete: function (index, row) {
-
+      handleDelete: function(index, row) {
 
         this.$confirm('确认删除这条厂家信息?', '删除厂家信息', {
           confirmButtonText: '确定',
@@ -196,31 +194,25 @@
 
           deleteManufacturer(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
-              this.manufacturerData.splice(index, 1);
-              this.$notify({
-                title: "成功",
-                message: "厂家已经删除",
-                type: "success",
-                duration: 2000
-              });
+              this.manufacturerData.splice(index, 1)
+              this.$message.success("厂家已经删除")
             }
-          });
+          })
         }).catch(() => {
-        });
-
+        })
 
       },
-      showDetails: function (index, row) {
+      showDetails: function(index, row) {
         let params = {
           id: row.id
         }
         GetManufacturer(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
+            this.$message.error(response.data.msg)
+            return false
           } else {
             this.manufacturerDialog.formValue.manufacturer_name = response.data.data.manufacturer.manufacturer_name
             this.manufacturerDialog.formValue.contact = response.data.data.manufacturer.contact
@@ -232,11 +224,11 @@
             this.manufacturerDialog.isCreated = 3
             this.manufacturerDialog.isVisibility = true
           }
-        });
+        })
       },
-      manufacturerDialogComfirm: function (val) {
-        this.manufacturerDialog.isVisibility = false
-
+      manufacturerDialogComfirm: function(val) {
+        // this.manufacturerDialog.isVisibility = false
+        this.$refs.dialog.hide()
         if (val.isCreated == 2) { //修改
           let params = {
             'manufacturer_name': val.manufacturer_name,
@@ -251,8 +243,8 @@
           }
           modifyManufacturer(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
               this.manufacturerData[this.editIndex].manufacturer_name = response.data.data.manufacturer.manufacturer_name
               this.manufacturerData[this.editIndex].contact = response.data.data.manufacturer.contact
@@ -262,62 +254,57 @@
               this.manufacturerData[this.editIndex].contact_address = response.data.data.manufacturer.contact_address
               this.manufacturerData[this.editIndex].remark = response.data.data.manufacturer.remark
               this.manufacturerData[this.editIndex].manufacturer_code = response.data.data.manufacturer.manufacturer_code
-              this.$notify({
-                title: "成功",
-                message: "修改成功",
-                type: "success",
-                duration: 2000
-              });
+
+
+              this.$message.success("修改成功")
+
 
             }
-          });
+          })
 
         } else if (val.isCreated == 1) { //新增
           createManufacturer(val).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
               this.manufacturerData.unshift(response.data.data.manufacturer)
-              this.$notify({
-                title: "成功",
-                message: "新增成功",
-                type: "success",
-                duration: 2000
-              });
+
+              this.$message.success("新增成功")
+
 
             }
-          });
+          })
 
         }
 
-
       },
-      manufacturerDialogCancle: function () {
-        this.manufacturerDialog.isVisibility = false
+      manufacturerDialogCancle: function() {
+        this.$refs.dialog.hide()
+
       },
-      showDialog: function () {
+      showDialog: function() {
         this.manufacturerDialog.formValue = Object.assign({}, this.manufacturerDialog.resetForm)
-        this.manufacturerDialog.isVisibility = true
+        this.$refs.dialog.show()
         this.manufacturerDialog.isCreated = 1
 
       }, handleSizeChange(val) {
-        this.limit = val;
-        this.getList();
+        this.limit = val
+        this.getList()
       }, handleCurrentChange(val) {
-        this.page = val;
-        this.getList();
-      },getList(){
+        this.page = val
+        this.getList()
+      }, getList() {
         let params = {
-          'page':this.page,
-          'limit':this.limit
+          'page': this.page,
+          'limit': this.limit
         }
         this.loading = true
         getManufacturerList(params).then(response => {
           if (response.data.state == 0) {
             this.loading = false
-            this.$message.error(response.data.msg);
-            return false;
+            this.$message.error(response.data.msg)
+            return false
           } else {
             this.loading = false
             this.total = response.data.data.total
@@ -326,7 +313,7 @@
               this.manufacturerData.push(response.data.data.manufacturer[i])
             }
           }
-        });
+        })
 
       }
     },
@@ -334,62 +321,8 @@
       this.getList()
 
     }
-  };
-</script>
-
-<style rel="stylesheet/css" lang="scss" scoped>
-  .information {
-    border: 1px #dcdfe6 solid;
-    padding: 30px 20px 30px 20px;
-
-    .border {
-      border-bottom: 1px #dcdfe6 solid;
-      margin: 0px 0 20px 0;
-    }
-  }
-
-  .title {
-    height: 44px;
-    line-height: 44px;
-    padding: 0 0 0 10px;
-    margin: 0 0 10px 0;
-    // border-radius: 4px 4px 0 0;
-  }
-
-  .edit_separater {
-    border-top: 1px solid rgb(233, 233, 233);
-    margin-top: 15px;
-    margin-bottom: 15px;
   }
+</script>
 
-</style>
 
-<style>
-  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
-    font-size: 12px;
-  }
 
-  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
-    background: #6fb5fa;
-  }
-
-  .dataTitle {
-    color: #409eff;
-    font-size: 16px;
-    border-bottom: 1px #409eff solid;
-    height: 36px;
-    line-height: 30px;
-    margin: 0 0 15px 0;
-    position: relative;
-    padding: 0 0 6px 15px;
-  &::before {
-     position: absolute;
-     left: 0;
-     bottom: 10px;
-     content: "";
-     width: 2px;
-     height: 20px;
-     background: #409eff;
-   }
-  }
-</style>

src/xt_pages/stock/otherCancelStockOrder.vue

@@ -33,7 +33,6 @@
 
       </div>
 
-      <el-row :gutter="12" style="margin-top: 10px">
         <el-table
           :data="cancelStockDate"
           :class="signAndWeighBoxPatients"
@@ -115,7 +114,6 @@
           :total="total">
         </el-pagination>
 
-      </el-row>
     </div>
   </div>
 </template>

src/xt_pages/stock/salesReturnEdit.vue

@@ -10,7 +10,7 @@
 
   <div class="app-container">
 
-    <sales-return-dialog :propForm="propForm"
+    <sales-return-dialog ref="dialog" :propForm="propForm"
                      :visibility="isVisibility"
                      v-on:dialog-comfirm="comfirm"
                      v-on:dialog-cancle="cancle"></sales-return-dialog>
@@ -172,7 +172,8 @@
     },
     methods: {
       comfirm: function(val) {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ; i--) {
             if (i == 0) {
@@ -184,14 +185,17 @@
               tempForm['good_type_id'] = val.goodTypeId
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['count'] = ''
-              this.recordInfo.recordData.push(tempForm)
+              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
+
             }
           }
         }
 
         this.currentIndex = -1
       }, cancle: function() {
-        this.isVisibility = false
+
+        this.$refs.dialog.hide()
+
       }, GetConfigInfo: function() {
         const params = {
           type: this.$route.query.type
@@ -264,12 +268,8 @@
                 this.$message.error(response.data.msg)
                 return false
               } else {
-                this.$notify({
-                  title: '成功',
-                  message: '删除成功',
-                  type: 'success',
-                  duration: 2000
-                })
+
+                this.$message.success("删除成功")
                 this.recordInfo.recordData.splice(index, 1)
               }
             })
@@ -284,9 +284,7 @@
         }
       }, showDialog(index, row) {
         this.currentIndex = index
-
-        this.isVisibility = true
-        console.log(this.form.manufacturer)
+        this.$refs.dialog.show()
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {
           if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
             this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
@@ -322,12 +320,9 @@
                 this.$message.error(response.data.msg)
                 return false
               } else {
-                this.$notify({
-                  title: '成功',
-                  message: '退货成功',
-                  type: 'success',
-                  duration: 2000
-                })
+
+                this.$message.success('退货成功')
+
                 this.$router.back(-1)
               }
             })

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -9,7 +9,7 @@
     </div>
 
     <div class="app-container">
-      <sales-return-dialog :propForm="propForm"
+      <sales-return-dialog ref="dialog" :propForm="propForm"
                            :visibility="isVisibility"
                            v-on:dialog-comfirm="comfirm"
                            v-on:dialog-cancle="cancle"></sales-return-dialog>
@@ -22,7 +22,8 @@
 
 
       <div class="cell clearfix">
-        <label class="title"><span class="name">厂商</span> : </label>
+        <label class="title"><span class="name">厂商<span style="color: red;margin-left: -15px">*</span></span> : </label>
+
         <el-select v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer()">
           <el-option
             v-for="(option, index) in manufacturer"
@@ -191,7 +192,8 @@
     },
     methods: {
       comfirm: function(val) {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ; i--) {
             if (i == 0) {
@@ -203,14 +205,17 @@
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['return_count'] = ''
               tempForm['price'] = ''
-              this.recordInfo.recordData.push(tempForm)
+              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
+
             }
           }
         }
 
         this.currentIndex = -1
       }, cancle: function() {
-        this.isVisibility = false
+
+        this.$refs.dialog.hide()
+
       }, GetConfigInfo: function() {
         const params = {
           type: this.type
@@ -303,8 +308,8 @@
           this.$message.error('请先选择厂商')
           return
         } else {
-          this.isVisibility = true
-          console.log(this.form.manufacturer)
+          this.$refs.dialog.show()
+
           for (let i = 0; i < this.propForm.goodInfo.length; i++) {
             if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
               this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
@@ -346,12 +351,9 @@
                 this.$message.error(response.data.msg)
                 return false
               } else {
-                this.$notify({
-                  title: '成功',
-                  message: '退货成功',
-                  type: 'success',
-                  duration: 2000
-                })
+
+                this.$message.success('退货成功')
+
                 this.recordInfo.recordData = []
                 this.$router.back(-1)
               }

src/xt_pages/stock/stockInOrderAdd.vue

@@ -10,7 +10,7 @@
     </div>
     <div class="app-container">
 
-      <stock-in-dialog :propForm="propForm"
+      <stock-in-dialog ref="dialog" :propForm="propForm"
                        :visibility="isVisibility"
                        v-on:dialog-comfirm="comfirm"
                        v-on:dialog-cancle="cancle"></stock-in-dialog>
@@ -22,7 +22,8 @@
       </div>
 
       <div class="cell clearfix">
-        <label class="title"><span class="name">厂商</span> : </label>
+        <label class="title"><span class="name">厂商<span style="color: red;margin-left: -15px">*</span></span> : </label>
+
         <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商" @change="changeManufacturer()" >
           <el-option
             v-for="(option, index) in manufacturer"
@@ -338,7 +339,7 @@
         this.propForm.isCreated = 1
         this.isVisibility = true
       }, comfirm: function(val) {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ; i--) {
             if (i == 0) {
@@ -356,14 +357,17 @@
               tempForm['remark'] = ''
               tempForm['dealer'] = ''
               tempForm['manufacturer'] = ''
-              this.recordInfo.recordData.push(tempForm)
+              // this.recordInfo.recordData.add(tempForm,this.currentIndex + i)
+              // this.recordInfo.recordData.push(tempForm)
+              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
             }
           }
         }
 
         this.currentIndex = -1
       }, cancle: function() {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
       }, GetAllGoodType: function() {
         GetAllGoodType().then(response => {
           if (response.data.state == 0) {
@@ -463,7 +467,8 @@
           this.$message.error('请先选择厂商')
           return
         } else {
-          this.isVisibility = true
+
+          // this.isVisibility = true
           const params = {
             id: this.form.manufacturer
           }
@@ -485,6 +490,8 @@
                   obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
                   return cur
                 }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+                this.$refs.dialog.show()
+
               }
             }
           })
@@ -543,12 +550,9 @@
                 this.$message.error(response.data.msg)
                 return false
               } else {
-                this.$notify({
-                  title: '成功',
-                  message: '入库成功',
-                  type: 'success',
-                  duration: 2000
-                })
+
+                this.$message.success('入库成功')
+
                 this.$router.back(-1)
               }
             })

src/xt_pages/stock/stockInOrderDetail.vue

@@ -79,13 +79,12 @@
           </template>
         </el-table-column>
         <el-table-column label="生产日期" min-width="40" align="center">
-          <template slot-scope="scope">
+          <template v-if="scope.row.product_date != 0" slot-scope="scope">
             {{scope.row.product_date | parseTime('{y}-{m}-{d}')}}
-
           </template>
         </el-table-column>
         <el-table-column label="有效日期" min-width="40" align="center">
-          <template slot-scope="scope">
+          <template v-if="scope.row.product_date != 0" slot-scope="scope">
             {{ scope.row.expiry_date | parseTime('{y}-{m}-{d}')}}
           </template>
         </el-table-column>

src/xt_pages/stock/stockInOrderEdit.vue

@@ -10,7 +10,7 @@
 
   <div class="app-container">
 
-    <stock-in-dialog :propForm="propForm"
+    <stock-in-dialog ref="dialog" :propForm="propForm"
                      :visibility="isVisibility"
                      v-on:dialog-comfirm="comfirm"
                      v-on:dialog-cancle="cancle"></stock-in-dialog>
@@ -259,7 +259,8 @@ export default {
     methods: {
 
       comfirm: function(val) {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ;i--) {
             if (i == 0) {
@@ -278,14 +279,16 @@ export default {
               tempForm['remark'] = ''
               tempForm['dealer'] = ''
               tempForm['manufacturer'] = ''
-              this.recordInfo.recordData.push(tempForm)
+              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
+
             }
           }
         }
 
         this.currentIndex = -1
       }, cancle: function() {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
       }, GetConfigInfo: function() {
         GetAllConfig().then(response => {
           if (response.data.state == 0) {
@@ -345,12 +348,10 @@ export default {
                 this.$message.error(response.data.msg)
                 return false
               } else {
-                this.$notify({
-                  title: '成功',
-                  message: '删除成功',
-                  type: 'success',
-                  duration: 2000
-                })
+
+                this.$message.success("删除成功")
+
+
                 this.recordInfo.recordData.splice(index, 1)
               }
             })
@@ -396,6 +397,8 @@ export default {
                   obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
                   return cur
                 }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+                this.$refs.dialog.show()
+
               }
             }
           })
@@ -425,12 +428,9 @@ export default {
                 this.$message.error(response.data.msg)
                 return false
               } else {
-                this.$notify({
-                  title: '成功',
-                  message: '入库成功',
-                  type: 'success',
-                  duration: 2000
-                })
+
+                this.$message.success("入库成功")
+
                 this.$router.back(-1)
               }
             })

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -11,7 +11,7 @@
 
   <div class="app-container">
 
-    <sales-return-dialog :propForm="propForm"
+    <sales-return-dialog ref="dialog" :propForm="propForm"
                          :visibility="isVisibility"
                          v-on:dialog-comfirm="comfirm"
                          v-on:dialog-cancle="cancle"></sales-return-dialog>
@@ -25,7 +25,8 @@
 
 
     <div class="cell clearfix">
-      <label class="title"><span class="name">厂商</span> : </label>
+      <label class="title"><span class="name">厂商<span style="color: red;margin-left: -15px">*</span></span> : </label>
+
       <el-select  v-model="form.manufacturer" clearable  placeholder="请选择厂商"  @change="changeManufacturer()">
         <el-option
           v-for="(option, index) in manufacturer"
@@ -210,7 +211,8 @@
     },
     methods: {
       comfirm: function(val) {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ;i--) {
             if (i == 0) {
@@ -223,15 +225,16 @@
               tempForm['count'] = ''
               tempForm['price'] = ''
               tempForm['remark'] = ''
+              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
 
-              this.recordInfo.recordData.push(tempForm)
             }
           }
         }
 
         this.currentIndex = -1
       }, cancle: function() {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
       }, GetConfigInfo: function() {
         const params = {
           type: this.$route.query.type
@@ -326,7 +329,8 @@
           this.$message.error('请先选择厂商')
           return
         } else {
-          this.isVisibility = true
+          this.$refs.dialog.show()
+
           console.log(this.form.manufacturer)
           for (let i = 0; i < this.propForm.goodInfo.length; i++) {
             if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
@@ -371,12 +375,8 @@
                 this.$message.error(response.data.msg)
                 return false
               } else {
-                this.$notify({
-                  title: '成功',
-                  message: '退货成功',
-                  type: 'success',
-                  duration: 2000
-                })
+
+                this.$message.success("退货成功")
                 this.recordInfo.recordData = []
                 this.$router.back(-1)
               }

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -10,7 +10,7 @@
 
   <div class="app-container">
 
-    <sales-return-dialog :propForm="propForm"
+    <sales-return-dialog  ref="dialog"  :propForm="propForm"
                      :visibility="isVisibility"
                      v-on:dialog-comfirm="comfirm"
                      v-on:dialog-cancle="cancle"></sales-return-dialog>
@@ -193,7 +193,8 @@
     },
     methods: {
       comfirm: function(val) {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ; i--) {
             if (i == 0) {
@@ -207,15 +208,15 @@
               tempForm['count'] = ''
               tempForm['price'] = ''
               tempForm['remark'] = ''
+              this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
 
-              this.recordInfo.recordData.push(tempForm)
             }
           }
         }
 
         this.currentIndex = -1
       }, cancle: function() {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
       }, GetConfigInfo: function() {
         const params = {
           type: this.$route.query.type
@@ -284,12 +285,9 @@
                 this.$message.error(response.data.msg)
                 return false
               } else {
-                this.$notify({
-                  title: '成功',
-                  message: '删除成功',
-                  type: 'success',
-                  duration: 2000
-                })
+
+                this.$message.success("删除成功")
+
                 this.recordInfo.recordData.splice(index, 1)
               }
             })
@@ -305,8 +303,7 @@
       }, showDialog(index, row) {
         this.currentIndex = index
 
-        this.isVisibility = true
-        console.log(this.form.manufacturer)
+
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {
           if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
             this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
@@ -317,6 +314,8 @@
           obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
           return cur
         }, [])
+        this.$refs.dialog.show()
+
       }, back() {
         this.$router.go(-1)
       }, submit() {
@@ -342,12 +341,8 @@
                 this.$message.error(response.data.msg)
                 return false
               } else {
-                this.$notify({
-                  title: '成功',
-                  message: '退货成功',
-                  type: 'success',
-                  duration: 2000
-                })
+
+                this.$message.success("退货成功")
                 this.$router.back(-1)
               }
             })

src/xt_pages/user/components/PatientDetail.vue

@@ -61,7 +61,7 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="8" style="height:59px;"> 
+            <el-col :span="8" style="height:59px;">
               <el-form-item label="治疗状态(转归) : " class="is-required" prop="lapseto"  >
                 <el-radio-group v-model="form.lapseto">
                   <el-radio v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" disabled>{{item.label}}</el-radio>
@@ -235,7 +235,7 @@
             </el-checkbox-group>
           </el-form-item>
         </el-col>
-       
+
         <el-col :span="24">
           <el-form-item label="诊断 : " prop="diagnose">
             <!-- <textarea v-model="form.diagnose" class="textarea" disabled></textarea> -->
@@ -300,7 +300,7 @@
       <div id="print-info-box" >
         <div class="print_main_content">
             <div class="order_title">
-                方济医院血液透析门诊病历
+               {{orgname}} 血液透析门诊病历
             </div>
             <div>
                 <table>