Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/views/platform/index.vue

@@ -1016,6 +1016,13 @@ const batchSettle = () => {
     })
     return
   }
+  if(selectedList.value.some((item:any) => item.settlementStatusName == '已结算')) {
+    ElMessage({
+      message: '存在已结算数据，不能结算！',
+      type: 'warning'
+    })
+    return
+  }
   api.financeApi.getReceivableCompany({
     incomeIds: [...selectedList.value]
   }).then((res: any) => {

src/views/platform/platformRecord.vue

@@ -71,10 +71,12 @@
       <el-table-column prop="actualReceivedAmount" label="实收金额" width="150"></el-table-column>
       <el-table-column prop="receivePaymentDate" label="收款日期" width="200"></el-table-column>
       <el-table-column label="收款凭证" width="100">
-        <template #default="scope">
-          <el-button link type="primary" @click="view">查看凭证（1）</el-button>
-        </template>
-      </el-table-column>
+            <template #default="scope">
+              <el-button link type="primary" v-if="scope.row.fileUrl"
+                @click="view(scope.row)">查看凭证（{{ scope.row.fileUrl.split(',').length }}）</el-button>
+              <span v-else>无凭证</span>
+            </template>
+          </el-table-column>
       <el-table-column prop="createBy" label="结算人" width="200"></el-table-column>
       <el-table-column prop="createTime" label="结算时间" width="200"></el-table-column>
       <el-table-column label="操作" width="200" align="center" fixed="right">
@@ -88,7 +90,13 @@
         layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange($event)"
         @current-change="handleCurrentChange($event)"></el-pagination>
     </div>
+
   </PageMain>
+  <el-dialog v-model="viewCredential" title="查看凭证" width="400">
+    <div class="text-center text-[14px] text-[#999] pb-[20px]">点击图片放大预览</div>
+    <el-image style="width: 100%; height: 300px" :src="CredentialList[0]" :zoom-rate="1.2" :max-scale="7"
+      :min-scale="0.2" :preview-src-list="CredentialList" show-progress :initial-index="4" alt="凭证图片" fit="cover" />
+  </el-dialog>
 </template>
 
 <script setup lang="ts">
@@ -99,7 +107,8 @@ const router = useRouter();
 
 let form = ref({});
 let tableData = ref([]);
-
+const viewCredential = ref(false)//查看凭证弹窗
+const CredentialList = ref([])//凭证图片
 let pages = ref(1);
 let size = ref(10);
 let total = ref(0);
@@ -201,6 +210,11 @@ const viewDetail = (row) => {
     }
   })
 }
+const view = (scope) => {
+  CredentialList.value = scope.fileUrl.split(',')
+  viewCredential.value = true
+}
+
 onMounted(() => {
   initList();
   initOption();

src/views/quoteConfig/project/index.vue

@@ -29,7 +29,7 @@
         </div>
         <el-form class="p-[20px_8px_0_24px]" :model="projectForm" ref="projectRefs">
           <el-row :gutter="20">
-            <el-col :span="4">
+            <el-col :span="8">
               <el-form-item label="方案类型">
                 <el-select clearable v-model="projectForm.schemeType" placeholder="请选择" @change="search">
                   <el-option key="1" value="1" label="基础方案"></el-option>
@@ -37,7 +37,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="8">
               <el-form-item label="险种">
                 <el-select clearable v-model="projectForm.productId" placeholder="请选择" @change="search">
                   <el-option v-for="item in insuranceType" :key="item.value" :value="item.value"
@@ -45,7 +45,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="8">
               <el-form-item>
                 <el-input clearable prefix-icon="search" placeholder="输入规则描述查找" @keyup.enter="search"
                   v-model="projectForm.ruleDesc"></el-input>

src/views/receivable/documentary/index.vue

@@ -153,6 +153,7 @@
           <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
           <el-table-column prop="deptName" label="出单机构" width="120"></el-table-column>
           <el-table-column prop="agreementName" label="出单协议" width="150"></el-table-column>
+          <el-table-column prop="invoiceStatusName" label="开票状态" width="100"></el-table-column>
           <el-table-column prop="orderType" label="订单类型" width="100"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="100"></el-table-column>
           <el-table-column prop="otherCostsPremiums" label="应收跟单费" width="100"></el-table-column>
@@ -327,6 +328,7 @@
           <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
           <el-table-column prop="deptName" label="出单机构" width="120"></el-table-column>
           <el-table-column prop="agreementName" label="出单协议" width="150"></el-table-column>
+          <el-table-column prop="invoiceStatusName" label="开票状态" width="100"></el-table-column>
           <el-table-column prop="orderType" label="订单类型" width="100"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="100"></el-table-column>
           <el-table-column prop="otherCostsPremiums" label="应收跟单费" width="100"></el-table-column>
@@ -620,6 +622,13 @@ const handleInvoice = () => {
     })
     return
   }
+  if(selectedList.value.some((item:any) => item.invoiceStatusName == '已开票')) {
+    ElMessage({
+      message: '存在已开票数据，不能开票！',
+      type: 'warning'
+    })
+    return
+  }
   invoiceShow.value = true
   let arr = selectedList.value.map((item) => {
     return item.id

src/views/receivable/handingFee/index.vue

@@ -617,6 +617,13 @@ const handleInvoice = () => {
     })
     return
   }
+  if(selectedList.value.some((item:any) => item.invoiceStatusName == '已开票')) {
+    ElMessage({
+      message: '存在已开票数据，不能开票！',
+      type: 'warning'
+    })
+    return
+  }
   invoiceShow.value = true
   let arr = selectedList.value.map((item) => {
     return item.id