修改

src/components/patientRegister/PatientRegisterEdit.vue

@@ -231,28 +231,27 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label="创建者">
-                <el-input v-model="form.creatorName" disabled></el-input>
+                <el-input v-model="form.creatorId" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="创建时间">
-                <el-input :value="form.creationTime | dateFormat" disabled></el-input>
+                <el-input :value="form.creationTime ? lmoment(form.creationTime, 'yyyy-MM-DD'):''" disabled></el-input>                 
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="修改者">
-                <el-input v-model="form.creatorName" disabled></el-input>
+                <el-input v-model="form.lastModifierId" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="修改时间">
-                <el-input :value="form.lastModificationTime | dateFormat" disabled></el-input>
+                <el-input :value="form.lastModificationTime ? lmoment(form.lastModificationTime, 'yyyy-MM-DD'):''" disabled></el-input>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
-
-        <el-image class="photo" :src="form.photo" style="width:150;height:200" >
+        <el-image class="photo" :src="apiurl + '/' + form.photo" style="width:150;height:200" >
           <div slot="placeholder" class="image-slot">
             加载中<span class="dot">...</span>
           </div>
@@ -294,7 +293,11 @@
         class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowick" ref="patientList">
         <el-table-column type="index" width="30"/>
         <el-table-column prop="patientNo" label="档案号" />
-        <el-table-column label="末次体检" />
+        <el-table-column prop="lastTime" label="末次体检" width="100">
+          <template slot-scope="scope">
+            <div v-if="scope.row.lastTime">{{ lmoment(scope.row.lastTime, 'yyyy-MM-DD') }}</div>
+          </template>
+        </el-table-column>
         <el-table-column prop="medicalTimes" label="体检次数" />
         <el-table-column prop="displayName" label="姓名" />
         <el-table-column prop="sexId" label="性别">
@@ -337,6 +340,7 @@
 import moment from 'moment';
 import { mapState } from 'vuex'
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { apiurl } from '../../utlis/mm'
 import { objCopy,setNull,dddw } from '../../utlis/proFunc'
 import Camera from './Camera.vue'
 import PatientRegisterItem from './PatientRegisterItem.vue'
