Merge branch 'yanglilong' into 'master'

Yanglilong

See merge request !5

README.md

@@ -23,7 +23,7 @@
 1. IP: 139.224.200.172
 2. 域名 http://bims.medilink-global.com.cn
 3. 登录账密  admin/123456
-4. 发布目录：/datavg/bims/
+4. 发布目录：/datavg/front/bims/
 
 ### nginx
 生产nginx配置文件地址： /usr/local/nginx/conf/

src/views/charge-query/detail.vue

@@ -6,7 +6,7 @@
       <a-row :gutter="30">
         <a-col :xl="4" :lg="6" :sm="12">
           <a-form-model-item label="病历号">
-            <a-input v-model="form.patientNo" placeholder="请输入病历号" allow-clear />
+            <a-input v-model="form.mrnNo" placeholder="请输入病历号" allow-clear />
           </a-form-model-item>
         </a-col>
         <a-col :xl="4" :lg="6" :sm="12">
@@ -154,7 +154,7 @@ export default {
       pageForm: {
         doctorCode: "",
         patientName: "",
-        patientNo: "",
+        mrnNo: "",
         paymentCode: "",
         payorId: 0,
         visitTimeEnd: "",
@@ -187,11 +187,11 @@ export default {
       },
       editFormObj: {
         id: "",
-        patientNo: '',
+        mrnNo: '',
         patientName: '',
       },
       editRules: {
-        patientNo: [{ required: true, message: "病历号", trigger: "blur" }],
+        mrnNo: [{ required: true, message: "病历号", trigger: "blur" }],
         patientName: [{ required: true, message: "客户姓名", trigger: "blur" }],
       },
     };
@@ -327,8 +327,8 @@ export default {
     },
     // 重置
     handlerReset() {
-      const { patientNo, patientName } = this.form;
-      this.form = {patientNo, patientName};
+      const { mrnNo, patientName } = this.form;
+      this.form = {mrnNo, patientName};
     },
     editEvt(record) {
       this.editFormObj = {

src/views/charge-query/lpjManageDetail.vue

@@ -160,7 +160,7 @@ import moment from 'moment'
 export default {
   data() {
     const columns = [
-      { title: "就诊日期", dataIndex: "visitTimeStart", width: 200,scopedSlots: { customRender: "visitTimeStart" } },
+      { title: "就诊日期", dataIndex: "receiptDate", width: 200,scopedSlots: { customRender: "receiptDate" } },
       { title: "病历号", dataIndex: "patientNo", key:"patientNo",align:'center', width: 136},
       { title: "客户姓名", dataIndex: "patientName", width: 98 },
       { title: "账单编号", dataIndex: "receiptNo", key:"receiptNo",align:'center', width: 136},

src/views/welfare/info/components/coverages/index.vue

@@ -74,7 +74,7 @@ export default {
         Y: '是',
         N: '否'
       };
-      return data[value];
+      return data[value]||'否';
     },
   },
   watch: {