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

sgzb-ui/src/components/Notice/index.vue

@@ -2,7 +2,7 @@
     <div class="notice-dialog">
         <!-- 消息通知弹框 -->
         <el-dialog
-            :title="noticeTitle"
+            :title="noticeTitleNew"
             :width="noticeDialog.outerWidth"
             :visible.sync="noticeDialog.outerVisible"
             v-if="noticeDialog.outerVisible"
@@ -15,7 +15,7 @@
             custom-class="center-dialog"
         >
             <el-button class="notice-num" type="primary"
-                >重要通知({{ unreadNUm }}/{{ noticeNum }})</el-button
+                >重要通知({{ unreadNum }}/{{ noticeNum }})</el-button
             >
             <el-button
                 class="notice-known"
@@ -62,20 +62,19 @@ export default {
         noticeNum() {
             return this.noticeList.length
         },
-
+        noticeTitleNew() {
-        noticeTitle() {
+            return this.noticeList[this.unreadNum - 1].noticeTitle
-            return this.noticeList[this.unreadNUm - 1].noticeTitle
         },
         noticeContent() {
             return this.removeHTMLTags(
-                this.noticeList[this.unreadNUm - 1].noticeContent,
+                this.noticeList[this.unreadNum - 1].noticeContent,
             )
         },
         releaseTime() {
-            return this.noticeList[this.unreadNUm - 1].createTime.slice(0, 10)
+            return this.noticeList[this.unreadNum - 1].createTime.slice(0, 10)
         },
         releaseCreateName() {
-            return this.noticeList[this.unreadNUm - 1].nickName
+            return this.noticeList[this.unreadNum - 1].nickName
         },
     },
 
@@ -97,7 +96,7 @@ export default {
                 noticeId: [],
                 userId: sessionStorage.getItem('userId'),
             }
-            params.noticeId.push(this.noticeList[this.unreadNUm - 1].noticeId)
+            params.noticeId.push(this.noticeList[this.unreadNum - 1].noticeId)
             const res = await setQueryNoticeApi(params)
             this.loading = false
             if (res.code == 200) {
@@ -105,9 +104,9 @@ export default {
                     this.$emit('closeDialog', false)
                     return
                 }
-                this.unreadNUm += 1
+                this.unreadNum += 1
                 // 如果全部点完，则关闭弹框
-                if (this.unreadNUm > this.noticeNum) {
+                if (this.unreadNum > this.noticeNum) {
                     this.$emit('closeDialog', false)
                 }
             }

sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue

@@ -152,6 +152,7 @@
                     size="mini"
                     v-if="isAdd || isEdit"
                     @click="handleAdd"
+                    :loading="submitLoading"
                 >
                     保存
                 </el-button>
@@ -497,6 +498,7 @@ export default {
             selDeviceTypeChangeValue: '',
             deviceTypeTreeNew: [],
             completeSetList: [],
+            submitLoading: false,
         }
     },
 
@@ -769,7 +771,7 @@ export default {
                         if (this.rejectTaskStatus == 100) {
                             this.queryParams.souceByRefuse = 1
                         }
-
+                        this.submitLoading = true
                         const params = {
                             ...this.queryParams,
                             taskId: this.taskId,
@@ -786,6 +788,8 @@ export default {
                             this.$message.error('机具类型库存量为零无法领料')
                             return
                         }
+
+                        this.submitLoading = true
                         res = await submitLeaseApply(this.queryParams)
                     }
                     if (res.code == 200) {
@@ -793,11 +797,13 @@ export default {
                             type: 'success',
                             message: res.msg,
                         })
+                        this.submitLoading = false
                         // this.$tab.closeOpenPage({
                         //     path: '/claimAndRefund/receive/receiveApply',
                         // })
-
                         this.$emit('goBackPage')
+                    } else {
+                        this.submitLoading = false
                     }
                 }
             })

sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue

@@ -134,6 +134,7 @@
                     icon="el-icon-plus"
                     size="mini"
                     @click="handleAdd"
+                    :loading="submitLoading"
                     >保存</el-button
                 >
             </el-col>
@@ -488,6 +489,7 @@ export default {
             rowId: '',
             selDeviceTypeChangeValue: '',
             deviceTypeTreeNew: [],
+            submitLoading: false,
         }
     },
     mounted() {
@@ -762,6 +764,7 @@ export default {
                             backApplyDetails:
                                 this.queryParams.leaseApplyDetails,
                         }
+                        this.submitLoading = true
                         const res = await submitRefuseBackApply(params)
                         if (res.code == 200) {
                             this.$message({ type: 'success', message: res.msg })
@@ -773,6 +776,8 @@ export default {
                             //     })
                             // }, 1000)
                         }
+
+                        this.submitLoading = false
                     } else {
                         let params = {
                             companyId: this.companyId,
@@ -783,6 +788,7 @@ export default {
                             backApplyDetails:
                                 this.queryParams.leaseApplyDetails,
                         }
+                        this.submitLoading = true
                         const res = await submitBackApplyApi(params)
                         if (res.code == 200) {
                             this.$message({ type: 'success', message: res.msg })
@@ -793,6 +799,7 @@ export default {
                             //     })
                             // }, 1000)
                         }
+                        this.submitLoading = false
                     }
                 }
             })

sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue

@@ -159,7 +159,7 @@
                     <template v-else> - </template> -->
 
                     <el-button
-                        v-if="row.status == 1"
+                        v-if="row.status != 2"
                         type="text"
                         @click="handleQueryFile(row)"
                         >查看附件</el-button

sgzb-ui/vue.config.js

@@ -43,10 +43,10 @@ module.exports = {
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        target: `http://192.168.2.167:28080`, //超
+        // target: `http://192.168.2.167:28080`, //超
         // target: `http://10.40.92.81:28080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
-        // target: `http://192.168.2.248:28080`, //帅
+        target: `http://192.168.2.248:28080`, //帅
         // target: `http://192.168.2.209:28080`, //福
 
         //******** 注意事项  ********* */