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

src/router/index.js

@@ -97,12 +97,10 @@ var _asy_router_map = [
   dialysis,
   stock,
   qcd,
-  // data_dict,
   device,
-  // role,
   org,
-  systems,
   data_upload,
+  systems,
 ]
 
 var is_asy_router = process.env.NODE_ENV === 'production' // true; 设置为 true 强制进行路由验证

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

@@ -63,7 +63,7 @@
 
     <div slot="footer" class="dialog-footer">
       <el-button @click="handleCancle">取 消</el-button>
-      <el-button type="primary" @click="handleComfirm">保 存</el-button>
+      <el-button :disabled="this.doubleReview.creater == 0 || this.doubleReview.modifier == 0 ? false : true " type="primary" @click="handleComfirm">保 存</el-button>
     </div>
   </el-dialog>
 

src/xt_pages/upload/config/City.vue

@@ -5,8 +5,8 @@
         <el-col :span="24" :offset="6">
           <!--<div>质控平台的上报对接，是为了解决手工录入的效率和易出错的问题，对接涉及各种技术，请勿随意配置，联系酷医云客服协助处理。</div>-->
           <div class="titleOne">
-            质控平台的上报对接，是为了解决手工录入的效率和易出错的问题，对接涉及各种技术，请勿随意配置，联系酷医云客服协助处理。<br />&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;微信:11111
-            电话：13535547901
+            质控平台的上报对接，是为了解决手工录入的效率和易出错的问题，对接涉及各种技术，请勿随意配置，联系酷医云客服协助处理。<br />&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;微信:kuyicloud
+            电话：18682074632
           </div>
         </el-col>
       </el-row>

src/xt_pages/upload/config/Country.vue

@@ -4,8 +4,8 @@
       <el-row :gutter="20">
         <el-col :span="24" :offset="6">
           <div class="titleOne">
-            质控平台的上报对接，是为了解决手工录入的效率和易出错的问题，对接涉及各种技术，请勿随意配置，联系酷医云客服协助处理。<br />&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;微信:11111
-            电话：13535547901
+            质控平台的上报对接，是为了解决手工录入的效率和易出错的问题，对接涉及各种技术，请勿随意配置，联系酷医云客服协助处理。<br />&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;微信:kuyicloud
+            电话：18682074632
           </div>
         </el-col>
       </el-row>

src/xt_pages/upload/config/Province.vue

@@ -5,8 +5,8 @@
         <el-col :span="24" :offset="6">
           <!--<div>质控平台的上报对接，是为了解决手工录入的效率和易出错的问题，对接涉及各种技术，请勿随意配置，联系酷医云客服协助处理。</div>-->
           <div class="titleOne">
-            质控平台的上报对接，是为了解决手工录入的效率和易出错的问题，对接涉及各种技术，请勿随意配置，联系酷医云客服协助处理。<br />&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;微信:11111
-            电话：13535547901
+            质控平台的上报对接，是为了解决手工录入的效率和易出错的问题，对接涉及各种技术，请勿随意配置，联系酷医云客服协助处理。<br />&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;微信:kuyicloud
+            电话：18682074632
           </div>
         </el-col>
       </el-row>

src/xt_pages/upload/fast/FastCity.vue

@@ -9,7 +9,7 @@
         <p>您选择的区域酷医云暂未对接，请联系酷医云客服，我们将免费为您实现对接</p>
         <img style="width: 150px;height: 150px" src="../../../assets/home/wechat_qrcode.png"/>
         <p>服务热线</p>
-        <p style="font-size: 16px">0755-86526342</p>
+        <p style="font-size: 16px">18682074632</p>
       </div>
 
       <span slot="footer" class="dialog-footer">

src/xt_pages/upload/fast/FastCountry.vue

@@ -6,73 +6,76 @@
       v-on:inspection="inspectionClick()"
     ></fast-patients-sidebar>
     <!-- <fast-upload-detail v-if="isShow == 1"  :id="patientID"  :is-edit='true' :class='panelClass'></fast-upload-detail> -->
-    <!-- <one></one> -->
-    <two></two>
-    <fast-upload-inspectiton-detail
-      v-if="isShow == 2"
-      :id="patientID"
-      :is-edit="true"
-      :class="panelClass"
-    ></fast-upload-inspectiton-detail>
+    <one v-if="isShow == 1" :id="patientID" :is-edit='true' :class='panelClass'></one>
+    <two v-if="isShow == 2"
+         :id="patientID"
+         :is-edit="true"
+         :class="panelClass"></two>
+    <!--<fast-upload-inspectiton-detail-->
+    <!--v-if="isShow == 2"-->
+    <!--:id="patientID"-->
+    <!--:is-edit="true"-->
+    <!--:class="panelClass"-->
+    <!--&gt;</fast-upload-inspectiton-detail>-->
   </div>
 </template>
 
 <script>
