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

config/dev.env.js

@@ -7,7 +7,7 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   BASE_API: '"http://api.xt.test.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://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -20,7 +20,7 @@ module.exports = {
     // host: 'xt.test.sgjyun.com',
     // host: 'xt.kuyicloud.com',
     host: 'xt.test.sgjyun.com',
-    //host:'localhost',
+    // host:'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/lang/zh.js

@@ -170,7 +170,11 @@ export default {
     remind_print: '排版提醒打印',
     system_prescription: '透析方案',
     integration_config: '集成配置',
-    his_config: 'HIS集成配置'
+    his_config: 'HIS集成配置',
+
+    slow:"慢病管理",
+    scrm:'SCRM',
+    shop:"分销商城",
   },
   navbar: {
     logOut: '退出登录',

src/router/index.js

@@ -17,6 +17,9 @@ import org from './modules/org'
 import systems from './modules/systems'
 import data_upload from './modules/data_upload'
 import integration from './modules/integration'
+import slow from './modules/slow'
+import scrm from './modules/scrm'
+import shop from './modules/shop'
 
 
 
@@ -104,6 +107,9 @@ var _asy_router_map = [
   device,
   org,
   data_upload,
+  slow,
+  scrm,
+  shop,
   integration,
   systems,
 ]

src/router/modules/scrm.js

@@ -0,0 +1,17 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/scrm',
+  component: Layout,
+  redirct: 'noredirect',
+//   hidden:true,
+  children: [{
+    path: process.env.SRCM_HOST,
+    name: 'scrm',
+    meta: {
+      title: 'scrm',
+      other:true,
+      noCache: true
+    }
+  }]
+}

src/router/modules/shop.js

@@ -0,0 +1,16 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/shop',
+  component: Layout,
+  redirct: 'noredirect',
+  children: [{
+    path: process.env.MIRCO_MALL_HOST,
+    name: 'shop',
+    meta: {
+      title: 'shop',
+      other:true,
+      noCache: true
+    }
+  }]
+}

src/router/modules/slow.js

@@ -0,0 +1,16 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/slow',
+  component: Layout,
+  redirct: 'noredirect',
+  children: [{
+    path: 'process.env.CDM_HOST',
+    name: 'slow',
+    meta: {
+      title: 'slow',
+      other:true,
+      noCache: true
+    }
+  }]
+}

src/store/modules/xt_permission.js

