fix(package.lock): 解决冲突

src/components/Antd/index.js

-import Vue from "vue";
+import Vue from 'vue'
 import {
   Row,
   Col,
@@ -12,6 +12,7 @@ import {
   DatePicker,
   Input,
   InputNumber,
+  Checkbox,
   Radio,
   upload,
   Button,
@@ -23,9 +24,9 @@ import {
   Collapse,
   Tabs,
   Tooltip,
-	Popover,
-	Empty
-} from "ant-design-vue";
+  Popover,
+  Empty
+} from 'ant-design-vue'
 
 export default () => {
   let els = [
@@ -41,6 +42,7 @@ export default () => {
     DatePicker,
     Input,
     InputNumber,
+    Checkbox,
     Radio,
     upload,
     Button,
@@ -52,15 +54,15 @@ export default () => {
     Collapse,
     Tabs,
     Tooltip,
-		Popover,
-		Empty
-  ];
+    Popover,
+    Empty
+  ]
   // 注册
   els.forEach((item) => {
-    Vue.use(item);
-  });
+    Vue.use(item)
+  })
   // 全局提示
-  Vue.prototype.$msg = notification;
-  Vue.prototype.$message = message;
-  Vue.prototype.$modal = Modal;
-};
+  Vue.prototype.$msg = notification
+  Vue.prototype.$message = message
+  Vue.prototype.$modal = Modal
+}

src/views/verification/collectionDetail.vue

@@ -222,7 +222,7 @@
                       :model="searchForm"
                     >
                       <a-row>
-                        <a-col :lg="4" :sm="12">
+                        <a-col :lg="6" :sm="12">
                           <a-form-model-item label="账单日期">
                             <a-range-picker
                               format="YYYY-MM-DD"
@@ -232,7 +232,7 @@
                             />
                           </a-form-model-item>
                         </a-col>
-                        <a-col :lg="4" :sm="12">
+                        <a-col :lg="6" :sm="12">
                           <a-form-model-item label="病历号">
                             <a-input
                               v-model="searchForm.mrnNo"
@@ -242,7 +242,7 @@
                             />
                           </a-form-model-item>
                         </a-col>
-                        <a-col :lg="4" :sm="12">
+                        <a-col :lg="6" :sm="12">
                           <a-form-model-item label="客户名称">
                             <a-input
                               v-model="searchForm.patientName"
@@ -252,7 +252,7 @@
                             />
                           </a-form-model-item>
                         </a-col>
-                        <a-col :lg="4" :sm="12">
+                        <a-col :lg="6" :sm="12">
                           <a-form-model-item
                             label="状态"
                             :labelCol="{ span: 7 }"
@@ -273,7 +273,7 @@
                             </a-select>
                           </a-form-model-item>
                         </a-col>
-                        <a-col :lg="4" :sm="12">
+                        <a-col :lg="6" :sm="12">
                           <a-form-model-item label="账单编号">
                             <a-input
                               v-model="searchForm.receiptNo"
@@ -283,6 +283,15 @@
                             />
                           </a-form-model-item>
                         </a-col>
+                        <a-col :lg="6" :sm="12">
+                          <a-form-model-item label="" class="mar_l40">
+                            <a-checkbox
+                              :checked="searchForm.hasBack == 'Y'"
+                              @change="($event) => changeHasBack($event)"
+                            />
+                            <span class="lable">是否已回款</span>
+                          </a-form-model-item>
+                        </a-col>
                         <a-col class="flex-col" :lg="4" :sm="12">
                           <div>
                             <a-button type="primary" @click="searchData">
@@ -463,7 +472,8 @@ export default {
       searchForm: {
         billDate: [],
         mrnNo: '', // 病历号
-        patientName: '' // 客户名字
+        patientName: '', // 客户名字
+        hasBack: 'N'
       },
       savedStatus: false, //是否已保存
       relatedList: [],
@@ -592,24 +602,6 @@ export default {
       const base = JSON.parse(JSON.stringify(this.columns))
       const changeAmount = this.changeAmount
       const delRecord = this.delRecord
-      // base[1] = {
-      //   title: '账单状态',
-      //   dataIndex: 'status',
-      //   ellipsis: true,
-      //   width: 100,
-      //   fixed: 'left',
-      //   customRender: (val, row) => {
-      //     return (
-      //       <span
-      //         style={{
-      //           color: row.staus == 2 ? 'red' : ''
-      //         }}
-      //       >
-      //         {row.staus == 1 ? '有效' : row.staus == 2 ? '无效' : ''}
-      //       </span>
-      //     )
-      //   }
-      // }
       base[7] = {
         title: '回款金额',
         dataIndex: 'backAmount',
@@ -786,6 +778,11 @@ export default {
   },
   methods: {
     moment,
+    // 切换是否已回款
+    changeHasBack(e) {
+      let val = e.target.checked
+      this.searchForm.hasBack = val ? 'Y' : 'N'
+    },
     // 获取未清余额合计
     getBackMoneyReportCount(params) {
       this.$apis
@@ -1217,6 +1214,14 @@ export default {
     opacity: 0;
   }
 }
+.lable {
+  margin-left: 10px;
+  font-weight: bold;
+  color: rgba(0, 0, 0, 0.85);
+}
+.mar_l40 {
+  margin-left: 60px;
+}
 .all-list_box {
   height: calc(100vh - 400px);
   overflow-y: auto;