fix:开票管理、驳回订单添加字段

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,26 @@
               </el-col>
             </el-row>
             <el-row>
+              <el-col :span="12">
+                <el-form-item label="公司类型" prop="revBankCardNum">
+                  <el-select
+                    v-model="formData.businessQuality"
+                    filterable
+                    placeholder=""
+                    clearable
+                    value-key="bankCardNum"
+                    @change="companyChange"
+                  >
+                    <el-option
+                      v-for="(item, index) in companyTypeList"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.id"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
               <el-col :span="12">
                 <el-form-item label="开票员" prop="biller">
                   <el-input
@@ -191,6 +211,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 +223,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 +233,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 +248,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 +266,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 +279,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 +299,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 +310,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 +564,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: "对方单位名称",
@@ -683,6 +704,18 @@ export default {
         ],
       },
       collectionData: [], //所有内部账户信息列表
+      companyTypeList: [
+        {
+          id: 1,
+          name: '个体户'
+        },{
+          id: 2,
+          name: '小规模'
+        },{
+          id: 3,
+          name: '一般纳税'
+        },
+      ], //公司类型
       allCollectionData: [], //所有账户信息列表
       formDataId: "", //编辑数据id
       profitObj: {},
@@ -976,12 +1009,12 @@ 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;

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,10 +193,10 @@ export default {
       this.screenWidth = document.body.clientWidth
     }
     this.sysName = "Zgdd Platform";
-
-    this.$store.commit('SET_TIMER', setInterval(() => {
-      this.getMessage()
-    }, 3000))
+    this.getMessage()
+    // this.$store.commit('SET_TIMER', setInterval(() => {
+    //   this.getMessage()
+    // }, 3000))
 
     // var user = sessionStorage.getItem("user")
 
@@ -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/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%;