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

src/views/additionalOrder/additional/index.vue

@@ -1398,12 +1398,12 @@
                           </el-form-item>
                       </el-col>
                       <el-col :span="6">
-                          <el-form-item label="签单日期" prop="signingTime">
+                          <el-form-item label="签单时间" prop="signingTime">
                               <el-date-picker
                                   v-model="additionalForm.signingTime"
-                                  type="date"
+                                  type="datetime"
                                   placeholder="请选择"
-                                  value-format="YYYY-MM-DD"
+                                  value-format="YYYY-MM-DD HH:mm:ss"
                                   style="width: 100%"
                               />
                           </el-form-item>
@@ -1415,7 +1415,7 @@
                       </el-col>
                       <el-col :span="6">
                           <el-form-item label="车船税" prop="taxPremium">
-                              <el-input v-model="additionalForm.taxPremium" placeholder="请输入车船税">
+                              <el-input v-model="additionalForm.taxPremium" @input="autoSumPremium()" placeholder="请输入车船税">
                                   <template #append>
                                       <span>元</span>
                                   </template>
@@ -1438,7 +1438,7 @@
                       </el-col>
                       <el-col :span="6">
                           <el-form-item label="交强险保费" prop="jqPremium">
-                              <el-input v-model="additionalForm.jqPremium" placeholder="请输入交强险保费">
+                              <el-input v-model="additionalForm.jqPremium" @input="autoSumPremium()" placeholder="请输入交强险保费">
                                   <template #append>
                                       <span>元</span>
                                   </template>
@@ -1447,7 +1447,7 @@
                       </el-col>
                       <el-col :span="6">
                           <el-form-item label="驾意险保费" prop="jyPremium">
-                              <el-input v-model="additionalForm.jyPremium" placeholder="请输入驾意险保费">
+                              <el-input v-model="additionalForm.jyPremium" @input="autoSumPremium()" placeholder="请输入驾意险保费">
                                   <template #append>
                                       <span>元</span>
                                   </template>
@@ -1470,7 +1470,7 @@
                       </el-col>
                       <el-col :span="6">
                           <el-form-item label="商业险保费" prop="syPremium">
-                              <el-input v-model="additionalForm.syPremium" placeholder="请输入商业险保费">
+                              <el-input v-model="additionalForm.syPremium" @input="autoSumPremium()" placeholder="请输入商业险保费">
                                   <template #append>
                                       <span>元</span>
                                   </template>
