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

src/views/layout/Layout.vue

@@ -2,7 +2,7 @@
   <div class="app-wrapper" :class="classObj">
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"></div>
       <navbar></navbar>
-    
+
     <div class="Header-container">
     <sidebar class="sidebar-container"></sidebar>
     <div class="main-container">

src/views/layout/components/Navbar.vue

@@ -5,10 +5,8 @@
     </div>
     <el-menu class="navbar" mode="horizontal">
       <div>
-        <el-dropdown trigger="click" style="color:#fff;">
-        <span class="el-dropdown-link">{{ this.$store.getters.xt_user.org.org_name }}
+        <span> {{this.$store.getters.xt_user.org.org_name}}
         </span>
-        </el-dropdown>
       </div>
       <div class="system-nav">
         <div class="system-nav-menu active">
@@ -116,7 +114,7 @@
       }
 
     },
-    create() {
+    created() {
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
       console.log(this.orgname)

src/xt_pages/stock/Dialog/stockInDialog.vue

@@ -85,19 +85,19 @@
         multipleSelection: [],
         currentGoodTypeId: 0,
         isClose: false,
-        visibility: false,
+        visibility: false
       }
     },
     props: {
       propForm: {
         type: Object
-      },
+      }
     },
     methods: {
-      hide:function(){
+      hide: function() {
         this.visibility = false
       },
-      show:function(){
+      show: function() {
         this.visibility = true
       },
       goodTypeTableChange: function(currentRow, oldCurrentRow) {
@@ -124,12 +124,14 @@
         this.goodInfoTableData = []
         this.$emit('dialog-cancle', this.getValue())
         this.$refs.multipleTable.clearSelection()
+        this.$refs.templatetable.setCurrentRow(null)
       },
       comfirm: function(formName) {
         this.goodInfo = []
         this.goodInfoTableData = []
         this.$emit('dialog-comfirm', this.getValue())
         this.$refs.multipleTable.clearSelection()
+        this.$refs.templatetable.setCurrentRow(null)
       },
       getValue: function() {
         const obj = {
@@ -182,7 +184,7 @@
         this.multipleSelection = val
       }, changeAllGoodInfoTableData: function(val) {
         this.multipleSelection = val
-      },clickRow:function(row) {
+      }, clickRow: function(row) {
         this.$refs.multipleTable.toggleRowSelection(row)
       }
     }

src/xt_pages/user/components/PatientForm.vue

@@ -87,14 +87,14 @@
                   <el-input v-model="form.homeTelephone" maxlength="20"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:58px;" >
+              <el-col :span="8" :style="isEdit?'width:360px':''"  >
                 <el-form-item label="患者来源 : " class="is-required" prop="source" >
                   <el-radio-group v-model="form.source">
                     <el-radio v-for="item in sourceOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:58px;">
+              <el-col :span="8" :style="isEdit?'width:360px':''" >
                 <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" >{{item.label}}</el-radio>
@@ -113,7 +113,7 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8" >
+              <el-col :span="8" :style="isEdit?'width:360px':''" >
                 <el-form-item label="家庭住址 : " prop="homeAddress">
                   <el-input v-model="form.homeAddress"></el-input>
                 </el-form-item>
@@ -185,12 +185,12 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" >
+                <el-col :span="8" :style="isEdit?'width:360px':''" >
                   <el-form-item label="工作单位 : " prop="work">
                     <el-input v-model="form.work"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" >
+                <el-col :span="8" :style="isEdit?'width:360px':''">
                   <el-form-item label="单位地址 : " prop="unit_address">
                     <el-input v-model="form.unit_address"></el-input>
                   </el-form-item>
@@ -241,17 +241,17 @@
 
         <div class="dataTitle">治疗信息</div>
         <el-row :span="24">
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="主诉 : " prop="patient_complains">
               <el-input type="textarea" :rows="3" v-model="form.patient_complains" resize="none" placeholder=""></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="现病史 : " prop="present_history">
               <el-input type="textarea" :rows="3" v-model="form.present_history" resize="none" placeholder=""></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="既往史 : " prop="past_history">
               <el-input type="textarea" :rows="3" v-model="form.past_history" resize="none" placeholder=""></el-input>
             </el-form-item>
@@ -498,9 +498,9 @@
       }
 
       return {
-        crumbs:[
-          {path:false, name:'病人管理'},
-          {path:false, name:'新增病人'},
+        crumbs: [
+          { path: false, name: '病人管理' },
+          { path: false, name: '新增病人' }
         ],
         generic_info_fold: true,
         treat_info_fold: true,
@@ -1010,6 +1010,7 @@
   .el-form{
   .el-col-6,.el-col-8{
     width: 430px;
+    height: 59px!important;
   }
   .el-form-item {
   .el-select {

src/xt_pages/workforce/components/setup_template_dialog.vue

@@ -18,81 +18,80 @@
 </template>
 
 <script>
-import { setTemplateMode } from "@/api/schedule_template/patient"
+import { setTemplateMode } from '@/api/schedule_template/patient'
 
 export default {
-    name: "SetUpTemplateDialog",
-    data() {
-        return {
-            visible: false,
-            form: {
-                mode: 0,
-            },
-        }
+  name: 'SetUpTemplateDialog',
+  data() {
+    return {
+      visible: false,
+      form: {
+        mode: 0
+      }
+    }
+  },
+  props: {
+    template_mode: {
+      type: Object
     },
-    props: {
-        template_mode: {
-            type: Object,
-        },
-        origin_mode: {
-            type: Number,
-        }
+    origin_mode: {
+      type: Number
+    }
+  },
+  watch: {
+    'template_mode.mode': function() {
+      this.form.mode = this.template_mode.mode
+    }
+  },
+  methods: {
+    _close: function(done) {
+      this.clear()
+      done()
     },
-    watch: {
-        "template_mode.mode": function() {
-            this.form.mode = this.template_mode.mode
-        }
+    clear: function() {
+
+    },
+    show() {
+      this.clear()
+      this.visible = true
     },
-    methods: {
-        _close: function(done) {
-            this.clear()
-            done()
-        },
-        clear: function() {
-         
-        },
-        show() {
-            this.clear()
-            this.visible = true
-        },
-        hide() {
-            this.clear()
-            this.visible = false
-        },
-        saveAction: function() {
-            var msg = ""
-            if (this.origin_mode == 0) { // 0 -> 1 或 0 -> 2 直接清除下两周的排班
-                msg = "开启模板将清除下两周已设置的排班！是否继续开启？"
-            } else if (this.form.mode == 0) { // 1 -> 0 或 2 -> 0 则不处理排班，但清除所有模板item
+    hide() {
+      this.clear()
+      this.visible = false
+    },
+    saveAction: function() {
+      var msg = ''
+      if (this.origin_mode == 0) { // 0 -> 1 或 0 -> 2 直接清除下两周的排班
+        msg = '开启模板将清除下两周已设置的排班！是否继续开启？'
+      } else if (this.form.mode == 0) { // 1 -> 0 或 2 -> 0 则不处理排班，但清除所有模板item
 
-            } else if (this.origin_mode == 1 && this.form.mode == 2) { // 1 -> 2 清除第二周排班
-                msg = "开启双周模板将清除下第二周已设置的排班！是否继续开启？"
-            } else if (this.origin_mode == 2 && this.form.mode == 1) { // 2 -> 1 清除第二周模板item，清除第二周排班，将第一周的排班重复到第二周
-                msg = "双周模板调整为单周模板时，下第二周排班将被清除，并用单周模板生成下第二周的排班！是否继续调整？"
-            }
-            if (msg.length == 0) {
-                this.submit()
-            } else {
-                this.$confirm(msg, '提示', {confirmButtonText: '确 定', cancelButtonText: '取 消', type: 'warning'})
-                .then(() => {
-                    this.submit()
-                })
-            }
-        },
-        submit: function() {
-            setTemplateMode(this.form.mode).then(rs => {
-                var resp = rs.data
-                if (resp.state == 1) {
-                    this.template_mode.mode = this.form.mode
-                    this.hide()
-                    this.$emit("chenge_mode", this.form.mode)
-                    
-                } else {
-                    this.$message.error(resp.msg)
-                }
-            })
+      } else if (this.origin_mode == 1 && this.form.mode == 2) { // 1 -> 2 清除第二周排班
+        msg = '开启双周模板将清除下第二周已设置的排班！是否继续开启？'
+      } else if (this.origin_mode == 2 && this.form.mode == 1) { // 2 -> 1 清除第二周模板item，清除第二周排班，将第一周的排班重复到第二周
+        msg = '双周模板调整为单周模板时，下第二周排班将被清除，并用单周模板生成下第二周的排班！是否继续调整？'
+      }
+      if (msg.length == 0) {
+        this.submit()
+      } else {
+        this.$confirm(msg, '提示', { confirmButtonText: '确 定', cancelButtonText: '取 消', type: 'warning' })
+          .then(() => {
+            this.submit()
+          })
+      }
+    },
+    submit: function() {
+      setTemplateMode(this.form.mode).then(rs => {
+        var resp = rs.data
+        if (resp.state == 1) {
+          this.template_mode.mode = this.form.mode
+          this.hide()
+          this.$emit('chenge_mode', this.form.mode)
+        } else {
+          this.$message.error(resp.msg)
         }
+      })
     }
+  }
 }
 </script>