Merge branch 'func-eccs-2152' into test

src/views/charge-query/index.vue

@@ -125,7 +125,7 @@
         {{text == 'Y' ? '是' : text == 'N' ? '否' : ''}}
       </template>
       <template slot="status" slot-scope="text">
-        {{text == '1' ? '有效' : text == '2' ? '无效' : ''}}
+        <span :style="{color: text == 2 ? 'red' : ''}">{{ text==1?'有效':text==2?'无效':'' }}</span>
       </template>
     </a-table>
     <!--分页-->

src/views/charge-query/lpjManageDetail.vue

@@ -134,7 +134,7 @@
         {{ text==1?'已寄送':'未寄送' }}
       </template>
       <template slot="status" slot-scope="text">
-        {{ text==1?'有效':text==2?'无效':'' }}
+        <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> -->

src/views/verification/collectionDetail.vue

@@ -169,7 +169,7 @@
                 :pagination="false"
               >
               <template slot="status" slot-scope="text">
-                {{ text==1?'有效':text==2?'无效':'' }}
+                <span :style="{color: text == 2 ? 'red' : ''}">{{ text==1?'有效':text==2?'无效':'' }}</span>
               </template>
                 <template slot="operation" slot-scope="text, record, index">
                   <a-button
@@ -192,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"
@@ -202,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"
@@ -212,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"
@@ -223,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" />查询
@@ -246,7 +265,7 @@
                 }"
               >
               <template slot="status" slot-scope="text">
-                {{ text==1?'有效':text==2?'无效':'' }}
+                <span :style="{color: text == 2 ? 'red' : ''}">{{ text==1?'有效':text==2?'无效':'' }}</span>
               </template>
               </a-table>
               <BurtPagination
@@ -321,6 +340,16 @@ export default {
         { title: "账单列表", key: "1", show: false, content: "Insurance" },
       ],
       activeKey: "0",
+      statusOptions: [
+        {
+          name: '无效',
+          code:2
+        },
+        {
+          name: '有效',
+          code: 1
+        }
+      ]
     };
   },
   mixins: [mixins],