no message

src/views/charge-query/detail.vue

@@ -25,11 +25,7 @@
         </a-col>
         <a-col :xl="5" :lg="6" :sm="12">
           <a-form-model-item label="看诊医生">
-            <a-select  v-model="form.doctorCode" placeholder="请选择看诊医生" allowClear>
-              <a-select-option v-for="item in doctorOptions" :key="item.doctorCode" :value="item.doctorCode">
-                {{ item.doctorDesc }}
-              </a-select-option>
-            </a-select>
+            <a-input v-model="form.doctorName" placeholder="请输入看诊医生" allow-clear />
           </a-form-model-item>
         </a-col>
         <a-col :xl="5" :lg="6" :sm="12">

src/views/charge-query/index.vue

@@ -75,6 +75,15 @@
             <a-input v-model="form.receiptNo" placeholder="请输入账单编号" allow-clear />
           </a-form-model-item>
         </a-col>
+        <a-col :xl="6" :lg="6" :sm="12">
+          <a-form-model-item label="状态">
+            <a-select v-model="form.status" placeholder="请选择状态" allowClear>
+              <a-select-option v-for="item in statusOptions" :key="item.code" :value="item.code">
+                {{ item.name }}
+              </a-select-option>
+            </a-select>
+          </a-form-model-item>
+        </a-col>
         <a-col :xl="8" :lg="3" :sm="3" class="none-label">
           <a-form-model-item label="button">
             <!-- <a-button>更新数据</a-button> -->
@@ -115,6 +124,9 @@
       <template slot="isEobBack" slot-scope="text">
         {{text == 'Y' ? '是' : text == 'N' ? '否' : ''}}
       </template>
+      <template slot="status" slot-scope="text">
+        {{text == '1' ? '有效' : text == '2' ? '无效' : ''}}
+      </template>
     </a-table>
     <!--分页-->
     <BurtPagination :pagination="pagination" @pageChange="_getChargeList" />
