wuguojie пре 9 месеци
родитељ
комит
a8602b3db4
3 измењених фајлова са 13 додато и 5 уклоњено
  1. 2 0
      src/router/guards.ts
  2. 10 5
      src/views/insurancePolicy/index.vue
  3. 1 0
      src/views/personnel/memberManagement.vue

+ 2 - 0
src/router/guards.ts

@@ -10,6 +10,8 @@ import '@/assets/styles/nprogress.css'
 
 function setupRoutes(router: Router) {
   router.beforeEach(async (to, _from, next) => {
+    console.log('目标', to)
+    console.log('来源', _from)
     const settingsStore = useSettingsStore()
     const userStore = useUserStore()
     const routeStore = useRouteStore()

+ 10 - 5
src/views/insurancePolicy/index.vue

@@ -899,7 +899,7 @@
                           <el-table-column label="险种" prop="kindName" align="center"></el-table-column>
                           <el-table-column label="保额" align="center">
                             <template #default="props">
-                              <el-select v-model="props.row.amount">
+                              <el-select v-model="props.row.amount" :disabled="scope.row.projectList?.[productIndex]?.schemeType == '1'">
                                 <el-option v-for="item in props.row.options" :label="item.label" :value="item.value"></el-option>
                               </el-select>
                             </template>
@@ -1082,7 +1082,7 @@
             </el-table-column>
             <el-table-column label="报价协议" prop="" align="center" width="260">
               <template #default="scope">
-                <el-select v-model="scope.row.agreement" :disabled="scope.row.isDispatch" v-if="currentRow.some(a => a.id === scope.row.id)" :placeholder="scope.row.isDispatch?'默认':'请选择'">
+                <el-select v-model="scope.row.agreement" :disabled="scope.row.isDispatch || scope.row.agreements.length == 1" v-if="currentRow.some(a => a.id === scope.row.id)" :placeholder="scope.row.isDispatch?'默认':'请选择'">
                   <el-option v-for="item in scope.row.agreements" :value="item.id" :label="item.agreementName"></el-option>
                 </el-select>
               </template>
@@ -2796,7 +2796,7 @@ const handleSubmit = async (InsurancePolicyRefs: FormInstance | undefined, scope
   }
   await InsurancePolicyRefs.validate((valid) => {
     if(valid) {
-      loading.value = true
+      // loading.value = true
       quoteData.value[scope.$index].loading = true
       let arr = [], brr = [], crr = []
       if(quoteData.value.length>0) {
@@ -2956,14 +2956,14 @@ const handleSubmit = async (InsurancePolicyRefs: FormInstance | undefined, scope
           riskCode: '0507',
           startDate: insurancePolicyForm.value.JQStartDate,
           endDate: insurancePolicyForm.value.JQEndDate,
-          instantFlag: false
+          instantFlag: insurancePolicyForm.value.JQInstantFlag
         }: null,
 
         biRiskInfoVo: insurancePolicyForm.value.productId === '034001' || insurancePolicyForm.value.productId === '034002' || insurancePolicyForm.value.productId === '0330034002' || insurancePolicyForm.value.productId === '0330034001'&&insurancePolicyForm.value.SYStartDate&&insurancePolicyForm.value.SYEndDate?{
           riskCode: '0510',
           startDate: insurancePolicyForm.value.SYStartDate,
           endDate: insurancePolicyForm.value.SYEndDate,
-          instantFlag: false
+          instantFlag: insurancePolicyForm.value.SYInstantFlag
         }: null,
 
         vehicleAndVesselTaxVo: {
@@ -3205,6 +3205,11 @@ const ruleFilterCompany = (item) => {
         a.loading = false
       })
       quoteData.value = res.data
+      quoteData.value.forEach(item => {
+          if(item.agreements && item.agreements.length == 1) {
+              item.agreement = item.agreements[0].id
+          }
+      })
     } else {
       quoteData.value = []
       ElMessage({

+ 1 - 0
src/views/personnel/memberManagement.vue

@@ -419,6 +419,7 @@ const pageInfo =reactive( {
   show:true
 });
 function showAllMember(){
+  status.value = ''
   deptItem.value={}
   pageInfo.pageNum = 1;
   pageInfo.pageSize = 10;