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

package-lock.json

@@ -3056,6 +3056,11 @@
       "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
       "dev": true
     },
+    "dayjs": {
+      "version": "1.11.13",
+      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz",
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
+    },
     "de-indent": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",

src/components/TemplateTable/index.vue

@@ -212,7 +212,7 @@
       </el-form-item> -->
     </el-form>
 
-    <slot v-if="custom" show-overflow-tooltip></slot>
+    
     <slot v-if="tipFlag">
       <div >
         <span style="color:red">注意更新签单日期</span>

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/HandlingFees.vue

@@ -3,7 +3,7 @@
   <div class="container" style="width: 99%; margin-top: 0px">
     <templateTable
       tipFlag
-      custom
+      
       :formList="formList"
       ref="templateTable"
       :searchData.sync="searchData"

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/HandlingFees.vue

@@ -3,7 +3,6 @@
   <div class="container" style="width: 99%; margin-top: 0px">
     <templateTable
       tipFlag
-      custom
       :formList="formList"
       ref="templateTable"
       :searchData.sync="searchData"

src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalance.vue

@@ -5,7 +5,6 @@
       tipFlag
       ref="templateTable"
       :formList="formList"
-      custom
       :searchData.sync="searchData"
       :tableConfig="tableConfig"
       @selectionChange="selectionChange"

src/views/Task/daikeComponents/KtLetter1.vue

@@ -6025,6 +6025,7 @@ import dayjs from 'dayjs'
   mounted() {
     this.getCompanyList(this.$route.query.data)
     this.onScroll();
+    
     if (this.$route.query.data) {
       if(this.isDateBeforeToday(this.$route.query.data.jqstartdate)){
         this.jqstartDate = this.transformTime1();
@@ -6033,6 +6034,7 @@ import dayjs from 'dayjs'
           this.jqstartDate = this.$route.query.data.jqstartdate;
           this.jqendDate = this.$route.query.data.jqenddate;
       }
+      
       if (this.$route.query.data.jqstartdate.split(" ")[1] == "00:00:00") {
         this.immediatelyValue = false;
       } else {
@@ -6593,6 +6595,8 @@ import dayjs from 'dayjs'
       this.policyNumberForm[type] = []
     },
     editingWay(paramsEdit) {
+      // console.log(paramsEdit)
+      
       if (paramsEdit) {
         var _this = this;
         this.jqchecked = false;
@@ -6603,7 +6607,12 @@ import dayjs from 'dayjs'
           paramsEdit;
         this.editorInfo = { ...paramsEdit };
         // this.vehicleAndVesselTaxForm = { ...paramsEdit.vehicleAndVesselTax };
-
+        console.log(paramsEdit.jqstartdate)
+        if (paramsEdit.jqstartdate.split(" ")[1] == "00:00:00") {
+          this.immediatelyValue = false;
+        } else {
+          this.immediatelyValue = true;
+        }
         _this.carInfo = carinfo;
         if (_this.carInfo.carnature == "8A") {
           _this.carInfo.carnature = "02";

src/views/Task/daikeComponents/KtOrder.vue

@@ -2245,6 +2245,7 @@ export default {
     CloseEdit(index, row) {
       this.$api.letter.getByOrderNo({ orderNo: row.orderno }).then((res) => {
         if (res.code == 200) {
+          // console.log(this.isLetterOrder,res.data )
           if (this.isLetterOrder) {
             this.$router.push({
               path: "/letter/letter",