解决合并冲突

openhis-ui-vue3/src/views/charge/clinicRecord/index.vue

@@ -20,6 +20,19 @@
             @keyup.enter="getClinicRecord"
           />
         </el-form-item>
+        <el-form-item label="发票状态：" prop="invoiceStatus">
+          <el-select
+            v-model="queryParams.invoiceStatus"select
+            placeholder="发票状态"
+            clearable
+            style="width: 240px"
+            @keyup.enter="getClinicRecord"
+          >
+          <el-option v-for="item in invoiceStatusList" :key="item.value" :label="item.label"
+                    :value="item.value">
+          </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="结算时间：" prop="activeFlag">
           <el-date-picker
             v-model="occurrenceTime"
@@ -38,6 +51,12 @@
         </div>
       </el-form>
     </div>
+    <div style="float: right; margin: 0 20px 10px 0">
+      <span style="margin-right: 20px">
+        {{ '总数：' + count + '/' + '成功：' + successCount }}
+      </span>
+      <el-button type="primary" :loading="loading" plain @click="handleBatchProcess">批量开具</el-button>
+    </div>
     <el-table :data="clinicRecord" border>
       <!-- <el-table-column label="计算类型" align="center" prop="statusEnum_enumText" /> -->
       <el-table-column label="患者姓名" align="center" prop="patientName" :show-overflow-tooltip="true"/>
@@ -140,10 +159,17 @@ const queryParams = ref({
   billDateSTime:"",
   billDateETime:"",
   searchKey:"",
+  invoiceStatus:1,
   kinsEnum: 1
 });
+const invoiceStatusList = ref([
+    { value: 1, label: '已开具' },
+    { value: 0, label: '未开具' },
+  ]);
 const paymentDetailShow = ref(false)
 const clinicRecord = ref([]);
+const successCount = ref(0);
+const count = ref(0);
 const reasonDialogVisible = ref(false);
 const reasonForm = ref({
   reason: ''
@@ -215,6 +241,49 @@ function handleReset() {
 // function handleEdit(row){
   
 // }
+
+const loading = ref(false)
+async function handleBatchProcess() {
+  // 遍历list并异步执行invoiceReissue方法
+  let list = clinicRecord.value.filter(item =>{
+    return item.statusEnum == 1 && (item.invoiceNo == undefined || item.invoiceNo == null)
+  })
+  loading.value = true
+  count.value = list.length;
+  for (const item of list) {
+    try {
+      const res = await invoiceReissue({
+        paymentId: item.id,
+        encounterId: item.encounterId ? item.encounterId : ""
+      });
+      
+      if (res.data) {
+        // 门诊电子发票开具失败 住院电子发票开具失败 电子发票类型不明确
+        if (
+          res.data.includes(" 挂号电子发票开具失败") ||
+          res.data.includes(" 住院电子发票开具失败") ||
+          res.data.includes(" 门诊电子发票开具失败") ||
+          res.data.includes(" 电子发票类型不明确")
+        ) {
+          // proxy.$message.error(res.data);
+        } else {
+          successCount.value++;
+          // window.open(res.data);
+        }
+      }
+      if (res.code == 200) {
+        // getLists();
+      } else {
+        // proxy.$message.error(res.data);
+      }
+    } catch (err) {
+      console.error(err);
+    }
+  }
+  loading.value = false
+  getLists()
+}
+
 function handleOpen(row,type){
   if(type==1){
     invoiceReissue({paymentId:row.id,encounterId:row.encounterId?row.encounterId:""}).then((res) => {