@@ -43,7 +43,7 @@ function xt_filterAsyncRouter(routers) {
 function setupRouters(urls) {
   // console.log(urls)
   xt_asyncRouterMap.forEach(router => {
-    // console.log(router.path)
+    console.log(router)
     if (Object.prototype.toString.call(router.children) === '[object Array]') {
       router.hidden = true
       router.children.forEach(c_router => {
@@ -61,7 +61,7 @@ function setupRouters(urls) {
     } else {
       router.hidden = true
       if (IndexOf(urls, router.path) !== -1) {
-        // console.log('router show : ' + router.path)
+        console.log('router show : ' + router.path)
       // if (urls.indexOf(router.path) !== -1) {
         router.hidden = false
       }

src/store/modules/xt_user.js

@@ -214,9 +214,47 @@ const xt_user = {
             mall_role_exist: infoJSON.mall_role_exist
           })
 
-          commit('SET_URLFORS', {
-            urlfors: infoJSON.urlfors
-          })
+          
+          let urlfors = infoJSON.urlfors
+          if(infoJSON.cdm_role_exist == true){
+            console.log("有")
+            urlfors.push("/slow")
+            this.commit('SET_URLFORS', {
+              urlfors: urlfors
+            })
+          }else{
+            this.commit('SET_URLFORS', {
+              urlfors: infoJSON.urlfors
+            })
+          }
+
+          if(infoJSON.scrm_role_exist == true){
+            urlfors.push("/scrm")
+            this.commit('SET_URLFORS', {
+              urlfors: urlfors
+            })
+          }else{
+            this.commit('SET_URLFORS', {
+              urlfors: infoJSON.urlfors
+            })
+          }
+
+          if(infoJSON.mall_role_exist == true){
+            console.log("有")
+            urlfors.push("/shop")
+            this.commit('SET_URLFORS', {
+              urlfors: urlfors
+            })
+          }else{
+            this.commit('SET_URLFORS', {
+              urlfors: infoJSON.urlfors
+            })
+          }
+          console.log(222222222222,infoJSON)
+          
+          // commit('SET_URLFORS', {
+          //   urlfors: infoJSON.urlfors
+          // })
 
           resolve(infoJSON.user.user_id)
         } else {
@@ -237,9 +275,46 @@ const xt_user = {
                 mall_role_exist: data.mall_role_exist
               })
 
-              this.commit('SET_URLFORS', {
-                urlfors: data.urlfors
-              })
+              let urlfors = data.urlfors
+              if(data.cdm_role_exist == true){
+                console.log("有")
+                urlfors.push("/slow")
+                this.commit('SET_URLFORS', {
+                  urlfors: urlfors
+                })
+              }else{
+                this.commit('SET_URLFORS', {
+                  urlfors: data.urlfors
+                })
+              }
+
+              if(data.scrm_role_exist == true){
+                urlfors.push("/scrm")
+                this.commit('SET_URLFORS', {
+                  urlfors: urlfors
+                })
+              }else{
+                this.commit('SET_URLFORS', {
+                  urlfors: data.urlfors
+                })
+              }
+
+              if(data.mall_role_exist == true){
+                console.log("有")
+                urlfors.push("/shop")
+                this.commit('SET_URLFORS', {
+                  urlfors: urlfors
+                })
+              }else{
+                this.commit('SET_URLFORS', {
+                  urlfors: data.urlfors
+                })
+              }
+              
+
+              // this.commit('SET_URLFORS', {
+              //   urlfors: data.urlfors
+              // })
 
               commit('SET_FILEDS', {
                 fileds: data.fileds

src/views/layout/components/Sidebar/SidebarItem.vue

@@ -8,7 +8,7 @@
       "
       @click="onClick(item)"
     >
-      <router-link :to="resolvePath(onlyOneChild.path)">
+      <router-link v-if="!onlyOneChild.meta.other" :to="resolvePath(onlyOneChild.path)">
         <el-menu-item
           :index="resolvePath(onlyOneChild.path)"
           :class="{ 'submenu-title-noDropdown': !isNest }"
@@ -23,6 +23,20 @@
           >{{ generateTitle(onlyOneChild.meta.title) }}</span>
         </el-menu-item>
       </router-link>
+      <a v-else :href="onlyOneChild.path" target="_blank">
+        <el-menu-item
+          :index="resolvePath(onlyOneChild.path)"
+          :class="{ 'submenu-title-noDropdown': !isNest }"
+        >
+          <i v-if="onlyOneChild.name == 'slow'" class="icon iconfont icon-manbing-xuanzhong" style="margin-right:4px"></i>
+          <i v-if="onlyOneChild.name == 'scrm'" class="icon iconfont icon-pengyou" style="margin-right:4px"></i>
+          <i v-if="onlyOneChild.name == 'shop'" class="icon iconfont icon-service_fill" style="margin-right:4px"></i>
+          <span
+            v-if="onlyOneChild.meta && onlyOneChild.meta.title"
+            slot="title"
+          >{{ generateTitle(onlyOneChild.meta.title) }}</span>
+        </el-menu-item>
+      </a>
     </div>
 
     <div v-else>
@@ -187,7 +201,9 @@ export default {
       return true;
     }
   },
-  created() {}
+  created() {
+    console.log(1111111111,this.permission_routers)
+  }
 };
 </script>
 

src/views/layout/components/Sidebar/index.vue

@@ -37,7 +37,7 @@
         :index="index"
         @a="b"
       ></sidebar-item>
-     <el-menu-item v-if="this.$store.getters.xt_user.cdm_role_exist" index="100">
+     <!-- <el-menu-item v-if="this.$store.getters.xt_user.cdm_role_exist" index="100">
       <a :href="CDMWebsit()">
         <i class="icon iconfont icon-manbing-xuanzhong" style="margin-right:4px"></i>
         <span
@@ -60,7 +60,7 @@
             slot="title"
           >分销商城</span>
         </a>
-      </el-menu-item>
+      </el-menu-item> -->
     </el-menu>
 
   </el-scrollbar>

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -975,13 +975,13 @@
                               v-if="
                                 setAdminUserES(
                                   record.assessment_before_dislysis,
-                                  'modifier'
+                                  'creater'
                                 ) == ''
                               "
                               >{{
                                 getAdminUser(
                                   record.assessment_before_dislysis,
-                                  "modifier"
+                                  "creater"
                                 )
                               }}</span
                             >
@@ -990,7 +990,7 @@
                               :src="
                                 setAdminUserES(
                                   record.assessment_before_dislysis,
-                                  'modifier'
+                                  'creater'
                                 )
                               "
                               alt

src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue

@@ -939,31 +939,31 @@
                             </div>
                           </td>
                           <td>
-                            <!--<span-->
-                              <!--v-if="-->
-                                <!--setAdminUserES(-->
-                                  <!--record.assessment_before_dislysis,-->
-                                  <!--'creater'-->
-                                <!--) == ''-->
-                              <!--"-->
-                              <!--&gt;{{-->
-                                <!--getAdminUser(-->
-                                  <!--record.assessment_before_dislysis,-->
-                                  <!--"creater"-->
-                                <!--)-->
-                              <!--}}</span-->
-                            <!--&gt;-->
-                            <!--<img-->
-                              <!--class="es-img"-->
-                              <!--:src="-->
-                                <!--setAdminUserES(-->
-                                  <!--record.assessment_before_dislysis,-->
-                                  <!--'creater'-->
-                                <!--)-->
-                              <!--"-->
-                              <!--alt=""-->
-                              <!--srcset=""-->
-                              <!--v-else-->
+                            <span
+                              v-if="
+                                setAdminUserES(
+                                  record.assessment_before_dislysis,
+                                  'creater'
+                                ) == ''
+                              "
+                              >{{
+                                getAdminUser(
+                                  record.assessment_before_dislysis,
+                                  "creater"
+                                )
+                              }}</span
+                            >
+                            <img
+                              class="es-img"
+                              :src="
+                                setAdminUserES(
+                                  record.assessment_before_dislysis,
+                                  'creater'
+                                )
+                              "
+                              alt=""
+                              srcset=""
+                              v-else
                             />
                           </td>
                         </tr>

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -697,17 +697,17 @@
                         </div>
                       </td>
                       <td>
-                        <!--<span-->
-                          <!--v-if="setAdminUserES(predialysis.modifier) == ''"-->
-                          <!--&gt;{{ getAdminUser(predialysis.modifier) }}</span-->
-                        <!--&gt;-->
-                        <!--<img-->
-                          <!--class="es-img"-->
-                          <!--:src="setAdminUserES(predialysis.modifier)"-->
-                          <!--alt=""-->
-                          <!--srcset=""-->
-                          <!--v-else-->
-                        <!--/>-->
+                        <span
+                          v-if="setAdminUserES(predialysis.creater) == ''"
+                          >{{ getAdminUser(predialysis.creater) }}</span
+                        >
+                        <img
+                          class="es-img"
+                          :src="setAdminUserES(predialysis.creater)"
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
                       </td>
                     </tr>
 

src/xt_pages/user/inspection.vue

@@ -4,30 +4,10 @@
     <div class="patient-app-container app-container" v-loading="pageLoading" element-loading-text="拼命加载中">
       <el-row :gutter="20">
         <el-col :span="7">
-          <el-table
-            :header-cell-style="{
-              backgroundColor: 'rgb(245, 247, 250)',
-              color: '#606266'
-            }"
-            :row-style="{ color: '#303133' }"
-            :data="projects"
-            border
-            style="width: 100%"
-            highlight-current-row
-            @current-change="handleCurrentChange"
-            ref="singleTable"
-          >
+          <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)', color: '#606266' }" :row-style="{ color: '#303133' }" :data="projects"  border style="width: 100%" highlight-current-row  @current-change="handleCurrentChange" ref="singleTable"  >
             <el-table-column label="检验检查项目" align="center">
-              <el-table-column
-                prop="project_name"
-                label="检验项目"
-                align="center">
-              </el-table-column>
-              <el-table-column
-                prop="count"
-                label="次数"
-                width="80"
-                align="center">
+              <el-table-column prop="project_name" label="检验项目" align="center"> </el-table-column>
+              <el-table-column prop="count" label="次数"  width="80"  align="center">
               </el-table-column>
             </el-table-column>
           </el-table>
@@ -41,71 +21,35 @@
           <div class="filter-container" >
             <el-button class="filter-item" type="text" style="color:#000">{{itemName}} <span v-if="itemDate">（检查日期：{{itemDate}}）</span></el-button>
           </div>
-          <el-table
-            :header-cell-style="{
-              backgroundColor: 'rgb(245, 247, 250)',
-              color: '#606266'
-            }"
-            :row-style="{ color: '#303133' }"
-            :data="items"
-            border
-            style="width: 100%"
-            id="user-inspection-order"
-          >
-            <el-table-column
-              prop="item_name"
-              label="检验项目"
-              align="center"
-              min-width="180">
+          <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)', color: '#606266'  }"  :row-style="{ color: '#303133' }" :data="items"  border  style="width: 100%"  id="user-inspection-order" >
+            <el-table-column prop="item_name" label="检验项目" align="center" min-width="180">
               <template slot-scope="scope">
                 {{scope.row.item_name}} {{scope.row.item_name_addition}}
               </template>
             </el-table-column>
-            <el-table-column
-              prop="name"
-              label="结果"
-              align="center"
-              min-width="80">
+            <el-table-column prop="name" label="结果" align="center" min-width="80">
               <template slot-scope="scope">
                 <span>{{scope.row.value}}</span>
                 <span v-if="scope.row.range_type==1">{{scope.row.value_direction}}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="address"
-              label="参考值"
-              align="center"
-              min-width="120">
+            <el-table-column prop="address" label="参考值" align="center" min-width="120">
               <template slot-scope="scope">
                 <span v-if="scope.row.range_type==1">{{scope.row.range_min}}~{{scope.row.range_max}}</span>
                 <span v-else>{{scope.row.range_value}}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="unit"
-              label="单位"
-              align="center"
-              min-width="80">
+            <el-table-column prop="unit" label="单位"  align="center"  min-width="80">
             </el-table-column>
           </el-table>
-          <el-pagination
-          align="right"
-            @current-change="handleCurrentChangePage"
-            :current-page="queryParams.page"
-            :page-size="1"
-            background
-            style="margin-top:20px;"
-            layout="total, prev, pager, next, jumper"
-            :total="total">
+          <el-pagination align="right"  @current-change="handleCurrentChangePage" :current-page="queryParams.page" :page-size="1"  background style="margin-top:20px;" layout="total, prev, pager, next, jumper" :total="total">
           </el-pagination>
         </el-col>
       </el-row>
     </div>
 
     <el-dialog :title="formTitle" :visible.sync="dialogFormVisible" width="1000px" id="user-inspection-form" v-loading="formLoading">
-
       <el-form :model="form"  ref="form" label-position="top">
-
         <el-row >
           <el-col :span="24" v-if="form.formItem[0].project_id == 14">
             <el-form-item label="传染病周期提醒: " >
@@ -173,447 +117,440 @@
 </template>
 
 <script>
-import PatientSidebar from "./components/PatientSidebar";
-import {fetchInspectionReference,CreatePatientInspection,fetchPatientInspections,EditPatientInspection,DeletePatientInspection} from "@/api/inspection";
-import {uParseTime,isPositiveNumber} from "@/utils/tools";
+import PatientSidebar from './components/PatientSidebar'
+import { fetchInspectionReference, CreatePatientInspection, fetchPatientInspections, EditPatientInspection, DeletePatientInspection } from '@/api/inspection'
+import { uParseTime, isPositiveNumber } from '@/utils/tools'
 
 export default {
-  name: "Inspection",
+  name: 'Inspection',
   components: { PatientSidebar },
   data() {
     return {
-      total:0,
-      pageLoading:true,
-      itemLoading:false,
-      formLoading:false,
-      itemDate:'',
+      total: 0,
+      pageLoading: true,
+      itemLoading: false,
+      formLoading: false,
+      itemDate: '',
       patientID: 0,
-      panelClass: "patient-app-container",
+      panelClass: 'patient-app-container',
       patientInfo: {
         id: 0
       },
-      itemName:'请选择项目',
-      formTitle:'',
-      dialogFormVisible:false,
-      patient_info:null,
-      form:{
-        remind_cycle:'',
-        method:'add',
-        project_id:0,
-        inspect_date:'',
-        formItem:[
-          {id:0, value:''},
+      itemName: '请选择项目',
+      formTitle: '',
+      dialogFormVisible: false,
+      patient_info: null,
+      form: {
+        remind_cycle: '',
+        method: 'add',
+        project_id: 0,
+        inspect_date: '',
+        formItem: [
+          { id: 0, value: '' }
         ]
       },
-      formItem:[],
-      items:[],
-      inspections:[],
-      inspectionsMap:{},
-      projects:[],
-      project:null,
-      queryParams:{
-        patient:0,
-        project_id:0,
-        page:1
-      },
-    };
+      formItem: [],
+      items: [],
+      inspections: [],
+      inspectionsMap: {},
+      projects: [],
+      project: null,
+      queryParams: {
+        patient: 0,
+        project_id: 0,
+        page: 1
+      }
+    }
   },
-  methods:{
-    deleteInspection(){
-
-      if(this.project == null || this.itemDate == "") {
-        this.$message.error("请先选择删除删除的记录");
-        return false;
+  methods: {
+    deleteInspection() {
+      if (this.project == null || this.itemDate == '') {
+        this.$message.error('请先选择删除删除的记录')
+        return false
       }
 
       this.$confirm('确认删除此记录?', '删除', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       }).then(() => {
-        var params = {patient: this.patientID, date: this.itemDate, project_id: this.project.project_id};
-          DeletePatientInspection(params).then(response=>{
-              if(response.data.state==0) {
-                  this.$message.error(response.data.msg);
-                  return false;
-              }else {
-                this.$notify({
-                    title: "成功",
-                    message: "删除成功",
-                    type: "success",
-                    duration: 2000
-                });
-
-                for( var index in this.projects) {
-                  if (this.projects[index].project_id == params.project_id) {
-                    this.projects[index].count --;
-                    break;
-                  }
-                }
-                this.total -=1;
-                this.itemDate = "";
-                this.items = [];
-                if(this.total > 0) {
-                  this.queryParams.page = 1;
-                  this.fetchPatientInspections(this.queryParams);
-                }
+        var params = { patient: this.patientID, date: this.itemDate, project_id: this.project.project_id }
+        DeletePatientInspection(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.$notify({
+              title: '成功',
+              message: '删除成功',
+              type: 'success',
+              duration: 2000
+            })
+
+            for (var index in this.projects) {
+              if (this.projects[index].project_id == params.project_id) {
+                this.projects[index].count--
+                break
               }
-          });
-      }).catch(() => { });
+            }
+            this.total -= 1
+            this.itemDate = ''
+            this.items = []
+            if (this.total > 0) {
+              this.queryParams.page = 1
+              this.fetchPatientInspections(this.queryParams)
+            }
+          }
+        })
+      }).catch(() => { })
     },
-    openEdit(){
-      if(this.project == null) {
-        this.$message.error("请先选择项目");
-        return false;
+    openEdit() {
+      if (this.project == null) {
+        this.$message.error('请先选择项目')
+        return false
       }
 
-      this.form.method = "edit";
-      this.formTitle = "修改" + this.project.project_name;
-      this.form.project_id = this.project.project_id;
-      this.form.inspect_date = this.itemDate;
+      this.form.method = 'edit'
+      this.formTitle = '修改' + this.project.project_name
+      this.form.project_id = this.project.project_id
+      this.form.inspect_date = this.itemDate
       this.form.remind_cycle = this.patient_info.remind_cycle
       console.log(this.form.remind_cycle)
 
-      this.form.formItem = [];
-      for(var index in this.project.inspection_reference){
+      this.form.formItem = []
+      for (var index in this.project.inspection_reference) {
         this.form.formItem.push({
-          id:  (this.project.inspection_reference[index].id in this.inspectionsMap)? this.inspectionsMap[this.project.inspection_reference[index].id].id:0,
+          id: (this.project.inspection_reference[index].id in this.inspectionsMap) ? this.inspectionsMap[this.project.inspection_reference[index].id].id : 0,
           project_id: this.project.inspection_reference[index].project_id,
           project_name: this.project.inspection_reference[index].project_name,
           item_id: this.project.inspection_reference[index].id,
           item: this.project.inspection_reference[index].item,
           item_name: this.project.inspection_reference[index].item_name,
           range_type: this.project.inspection_reference[index].range_type,
-          value:(this.project.inspection_reference[index].id in this.inspectionsMap)? this.inspectionsMap[this.project.inspection_reference[index].id].inspect_value:"",
-          select_options: this.project.inspection_reference[index].range_options.split(","),
-          unit: this.project.inspection_reference[index].unit,
-        });
+          value: (this.project.inspection_reference[index].id in this.inspectionsMap) ? this.inspectionsMap[this.project.inspection_reference[index].id].inspect_value : '',
+          select_options: this.project.inspection_reference[index].range_options.split(','),
+          unit: this.project.inspection_reference[index].unit
+        })
       }
 
-      console.log( this.form.formItem)
-
-      this.dialogFormVisible = true;
+      console.log(this.form.formItem)
 
+      this.dialogFormVisible = true
     },
-    openNew(){
-      if(this.project == null) {
-        this.$message.error("请先选择项目");
-        return false;
+    openNew() {
+      if (this.project == null) {
+        this.$message.error('请先选择项目')
+        return false
       }
-      this.form.method = "add";
-      this.formTitle = "新增" + this.project.project_name;
-      this.form.project_id = this.project.project_id;
+      this.form.method = 'add'
+      this.formTitle = '新增' + this.project.project_name
+      this.form.project_id = this.project.project_id
       this.form.remind_cycle = this.patient_info.remind_cycle
 
-      var today = new Date();
-      this.form.inspect_date = uParseTime(today, '{y}-{m}-{d}');
-      this.form.formItem = [];
-      for(var index in this.project.inspection_reference){
+      var today = new Date()
+      this.form.inspect_date = uParseTime(today, '{y}-{m}-{d}')
+      this.form.formItem = []
+      for (var index in this.project.inspection_reference) {
         // var formItem = this.project.inspection_reference[index];
         // formItem["value"] = '';
         // if (formItem.range_type==2) {
         //   formItem["select_options"] = formItem.range_options.split(",");
         // }
         this.form.formItem.push({
-          id:    0,
+          id: 0,
           project_id: this.project.inspection_reference[index].project_id,
           project_name: this.project.inspection_reference[index].project_name,
           item_id: this.project.inspection_reference[index].id,
           item: this.project.inspection_reference[index].item,
           item_name: this.project.inspection_reference[index].item_name,
           range_type: this.project.inspection_reference[index].range_type,
-          value:'',
-          select_options: this.project.inspection_reference[index].range_options.split(","),
-          unit: this.project.inspection_reference[index].unit,
-        });
+          value: '',
+          select_options: this.project.inspection_reference[index].range_options.split(','),
+          unit: this.project.inspection_reference[index].unit
+        })
       }
 
-      this.dialogFormVisible = true;
+      this.dialogFormVisible = true
     },
-    submitEdit(formName){
+    submitEdit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.formLoading = true;
-          if (this.form.formItem.length==0) {
-            this.$message.error("未填写项目");
-            return false;
+          this.formLoading = true
+          if (this.form.formItem.length == 0) {
+            this.$message.error('未填写项目')
+            return false
           }
-          for( var index in this.form.formItem) {
-            this.form.formItem[index].value = '' + this.form.formItem[index].value;
+          for (var index in this.form.formItem) {
+            this.form.formItem[index].value = '' + this.form.formItem[index].value
           }
 
-
-
-
-          EditPatientInspection(this.patientID, this.form,this.form.remind_cycle).then(response=>{
-            if (response.data.state==1) {
+          EditPatientInspection(this.patientID, this.form, this.form.remind_cycle).then(response => {
+            if (response.data.state == 1) {
               this.$notify({
-                title: "成功",
-                message: "修改成功",
-                type: "success",
+                title: '成功',
+                message: '修改成功',
+                type: 'success',
                 duration: 2000
-              });
+              })
               this.patient_info.remind_cycle = response.data.data.remind_cycle
-              this.itemDate = this.form.inspect_date;
-              this.items=[];
-              var inspections = response.data.data.inspections;
-              this.inspections = response.data.data.inspections;
-              if (inspections==null) {
-                this.inspections = [];
-                return false;
+              this.itemDate = this.form.inspect_date
+              this.items = []
+              var inspections = response.data.data.inspections
+              this.inspections = response.data.data.inspections
+              if (inspections == null) {
+                this.inspections = []
+                return false
               }
-              var inspectionsMap = {};
-              this.inspectionsMap = {};
+              var inspectionsMap = {}
+              this.inspectionsMap = {}
               for (var index in inspections) {
-                inspectionsMap[inspections[index].item_id] = inspections[index];
-                this.inspectionsMap[inspections[index].item_id] = inspections[index];
+                inspectionsMap[inspections[index].item_id] = inspections[index]
+                this.inspectionsMap[inspections[index].item_id] = inspections[index]
               }
-              var items = this.project.inspection_reference;
-              for(var index in items) {
+              var items = this.project.inspection_reference
+              for (var index in items) {
                 if (items[index].id in inspectionsMap) {
-                  var item = {};
-                  for(var key in items[index]) {
-                    item[key] = items[index][key];
+                  var item = {}
+                  for (var key in items[index]) {
+                    item[key] = items[index][key]
                   }
-                  item.value = inspectionsMap[items[index].id].inspect_value;
-                  item.value_direction = "";
-                  if (item.range_type==1) {
-                    var value = parseFloat(item.value);
-                    var range_min = parseFloat(item.range_min);
-                    var range_max = parseFloat(item.range_max);
+                  item.value = inspectionsMap[items[index].id].inspect_value
+                  item.value_direction = ''
+                  if (item.range_type == 1) {
+                    var value = parseFloat(item.value)
+                    var range_min = parseFloat(item.range_min)
+                    var range_max = parseFloat(item.range_max)
                     if (value < range_min) {
-                      item.value_direction = "↓";
-                    }else if (value > range_max) {
-                      item.value_direction = "↑";
+                      item.value_direction = '↓'
+                    } else if (value > range_max) {
+                      item.value_direction = '↑'
                     }
                   }
-                  this.items.push(item);
+                  this.items.push(item)
                 }
               }
 
-              this.resetForm(formName);
-              this.dialogFormVisible = false;
-
-            }else {
-              this.$message.error(response.data.msg);
-              return false;
+              this.resetForm(formName)
+              this.dialogFormVisible = false
+            } else {
+              this.$message.error(response.data.msg)
+              return false
             }
-          }).catch(v=>{
-            this.$message.error(v);
-            return false;
-          });
-          this.formLoading = false;
-          return false;
+          }).catch(v => {
+            this.$message.error(v)
+            return false
+          })
+          this.formLoading = false
+          return false
         } else {
-          return false;
+          return false
         }
-      });
+      })
     },
-    submitNew(formName){
+    submitNew(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.formLoading = true;
-          if (this.form.formItem.length==0) {
-            this.$message.error("未填写项目");
-            return false;
+          this.formLoading = true
+          if (this.form.formItem.length == 0) {
+            this.$message.error('未填写项目')
+            return false
           }
-          for( var index in this.form.formItem) {
-            this.form.formItem[index].value = '' + this.form.formItem[index].value;
+          for (var index in this.form.formItem) {
+            this.form.formItem[index].value = '' + this.form.formItem[index].value
           }
-          CreatePatientInspection(this.patientID, this.form, this.form.remind_cycle).then(response=>{
-            if (response.data.state==1) {
+          CreatePatientInspection(this.patientID, this.form, this.form.remind_cycle).then(response => {
+            if (response.data.state == 1) {
               this.$notify({
-                title: "成功",
-                message: "新增成功",
-                type: "success",
+                title: '成功',
+                message: '新增成功',
+                type: 'success',
                 duration: 2000
-              });
+              })
               // this.form.remind_reycle = response.data.data.remind_reycc
               this.patient_info.remind_cycle = response.data.data.remind_cycle
-              console.log( this.patient_info.remind_cycle)
+              console.log(this.patient_info.remind_cycle)
 
-              this.itemDate = this.form.inspect_date;
-              this.items=[];
-              for( var index in this.projects) {
+              this.itemDate = this.form.inspect_date
+              this.items = []
+              for (var index in this.projects) {
                 if (this.projects[index].project_id == this.form.project_id) {
-                  this.projects[index].count ++;
-                  break;
+                  this.projects[index].count++
+                  break
                 }
               }
-              this.total +=1;
-              var inspections = response.data.data.inspections;
-              this.inspections = response.data.data.inspections;
-              if (inspections==null) {
-                this.inspections = [];
-                return false;
+              this.total += 1
+              var inspections = response.data.data.inspections
+              this.inspections = response.data.data.inspections
+              if (inspections == null) {
+                this.inspections = []
+                return false
               }
-              var inspectionsMap = {};
-              this.inspectionsMap = {};
+              var inspectionsMap = {}
+              this.inspectionsMap = {}
               for (var index in inspections) {
-                inspectionsMap[inspections[index].item_id] = inspections[index];
-                this.inspectionsMap[inspections[index].item_id] = inspections[index];
+                inspectionsMap[inspections[index].item_id] = inspections[index]
+                this.inspectionsMap[inspections[index].item_id] = inspections[index]
               }
-              var items = this.project.inspection_reference;
-              for(var index in items) {
+              var items = this.project.inspection_reference
+              for (var index in items) {
                 if (items[index].id in inspectionsMap) {
-                  var item = {};
-                  for(var key in items[index]) {
-                    item[key] = items[index][key];
+                  var item = {}
+                  for (var key in items[index]) {
+                    item[key] = items[index][key]
                   }
-                  item.value = inspectionsMap[items[index].id].inspect_value;
-                  item.value_direction = "";
-                  if (item.range_type==1) {
-                    var value = parseFloat(item.value);
-                    var range_min = parseFloat(item.range_min);
-                    var range_max = parseFloat(item.range_max);
+                  item.value = inspectionsMap[items[index].id].inspect_value
+                  item.value_direction = ''
+                  if (item.range_type == 1) {
+                    var value = parseFloat(item.value)
+                    var range_min = parseFloat(item.range_min)
+                    var range_max = parseFloat(item.range_max)
                     if (value < range_min) {
-                      item.value_direction = "↓";
-                    }else if (value > range_max) {
-                      item.value_direction = "↑";
+                      item.value_direction = '↓'
+                    } else if (value > range_max) {
+                      item.value_direction = '↑'
                     }
                   }
-                  this.items.push(item);
+                  this.items.push(item)
                 }
               }
 
-              this.resetForm(formName);
-              this.dialogFormVisible = false;
-
-
-              this.queryParams.patient = this.patientID;
-              this.queryParams.project_id = this.project.project_id;
-              this.queryParams.page = 1;
-              this.total = 0;
-              this.fetchPatientInspections(this.queryParams);
-
-
-            }else {
-              this.$message.error(response.data.msg);
-              return false;
+              this.resetForm(formName)
+              this.dialogFormVisible = false
+
+              this.queryParams.patient = this.patientID
+              this.queryParams.project_id = this.project.project_id
+              this.queryParams.page = 1
+              this.total = 0
+              this.fetchPatientInspections(this.queryParams)
+            } else {
+              this.$message.error(response.data.msg)
+              return false
             }
-          }).catch(v=>{
-            this.$message.error(v);
-            return false;
-          });
-          this.formLoading = false;
-          return false;
+          }).catch(v => {
+            this.$message.error(v)
+            return false
+          })
+          this.formLoading = false
+          return false
         } else {
-          return false;
+          return false
         }
-      });
-
+      })
     },
-    fetchInspectionReference(){
-      fetchInspectionReference(this.patientID).then(response=>{
-        if(response.data.state==1) {
-          var reference = response.data.data.reference;
-          var patient_info = response.data.data.patient_info;
-          this.projects = reference;
-          this.patient_info = patient_info;
-          this.pageLoading = false;
+    fetchInspectionReference() {
+      fetchInspectionReference(this.patientID).then(response => {
+        if (response.data.state == 1) {
+          var reference = response.data.data.reference
+          var patient_info = response.data.data.patient_info
+          this.projects = reference
+          this.patient_info = patient_info
+          this.pageLoading = false
           this.form.remind_cycle = this.patient_info.remind_cycle
-        }else {
-          this.$message.error(response.data.msg);
-          return false;
+        } else {
+          this.$message.error(response.data.msg)
+          return false
         }
-      }).catch(v=>{
-      });
+      }).catch(v => {
+      })
     },
     setCurrent(row) {
-      this.$refs.singleTable.setCurrentRow(row);
+      this.$refs.singleTable.setCurrentRow(row)
     },
     resetForm(formName) {
-      this.$refs[formName].resetFields();
+      this.$refs[formName].resetFields()
     },
     handleCurrentChange(row) {
-      this.itemDate = '';
-      this.form.method = 'add';
-      if(typeof(row)=="undefined" || row==null) {
-        this.project = null;
-        this.items = [];
-        this.itemName='请选择项目';
-      }else {
-        this.itemLoading = true;
-        this.project = row;
-        this.items = row.inspection_reference;
-        this.itemName=row.project_name;
-
-        this.queryParams.patient = this.patientID;
-        this.queryParams.project_id = this.project.project_id;
-        this.queryParams.page = 1;
-        this.total = 0;
-        this.fetchPatientInspections(this.queryParams);
+      this.itemDate = ''
+      this.form.method = 'add'
+      if (typeof (row) === 'undefined' || row == null) {
+        this.project = null
+        this.items = []
+        this.itemName = '请选择项目'
+      } else {
+        this.itemLoading = true
+        this.project = row
+        this.items = row.inspection_reference
+        this.itemName = row.project_name
+
+        this.queryParams.patient = this.patientID
+        this.queryParams.project_id = this.project.project_id
+        this.queryParams.page = 1
+        this.total = 0
+        this.fetchPatientInspections(this.queryParams)
       }
     },
 
     handleCurrentChangePage(val) {
-        this.itemLoading = true;
-      this.queryParams.page = val;
-      this.fetchPatientInspections(this.queryParams);
+      this.itemLoading = true
+      this.queryParams.page = val
+      this.fetchPatientInspections(this.queryParams)
     },
-    fetchPatientInspections(params){
-      this.items = [];
-      fetchPatientInspections(params).then(response=>{
-        if(response.data.state==1) {
-          var inspections = response.data.data.inspections;
-          this.total = response.data.data.total;
-          this.itemDate = response.data.data.date;
-          this.inspections = response.data.data.inspections;
-          if (inspections==null) {
-            this.inspections = [];
-            return false;
+    fetchPatientInspections(params) {
+      this.items = []
+      fetchPatientInspections(params).then(response => {
+        if (response.data.state == 1) {
+          var inspections = response.data.data.inspections
+          this.total = response.data.data.total
+          this.itemDate = response.data.data.date
+          this.inspections = response.data.data.inspections
+          if (inspections == null) {
+            this.inspections = []
+            return false
           }
-          var inspectionsMap = {};
-          this.inspectionsMap = {};
+          var inspectionsMap = {}
+          this.inspectionsMap = {}
           for (var index in inspections) {
-            inspectionsMap[inspections[index].item_id] = inspections[index];
-            this.inspectionsMap[inspections[index].item_id] = inspections[index];
+            inspectionsMap[inspections[index].item_id] = inspections[index]
+            this.inspectionsMap[inspections[index].item_id] = inspections[index]
           }
-          var items = this.project.inspection_reference;
-          for(var index in items) {
-            if (items[index].id in inspectionsMap) {
-              var item = {};
-              for(var key in items[index]) {
-                item[key] = items[index][key];
+          var items = this.project.inspection_reference
+          for (var index in items) {
+            if (items[index].id in inspectionsMap || items[index].item_id in inspectionsMap) {
+              var item = {}
+              for (var key in items[index]) {
+                item[key] = items[index][key]
               }
-              item.value = inspectionsMap[items[index].id].inspect_value;
-              item.value_direction = "";
-              if (item.range_type==1) {
-                var value = parseFloat(item.value);
-                var range_min = parseFloat(item.range_min);
-                var range_max = parseFloat(item.range_max);
+              if (item.item_id > 0) {
+                item.value = inspectionsMap[items[index].item_id].inspect_value
+              } else {
+                item.value = inspectionsMap[items[index].id].inspect_value
+              }
+              item.value_direction = ''
+              if (item.range_type == 1) {
+                var value = parseFloat(item.value)
+                var range_min = parseFloat(item.range_min)
+                var range_max = parseFloat(item.range_max)
                 if (value < range_min) {
-                  item.value_direction = "↓";
+                  item.value_direction = '↓'
                 } else if (value > range_max) {
-                  item.value_direction = "↑";
+                  item.value_direction = '↑'
                 }
               }
-              this.items.push(item);
+              this.items.push(item)
             }
           }
           console.log(this.items)
-
         }
-      }).catch(v=>{});
+      }).catch(v => {})
       setTimeout(() => {
-        this.itemLoading = false;
-      }, 1000);
-    },
+        this.itemLoading = false
+      }, 1000)
+    }
   },
   created() {
-    const id = this.$route.query && this.$route.query.id;
-    this.patientID = parseInt(id);
+    const id = this.$route.query && this.$route.query.id
+    this.patientID = parseInt(id)
     if (isNaN(this.patientID) || this.patientID <= 0) {
       this.$notify.error({
-        title: "错误",
-        message: "无效的id"
-      });
-      this.$router.push("/patients/patients");
+        title: '错误',
+        message: '无效的id'
+      })
+      this.$router.push('/patients/patients')
     }
 
-    this.fetchInspectionReference();
+    this.fetchInspectionReference()
   }
-};
+}
 </script>
 
 <style>