Merge branch 'update' of http://git.shengws.com/zhangbj/xt_pad into update

build/cdn.json

-{
-  "version": "1.0.58"
-}

config/index.js

-'use strict'
-// Template version: 1.3.1
-// see http://vuejs-templates.github.io/webpack for documentation.
-
-const path = require('path')
-
-module.exports = {
-  dev: {
-
-    // Paths
-    assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
-    proxyTable: {},
-
-    // Various Dev Server settings
-    host: 'localhost', // can be overwritten by process.env.HOST
-    port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
-    autoOpenBrowser: false,
-    errorOverlay: true,
-    notifyOnErrors: true,
-    poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
-
-    // Use Eslint Loader?
-    // If true, your code will be linted during bundling and
-    // linting errors and warnings will be shown in the console.
-    useEslint: true,
-    // If true, eslint errors and warnings will also be shown in the error overlay
-    // in the browser.
-    showEslintErrorsInOverlay: false,
-
-    /**
-     * Source Maps
-     */
-
-    // https://webpack.js.org/configuration/devtool/#development
-    devtool: 'cheap-module-eval-source-map',
-
-    // If you have problems debugging vue-files in devtools,
-    // set this to false - it *may* help
-    // https://vue-loader.vuejs.org/en/options.html#cachebusting
-    cacheBusting: true,
-
-    cssSourceMap: true
-  },
-
-  build: {
-    // Template for index.html
-    index: path.resolve(__dirname, '../dist/index.html'),
-
-    // Paths
-    assetsRoot: path.resolve(__dirname, '../dist'),
-    assetsSubDirectory: 'static',
-    assetsPublicPath: './',
-
-    /**
-     * Source Maps
-     */
-
-    productionSourceMap: false,
-    // https://webpack.js.org/configuration/devtool/#production
-    devtool: '#source-map',
-
-    // Gzip off by default as many popular static hosts such as
-    // Surge or Netlify already gzip all static assets for you.
-    // Before setting to `true`, make sure to:
-    // npm install --save-dev compression-webpack-plugin
-    productionGzip: false,
-    productionGzipExtensions: ['js', 'css'],
-
-    // Run the build command with an extra argument to
-    // View the bundle analyzer report after build finishes:
-    // `npm run build --report`
-    // Set to `true` or `false` to always turn it on or off
-    bundleAnalyzerReport: process.env.npm_config_report
-  }
-}

config/prod.env.js

-'use strict'
-module.exports = {
-  NODE_ENV: '"production"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"'
-
-  // BASE_API: '"https://api.xt.kuyicloud.com"'
-  // http://api.xt.test.sgjyun.com
-  // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
-}

