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

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

package.json

@@ -25,6 +25,7 @@
     "bignumber.js": "^9.1.2",
     "cross-env": "^7.0.3",
     "crypto-js": "^4.2.0",
+    "dayjs": "^1.11.13",
     "decimal.js": "^10.4.3",
     "echarts": "^4.9.0",
     "element-china-area-data": "^6.1.0",

src/views/Core/PersonalPanel.vue

@@ -206,10 +206,10 @@ export default {
     },
     //消息通知
     notify() {
-      this.$refs.messagePanel.setBackupVisible(true)
-      // this.$router.push({
-      //   path: '/message'
-      // })
+      // this.$refs.messagePanel.setBackupVisible(true)
+      this.$router.push({
+        path: '/message'
+      })
     },
     //闪电增员
     recruiting() {

src/views/FinancialManagement/CarInsurance/Verifytasks/RejectOrders.vue

@@ -70,6 +70,11 @@ export default {
             label: "车牌号",
             type: "text",
           },
+          {
+            label: "录入人",
+            prop: "recorder",
+            type: "text",
+          },
           {
             prop: "auditname",
             label: "审核人",
@@ -80,6 +85,11 @@ export default {
             label: "驳回原因",
             type: "text",
           },
+          {
+            label: "驳回时间",
+            prop: "audittime",
+            type: "text",
+          },
           {
             prop: "jqpremium",
             label: "交强保费",
@@ -216,6 +226,6 @@ export default {
   }
 };
 </script>
-      
+
 <style scoped lang="scss">
-</style>
+</style>

src/views/FinancialManagement/ExpenseManagement/PaymentManagement.vue

@@ -182,6 +182,15 @@
               </el-col>
             </el-row>
             <el-row>
+              <el-col :span="12">
+                <el-form-item label="公司类型" prop="businessQuality">
+                  <el-input
+                    disabled
+                    v-model="formData.businessQuality"
+                    autocomplete="off"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
               <el-col :span="12">
                 <el-form-item label="开票员" prop="biller">
                   <el-input
@@ -191,6 +200,8 @@
                   ></el-input>
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row>
               <el-col :span="12">
                 <el-form-item label="开票金额" prop="invoiceMoney">
                   <el-input-number
@@ -201,8 +212,6 @@
                   ></el-input-number>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
               <el-col :span="12">
                 <el-form-item label="发票数" prop="invoiceNum">
                   <el-input-number
@@ -213,6 +222,8 @@
                   ></el-input-number>
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row>
               <el-col class="invoic" :span="12">
                 <el-form-item label="开票科目" prop="invoiceSubjectsValue">
                   <el-input
@@ -226,8 +237,6 @@
                   ></el-input>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
               <el-col :span="12">
                 <el-form-item label="发票类型" prop="invoiceType">
                   <el-select
@@ -246,6 +255,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row>
               <el-col :span="12">
                 <el-form-item label="开票日期" prop="invoiceTime">
                   <el-date-picker
@@ -257,8 +268,6 @@
                   </el-date-picker>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
               <el-col :span="12">
                 <el-form-item label="对方单位" prop="otherUnit">
                   <el-select
@@ -279,6 +288,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row>
               <el-col :span="12">
                 <el-form-item label="支出卡号" prop="outBankCardNum">
                   <el-input
@@ -288,8 +299,6 @@
                   ></el-input>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
               <el-col :span="12">
                 <el-form-item label="税率(%)" prop="rate">
                   <el-input-number
@@ -544,6 +553,7 @@ export default {
         { prop: "invoiceId", label: "发票号码", type: "text", minWidth: 160 },
         { prop: "invoiceNum", label: "发票数", type: "text", minWidth: 60 },
         { prop: "invoiceBy", label: "开票方", type: "text", minWidth: 360 },
+        { prop: "businessQuality", label: "公司类型", type: "text", minWidth: 80 },
         {
           prop: "otherUnit",
           label: "对方单位名称",
@@ -976,16 +986,17 @@ export default {
     //选择开票方change事件
     companyChange(item) {
         if(item.accountName=="太原天勤保险代理有限公司"){
-          this.formData.invoiceSubjects1 ='经纪代理服务' 
-          this.formData.invoiceSubjects2 ='保险代理手续费' 
+          this.formData.invoiceSubjects1 ='经纪代理服务'
+          this.formData.invoiceSubjects2 ='保险代理手续费'
         }
       // else{
-      //   this.formData.invoiceSubjects1 ='' 
-      //   this.formData.invoiceSubjects2 ='' 
+      //   this.formData.invoiceSubjects1 =''
+      //   this.formData.invoiceSubjects2 =''
       // }
       this.formData.revBankCardNum = item.bankCardNum;
       this.formData.biller = item.biller;
       this.formData.accountId = item.accountId;
+      this.formData.businessQuality = item.businessQuality;
     },
     //选择开票方change事件
     outherChange(item) {

src/views/HeadBar/HeadBar.vue

@@ -63,6 +63,9 @@ import Action from "@/components/Toolbar/Action"
 import NoticePanel from "@/views/Core/NoticePanel"
 import MessagePanel from "@/views/Core/MessagePanel"
 import PersonalPanel from "@/views/Core/PersonalPanel"
+
+import { sendWebsocket, closeWebsocket } from "@/utils/websocket.js";
+
 export default {
   components: {
     Hamburger,
@@ -190,7 +193,7 @@ export default {
       this.screenWidth = document.body.clientWidth
     }
     this.sysName = "Zgdd Platform";
-
+    this.getMessage()
     // this.$store.commit('SET_TIMER', setInterval(() => {
     //   this.getMessage()
     // }, 3000))
@@ -229,13 +232,14 @@ export default {
   methods: {
     getMessage() {
       let that = this
-      that.$api.letter.getMessage({
-        pageNum: 1,
-        pageSize: 10
-      }).then(res => {
-        if(res.code === 200) {
-          if(res.data.list&&res.data.list.length>0) {
-            let list = res.data.list.filter(item => item.state === '0')
+      let userId = sessionStorage.getItem("user")
+      sendWebsocket(
+        `${process.env.SOCKET_Url}getMessage/${userId}`,
+        {userId: userId},
+        (e) => {
+          console.log('链接成功', e)
+          if(e.list&&e.list.length>0) {
+            let list = e.list.filter(item => item.state === '0')
             if(list.length>0) {
               that.isDot = true
             } else {
@@ -244,8 +248,29 @@ export default {
           } else {
             that.isDot = false
           }
+        },
+        () => {
+          console.log('连接失败了')
+          that.isDot = false
         }
-      })
+      )
+      // that.$api.letter.getMessage({
+      //   pageNum: 1,
+      //   pageSize: 10
+      // }).then(res => {
+      //   if(res.code === 200) {
+      //     if(res.data.list&&res.data.list.length>0) {
+      //       let list = res.data.list.filter(item => item.state === '0')
+      //       if(list.length>0) {
+      //         that.isDot = true
+      //       } else {
+      //         that.isDot = false
+      //       }
+      //     } else {
+      //       that.isDot = false
+      //     }
+      //   }
+      // })
     },
     show(e){
       this.toolbarActive=true;

src/views/Task/daikeComponents/KtLetter1.vue

@@ -217,19 +217,19 @@
           <el-col :xs="colSpan.xs" :sm="colSpan.sm" :md="colSpan.md" :lg="colSpan.lg" :xl="colSpan.xl">
             <el-form-item label="注册日期" prop="registerDate" class="red-btn">
               <el-date-picker v-dateFormat v-model="carInfo.registerDate" :picker-options="pickerOptions" @blur="getCompanyList"
-                value-format="yyyy-MM-dd" type="date" placeholder="选择注册日期" placement="bottom-start"></el-date-picker>
+                value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择注册日期" placement="bottom-start" @change="(e) => carInfo.registerDate = changeDate(e)"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :xs="colSpan.xs" :sm="colSpan.sm" :md="colSpan.md" :lg="colSpan.lg" :xl="colSpan.xl">
             <el-form-item label="发证日期" prop="issueDate" class="red-btn" @blur="getCompanyList">
               <el-date-picker v-dateFormat v-model="carInfo.issueDate" :picker-options="issueDateOptions" type="date"
-                placeholder="选择发证日期" value-format="yyyy-MM-dd" placement="bottom-start"></el-date-picker>
+                placeholder="选择发证日期" value-format="yyyy-MM-dd" placement="bottom-start" @change="(e) => carInfo.issueDate = changeDate(e)"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :xs="colSpan.xs" :sm="colSpan.sm" :md="colSpan.md" :lg="colSpan.lg" :xl="colSpan.xl" v-if="transferDateShow">
             <el-form-item label="转移登记日期" prop="transferDate">
               <el-date-picker v-dateFormat v-model="carInfo.transferDate" :picker-options="pickerOptions" type="date" @blur="getCompanyList"
-                placeholder="选择日期" value-format="yyyy-MM-dd" placement="bottom-start"></el-date-picker>
+                placeholder="选择日期" value-format="yyyy-MM-dd" placement="bottom-start" @change="(e) => carInfo.transferDate = changeDate(e)"></el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
@@ -332,7 +332,7 @@
           <el-col :xs="colSpan.xs" :sm="colSpan.sm" :md="colSpan.md" :lg="colSpan.lg" :xl="colSpan.xl" v-if="ownerInfo.property=='0'">
             <el-form-item label="联系人有效期止期" prop="leaderOtherEffectiveDate" class="red-btn">
               <el-date-picker v-dateFormat  v-model="ownerInfo.leaderOtherEffectiveDate" type="date" value-format="yyyy-MM-dd" @blur="getCompanyList"
-                placeholder="选择有效期止期" placement="bottom-start" style="width: calc(100% - 40px)"></el-date-picker>
+                placeholder="选择有效期止期" placement="bottom-start" style="width: calc(100% - 40px)" @change="(e) => ownerInfo.leaderOtherEffectiveDate = changeDate(e)"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :xs="colSpan.xs" :sm="colSpan.sm" :md="colSpan.md" :lg="colSpan.lg" :xl="colSpan.xl" v-if="ownerInfo.property=='0'">
@@ -350,13 +350,13 @@
             <el-form-item label="有效期起期" prop="identifyValidDate">
               <el-date-picker v-dateFormat v-model="ownerInfo.identifyValidDate" value-format="yyyy-MM-dd" @blur="getCompanyList"
                 :picker-options="pickerOptions" type="date" placeholder="选择有效期起期"
-                placement="bottom-start"></el-date-picker>
+                placement="bottom-start" @change="(e) => ownerInfo.identifyValidDate = changeDate(e)"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :xs="colSpan.xs" :sm="colSpan.sm" :md="colSpan.md" :lg="colSpan.lg" :xl="colSpan.xl">
             <el-form-item label="有效期止期" prop="identifyValidEndDate" class="red-btn">
               <el-date-picker v-dateFormat  v-model="ownerInfo.identifyValidEndDate" type="date" value-format="yyyy-MM-dd" @blur="getCompanyList"
-                placeholder="选择有效期止期" placement="bottom-start" style="width: calc(100% - 40px)"></el-date-picker>
+                placeholder="选择有效期止期" placement="bottom-start" style="width: calc(100% - 40px)" @change="(e) => ownerInfo.identifyValidEndDate = changeDate(e)"></el-date-picker>
               <div class="insure-long-term" @click="insureLongterm('ownerInfo')">
                 长期
               </div>
@@ -475,7 +475,7 @@
           <el-col :xs="colSpan.xs" :sm="colSpan.sm" :md="colSpan.md" :lg="colSpan.lg" :xl="colSpan.xl" v-if="policyHolderInfo.property=='0'">
             <el-form-item label="联系人有效期止期" prop="leaderOtherEffectiveDate" class="red-btn">
               <el-date-picker v-dateFormat  v-model="policyHolderInfo.leaderOtherEffectiveDate" type="date" value-format="yyyy-MM-dd" @blur="getCompanyList"
-                placeholder="选择有效期止期" placement="bottom-start" style="width: calc(100% - 40px)"></el-date-picker>
+                placeholder="选择有效期止期" placement="bottom-start" style="width: calc(100% - 40px)" @change="(e) => policyHolderInfo.leaderOtherEffectiveDatee = changeDate(e)"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :xs="colSpan.xs" :sm="colSpan.sm" :md="colSpan.md" :lg="colSpan.lg" :xl="colSpan.xl" v-if="policyHolderInfo.property=='0'">
@@ -492,14 +492,14 @@
           <el-col :xs="colSpan.xs" :sm="colSpan.sm" :md="colSpan.md" :lg="colSpan.lg" :xl="colSpan.xl">
             <el-form-item  label="有效期起期" prop="identifyValidDate">
               <el-date-picker v-dateFormat v-model="policyHolderInfo.identifyValidDate" value-format="yyyy-MM-dd" @blur="getCompanyList"
-                :picker-options="pickerOptions" type="date" placeholder="选择有效期起期" placement="bottom-start"></el-date-picker>
+                :picker-options="pickerOptions" type="date" placeholder="选择有效期起期" placement="bottom-start" @change="(e) => policyHolderInfo.identifyValidDate = changeDate(e)"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :xs="colSpan.xs" :sm="colSpan.sm" :md="colSpan.md" :lg="colSpan.lg" :xl="colSpan.xl">
             <el-form-item  label="有效期止期" prop="identifyValidEndDate">
               <el-date-picker v-dateFormat v-model="policyHolderInfo.identifyValidEndDate" type="date" @blur="getCompanyList"
                 value-format="yyyy-MM-dd" placeholder="选择有效期止期" placement="bottom-start"
-                style="width: calc(100% - 40px)"></el-date-picker>
+                style="width: calc(100% - 40px)" @change="(e) => policyHolderInfo.identifyValidEndDate = changeDate(e)"></el-date-picker>
               <div class="insure-long-term" @click="insureLongterm('policyHolderInfo')">
                 长期
               </div>
@@ -631,7 +631,7 @@
           <el-col :xs="colSpan.xs" :sm="colSpan.sm" :md="colSpan.md" :lg="colSpan.lg" :xl="colSpan.xl" v-if="insuredPersonInfo.property=='0'">
             <el-form-item label="联系人有效期止期" prop="leaderOtherEffectiveDate" class="red-btn">
               <el-date-picker v-dateFormat  v-model="insuredPersonInfo.leaderOtherEffectiveDate" type="date" value-format="yyyy-MM-dd" @blur="getCompanyList"
-                placeholder="选择有效期止期" placement="bottom-start" style="width: calc(100% - 40px)"></el-date-picker>
+                placeholder="选择有效期止期" placement="bottom-start" style="width: calc(100% - 40px)" @change="(e) => insuredPersonInfo.leaderOtherEffectiveDate = changeDate(e)"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :xs="colSpan.xs" :sm="colSpan.sm" :md="colSpan.md" :lg="colSpan.lg" :xl="colSpan.xl" v-if="insuredPersonInfo.property=='0'">
@@ -648,14 +648,14 @@
           <el-col :xs="colSpan.xs" :sm="colSpan.sm" :md="colSpan.md" :lg="colSpan.lg" :xl="colSpan.xl">
             <el-form-item label="有效期起期" prop="identifyValidDate">
               <el-date-picker v-dateFormat v-model="insuredPersonInfo.identifyValidDate" value-format="yyyy-MM-dd" @blur="getCompanyList"
-                :picker-options="pickerOptions" type="date" placeholder="选择有效期起期" placement="bottom-start"></el-date-picker>
+                :picker-options="pickerOptions" type="date" placeholder="选择有效期起期" placement="bottom-start" @change="(e) => insuredPersonInfo.identifyValidDate = changeDate(e)"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :xs="colSpan.xs" :sm="colSpan.sm" :md="colSpan.md" :lg="colSpan.lg" :xl="colSpan.xl">
             <el-form-item label="有效期止期" prop="identifyValidEndDate">
               <el-date-picker v-dateFormat v-model="insuredPersonInfo.identifyValidEndDate" type="date" @blur="getCompanyList"
                 value-format="yyyy-MM-dd" placeholder="选择有效期止期" placement="bottom-start"
-                style="width: calc(100% - 40px)"></el-date-picker>
+                style="width: calc(100% - 40px)" @change="(e) => insuredPersonInfo.identifyValidEndDate = changeDate(e)"></el-date-picker>
               <div class="insure-long-term" @click="insureLongterm('insuredPersonInfo')">
                 长期
               </div>
@@ -752,7 +752,7 @@
           <el-col v-show="vehicleAndVesselTaxForm.taxRelifFlag == 4" :xs="colSpan.xs" :sm="colSpan.sm" :md="colSpan.md" :lg="colSpan.lg" :xl="colSpan.xl">
             <el-form-item label="完税凭证填发日期：" prop="taxDocumentDate">
               <el-date-picker v-model="vehicleAndVesselTaxForm.taxDocumentDate" value-format="yyyy-MM-dd"
-                type="date" placeholder="完税凭证填发日期" placement="bottom-start"></el-date-picker>
+                type="date" placeholder="完税凭证填发日期" placement="bottom-start" @change="(e) => vehicleAndVesselTaxForm.taxDocumentDate = changeDate(e)"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col v-show="vehicleAndVesselTaxForm.taxRelifFlag == 4" :xs="colSpan.xs" :sm="colSpan.sm" :md="colSpan.md" :lg="colSpan.lg" :xl="colSpan.xl">
@@ -845,7 +845,7 @@
               </el-form-item>
               <el-form-item label="交强险终保日期" prop="identifyNumber" class="red-btn">
                 <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="jqendDate" type="datetime"
-                  placeholder="选择日期时间" placement="bottom-start"></el-date-picker>
+                  placeholder="选择日期时间" placement="bottom-start" @change="(e) => jqendDate = changeDate(e)"></el-date-picker>
               </el-form-item>
             </div>
           </div>
@@ -863,7 +863,7 @@
               </el-form-item>
               <el-form-item label="商业险终保日期" prop="name" class="red-btn">
                 <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="syendDate" type="datetime"
-                  placeholder="选择日期时间" placement="bottom-start"></el-date-picker>
+                  placeholder="选择日期时间" placement="bottom-start" @change="(e) => syendDate = changeDate(e)"></el-date-picker>
               </el-form-item>
             </div>
           </div>
@@ -4257,6 +4257,7 @@ import detailsDialog from "@/views/Core/components/detailsDialog.vue";
 import imageDialog from "@/views/Core/components/imageDialog.vue";
 import { mapState } from "vuex";
 import Ktletter1Popover from "./components/LetterPopover.vue"
+import dayjs from 'dayjs'
 
   export default {
   inject: ["reload"],
@@ -6065,6 +6066,9 @@ import Ktletter1Popover from "./components/LetterPopover.vue"
     },
   },
   methods: {
+    changeDate(value) {
+      return dayjs(value).format('YYYY-MM-DD')
+    },
     vehicleUseChange(value){
       if(value='05'){
         this.carInfo.property='1';

src/views/message/index.vue

@@ -3,7 +3,9 @@
     <el-col :span="4" class="colLeft">
       <div class="menu">
         <div class="menuItem" :class="{'active':menuIndex === index}" @click="handleClick(item,index)" v-for="(item, index) in menuList" :key="item+index">
-          <el-badge :value="item.value" :max="99">{{ item.text }}</el-badge>
+          <el-badge :value="item.value" :hidden="!item.value" :max="99">
+            <p style="margin: 0 10px">{{ item.text }}</p>
+          </el-badge>
         </div>
       </div>
     </el-col>
@@ -147,6 +149,14 @@ export default {
 }
 </script>
 
+<style>
+.menuItem .el-badge__content{
+  font-size: 10px;
+  height: 14px;
+  line-height: 14px;
+  padding: 0 5px;
+}
+</style>
 <style scoped lang="scss">
   .message{
     width: 100%;