@@ -347,7 +351,7 @@ export default {
   },
   data() {
     return {
-      
+      apiurl,
       form: {
         id: '', //id
         patientId: '00000000-0000-0000-0000-000000000000', //档案号ID 选择了档案就传档案号，未选就传00000-0000...
@@ -386,6 +390,10 @@ export default {
         mobileTelephone:'', //手机号
         nationId:null, //民族编号
         postalCode:'', //邮编
+        creatorId:null,
+        creationTime:'',
+        lastModificationTime:'',
+        lastModifierId:null,
       },     //单位 记录 目前新增与更新是一致 
 
       defaultNull:[
@@ -442,14 +450,17 @@ export default {
     query(param){
       //编辑的时候不查重
       if(this.form.id || !param) return
-      this.dialogVisible = true
-      console.log(param)
+      
+      //console.log(param)
       getapi(`/api/app/patient/in-filter?Filter=${param}`)
         .then(
           (res) => {                
             if(res.code == 1){
-              //console.log('res',res)              
-              this.patientList = res.data.items              
+              console.log('查重 ',res)  //有数据才显示
+              if(res.data.items && res.data.items.length > 0){
+                this.patientList = res.data.items
+                this.dialogVisible = true
+              }                        
             }
           }
         )
@@ -503,8 +514,11 @@ export default {
           delete body.completeFlag
           delete body.isMedicalStart
           delete body.patientNo
+          delete body.creatorId
+          delete body.creationTime
+          delete body.lastModificationTime
+          delete body.lastModifierId
 
-         
           setNull(body,this.defaultNull)
           
           //日期转换
@@ -526,22 +540,11 @@ export default {
                   objCopy(res.data,this.form)              
                   this.patientRegister.patientRegisterId = res.data.id                  
                   this.patientRegister.patientRegisterId = res.data.id
-
                   this.patientRegister.patientRegisterRd = res.data
                   this.patientRegister.query.times++
-
-                  return getapi(`/api/app/patient/${this.form.patientId}`)
                 }
               }
-            )
-            .then(
-              (res) => {                
-                if(res.code == 1){
-                  //返写档案号
-                  this.form.patientNo = res.data.patientNo
-                }
-              }
-            );
+            )            
 
           } else {
             //id不为空则编辑 

src/components/patientRegister/PatientRegisterList.vue

@@ -209,8 +209,9 @@ export default {
     },
     //点击体检次数行
     rowick(row) {
+      this.patientRegister.photo = '' //清除照片缓存
       this.patientRegister.patientRegisterId = row.id
-      this.patientRegister.patientRegisterRd = row
+      this.patientRegister.patientRegisterRd = row      
       //console.log('row',row)
     },
 

src/router/index.js

@@ -207,12 +207,7 @@ const routes = [
         path: '/patientRegister',  
         name: '体检人员登记', 
         component: () => import('../views/customerOrg/patientRegister.vue')
-      },
-      {
-        path: '/Camera',  
-        name: '体检人员登记', 
-        component: () => import('../components/patientRegister/Camera.vue')
-      },
+      },      
       {
         path: '/patientRegisterSign',  
         name: '体检人员签到', 

src/store/index.js

@@ -68,13 +68,13 @@ export default new Vuex.Store({
         patientRegisterNo: '', //条码号 【创建编辑时不操作】
         medicalTimes: 1, //条码号 【创建编辑时不操作】
         organizationUnitId: null, //体检中心
-        address: '', //地址
-        email: '', //email
-        idNo: '', //身份证号
-        telephone: '', //电话
-        mobileTelephone: '', //手机号
-        nationId: null, //民族编号
-        postalCode: '', //邮编
+        address:'', //地址
+        email:'', //email
+        idNo:'', //身份证号
+        telephone:'', //电话
+        mobileTelephone:'', //手机号
+        nationId:null, //民族编号
+        postalCode:'', //邮编
       },  //体检人员记录（初始值）一般创建用
 
       query: {

src/utlis/mm.js

@@ -1,5 +1,3 @@
-const apiurl='http://81.70.217.145:9529'
-
 export default{
-    apiurl
+    apiurl:'http://81.70.217.145:9529',
 }

src/utlis/proFunc.js

@@ -38,16 +38,17 @@ exports.dddw = (arrayData,key,value,display) => {
 }
 
 //一般uuid字段为空时，需设置为null值
-exports.setNull = (obj,arrayCols) => {
-  if(arrayCols){
-    for(let i=0;i<arrayCols.length;i++){
-      if(!obj[arrayCols[i]] || obj[arrayCols[i]].length < 1){
-        obj[arrayCols[i]] = null
+exports.setNull = (obj,arrayKeys) => {
+  if(arrayKeys){
+    for(let i=0;i<arrayKeys.length;i++){
+      if(!obj[arrayKeys[i]] || obj[arrayKeys[i]].length < 1){
+        obj[arrayKeys[i]] = null
       }        
     }
   }
 }
 
+
 //将字符串转换成二进制形式，中间用空格隔开
 exports.strToBinary=function(str) {
   let result = [];

src/views/Home.vue

@@ -197,10 +197,7 @@
               </el-menu-item>
               <el-menu-item index="patientRegister">
                 <i class="el-icon-menu"></i> <span slot="title">体检人员登记</span>
-              </el-menu-item>
-              <el-menu-item index="Camera">
-                <i class="el-icon-menu"></i> <span slot="title">拍照测试</span>
-              </el-menu-item>
+              </el-menu-item>              
               <el-menu-item index="patientRegisterSign">
                 <i class="el-icon-menu"></i> <span slot="title">体检人员签到</span>
               </el-menu-item>