-import FastUploadDetail from "./FastUploadDetail";
-import { fetchAllList } from "@/api/patient";
-import FastPatientsSidebar from "./FastPatientsSidebar";
-import FastUploadInspectitonDetail from "./FastUploadInspectitonDetail";
-import One from "./One";
-import Two from "./Two";
-
-export default {
-  name: "FastPatientsDetail",
-  components: {
-    FastUploadInspectitonDetail,
-    FastPatientsSidebar,
-    FastUploadDetail,
-    One,
-    Two
-  },
-  data() {
-    return {
-      patientID: 1,
-      panelClass: "patient-app-container",
-      patientInfo: {
-        id: 0
-      },
-      isShow: 1
-    };
-  },
-  created() {
-    const id = this.$route.query && this.$route.query.id;
-    this.patientID = parseInt(id);
+  import FastUploadDetail from './FastUploadDetail'
+  import { fetchAllList } from '@/api/patient'
+  import FastPatientsSidebar from './FastPatientsSidebar'
+  import FastUploadInspectitonDetail from './FastUploadInspectitonDetail'
+  import One from './One'
+  import Two from './Two'
 
-    if (isNaN(this.patientID) || this.patientID <= 0) {
-      this.getList(1);
-    } else {
-      this.getList(2);
-    }
-  },
-  methods: {
-    getList(type) {
-      fetchAllList().then(response => {
-        if (response.data.state == 1) {
-          this.patientsList = response.data.data.patients;
-          if (type == 1) {
-            this.patientID = this.patientsList[0].id;
-          } else {
-            this.patientID = this.$route.query.id;
-          }
-        }
-      });
+  export default {
+    name: 'FastPatientsDetail',
+    components: {
+      FastUploadInspectitonDetail,
+      FastPatientsSidebar,
+      FastUploadDetail,
+      One,
+      Two
     },
-    patientInfoClick: function() {
-      this.isShow = 1;
+    data() {
+      return {
+        patientID: 1,
+        panelClass: 'patient-app-container',
+        patientInfo: {
+          id: 0
+        },
+        isShow: 1
+      }
     },
-    inspectionClick: function() {
-      this.isShow = 2;
+    created() {
+      const id = this.$route.query && this.$route.query.id
+      this.patientID = parseInt(id)
+
+      if (isNaN(this.patientID) || this.patientID <= 0) {
+        this.getList(1)
+      } else {
+        this.getList(2)
+      }
+    },
+    methods: {
+      getList(type) {
+        fetchAllList().then(response => {
+          if (response.data.state == 1) {
+            this.patientsList = response.data.data.patients
+            if (type == 1) {
+              this.patientID = this.patientsList[0].id
+            } else {
+              this.patientID = this.$route.query.id
+            }
+          }
+        })
+      },
+      patientInfoClick: function() {
+        this.isShow = 1
+      },
+      inspectionClick: function() {
+        this.isShow = 2
+      }
     }
   }
-};
 </script>

src/xt_pages/upload/fast/FastProvince.vue

@@ -7,9 +7,9 @@
     >
       <div style="text-align: center">
         <p>您选择的区域酷医云暂未对接，请联系酷医云客服，我们将免费为您实现对接</p>
-        <img style="width: 150px;height: 150px" src="../../../assets/home/wechat_qrcode.png"/>
+        <img style="width: 150px;height: 150px" src="../../../assets/home/kuyi_wechat.jpg"/>
         <p>服务热线</p>
-        <p style="font-size: 16px">0755-86526342</p>
+        <p style="font-size: 16px">18682074632</p>
       </div>
 
 

src/xt_pages/upload/fast/One.vue

@@ -1,4 +1,6 @@
 <template>
+  <div class="app-container ">
+
   <div class="basicInfo">
     <div class="headline">基本资料</div>
     <div class="information">
@@ -189,6 +191,8 @@
       </div>
     </div>
   </div>
+  </div>
+
 </template>
 
 <style lang="scss">

src/xt_pages/upload/fast/Two.vue

@@ -1,4 +1,5 @@
 <template>
+
   <div class="checkInspection">
     <div class="headline">检验检查</div>
     <div class="allCheck">
@@ -406,7 +407,7 @@
             <p class="unit">mg/dL</p>
             <el-button type="primary" class="copy2">复制</el-button>
           </div>
-         
+
         </div>
       </div>
       <div class="example5 noTop">
@@ -495,7 +496,7 @@
             <p class="unidentified1">未查</p>
             <el-button type="primary" class="copy">复制</el-button>
           </div>
-          
+
         </div>
       </div>
       <div class="example6 noTop">

src/xt_pages/user/dialysisSolution.vue

@@ -66,7 +66,7 @@
         align="center"
         min-width="110">
         <template slot-scope="scope" >
-            <span >{{getAdminUserName(scope.row.doctor)}}</span>
+            <span >{{getAdminUserName(scope.row.registrars_id)}}</span>
         </template>
 
      </el-table-column>

src/xt_pages/user/doctorAdvice.vue

@@ -1531,8 +1531,12 @@
                 return false
               }
             })
+          }else{
+            this.addLoading = false
+
           }
         })
+
       },
       submitNewAdvice(formName, action) {
         this.$refs[formName].validate(valid => {