@@ -134,6 +146,7 @@ export default {
       { title: "收费时间", dataIndex: "receiptDate", width: 180 },
       { title: "账单编号", dataIndex: "receiptNo", width: 180 },
       { title: "账单类型", dataIndex: "receiptTypeStr", width: 130 },
+      { title: "状态", dataIndex: "status", width: 130 },
       { title: "病历号", dataIndex: "mrnNo",width: 180},
       { title: "客户姓名",dataIndex: "patientName",width: 120,},
       { title: "保险公司", dataIndex: "payorName", width: 200 },
@@ -190,7 +203,17 @@ export default {
       receiptTypeDict: {
         '1': '收费',
         '2': '退费'
+      },
+      statusOptions: [
+        {
+          name: '无效',
+          code:2
+        },
+        {
+          name: '有效',
+          code: 1
         }
+      ]
     };
   },
   components: {

src/views/charge-query/lpjManageDetail.vue

@@ -91,6 +91,20 @@
                 </a-form-model-item>
             </a-col>
         </a-row>
+        <a-row :gutter="30">
+            <a-col :lg="8" :sm="12">
+                <a-form-model-item label="账单编号">
+                    <a-input v-model="searchForm.receiptNo" placeholder="请输入账单编号" allow-clear />
+                </a-form-model-item>
+            </a-col>
+            <a-col :lg="8" :sm="12">
+              <a-form-model-item label="状态">
+                <a-select v-model="searchForm.rStatus" placeholder="请选择状态" allow-clear>
+                  <a-select-option :key="item.code" :value="item.code" v-for="item in statusOptions">{{item.name}}</a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+        </a-row>
       <a-row :gutter="30">
         <a-col :sm="24" class="none-label">
           <div class="btn-div flex">
@@ -119,6 +133,9 @@
       <template slot="sendSts" slot-scope="text">
         {{ text==1?'已寄送':'未寄送' }}
       </template>
+      <template slot="status" slot-scope="text">
+        {{ text==1?'有效':text==2?'无效':'' }}
+      </template>
       <template slot="operation" slot-scope="text, record">
         <!-- <a-button type="link" @click.stop="editEvt(record)">修改</a-button> -->
         <a-button type="link" class="danger" @click.stop="delRecord(record)">删除</a-button>
@@ -220,6 +237,16 @@ export default {
         sendDate: [{ required: true, message: "请选择寄送日期", trigger: "change" }],
         trackingNo: [{ required: true, message: "请输入寄送单号", trigger: "blur" }],
       },
+      statusOptions: [
+        {
+          name: '无效',
+          code: 2
+        },
+        {
+          name: '有效',
+          code: 1
+        }
+      ]
     };
   },
   components: {
@@ -235,6 +262,7 @@ export default {
             { title: "保险卡号", dataIndex: "memberCardNo", width: 180 },
             { title: "客户生日", dataIndex: "birthday", width: 160 },
             { title: "账单编号", dataIndex: "receiptNo", key:"receiptNo",align:'center', width: 136},
+            { title: "状态", dataIndex: "status", key:"status",align:'center', width: 136},
             { title: "保险公司", dataIndex: "payorName", ellipsis: true,  width: 250 },
             { title: "应收金额", dataIndex: "chargeAmount", width: 100, align: 'center' },
             { title: "折扣金额", dataIndex: "discountAmount", width: 100, align: 'center' },

src/views/customer/edit/index.vue

@@ -42,14 +42,14 @@
           <a-form-model-item label="出生日期" prop="birthday">
             <a-date-picker v-model="form.birthday" allow-clear placeholder="请选择出生日期" value-format="YYYY-MM-DD 00:00:00"></a-date-picker>
           </a-form-model-item>
-          <a-form-model-item label="客户公司名称" prop="corpName">
+          <!-- <a-form-model-item label="客户公司名称" prop="corpName">
             <a-select v-model="form.corpName" placeholder="请选择客户公司名称" show-search allow-clear
               :filterOption="filterCode" @change="corpChange" @search="corpSearch">
               <a-select-option v-for="item in comCorpCode" :key="item.id" :value="item.id + '$_' + item.longName">
                 {{ item.longName }}
               </a-select-option>
             </a-select>
-          </a-form-model-item>
+          </a-form-model-item> -->
           <a-form-model-item label="保单生效日期" prop="startDate">
             <a-date-picker allow-clear v-model="form.startDate" placeholder="请选择保单生效日期" value-format="YYYY-MM-DD 00:00:00" @change="startDateChange"></a-date-picker>
           </a-form-model-item>
@@ -85,7 +85,7 @@
             <a-date-picker allow-clear v-model="form.endDate" placeholder="请选择保单终止日期" value-format="YYYY-MM-DD 00:00:00"></a-date-picker>
           </a-form-model-item>
         </a-col>
-        <a-col :xl="6" :lg="6" :sm="12">
+        <!-- <a-col :xl="6" :lg="6" :sm="12">
           <a-form-model-item label="保险计划" prop="planName">
             <a-select v-model="form.planName" placeholder="请选择保险计划" show-search allow-clear :filterOption="filterCode" @search="codeSearch"
             >
@@ -94,7 +94,7 @@
               </a-select-option>
             </a-select>
           </a-form-model-item>
-        </a-col>
+        </a-col> -->
         <a-col :xl="6" :lg="6" :sm="12">
           <a-form-model-item label="其他备注" prop="remark">
             <a-input allow-clear v-model="form.remark" placeholder="请输入备注信息"></a-input>

src/views/verification/collectionDetail.vue

@@ -331,6 +331,12 @@ export default {
           ellipsis: true,
           width: 150,
         },
+        {
+          title: "账单状态",
+          dataIndex: "status",
+          ellipsis: true,
+          width: 150,
+        },
         { title: "病历号", dataIndex: "mrnNo", ellipsis: true, width: 195 },
         {
           title: "客户姓名",
@@ -338,7 +344,7 @@ export default {
           ellipsis: true,
           width: 160,
         },
-        // { title: "保险公司", dataIndex: "payorName", ellipsis: true, width: 160 },
+        { title: "保险公司", dataIndex: "payorName", ellipsis: true, width: 195 },
         {
           title: "账单日期",
           dataIndex: "receiptDate",
@@ -381,7 +387,7 @@ export default {
     selectedColumns() {
       const base = JSON.parse(JSON.stringify(this.columns));
       const changeAmount = this.changeAmount;
-      base[6] = {
+      base[8] = {
         title: "回款金额",
         dataIndex: "backAmount",
         ellipsis: true,
@@ -399,7 +405,7 @@ export default {
           );
         },
       };
-      base[8] = {
+      base[10] = {
         title: "未清余额",
         dataIndex: "residueBackAmount",
         ellipsis: true,
@@ -410,7 +416,7 @@ export default {
           return Number(residueBackAmount.toFixed(2));
         },
       };
-      base[7] =  {
+      base[9] =  {
         title: "个人欠费",
         dataIndex: "arrearsAmount",
         ellipsis: true,
@@ -428,7 +434,7 @@ export default {
           );
         },
       };
-      base.splice(6, 0, {
+      base.splice(8, 0, {
         title: "余末金额",
         dataIndex: "currentReceiptAmount",
         ellipsis: true,