src/pages/main/WaitingArea.vue

           var scheduals = [];
           for (let index = 0; index < this.scheduals.length; index++) {
             const schedual = this.scheduals[index];
-            if (schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weighing_before == 0) {
+            if (schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weight_before == 0) {
               if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
                 continue
               }
           var scheduals = [];
           for (let index = 0; index < this.scheduals.length; index++) {
             const schedual = this.scheduals[index];
-            if (schedual.prescription == null || schedual.prescription.creater == 0) {
+            if (schedual.prescription == null || schedual.prescription.prescription_doctor == 0) {
               if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
                 continue
               }
           schedualMap[schedual.device_number.zone.id] = [];
         }
         if (this.select_index == 1) {
-            if(schedual.prescription == null || schedual.prescription.creater == 0){
+            if(schedual.prescription == null || schedual.prescription.prescription_doctor == 0){
             schedualMap[schedual.device_number.zone.id].push(schedual);
             prescription_count++
           }
         } else if (this.select_index == 2){
-            if(schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weighing_before == 0){
+            if(schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weight_before == 0){
             schedualMap[schedual.device_number.zone.id].push(schedual);
             assessment_before_dislysis_count++
           }

src/pages/main/dialog/MonitDialog.vue

                 <th v-if="isShow('超滤量') && template_id !=6" width="76px">超滤量(L)</th>
                 <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
                 <th v-if="isShow('透析液温度')" width="82px">透析液温度(℃)</th>
-                <th v-if="isShow('置换率')" width="92px">置换率(L/h)</th>
-                <th v-if="isShow('置换量')" width="50px">置换量(L)</th>
+                <th v-if="isShow('置换率') && template_id ==6" width="92px">置换率(ml/min)</th>
+                <th v-if="isShow('置换率') && template_id !=6" width="92px">置换率(L/h)</th>
+                <th v-if="isShow('置换量') && template_id ==6" width="50px">置换量(ml)</th>
+                <th v-if="isShow('置换量') && template_id !=6" width="50px">置换量(L)</th>
                 <th v-if="isShow('电导度')" width="50px">电导度(mS/m)</th>
                 <th v-if="isShow('置换液流量')" width="50px">置换液流量(ml/h)</th>
 
                      v-model="form.sodium_concentration">
             </div>
             <div class="cell" v-if="isShow('置换率')">
-              <label>置换率(L/h)</label>
+              <label v-if="template_id == 6">置换率(ml/min)</label>
+              <label v-else>置换率(L/h)</label>
               <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox"
                      v-model="form.replacement_rate">
             </div>
             <div class="cell" v-if="isShow('置换量')">
-              <label>置换量(L)</label>
+              <label v-if="template_id == 6">置换量(ml)</label>
+              <label v-else>置换量(L)</label>
               <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox"
                      v-model="form.displacement_quantity">
             </div>

src/pages/main/dialog/PlaneDialog.vue

         if (response.data.state == 0) {
           Toast.fail(response.data.msg);
           return false;
-        } else {
+        } else {debugger
           Toast.success("下机成功");
-          this.$emit('did_off', response.data.data.dialysisOrder);
+          this.$emit('did_off', response.data.data.assessmentAfterDislysis);
           var record = this.record
           for (const key in response.data.data.dialysisOrder) {
             this.$set(record, key, response.data.data.dialysisOrder[key])

src/pages/main/dialog/PrescriptionDialog.vue

       <div class="DialogTit">
         <span @click="close()" class="iconfont">&#xe6e9;</span>
         <h1 class="name">透析处方</h1>
-        <botton @click="showmsgtip">{{patient.name}}  [透析号 {{patient.dialysis_no}} ]</botton>
+        <button @click="showmsgtip">{{patient.name}}  [透析号 {{patient.dialysis_no}} ]</button>
         <span @click="commitInfo" class="success" v-if="isPermission()">完成</span>
         <span @click="commitInfo" class="success" v-if="!isPermission()"></span>
 

src/pages/main/dialog/ThorougDialog.vue

         </div>
 
         <div class="item" v-if="isShow('实际超滤量')">
-          <label class="name" for="sjcll">实际超滤量(L)</label>
+          <label v-if="template_id == 6" class="name" for="sjcll">实际超滤量(ml)</label>
+          <label v-else class="name" for="sjcll">实际超滤量(L)</label>
           <div class="content">
             <input type="tel" @focus="inputFocus" id="sjcll" v-model="formValue.actual_ultrafiltration"/>
 
         puncture_point_oozing_blood_state: false,
         puncture_point_haematoma_state: false,
         eat_state: false,
-
+        template_id: 0,
         isShowDialog: true,
         time: '00:00',
         puncture_point_oozing_bloods:[
       let initMinute = ''
       let tempHour = ''
       let tempMinute = ''
+      this.template_id = this.$store.getters.user.template_info.template_id
 
       if (this.record != null && this.record.id != '' && this.record.assessment_doctor != 0) {
         for (const key in this.formValue) {
           // console.log(key, this.record[key]);
           this.formValue[key] = this.record[key];
         }
-      }else if (this.last_record != null && this.last_record.id != "") {
-        for (const key in this.formValue) {
-          // console.log(key, this.record[key]);
-          this.formValue[key] = this.last_record[key];
-        }
+      }else  {
+        // if (this.last_record != null && this.last_record.id != ""){
+        //   for (const key in this.formValue) {
+        //     // console.log(key, this.record[key]);
+        //     this.formValue[key] = this.last_record[key];
+        //   }
+        // }
         if (this.record != null && this.record.id != '' && this.record.assessment_doctor == 0){
           this.$set(this.formValue, "actual_ultrafiltration", this.record.actual_ultrafiltration)
           this.$set(this.formValue, "weight_after", this.record.weight_after)
           this.$set(this.formValue, "weight_loss", this.record.weight_loss)
+          this.$set(this.formValue, "actual_ultrafiltration", this.record.actual_ultrafiltration)
+          this.$set(this.formValue, "actual_displacement", this.record.actual_displacement)
+          this.$set(this.formValue, "actual_treatment_hour", this.record.actual_treatment_hour)
+          this.$set(this.formValue, "actual_treatment_minute", this.record.actual_treatment_minute)
         } else {
           this.$set(this.formValue, "actual_ultrafiltration", '')
           this.$set(this.formValue, "weight_after", '')
           this.$set(this.formValue, "weight_loss", '')
+          this.$set(this.formValue, "actual_ultrafiltration", '')
+          this.$set(this.formValue, "actual_displacement", '')
+          this.$set(this.formValue, "actual_treatment_hour", '')
+          this.$set(this.formValue, "actual_treatment_minute", '')
         }
       } 
   

src/pages/main/today/TodayTab.vue

                        :device_numbers="device_numbers" :admin_map="admin_user_map"
                        :special_premission="special_premission"
                        :device_number_map="device_number_map" @did_start="closeDialysisComputer"
-                        @did_add_monitor="didAddMonitor" @close="closeDialysisComputer" ref="computer_dialog"></computer-dialog>
+                        @did_add_monitor="didAddMonitor" @close="closeDialysisComputerclose" ref="computer_dialog"></computer-dialog>
     </van-popup>
 
     <van-popup title="透析监测" v-model="menuList[6].showPopup" :overlay="true" :close-on-click-overlay="false">
     <van-popup title="透析下机" v-model="menuList[7].showPopup" :overlay="true" :close-on-click-overlay="false">
       <plane-dialog :patient_prop="patient" :record="dialysis_order" :last_monitor_record="last_monitor_record" :admins="admin_users" :admin_map="admin_user_map"
                     :special_premission="special_premission"
-                    @did_off="closeDialysisOff" @close="closeDialysisOff" ref="plane_dialog"></plane-dialog>
+                    @did_off="closeDialysisOff" @close="closeDialysisOffclose" ref="plane_dialog"></plane-dialog>
     </van-popup>
 
     <van-popup title="透后评估" v-model="menuList[8].showPopup" :overlay="true" :close-on-click-overlay="false">
             }
 
             this.double_check = double_check == null ? {id: ''} : double_check
-            this.assessment_after_dislysis =
-              assessment_after_dislysis == null
-                ? {id: ''}
-                : assessment_after_dislysis
+            this.assessment_after_dislysis = assessment_after_dislysis == null ? {id: ''} : assessment_after_dislysis
             this.last_assessment_after_dislysis =
               last_assessment_after_dislysis == null
                 ? {id: ''}
       ,
       closeDialysisComputer: function (dialysis_order) {
         this.closeDialog(0)
+        this.dialysis_order = dialysis_order
+        // this.scrollToView('dialysis_computer')
+      },
+       closeDialysisComputerclose: function (dialysis_order) {
+        this.closeDialog(0)
+        // this.dialysis_order = dialysis_order
         // this.scrollToView('dialysis_computer')
       }
       ,
         // this.scrollToView('monitoring')
       }
       ,
-      closeDialysisOff: function () {
+      closeDialysisOff: function (assessment_after_dislysis) {debugger
+        this.closeDialog(7)
+        if (assessment_after_dislysis != undefined) {
+          this.assessment_after_dislysis = assessment_after_dislysis
+        }
+      },
+      closeDialysisOffclose: function () {
         this.closeDialog(7)
         // this.scrollToView('dialysis_off')
       }

src/pages/main/today/assessmentBefore.vue

           <span class="content">{{ catheter }}</span>
           <span class="unit"></span>
         </li>
+        <li v-if="isShow('衣物重')">
+          <label>衣物重 : </label>
+          <span class="content">{{ additional_weight?additional_weight:''}}</span>
+          <span class="unit">{{ additional_weight?'kg':''}}</span>
+        </li>
         <li v-if="isShow('干体重')">
           <label>干体重 : </label>
           <span class="content">{{ dry_weight?dry_weight:''}}</span>
     data () {
       return {
         title: '透前评估 ',
-
+        template_id: 0,
       }
     },
     props: {
         type: Object
       }
     },
+    created () {
+      this.template_id = this.$store.getters.user.template_info.template_id
+    },
     computed: {
       machine_type:function(){
         if (this.record == null || this.record.id == '') {
         }
         return this.record.weight_before
       },
+      additional_weight:function () {
+        if (this.record == null || this.record.id == '') {
+          return '-'
+        }
+        return this.record.additional_weight
+      },
       systolic_blood_pressure: function () {
         if (this.record == null || this.record.id == '') {
           return '-'

src/pages/main/today/dialysisMonitoring.vue

           <th width="76px">静脉压/动脉压(mmHg)</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压(mmHg)</th>
-          <th v-if="isShow('超滤量')" width="76px">超滤量(L)</th>
+          <th v-if="isShow('超滤量') && template_id ==6" width="76px">超滤量(ml)</th>
+          <th v-if="isShow('超滤量') && template_id !=6" width="76px">超滤量(L)</th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if="isShow('置换率')" width="92px">置换率(L/h)</th>
           <th v-if="isShow('置换量')"  width="92px">置换量(L)</th>
+          
           <th v-if="isShow('电导度')"  width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量')"  width="92px">置换液流量(ml/h)</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
   data() {
     return {
       title: "透析监测 ",
+      template_id: 0,
       tableDate: []
     };
   },
+   created () {
+    this.template_id = this.$store.getters.user.template_info.template_id
+   },
   methods: {
     isShow(name){
       var filedList = this.$store.getters.user.fileds

src/router/index.js

-import Vue from 'vue'
-import Router from 'vue-router'
-
-Vue.use(Router)
-
-export default new Router({
-  routes: [
-    {
-      path: '/',
-      name: 'Home',
-      component: () => import('@/pages/home/login')
-    },
-    {
-      path: '/product',
-      name: 'Product',
-      component: () => import('@/pages/product/index')
-    },
-    {
-      path: '/main',
-      name: 'main',
-      component: () => import('@/pages/main/index')
-    },
-    {
-      path: '/details',
-      name: 'details',
-      component: () => import('@/pages/main/DetailsPage')
-    },
-    {
-      path: '/monitoring',
-      name: 'monitorPage',
-      component: () => import('@/pages/monitoring/index')
-
-    },
-    {
-      path: '/my',
-      name: 'my',
-      component: () => import('@/pages/personal/index')
-    },
-    {
-      path: '/advice',
-      name: 'doctorAdvice',
-      component: () => import('@/pages/advice/index')
-    },
-    {
-      path: '/EditPersonal',
-      name: 'EditPersonal',
-      component: () => import('@/pages/personal/EditPersonal')
-    },
-    {
-      path: '/ElectronicSignature',
-      name: 'ElectronicSignature',
-      component: () => import('@/pages/personal/ElectronicSignature')
-    },
-    {
-      path: '/Print',
-      name: 'Print',
-      component: () => import('@/pages/main/PrintIndex')
-    },
-    {
-      path: '/add_urgent_schedule',
-      name: 'AddUrgentSchedule',
-      component: () => import('@/pages/main/add_urgent_schedule')
-    },
-    {
-      path: '/Prints',
-      name: 'Prints',
-      component: () => import('@/pages/main/Print')
-    },
-
-  ]
-})