fix bug

src/layout/top.vue

@@ -220,7 +220,7 @@ export default {
       console.log(e.data)
       const json = JSON.parse(e.data)
       // 收到服务器信息，心跳重置
-      this.msgCount = this.msgCount + 1
+      this.readCount()
       this.$notify({
         message: json.msgTxt,
         type: 'warning'

src/views/contract/component/info.vue

@@ -4,88 +4,88 @@
       <span>基础信息</span>
       <div>
         <el-button type="primary" plain @click="disabled = !disabled"
-        >{{ disabled ? '编 辑' : '保 存' }}
+          >{{ disabled ? '编 辑' : '保 存' }}
         </el-button>
       </div>
     </div>
     <div class="padding">
       <el-form
-          label-position="right"
-          label-width="100px"
-          :disabled="disabled"
-          style="background-color: white"
+        label-position="right"
+        label-width="100px"
+        :disabled="disabled"
+        style="background-color: white"
       >
         <div class="full-width flex flex-center flex-justify-between">
           <el-form-item label="合同名称" class="flex-child-average">
-            <el-input v-model="form.title"/>
+            <el-input v-model="form.title" />
           </el-form-item>
           <el-form-item label="合同类别" class="flex-child-average">
             <div class="full-width">
               <avue-input-tree
-                  v-model="form.type"
-                  class="full-width"
-                  placeholder="请选择合同类型"
-                  :dic="typeDic"
+                v-model="form.type"
+                class="full-width"
+                placeholder="请选择合同类型"
+                :dic="typeDic"
               ></avue-input-tree>
             </div>
           </el-form-item>
         </div>
         <div class="full-width flex flex-center flex-justify-between">
           <el-form-item label="合同编号" class="flex-child-average">
-            <el-input v-model="form.number"/>
+            <el-input v-model="form.number" />
           </el-form-item>
           <el-form-item label="合同金额" class="flex-child-average">
-            <el-input v-model="form.amount"/>
+            <el-input v-model="form.amount" />
           </el-form-item>
         </div>
         <div class="full-width flex flex-center flex-justify-between">
           <el-form-item label="合同甲方" class="flex-child-average">
-            <el-input v-model="form.partyA"/>
+            <el-input v-model="form.partyA" />
           </el-form-item>
           <el-form-item label="合同乙方" class="flex-child-average">
-            <el-input v-model="form.partyB"/>
+            <el-input v-model="form.partyB" />
           </el-form-item>
         </div>
         <div class="full-width flex flex-center flex-justify-between">
           <el-form-item label="签订日期" class="flex-child-average">
             <el-date-picker
-                v-model="form.signTime"
-                type="date"
-                style="width: 100%"
-                placeholder="合同签订日期"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
+              v-model="form.signTime"
+              type="date"
+              style="width: 100%"
+              placeholder="合同签订日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
           </el-form-item>
           <el-form-item label="到期日期" class="flex-child-average">
             <el-date-picker
-                v-model="form.expireTime"
-                type="date"
-                style="width: 100%"
-                placeholder="合同到期日期"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
+              v-model="form.expireTime"
+              type="date"
+              style="width: 100%"
+              placeholder="合同到期日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
           </el-form-item>
         </div>
         <div class="full-width flex flex-center flex-justify-between">
           <el-form-item label="签订地点" class="flex-child-average">
-            <el-input v-model="form.signLocation"/>
+            <el-input v-model="form.signLocation" />
           </el-form-item>
           <el-form-item label="合同状态" class="flex-child-average">
             <div class="full-width">
               <avue-input-tree
-                  v-model="form.status"
-                  class="full-width"
-                  placeholder="请选择合同状态"
-                  :dic="stuasDic"
+                v-model="form.contractsStatus"
+                class="full-width"
+                placeholder="请选择合同状态"
+                :dic="stuasDic"
               ></avue-input-tree>
             </div>
           </el-form-item>
         </div>
         <div class="full-width flex flex-center flex-justify-between">
           <el-form-item label="支付方式" class="flex-child-average">
-            <el-input v-model="form.paymentMode" type="textarea" :rows="5"/>
+            <el-input v-model="form.paymentMode" type="textarea" :rows="5" />
           </el-form-item>
         </div>
       </el-form>
@@ -107,7 +107,7 @@ export default {
       handler(val) {
         if (val) {
           this.form = val
-
+          console.log(this.form.type, typeof this.form.type)
         }
       },
       immediate: true
@@ -149,7 +149,7 @@ export default {
   },
   methods: {
     getDic(code) {
-      this.$api.common.dicList({code}).then(res => {
+      this.$api.common.dicList({ code }).then(res => {
         if (res.code === 200) {
           if (code === 'contract-status') {
             this.stuasDic = res.data.map(item => this.mapTree(item))
@@ -161,11 +161,10 @@ export default {
     },
     mapTree(item) {
       const haveChildren =
-          Array.isArray(item.children) && item.children.length > 0
+        Array.isArray(item.children) && item.children.length > 0
       return {
-        key: item.dictKey,
-        value: item.dictKey,
-        label: item.dictKey,
+        value: Number.parseInt(item.dictKey),
+        label: item.dictValue,
         children: haveChildren ? item.children.map(i => this.mapTree(i)) : []
       }
     },
@@ -185,7 +184,7 @@ export default {
           this.$message.error(res.msg)
         }
       })
-    },
+    }
   }
 }
 </script>

src/views/contract/index.vue

@@ -125,7 +125,13 @@ export default {
           },
           {
             label: '合同状态',
-            prop: 'contractsStatus'
+            prop: 'contractsStatus',
+            dicUrl:
+              '/api/blade-system/dict-biz/dictionary?code=contract-status',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey'
+            }
           },
           {
             label: '到期日期',