@@ -2043,11 +2043,11 @@ let additionalRules = ref({
     { pattern: /[\u4e00-\u9fa5\u3400-\u4DBF\u20000-\u2A6DFa-zA-Z0-9]+/, message: '车牌只允许输入汉字、字母、数字组合', trigger: 'blur' }
   ],
   vinNo: [
-    { required: true, message: "请输入车牌识别代码", trigger: "blur" },
+    { required: true, message: "请输入车牌识别代码", trigger: "change" },
     { pattern: /^[a-zA-Z0-9]{17}$/, min: 17, max: 17, message: '车辆识别代码长度为17位字母数字组合' }
   ],
   brandName: [
-    { required: true, message: "请输入品牌型号", trigger: "blur" }
+    { required: true, message: "请输入品牌型号", trigger: "change" }
   ],
   engineNo: [
     { required: true, message: "请输入发动机号", trigger: "blur" }
@@ -3353,6 +3353,7 @@ const handleCarType = (type) => {
 const handleCarTypeSelect = (data) => {
   carTypeShow.value = false
     additionalForm.value.carYear = data.marketYear
+    additionalForm.value.brandName = data.modelName
     additionalForm.value.completeKerbMass = data.wholeWeight
     additionalForm.value.displacement = data.displacement
     additionalForm.value.purchasePrice = data.replacementValue
@@ -4122,7 +4123,7 @@ const initEditData = () => {
   }
 }
 
-const longTime = (type) => {
+const longTime = (type:number) => {
     switch (type) {
         case 1:
             additionalForm.value.identifyValidEndDate1 = '9999-12-31'
@@ -4151,6 +4152,15 @@ const handleEquities = (bool) => {
     equitiesShow.value = bool
 }
 
+// 总保费自动计算
+const autoSumPremium=()=>{
+  const taxPremium:number=Number(additionalForm.value.taxPremium) || 0
+  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)+''
+}
+
 onMounted(() => {
   initOption()
   initEditData()

src/views/insurancePolicy/index.vue

@@ -2901,12 +2901,12 @@ const handleUnderwriting = (scope: any) => {
     }
   })
 }
-const historyhandleUnderwriting = (scope: any) => {
+const historyhandleUnderwriting = (ordersNo:String) => {
 
   underwritingShow.value = true
   let data = {
     order:{
-      ordersNo: scope,
+      ordersNo,
       quoteNo: insurancePolicyForm.value.order.quoteNo,
     },
     imageVoList: insurancePolicyForm.value.imageVoList,
@@ -2939,15 +2939,14 @@ const handleUnderwritingClose = (bool: any, dataObj: any) => {
       message: bool.msg,
       type: 'success'
     })
-    quoteData.value[underwritingIndex.value].underwritingMsg = "";
+    if(underwritingIndex.value>=0) quoteData.value[underwritingIndex.value].underwritingMsg = "";
     underwritingMsgShow.value = true
   } else {
     ElMessage({
       message: bool.msg,
       type: 'error'
     })
-    quoteData.value[underwritingIndex.value].underwritingMsg = bool.msg
-
+    if(underwritingIndex.value>=0) quoteData.value[underwritingIndex.value].underwritingMsg = bool.msg
   }
 }
 

src/views/payCredit/index.vue

@@ -14,6 +14,11 @@
                                 <el-input v-model="firstForm.salesman" placeholder="请输入" clearable></el-input>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="业务员工号">
+                                <el-input v-model="firstForm.userJzgInfoId" placeholder="请输入" clearable></el-input>
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="8">
                             <el-form-item label="业务员类型">
                                 <el-select v-model="firstForm.attrType" placeholder="请选择" clearable>
@@ -65,6 +70,7 @@
                 </el-form>
                 <el-table :data="firstData4" style="width: 100%; margin-top: 20px;">
                     <el-table-column prop="name" label="业务员"></el-table-column>
+                    <el-table-column prop="userJzgInfoId" label="业务员工号"></el-table-column>
                     <el-table-column prop="attrType" label="业务员类型">
                         <template #default="scope">
                             {{ scope.row.attrType == '1'?'前线人员':scope.row.attrType == '2'?'后线人员':scope.row.attrType == '3'?'合伙人':scope.row.attrType == '4'?'工作室管理员':scope.row.attrType == '5'?'团队':scope.row.attrType == '6'?'个代':scope.row.attrType == '7'?'电销':scope.row.attrType == '8'?'渠道':'' }}
@@ -108,6 +114,11 @@
                                 <el-input v-model="firstForm.salesman" placeholder="请输入" clearable></el-input>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="业务员工号">
+                                <el-input v-model="firstForm.userJzgInfoId" placeholder="请输入" clearable></el-input>
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="8">
                             <el-form-item label="业务员类型">
                                 <el-select v-model="firstForm.attrType" placeholder="请选择" clearable>
@@ -159,6 +170,7 @@
                 </el-form>
                 <el-table :data="firstData1" style="width: 100%; margin-top: 20px;">
                     <el-table-column prop="name" label="业务员"></el-table-column>
+                    <el-table-column prop="userJzgInfoId" label="业务员工号"></el-table-column>
                     <el-table-column prop="attrType" label="业务员类型">
                         <template #default="scope">
                             {{ scope.row.attrType == '1'?'前线人员':scope.row.attrType == '2'?'后线人员':scope.row.attrType == '3'?'合伙人':scope.row.attrType == '4'?'工作室管理员':scope.row.attrType == '5'?'团队':scope.row.attrType == '6'?'个代':scope.row.attrType == '7'?'电销':scope.row.attrType == '8'?'渠道':'' }}
@@ -218,6 +230,11 @@
                                 <el-input v-model="firstForm.salesman" placeholder="请输入" clearable></el-input>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="业务员工号">
+                                <el-input v-model="firstForm.userJzgInfoId" placeholder="请输入" clearable></el-input>
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="8">
                             <el-form-item label="业务员类型">
                                 <el-select v-model="firstForm.attrType" placeholder="请选择" clearable>
@@ -269,6 +286,7 @@
                 </el-form>
                 <el-table :data="firstData2" style="width: 100%; margin-top: 20px;">
                     <el-table-column prop="name" label="业务员"></el-table-column>
+                    <el-table-column prop="userJzgInfoId" label="业务员工号"></el-table-column>
                     <el-table-column prop="attrType" label="业务员类型">
                         <template #default="scope">
                             {{ scope.row.attrType == '1'?'前线人员':scope.row.attrType == '2'?'后线人员':scope.row.attrType == '3'?'合伙人':scope.row.attrType == '4'?'工作室管理员':scope.row.attrType == '5'?'团队':scope.row.attrType == '6'?'个代':scope.row.attrType == '7'?'电销':scope.row.attrType == '8'?'渠道':'' }}
@@ -307,6 +325,11 @@
                                 <el-input v-model="firstForm.salesman" placeholder="请输入" clearable></el-input>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="业务员工号">
+                                <el-input v-model="firstForm.userJzgInfoId" placeholder="请输入" clearable></el-input>
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="8">
                             <el-form-item label="业务员类型">
                                 <el-select v-model="firstForm.attrType" placeholder="请选择" clearable>
@@ -358,6 +381,7 @@
                 </el-form>
                 <el-table :data="firstData3" style="width: 100%; margin-top: 20px;">
                     <el-table-column prop="name" label="业务员"></el-table-column>
+                    <el-table-column prop="userJzgInfoId" label="业务员工号"></el-table-column>
                     <el-table-column prop="attrType" label="业务员类型">
                         <template #default="scope">
                             {{ scope.row.attrType == '1'?'前线人员':scope.row.attrType == '2'?'后线人员':scope.row.attrType == '3'?'合伙人':scope.row.attrType == '4'?'工作室管理员':scope.row.attrType == '5'?'团队':scope.row.attrType == '6'?'个代':scope.row.attrType == '7'?'电销':scope.row.attrType == '8'?'渠道':'' }}

src/views/payCredit/myTask.vue

@@ -9,6 +9,11 @@
                                 <el-input v-model="firstForm" placeholder="请输入" clearable></el-input>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="业务员工号">
+                                <el-input v-model="firstForm" placeholder="请输入" clearable></el-input>
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="8">
                             <el-form-item label="业务员类型">
                                 <el-select v-model="firstForm" placeholder="请选择" clearable>
@@ -30,7 +35,6 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="8"></el-col>
-                        <el-col :span="8"></el-col>
                         <el-col :span="8" style="display: flex; align-items: center; justify-content: flex-end">
                             <el-button type="primary">搜索</el-button>
                             <el-button plain>重置</el-button>