Merge branch 'func-eccs-2152' into 'master'

eccs 2152 [商保系统]账单列表- 增加状态字段回显

See merge request !38

src/views/charge-query/detail.vue

@@ -6,17 +6,17 @@
       <a-row :gutter="30">
         <a-col :xl="5" :lg="6" :sm="12">
           <a-form-model-item label="病历号">
-            <a-input v-model="form.mrnNo" placeholder="请输入病历号" allow-clear />
+            <a-input v-model="form.mrnNo" placeholder="请输入病历号" allow-clear disabled/>
           </a-form-model-item>
         </a-col>
         <a-col :xl="5" :lg="6" :sm="12">
           <a-form-model-item label="客户姓名">
-            <a-input v-model="form.patientName" placeholder="请输入客户姓名" allow-clear />
+            <a-input v-model="form.patientName" placeholder="请输入客户姓名" allow-clear disabled />
           </a-form-model-item>
         </a-col>
         <a-col :xl="5" :lg="6" :sm="12">
           <a-form-model-item label="保险公司">
-            <a-select v-model="form.payorId" placeholder="请选择保险公司" allowClear>
+            <a-select v-model="form.payorId" placeholder="请选择保险公司" allowClear disabled>
               <a-select-option v-for="item in companyOptions" :key="item.corpCode" :value="item.id">
                 {{ item.longName }}
               </a-select-option>
@@ -25,23 +25,16 @@
         </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 disabled/>
           </a-form-model-item>
         </a-col>
         <a-col :xl="5" :lg="6" :sm="12">
           <a-form-model-item label="收费时间">
-            <a-date-picker value-format="YYYY-MM-DD 00:00:00" v-model="form.receiptDate" placeholder="就诊时间" />
+            <a-date-picker value-format="YYYY-MM-DD 00:00:00" v-model="form.receiptDate" placeholder="就诊时间" disabled/>
           </a-form-model-item>
         </a-col>
-        <a-col :xl="16" :lg="12" :sm="12" class="none-label">
+        <!-- <a-col :xl="16" :lg="12" :sm="12" class="none-label">
           <a-form-model-item label="button">
-            <!-- <a-button>更新数据</a-button>
-            <a-button class="mar-left10" type="primary" @click="addNewCharge">
-              <Icon name="ssiadd" :size="14" />新建预授权</a-button> -->
             <a-button class="mar-left10" type="primary" @click="handlerReset">
               <Icon name="ssireset" :size="14" />重置
             </a-button>
@@ -49,7 +42,7 @@
               <Icon name="ssisearch_active" :size="14" />查询
             </a-button>
           </a-form-model-item>
-        </a-col>
+        </a-col> -->
       </a-row>
     </a-form-model>
 

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">
+        <span :style="{color: text == 2 ? 'red' : ''}">{{ text==1?'有效':text==2?'无效':'' }}</span>
+      </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,scopedSlots: { customRender: "status" } },
       { 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">
+        <span :style="{color: text == 2 ? 'red' : ''}">{{ text==1?'有效':text==2?'无效':'' }}</span>
+      </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,scopedSlots: { customRender: "status" } },
             { 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

@@ -165,9 +165,12 @@
                 class="table-content"
                 :columns="selectedColumns"
                 :data-source="selectedRows"
-                :scroll="{ x: true, y: 450 }"
+                :scroll="{ x: '100%', y: 450 }"
                 :pagination="false"
               >
+              <template slot="status" slot-scope="text">
+                <span :style="{color: text == 2 ? 'red' : ''}">{{ text==1?'有效':text==2?'无效':'' }}</span>
+              </template>
                 <template slot="operation" slot-scope="text, record, index">
                   <a-button
                     type="link"
@@ -189,7 +192,7 @@
                   :model="searchForm"
                 >
                   <a-row :gutter="30">
-                    <a-col :lg="6" :sm="10">
+                    <a-col :lg="5" :sm="10">
                       <a-form-model-item label="账单日期">
                         <a-range-picker
                           format="YYYY-MM-DD"
@@ -199,7 +202,7 @@
                         />
                       </a-form-model-item>
                     </a-col>
-                    <a-col :lg="6" :sm="10">
+                    <a-col :lg="4" :sm="10">
                       <a-form-model-item label="病历号">
                         <a-input
                           v-model="searchForm.mrnNo"
@@ -209,7 +212,7 @@
                         />
                       </a-form-model-item>
                     </a-col>
-                    <a-col :lg="6" :sm="12">
+                    <a-col :lg="4" :sm="12">
                       <a-form-model-item label="客户名称">
                         <a-input
                           v-model="searchForm.patientName"
@@ -220,6 +223,25 @@
                       </a-form-model-item>
                     </a-col>
                     <a-col :lg="4" :sm="12">
+                      <a-form-model-item label="状态">
+                        <a-select style="width: 160px;" v-model="searchForm.rStatus" 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 :lg="4" :sm="12">
+                      <a-form-model-item label="账单编号">
+                        <a-input
+                          v-model="searchForm.receiptNo"
+                          placeholder="请输入账单编号"
+                          allow-clear
+                          :disabled="!isEdit"
+                        />
+                      </a-form-model-item>
+                    </a-col>
+                    <a-col :lg="2" :sm="12">
                       <div class="btn-div mar-bottom10 none-label">
                         <a-button type="primary" @click="_getNewEOBList">
                           <Icon name="ssisearch_active" :size="14" />查询
@@ -233,7 +255,7 @@
               <a-table
                 :columns="columns"
                 :data-source="dataList"
-                :scroll="{ x: true, y: 300 }"
+                :scroll="{ x: '100%', y: 300 }"
                 :pagination="false"
                 :rowKey="'id'"
                 :row-selection="{
@@ -242,6 +264,9 @@
                   onSelectAll: onSelectAll,
                 }"
               >
+              <template slot="status" slot-scope="text">
+                <span :style="{color: text == 2 ? 'red' : ''}">{{ text==1?'有效':text==2?'无效':'' }}</span>
+              </template>
               </a-table>
               <BurtPagination
                 :pagination="pagination"
@@ -315,6 +340,16 @@ export default {
         { title: "账单列表", key: "1", show: false, content: "Insurance" },
       ],
       activeKey: "0",
+      statusOptions: [
+        {
+          name: '无效',
+          code:2
+        },
+        {
+          name: '有效',
+          code: 1
+        }
+      ]
     };
   },
   mixins: [mixins],
@@ -331,6 +366,13 @@ export default {
           ellipsis: true,
           width: 150,
         },
+        {
+          title: "账单状态",
+          dataIndex: "status",
+          ellipsis: true,
+          width: 150
+          ,scopedSlots: { customRender: "status" } 
+        },
         { title: "病历号", dataIndex: "mrnNo", ellipsis: true, width: 195 },
         {
           title: "客户姓名",
@@ -338,7 +380,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 +423,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 +441,7 @@ export default {
           );
         },
       };
-      base[8] = {
+      base[10] = {
         title: "未清余额",
         dataIndex: "residueBackAmount",
         ellipsis: true,
@@ -410,7 +452,7 @@ export default {
           return Number(residueBackAmount.toFixed(2));
         },
       };
-      base[7] =  {
+      base[9] =  {
         title: "个人欠费",
         dataIndex: "arrearsAmount",
         ellipsis: true,
@@ -428,7 +470,7 @@ export default {
           );
         },
       };
-      base.splice(6, 0, {
+      base.splice(8, 0, {
         title: "余末金额",
         dataIndex: "currentReceiptAmount",
         ellipsis: true,