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

src/views/additionalOrder/additional/index.vue

@@ -2104,6 +2104,7 @@ import carTypeSelect from './modules/carTypeSelect.vue'
 import insuranceSelect from './modules/insuranceSelect.vue'
 import imageData from './modules/imageData.vue'
 import { gainFocus } from "@/utils/dataformat"
+import Decimal from 'decimal.js'
 
 import agreement from "@/api/modules/agreement.ts";
 import { id } from 'element-plus/es/locale/index.mjs'
@@ -4620,7 +4621,7 @@ const autoSumPremium = () => {
   const jqPremium: number = Number(additionalForm.value.jqPremium) || 0
   const jyPremium: number = Number(additionalForm.value.jyPremium) || 0
   const syPremium: number = Number(additionalForm.value.syPremium) || 0
-  additionalForm.value.sumPremium = (taxPremium + jqPremium + jyPremium + syPremium) + ''
+  additionalForm.value.sumPremium = new Decimal(taxPremium).plus(jqPremium).plus(jyPremium).plus(syPremium)
 }
 
 onMounted(() => {

src/views/additionalOrder/order/index.vue

@@ -26,7 +26,7 @@
             <el-col :span="8">
               <el-form-item label="保险公司">
                 <el-select v-model="form.companyId" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in companyList" :key="item.companyCode" :value="item.companyCode"
+                  <el-option v-for="item in companyList" :key="item.id" :value="item.id"
                     :label="item.name"></el-option>
                 </el-select>
               </el-form-item>

src/views/externalAgreement/agreement/agreementIndex.vue

@@ -63,10 +63,16 @@
     </PageMain>
     <el-dialog :close-on-click-modal="false" v-model="copyDialog" title="选中内部协议" width="600">
       <el-form>
+        <el-form-item label="协议状态">
+          <el-switch v-model="isEnableCopy" active-value="1" inactive-value="0" />
+        </el-form-item>
+        <el-form-item label="生效状态">
+          <el-switch v-model="validStatusCopy" active-value="0" inactive-value="1" />
+        </el-form-item>
         <el-form-item label="内部协议">
           <el-select v-model="agreementCopyId" placeholder="请选择内部协议" filterable>
-            <el-option v-for="item in agreementList" :key="item.id" :value="item.id"
-              :label="item.agreementTitle"></el-option>
+            <el-option v-for="item in showAgreement()" :key="item.id" :value="item.id"
+              :label="item.agreementTitle + '(' + item.agreementName + ')'"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -537,11 +543,17 @@ const getDeptTree = () => {
 
 const copyDialog = ref(false)
 const agreementCopyId = ref('')
+const isEnableCopy = ref('1')
+const validStatusCopy = ref('0')
 const agreementList = ref([])
+const showAgreement = () => {
+  const arr = agreementList.value.filter(v => v.isEnable === isEnableCopy.value && v.validStatus === validStatusCopy.value)
+  return arr
+}
 const selAgreement = () => {
   agreementCopyId.value = '';
   copyDialog.value = true;
-  api.agreementApi.agreementList({ size: 1000,isExternal:"0" }).then((res: any) => {
+  api.agreementApi.agreementList({ size: 1000, isExternal: "0" }).then((res: any) => {
     if (res.code == '200') {
       agreementList.value = res.data.records;
     }

src/views/quoteConfig/agreement/agreementDetails.vue

@@ -32,7 +32,7 @@
                   getDict('is_enable').find(val => val.value == agreementInfo.isEnable)?.label}}</el-tag>
                 <el-tag type="success">{{getDict('valid_status').find(val => val.value ==
                   agreementInfo.validStatus)?.label
-                }}</el-tag>
+                  }}</el-tag>
               </div>
             </div>
             <el-descriptions :column="3" style="margin-top: 10px;">
@@ -50,9 +50,9 @@
           </div>
           <el-descriptions title="基本信息" class="m-top-20" :column="3">
             <el-descriptions-item label="协议名称：">{{ agreementInfo.agreementTitle
-            }}</el-descriptions-item>
+              }}</el-descriptions-item>
             <el-descriptions-item label="协议简称：">{{ agreementInfo.agreementAbbreviation
-            }}</el-descriptions-item>
+              }}</el-descriptions-item>
             <el-descriptions-item label="协议生效时间：">{{ agreementInfo.startDate }}</el-descriptions-item>
             <el-descriptions-item label="协议失效时间：">{{ agreementInfo.endDate }}</el-descriptions-item>
             <el-descriptions-item label="是否含增值税结算：">
@@ -117,7 +117,7 @@
                   <div class="flex a-c">
                     <img src="../../../assets/images/fee.png" alt="">
                     <span style="margin-right: 30px;font-size: 16px;" class="strong m-left-10">承保规则一{{ index + 1
-                      }}</span>
+                    }}</span>
                   </div>
                   <div class="flex">
                     <el-button link type="primary" :icon="CopyDocument" @click="handleCopy(item, {})">复制费用</el-button>
@@ -852,6 +852,15 @@ const columns = computed(() => [
       return `起${row.effectiveTime}\n止${row.failureTime}`
     }
   },
+  {
+    prop: "approved", label: "审核状态", width: '200', component: "Tag", filters: getDict('audit_status').map(v => ({ text: v.label, value: Number(v.value) })),
+    formatter: (row: any) => {
+      let name = getDict('audit_status').find(val => val.value == row.approved).label
+      if (name) {
+        return { type: 'warning', text: name };
+      }
+    }
+  },
   { prop: "costDescribe", component: 'customSlot', label: "费用规则名称", width: '240', },
   { prop: "priorityLevel", label: "优先级", width: '100', },
   { prop: "costRules", component: 'customSlot', label: "费用规则", width: '240', },
@@ -908,15 +917,6 @@ const columns = computed(() => [
       }
     }
   },
-  {
-    prop: "approved", label: "审核状态", width: '200', component: "Tag", filters: getDict('audit_status').map(v => ({ text: v.label, value: Number(v.value) })),
-    formatter: (row: any) => {
-      let name = getDict('audit_status').find(val => val.value == row.approved).label
-      if (name) {
-        return { type: 'warning', text: name };
-      }
-    }
-  },
   {
     prop: "isValid", label: "有效状态", width: '200', filters: getDict('valid_status').map(v => ({ text: v.label, value: Number(v.value) })),
     filteredValue: [0],
@@ -1533,7 +1533,7 @@ const submitUpdate1 = () => {
     height: 18px;
     margin-right: 20px;
     content: "";
-    margin-top: 2px;
+    margin-top: 6px;
     background-color: #0083ff;
   }
 }