Merge branch 'master' of http://git.shengws.com/csx/Vue_New

config/dev.env.js

@@ -6,9 +6,8 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
+  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
   // BASE_API:'"http://localhost:9531"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

src/store/modules/xt_user.js

@@ -363,12 +363,16 @@ const xt_user = {
         resolve()
       })
     }, updateAllFiledConfigList({ commit }, object) {
+      console.log(object)
       var oldFiledList = getFiledConfigList()
       var infoJSON = JSON.parse(oldFiledList)
 
       return new Promise((resolve, reject) => {
         infoJSON = object
+        console.log(infoJSON)
+
         setFiledConfigList(JSON.stringify(infoJSON))
+
         commit('SET_FILEDS_LIST', infoJSON)
         resolve()
       })

src/xt_pages/data/printTemplate.vue

@@ -222,9 +222,9 @@ export default {
               this.radio = template_id.toString();
               this.tempRadio = template_id.toString();
               // 同步
-              console.log(response.data.data.fileds)
+              // console.log(response.data.data.fileds)
               this.loading = false;
-               store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
+               // store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
               this.$message({
                 type: "success",
                 message: "切换成功"

src/xt_pages/dialysis/Dialog/StatOrderDialog/index.vue

@@ -1,104 +1,175 @@
 <template>
-    <div>
-        <el-dialog title="临时医嘱" :visible.sync="statOrder" width="500px">
-            <el-form :model="form">
-                <el-form-item label="医嘱类型 : " :label-width="formLabelWidth">
-                    <!-- <el-input v-model="form.name" auto-complete="off"></el-input> -->
-                    <span>临时</span>
-                </el-form-item>
-                <el-form-item label="医嘱时间 : " :label-width="formLabelWidth">
-                    <span>2018-09-08</span>
-                </el-form-item>
-                <el-form-item label="开始时间 : " :label-width="formLabelWidth">
-                  <el-col :span="11">
-                    <el-date-picker type="date" placeholder="选择日期" v-model="form.startDate" style="width: 100%;"></el-date-picker>
-                  </el-col>
-                </el-form-item>
-                <el-form-item label="提醒日期 : " :label-width="formLabelWidth">
-                  <el-col :span="11">
-                    <el-date-picker type="date" placeholder="选择日期" v-model="form.remindDate" style="width: 100%;"></el-date-picker>
-                  </el-col>
-                </el-form-item>
-                <el-form-item label="开嘱医生 : " :label-width="formLabelWidth">
-                  <el-select v-model="form.doctor" >
-                    <el-option v-for="item in doctorList" :label="item.label" :value="item.value" :key="item.value"></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="医嘱名称 : " :label-width="formLabelWidth">
-                  <el-select v-model="form.name" >
-                      <el-option v-for="(item, index) in nameList" :label="item.label" :value="item.value" :key="index"></el-option>
-                  </el-select>  
-                </el-form-item>
-                <el-form-item label="医嘱内容 : " :label-width="formLabelWidth">
-                    <span>1g*8# 片剂</span>
-                </el-form-item>
-                <el-form-item label="单次用量 : " :label-width="formLabelWidth">
-                    <el-input-number v-model="form.single" controls-position="right" @change="handleChange" ></el-input-number>
-                    <span>g</span>
-                </el-form-item> 
-                <el-form-item label="开药数量 : " :label-width="formLabelWidth">
-                    <el-input-number v-model="form.number" controls-position="right" @change="handleChange" ></el-input-number>
-                    <span>瓶</span>
-                </el-form-item> 
-                <el-form-item label="给药途径 : " :label-width="formLabelWidth">
-                  <el-select v-model="form.way" style="width:100%;" >
-                      <el-option v-for="(item, index) in wayList" :label="item.label" :value="item.value" :key="index"></el-option>                      
-                  </el-select>  
-                </el-form-item>
-                <el-form-item label="执行频率 : " :label-width="formLabelWidth">
-                  <el-select v-model="form.frequency" style="width:100%;">
-                      <el-option v-for="(item, index) in frequencyList" :label="item.label" :value="item.value" :key="index"></el-option>                                           
-                  </el-select>  
-                </el-form-item>
-                <el-form-item label="子药数量 : " :label-width="formLabelWidth">
-                  <el-input-number v-model="form.child" @change="handleChangeChild" label="0"></el-input-number>
-                </el-form-item>
+  <div>
+    <el-dialog title="临时医嘱" :visible.sync="statOrder" width="500px">
+      <el-form :model="form">
+        <el-form-item label="医嘱类型 : " :label-width="formLabelWidth">
+          <!-- <el-input v-model="form.name" auto-complete="off"></el-input> -->
+          <span>临时</span>
+        </el-form-item>
+        <el-form-item label="医嘱时间 : " :label-width="formLabelWidth">
+          <span>2018-09-08</span>
+        </el-form-item>
+        <el-form-item label="开始时间 : " :label-width="formLabelWidth">
+          <el-col :span="11">
+            <el-date-picker
+              type="date"
+              placeholder="选择日期"
+              v-model="form.startDate"
+              style="width: 100%;"
+            ></el-date-picker>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="提醒日期 : " :label-width="formLabelWidth">
+          <el-col :span="11">
+            <el-date-picker
+              type="date"
+              placeholder="选择日期"
+              v-model="form.remindDate"
+              style="width: 100%;"
+            ></el-date-picker>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="开嘱医生 : " :label-width="formLabelWidth">
+          <el-select v-model="form.doctor">
+            <el-option
+              v-for="item in doctorList"
+              :label="item.label"
+              :value="item.value"
+              :key="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="医嘱名称 : " :label-width="formLabelWidth">
+          <el-select v-model="form.name">
+            <el-option
+              v-for="(item, index) in nameList"
+              :label="item.label"
+              :value="item.value"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="医嘱内容 : " :label-width="formLabelWidth">
+          <span>1g*8# 片剂</span>
+        </el-form-item>
+        <el-form-item label="单次用量 : " :label-width="formLabelWidth">
+          <el-input-number
+            v-model="form.single"
+            controls-position="right"
+            @change="handleChange"
+          ></el-input-number>
+          <span>g</span>
+        </el-form-item>
+        <el-form-item label="开药数量 : " :label-width="formLabelWidth">
+          <el-input-number
+            v-model="form.number"
+            controls-position="right"
+            @change="handleChange"
+          ></el-input-number>
+          <span>瓶</span>
+        </el-form-item>
+        <el-form-item label="给药途径 : " :label-width="formLabelWidth">
+          <el-select v-model="form.way" style="width:100%;">
+            <el-option
+              v-for="(item, index) in wayList"
+              :label="item.label"
+              :value="item.value"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="执行频率 : " :label-width="formLabelWidth">
+          <el-select v-model="form.frequency" style="width:100%;">
+            <el-option
+              v-for="(item, index) in frequencyList"
+              :label="item.label"
+              :value="item.value"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="子药数量 : " :label-width="formLabelWidth">
+          <el-input-number
+            v-model="form.child"
+            @change="handleChangeChild"
+            label="0"
+          ></el-input-number>
+        </el-form-item>
 
-                <el-form style="border-top: 1px solid #409eff;border-bottom: 1px solid #409eff;padding:22px 0 0 0;">
-                  <el-form-item label="子药名称1 : " :label-width="formLabelWidth">
-                     <el-select v-model="form.name" >
-                        <el-option v-for="(item, index) in nameList" :label="item.label" :value="item.value" :key="index"></el-option>
-                     </el-select>  
-                  </el-form-item>
-                  <el-form-item label="子药描述1 : " :label-width="formLabelWidth">
-                    <span>1g*8# 片剂</span>
-                  </el-form-item>
-                  <el-form-item label="单次用量1 : " :label-width="formLabelWidth">
-                    <el-input-number v-model="form.single" controls-position="right" @change="handleChange" ></el-input-number>
-                    <span>g</span>
-                </el-form-item> 
-                <el-form-item label="开药数量1 : " :label-width="formLabelWidth">
-                    <el-input-number v-model="form.number" controls-position="right" @change="handleChange" ></el-input-number>
-                    <span>瓶</span>
-                </el-form-item> 
-              </el-form>
+        <el-form
+          style="border-top: 1px solid #409eff;border-bottom: 1px solid #409eff;padding:22px 0 0 0;"
+        >
+          <el-form-item label="子药名称1 : " :label-width="formLabelWidth">
+            <el-select v-model="form.name">
+              <el-option
+                v-for="(item, index) in nameList"
+                :label="item.label"
+                :value="item.value"
+                :key="index"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="子药描述1 : " :label-width="formLabelWidth">
+            <span>1g*8# 片剂</span>
+          </el-form-item>
+          <el-form-item label="单次用量1 : " :label-width="formLabelWidth">
+            <el-input-number
+              v-model="form.single"
+              controls-position="right"
+              @change="handleChange"
+            ></el-input-number>
+            <span>g</span>
+          </el-form-item>
+          <el-form-item label="开药数量1 : " :label-width="formLabelWidth">
+            <el-input-number
+              v-model="form.number"
+              controls-position="right"
+              @change="handleChange"
+            ></el-input-number>
+            <span>瓶</span>
+          </el-form-item>
+        </el-form>
 
-              <el-form style="border-top: 1px solid #409eff;border-bottom: 1px solid #409eff;padding:22px 0 0 0;">
-                  <el-form-item label="子药名称2 : " :label-width="formLabelWidth">
-                     <el-select v-model="form.name" >
-                        <el-option v-for="(item, index) in nameList" :label="item.label" :value="item.value" :key="index"></el-option>
-                     </el-select>  
-                  </el-form-item>
-                  <el-form-item label="子药描述2 : " :label-width="formLabelWidth">
-                    <span>1g*8# 片剂</span>
-                  </el-form-item>
-                  <el-form-item label="单次用量2 : " :label-width="formLabelWidth">
-                    <el-input-number v-model="form.single" controls-position="right" @change="handleChange" ></el-input-number>
-                    <span>g</span>
-                </el-form-item> 
-                <el-form-item label="开药数量2 : " :label-width="formLabelWidth">
-                    <el-input-number v-model="form.number" controls-position="right" @change="handleChange" ></el-input-number>
-                    <span>瓶</span>
-                </el-form-item> 
-              </el-form>
-                
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button @click="statOrder = false">取 消</el-button>                                
-                <el-button type="primary" @click="statOrder = false">保 存</el-button>
-            </div>
-        </el-dialog>
-    </div>
+        <el-form
+          style="border-top: 1px solid #409eff;border-bottom: 1px solid #409eff;padding:22px 0 0 0;"
+        >
+          <el-form-item label="子药名称2 : " :label-width="formLabelWidth">
+            <el-select v-model="form.name">
+              <el-option
+                v-for="(item, index) in nameList"
+                :label="item.label"
+                :value="item.value"
+                :key="index"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="子药描述2 : " :label-width="formLabelWidth">
+            <span>1g*8# 片剂</span>
+          </el-form-item>
+          <el-form-item label="单次用量2 : " :label-width="formLabelWidth">
+            <el-input-number
+              v-model="form.single"
+              controls-position="right"
+              @change="handleChange"
+            ></el-input-number>
+            <span>g</span>
+          </el-form-item>
+          <el-form-item label="开药数量2 : " :label-width="formLabelWidth">
+            <el-input-number
+              v-model="form.number"
+              controls-position="right"
+              @change="handleChange"
+            ></el-input-number>
+            <span>瓶</span>
+          </el-form-item>
+        </el-form>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="statOrder = false">取 消</el-button>
+        <el-button type="primary" @click="statOrder = false">保 存</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 <script>
 export default {
@@ -165,9 +236,8 @@ export default {
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
-.child{
+.child {
   border-top: 1px solid #dcdfe6;
   border-bottom: 1px solid #dcdfe6;
 }
 </style>
-

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -427,7 +427,7 @@
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('超滤量') &&(template_id != 6 || template_id != 10 || template_id != 11)">
+          <el-col :span="8" v-if="isShow('超滤量') &&(template_id == 6 || template_id == 10 || template_id == 11)">
             <el-form-item label="超滤量(ml)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
 
   NProgress.start()