Merge remote-tracking branch 'origin/wuguojie' into dev

# Conflicts:
#	src/views/HeadBar/HeadBar.vue

src/views/HeadBar/HeadBar.vue

@@ -191,10 +191,9 @@ export default {
     }
     this.sysName = "Zgdd Platform";
 
-    // this.$store.commit('SET_TIMER', setInterval(() => {
-    //   this.getMessage()
-    // }, 3000))
-
+    this.$store.commit('SET_TIMER', setInterval(() => {
+      this.getMessage()
+    }, 3000))
 
     // var user = sessionStorage.getItem("user")
 

src/views/PeopleManage/Agent/QuoteDetail.vue

@@ -93,6 +93,14 @@ export default {
       pageNum: 1,
       pageSize: 10,
       total: 0,
+
+      outOfBusinessVehicleUseoptions: [],
+      businessVehicleUseoptions: [],
+      natureOfVehicleUseoptions: [],
+      trafficManagementVehicleTypeoptions: [],
+      vehicleTypeoptions: [],
+      energyTypeoptions: [],
+
       orderInfo: {
         carinfo: {},
         applyinfo: {},
@@ -167,11 +175,55 @@ export default {
       this.pageSize = 10
       this.initData();
     },
+    capTypedictTag(val, option) {
+      if (option.find((item) => item.dictValue == val)) {
+        return option.find((item) => item.dictValue == val).dictTag;
+      } else {
+        return "-";
+      }
+    },
     // 获取详情
     getQuoteDetail(row) {
       this.$api.letter.getByCompanyId({
         companyId: row.subOrderNo
       }).then(res => {
+        if (
+          (res.data.carinfo.carnature &&
+            res.data.carinfo.carnature == "02") ||
+          res.data.carinfo.carnature == "非营业"
+        ) {
+          res.data.carinfo.vehicleUse = this.capTypedictTag(
+            res.data.carinfo.vehicleUse,
+            this.outOfBusinessVehicleUseoptions
+          );
+        } else {
+          res.data.carinfo.vehicleUse = this.capTypedictTag(
+            res.data.carinfo.vehicleUse,
+            this.businessVehicleUseoptions
+          );
+        }
+        res.data.carinfo.carnature = this.capTypedictTag(
+          res.data.carinfo.carnature,
+          this.natureOfVehicleUseoptions
+        );
+        res.data.carinfo.cartype = res.data.carinfo.cartype
+          ? this.capTypedictTag(
+            res.data.carinfo.cartype,
+            this.trafficManagementVehicleTypeoptions
+          )
+          : "";
+        res.data.carinfo.cimodelclass = res.data.carinfo.cimodelclass
+          ? this.capTypedictTag(
+            res.data.carinfo.cimodelclass,
+            this.vehicleTypeoptions
+          )
+          : "";
+        res.data.carinfo.energyType = res.data.carinfo.energyType
+          ? this.capTypedictTag(
+            res.data.carinfo.energyType,
+            this.energyTypeoptions
+          )
+          : "";
         this.orderInfo = {...res.data}
         this.$refs.detailsDialog.setBackupVisible(true);
       })
@@ -191,9 +243,23 @@ export default {
           this.resultList = res.data
         }
       })
-    }
+    },
+    getDicType(type) {
+      this.$api.insCompany.dicType(type).then((res) => {
+        if (res.code == 200) {
+          this[type + "options"] = res.data.ddList;
+        }
+      });
+    },
   },
   mounted() {
+    this.getDicType("natureOfVehicleUse"); //车辆使用性质
+    this.getDicType("vehicleType"); //车辆种类
+    this.getDicType("trafficManagementVehicleType"); //车辆类型
+    this.getDicType("energyType"); //能源种类
+    this.getDicType("businessVehicleUse"); //（车辆用途）营业
+    this.getDicType("outOfBusinessVehicleUse"); //（车辆用途）非营业
+    this.getDicType("productsType"); //（车辆用途）非营业
     this.initData();
     this.initAction();
     this.initResult();

src/views/Task/daikeComponents/KtLetter1.vue

@@ -6445,9 +6445,9 @@ export default {
     changeInput(e,listIndex, index, type,minquantity, dataIndex) {
       let num = Number(e)
       if (dataIndex >= 0) {
-        this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData[dataIndex].quantity = num
+        this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData[dataIndex].quantity = num<minquantity?minquantity:num
       } else {
-        this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData.quantity = num
+        this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData.quantity = num<minquantity?minquantity:num
       }
       this.$forceUpdate()
     },