bug修改

src/components/layouts/UserLayout.vue

@@ -61,8 +61,8 @@
   overflow: auto;
   .container {
     width: 100%;
-    min-width: 1366px;
-    min-height: 768px;
+    min-width: 1300px;
+    min-height: 600px;
     height: 100%;
     overflow: hidden;
     position: relative;

src/components/tools/StatusSlot.vue

@@ -116,6 +116,8 @@ export default {
       let result = this.statusKey
       if(this.statusKey === 'mail' || this.statusKey === 'bill') {
         result = 'mailBill'
+      } else if (this.statusKey === 'payMailContract') {
+        result = 'payMailContract'
       }
       return result
     }
@@ -168,6 +170,10 @@ export default {
         if (item.sendDate || item.postNo) {
           result = `${ item.sendDate }新增邮寄信息，邮寄单号：${ item.postNo }`
         }
+      } else if (this.statusKey === 'payMailContract') {
+        if (item.sendDate || item.postNo) {
+          result = `${ item.sendDate }新增邮寄信息，邮寄单号：${ item.postNo }`
+        }
       }
       return result
     }

src/views/dashboard/Analysis.vue

@@ -148,11 +148,18 @@ export default {
       }
     },
     haveRead(record) {
-      putAction(this.url.editCementSend, { anntId: record.anntId }).then((res) => {
-        if (res.success) {
-          this.loadData()
-          this.syncHeadNotic(record.anntId)
-          Bus.$emit('notice-change')
+      const that = this
+      this.$confirm({
+        title: '确认已读',
+        content: '是否确认将消息改为已读状态?',
+        onOk: function () {
+          putAction(that.url.editCementSend, { anntId: record.anntId }).then((res) => {
+            if (res.success) {
+              that.loadData()
+              that.syncHeadNotic(record.anntId)
+              Bus.$emit('notice-change')
+            }
+          })
         }
       })
     },

src/views/mineContract/modules/MineContractModule.vue

@@ -71,8 +71,8 @@
           :dataSource="logisticsInfoList"
           class="j-table-force-nowrap"
         >
-        <span slot="action" class="action-span-cell">
-          <a @click="lookLogistics()">查看物流</a>
+        <span slot="action" slot-scope="record" class="action-span-cell">
+          <a @click="lookLogistics(record)">查看物流</a>
         </span>
         </a-table>
       </div>
@@ -122,7 +122,7 @@ export default {
         {
           title: '邮寄人',
           align: 'center',
-          dataIndex: 'createBy'
+          dataIndex: 'mailName'
         },
         {
           title: '快递单号',
@@ -174,8 +174,9 @@ export default {
       this.$emit('openProjectDetail', param)
       this.close()
     },
-    lookLogistics() {
-      window.open('https://www.ems.com.cn/', '_blank')
+    lookLogistics(record) {
+      const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng'
+      window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`)
     },
     handleCancel() {
       this.close()

src/views/subBidCommittee/SubBidCommittee.vue

@@ -85,7 +85,7 @@ export default {
   },
   methods: {
     openDetail(record) {
-      this.$refs.detail.committeeId = record.id
+      this.$refs.detail.committee = record
       this.$refs.detail.open()
     },
     /*

src/views/subBidCommittee/modules/SubBidCommitteeDetail.vue

@@ -55,7 +55,7 @@ export default {
       loading: false,
       fileLoading: false, // 文件区域的加载效果
       fileList: [],
-      committeeId: '',
+      committee: '',
       committeeDetail: {}
     }
   },
@@ -64,15 +64,26 @@ export default {
       this.visible = true
       this.loading = true
       let param = {
-        id: this.committeeId
+        id: this.committee.id
       }
       getSubBidCommitteeDetail(param).then(res => {
-        this.committeeDetail = res.result
-        let fileIdsArr = []
-        this.committeeDetail.files.forEach(item => {
-          fileIdsArr.push(item.fileId)
-          this.initFileList(fileIdsArr)
-        })
+        if (res.success) {
+          if (res.result) {
+            this.committeeDetail = res.result
+            let fileIdsArr = []
+            this.committeeDetail.files.forEach(item => {
+              fileIdsArr.push(item.fileId)
+              this.initFileList(fileIdsArr)
+            })
+          } else {
+            this.committeeDetail = {
+              name: this.committee.name
+            }
+          }
+
+        } else {
+          this.$message.warn(res.message)
+        }
       }).finally(() => {
         this.loading = false
       })

src/views/system/UserAnnouncementList.vue

@@ -256,13 +256,21 @@ export default {
       return value
     },
     haveRead(record) {
-      putAction(this.url.editCementSend, {anntId: record.anntId}).then((res) => {
-        if (res.success) {
-          this.loadData()
-          this.syncHeadNotic(record.anntId)
-          Bus.$emit('notice-change')
+      const that = this
+      this.$confirm({
+        title: '确认已读',
+        content: '是否确认将消息改为已读状态?',
+        onOk: function () {
+          putAction(that.url.editCementSend, {anntId: record.anntId}).then((res) => {
+            if (res.success) {
+              that.loadData()
+              that.syncHeadNotic(record.anntId)
+              Bus.$emit('notice-change')
+            }
+          })
         }
       })
+
     },
   }
 }

src/views/user/Login.vue

@@ -434,7 +434,7 @@ export default {
     z-index: 99;
     width: 50%;
     box-sizing: border-box;
-    height: 60%;
+    height: 80%;
     position: absolute;
     right: 0;
     top: 50%;
@@ -445,12 +445,13 @@ export default {
       height: 100%;
       overflow: hidden;
       display: flex;
-      justify-content: space-between;
+      justify-content: center;
       flex-direction: column;
 
       .title {
         display: flex;
         justify-content: center;
+        margin-bottom: 10px;
 
         img {
           width: 395px;
@@ -481,7 +482,7 @@ export default {
   }
 
   /deep/ .ant-row {
-    margin-bottom: 0 !important;
+    margin-bottom: 5px !important;
   }
 
   /deep/ .ant-input-affix-wrapper .ant-input {

src/views/user/alteration/Alteration.vue

@@ -322,7 +322,7 @@ export default {
 }
 
 .alteration-content {
-  margin: auto;
+  //margin: auto;
   width: 1000px;
   display: flex;
   justify-content: center;