@dongkboy преди 2 години
родител
ревизия
2c590bf01a

+ 2 - 2
config/dev.env.js

@@ -9,9 +9,9 @@ module.exports = merge(prodEnv, {
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
-  // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
+  BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
   // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
-  BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
+  // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇
   // BASE_URL: '"http:///192.168.0.103:8080/"',//

+ 45 - 42
src/components/Form/retrievalForm.vue

@@ -1,45 +1,43 @@
 <template>
   <el-form ref="form" :model="formData" :inline="true" :label-width="labelWidth" size="small">
     <el-row>
-      <div  >
-        <el-col :span="6" v-for="field in formFields" :key="field.label">
-          <el-form-item :label="field.label" v-show="field.Retained !== false">
-            <template v-if="field.type === 'input'">
-              <el-input v-model="formData[field.name]" :placeholder="'请输入' + field.label"></el-input>
-            </template>
-            <template v-else-if="field.type === 'select'">
-              <el-select v-model="formData[field.name]" filterable clearable :placeholder="'请选择' + field.label"
-                @change="selectChange($event, field.name)">
-                <el-option v-for="(option, index) in field.options" :key="index"
-                  :label="field.optionsIabel ? option[field.optionsIabel] : option.name"
-                  :value="field.optionsValue ? option[field.optionsValue] : option.id"></el-option>
-              </el-select>
-            </template>
-            <template v-else-if="field.type === 'date'">
-              <el-date-picker  type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期"
-                end-placeholder="结束日期" v-model="formData[field.list]" style="width: 100%;"
-                @change="dateChange($event, field.name)"></el-date-picker>
-            </template>
-            <template v-else-if="field.type === 'switch'">
-              <el-switch v-model="formData[field.name]"></el-switch>
-            </template>
-            <template v-else-if="field.type === 'checkbox'">
-              <el-checkbox-group v-model="formData[field.name]">
-                <el-checkbox v-for="(option, index) in field.options" :key="index" :label="option.label"
-                  :name="field.name"></el-checkbox>
-              </el-checkbox-group>
-            </template>
-            <template v-else-if="field.type === 'radio'">
-              <el-radio-group v-model="formData[field.name]">
-                <el-radio v-for="(option, index) in field.options" :key="index" :label="option.label"></el-radio>
-              </el-radio-group>
-            </template>
-            <template v-else-if="field.type === 'textarea'">
-              <el-input type="textarea" v-model="formData[field.name]"></el-input>
-            </template>
-          </el-form-item>
-        </el-col>
-      </div>
+      <el-col :span="6" v-for="field in formFields" :key="field.label">
+        <el-form-item :label="field.label" v-show="field.Retained !== false">
+          <template v-if="field.type === 'input'">
+            <el-input v-model="formData[field.name]" :placeholder="'请输入' + field.label"></el-input>
+          </template>
+          <template v-else-if="field.type === 'select'">
+            <el-select v-model="formData[field.name]" filterable clearable :placeholder="'请选择' + field.label"
+              @change="selectChange($event, field.name)">
+              <el-option v-for="(option, index) in field.options" :key="index"
+                :label="field.optionsIabel ? option[field.optionsIabel] : option.name"
+                :value="field.optionsValue ? option[field.optionsValue] : option.id"></el-option>
+            </el-select>
+          </template>
+          <template v-else-if="field.type === 'date'">
+            <el-date-picker type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期"
+              end-placeholder="结束日期" v-model="formData[field.list]" style="width: 100%;"
+              @change="dateChange($event, field.name)"></el-date-picker>
+          </template>
+          <template v-else-if="field.type === 'switch'">
+            <el-switch v-model="formData[field.name]"></el-switch>
+          </template>
+          <template v-else-if="field.type === 'checkbox'">
+            <el-checkbox-group v-model="formData[field.name]">
+              <el-checkbox v-for="(option, index) in field.options" :key="index" :label="option.label"
+                :name="field.name"></el-checkbox>
+            </el-checkbox-group>
+          </template>
+          <template v-else-if="field.type === 'radio'">
+            <el-radio-group v-model="formData[field.name]">
+              <el-radio v-for="(option, index) in field.options" :key="index" :label="option.label"></el-radio>
+            </el-radio-group>
+          </template>
+          <template v-else-if="field.type === 'textarea'">
+            <el-input type="textarea" v-model="formData[field.name]"></el-input>
+          </template>
+        </el-form-item>
+      </el-col>
       <el-col :span="2" :offset="1" style="margin-top: 10px;" class="fold">
         <span @click="toggleCollapse">折叠筛选信息</span>
         <img src="../../../src/icon/Arrow.png" alt
@@ -85,19 +83,19 @@ export default {
       if (field.label === '报价时间' && !this.formData[field.list]) {
         this.$set(this.formData, field.list, [this.currentDate, this.currentDate]);
         this.$set(this.formData, field.name[0], this.currentDate);
-        this.$set(this.formData, field.name[1],this.currentDate );
+        this.$set(this.formData, field.name[1], this.currentDate);
       }
     });
     this.formFields = this.fields;
     this.resetForm();
-    this.defaultTime=this.currentDate;
+    this.defaultTime = this.currentDate;
   },
 
   methods: {
     selectChange(id, filed) {
       switch (filed) {
         case 'provinceId':
-            console.log(this.formData)
+          console.log(this.formData)
           break;
         case 'cityId':
 
@@ -142,6 +140,11 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+.el-row{
+  display: flex;
+  flex-wrap: wrap;
+  align-content: flex-start;
+}
 .el-form-item>>>.el-input {
   width: 250px;
 }

+ 26 - 17
src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -489,10 +489,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="['单交', '交三', '交商', '兜底配置'].includes(
-            productCostForm.productName
-          )
-            ">
+
+          <el-row v-if="productjqincludes">
             <h4 style="color: tomato">交强险费用</h4>
             <el-col :span="5" :offset="1">
               <el-form-item label="费用比例" prop="jqCarCostsProportion">
@@ -544,10 +542,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="['单商', '单三', '交商', '交三', '兜底配置'].includes(
-            productCostForm.productName
-          )
-            ">
+          <el-row v-if="productsyincludes">
             <h4 style="color: tomato">商业险费用</h4>
 
             <el-col :span="5" :offset="1">
@@ -1703,9 +1698,9 @@ export default {
       },
       //产品费用
       productCostForm: {
-        agreementId: [],
+        agreementId: '',
         productName: [],
-        productId: "",
+        productId: [],
         costsDescription: "", //费用描述
         costsStartDate: "", //费用起期
         costsEndDate: "", //费用止期
@@ -2028,6 +2023,18 @@ export default {
     };
   },
   computed: {
+    productjqincludes(){
+      let a=['单交', '交三', '交商', '兜底配置'];
+      let b=this.productCostForm.productName;
+      let contains = b.every(item => a.includes(item));
+      return contains
+    },
+    productsyincludes(){
+      let a= ['单商', '单三', '交商', '交三', '兜底配置'];
+      let b=this.productCostForm.productName;
+      let contains = b.every(item => a.includes(item));
+      return contains
+    },
     // 机构列表转属性数据
     companyListTree() {
       let cloneData = JSON.parse(JSON.stringify(this.companyList)); // 对源数据深度克隆
@@ -2557,6 +2564,8 @@ export default {
           })
           this.$nextTick(() => {
             this.dynamicFormArray = obj.costsAttrLinks;
+            obj.productId=[obj.productId]
+            obj.productName=[obj.productName]
             this.productCostForm = obj;
           });
           this.productCostAddDialogType = "edit";
@@ -2814,7 +2823,7 @@ export default {
         if (valid) {
           if (this.productCostAddDialogType == "add") {
             this.$api.insCompany
-              .productCostSave([this.productCostForm])
+              .productCostSave(this.productCostForm)
               .then((res) => {
                 if (res.code == "200") {
                   this.$message({
@@ -3060,12 +3069,12 @@ export default {
           return '删除'
       }
     },
-    auditTypeFormation(row) {
-      for (var i = 0; i < this.expenseAuditlist.length; i++) {
-        if (row.isAudit == parseInt(this.expenseAuditlist[i].value)) {
-          return this.expenseAuditlist[i].label;
-        }
-      }
+    auditTypeFormation(row,column) {
+      let expenseAudit=row.isAudit;
+      console.log(this.expenseAuditlist)
+        let expense=this.expenseAuditlist.find(val=>val.value==expenseAudit);
+        console.log(expense)
+        // return expense;
     },
     agreementtypeFormatter(row, column) {
       //协议类型

+ 21 - 19
src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyintasks.vue

@@ -99,7 +99,7 @@ export default {
         userId: "",
       },
       retrievalFields: [
-        {
+      {
           name: 'provinceId',
           label: '省机构名称',
           type: 'select',
@@ -124,14 +124,7 @@ export default {
           type: 'select',
           options: []
         },
-        {
-          name: 'managementSource',
-          label: '机构来源',
-          type: 'select',
-          options: [],
-          optionsIabel: "dictTag",
-          optionsValue: "dictValue",
-        },
+
         {
           name: 'taskNo',
           label: '任务池号',
@@ -139,23 +132,31 @@ export default {
 
         },
         {
-          name: 'subOrderId',
+          name: 'orderNo',
           label: '订单号',
           type: 'input',
 
         },
+        {
+          name: 'managementSource',
+          label: '机构来源',
+          type: 'select',
+          options: [],
+          optionsIabel: "dictTag",
+          optionsValue: "dictValue",
+        },
         {
           name: 'companyId',
           label: '保险公司',
           type: 'select',
           options: []
         },
+
         {
-          name: 'agreeId',
-          label: '协议选择',
-          type: 'select',
-          options: [],
-          optionsIabel: "agreementName",
+          name: 'insuredName',
+          label: '被保险人',
+          type: 'input',
+          Retained: true,
         },
         {
           name: 'licenseNo',
@@ -205,10 +206,11 @@ export default {
           Retained: true,
         },
         {
-          name: 'insuredName',
-          label: '被保险人',
-          type: 'input',
-          Retained: true,
+          name: 'agreeId',
+          label: '协议选择',
+          type: 'select',
+          options: [],
+          optionsIabel: "agreementName",
         },
         {
           name: ["quoteStartDateStr", "quoteEndDateStr"],

+ 10 - 9
src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyuntasks.vue

@@ -150,12 +150,12 @@ export default {
           type: 'select',
           options: []
         },
+
         {
-          name: 'agreeId',
-          label: '协议选择',
-          type: 'select',
-          options: [],
-          optionsIabel: "agreementName",
+          name: 'insuredName',
+          label: '被保险人',
+          type: 'input',
+          Retained: true,
         },
         {
           name: 'licenseNo',
@@ -205,10 +205,11 @@ export default {
           Retained: true,
         },
         {
-          name: 'insuredName',
-          label: '被保险人',
-          type: 'input',
-          Retained: true,
+          name: 'agreeId',
+          label: '协议选择',
+          type: 'select',
+          options: [],
+          optionsIabel: "agreementName",
         },
         {
           name: ["quoteStartDateStr", "quoteEndDateStr"],