From e7a0afdf62a06ec4b5ee1c3bbe514b1740e02c5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Thu, 20 Jul 2023 17:35:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=8F=B3?=
 =?UTF-8?q?=E4=BE=A7=E6=93=8D=E4=BD=9C=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PC/InterFace.Dash/public/config.js            |  1 +
 PC/InterFace.Dash/src/App.vue                 |  1 +
 PC/InterFace.Dash/src/api/wms-business.js     | 29 +++++++++++++++++++
 .../src/components/tablePagination/index.vue  | 15 ++++++++--
 .../src/components/umyTable/index.vue         |  7 +++--
 .../src/views/menuList/MessageReceive.vue     | 25 +++++++++++++++-
 6 files changed, 73 insertions(+), 5 deletions(-)
 create mode 100644 PC/InterFace.Dash/src/api/wms-business.js

diff --git a/PC/InterFace.Dash/public/config.js b/PC/InterFace.Dash/public/config.js
index 4df295d..08062ff 100644
--- a/PC/InterFace.Dash/public/config.js
+++ b/PC/InterFace.Dash/public/config.js
@@ -1,6 +1,7 @@
 // dev_win
 // window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:60068'
 window.SITE_CONFIG['base'] = 'http://192.168.0.180:60068'
+window.SITE_CONFIG['businessApi'] = 'http://dev.ccwin-in.com:10097'
 window.SITE_CONFIG['columnsApiNames'] = '/api/abp/application-localization'
 // window.SITE_CONFIG['columnsApiNames'] = '/api/abp/application-configuration'
 window.SITE_CONFIG['columnsApiNamesZh'] = 'Z'
diff --git a/PC/InterFace.Dash/src/App.vue b/PC/InterFace.Dash/src/App.vue
index a88e274..3e9b966 100644
--- a/PC/InterFace.Dash/src/App.vue
+++ b/PC/InterFace.Dash/src/App.vue
@@ -9,6 +9,7 @@ export default {
   name: 'App'
 }
 localStorage.setItem('base',window.SITE_CONFIG['base'])
+localStorage.setItem('businessApi',window.SITE_CONFIG['businessApi'])
 localStorage.setItem('columnsApiNames',window.SITE_CONFIG['columnsApiNames'])
 localStorage.setItem('columnsApiNamesZh',window.SITE_CONFIG['columnsApiNamesZh'])
 localStorage.setItem('isAutoLogin',window.SITE_CONFIG['isAutoLogin'])
diff --git a/PC/InterFace.Dash/src/api/wms-business.js b/PC/InterFace.Dash/src/api/wms-business.js
new file mode 100644
index 0000000..71f0dd9
--- /dev/null
+++ b/PC/InterFace.Dash/src/api/wms-business.js
@@ -0,0 +1,29 @@
+// 外部业务数据接口
+import request from '@/utils/request'
+let businessApi = localStorage.getItem('businessApi')
+
+// 获取表头数据
+export function messageReceiveUpdateStatsById(id) {
+    return request({
+        method:'get',
+        url: businessApi + '/api/wms/message-receive/update-stats-by-id/'+id,
+    })
+}
+
+// // 测试数据-明细-列表
+// export function TestSchoolDetailList(data,includeDetails) {
+//     return request({
+//         method:'post',
+//         url: base_api + '/api/TestStudentDetail/base/get-list-page-by-filter?includeDetails='+Boolean(includeDetails),
+//         data
+//     })
+// }
+
+// // 测试数据-明细-删除
+// export function TestSchoolDetailList_delete(id) {
+//     return request({
+//         method:'DELETE',
+//         url: base_api + '/api/TestStudentDetail/base/delete-by-id',
+//         params:{id:id}
+//     })
+// }
\ No newline at end of file
diff --git a/PC/InterFace.Dash/src/components/tablePagination/index.vue b/PC/InterFace.Dash/src/components/tablePagination/index.vue
index d0eabdd..7aa12d8 100644
--- a/PC/InterFace.Dash/src/components/tablePagination/index.vue
+++ b/PC/InterFace.Dash/src/components/tablePagination/index.vue
@@ -53,6 +53,8 @@
         @inlineDialog="inlineDialog"
         :buttonOperationList_left="buttonOperationList_left"
         @buttonOperationClick_left="buttonOperationClick_left"
+        :buttonOperationList_right="buttonOperationList_right"
+        @buttonOperationClick_right="buttonOperationClick_right"
         :tableBorder="true"
         :firstFixed="true"
         :cellStyle = "cellStyle"
@@ -115,11 +117,16 @@ export default {
         return []
       }
     },
-    // 操作列按钮
+    // 操作列按钮(左侧)
     buttonOperationList_left:{
       type: Array,
       default: null,
     },
+    // 操作列按钮(右侧)
+    buttonOperationList_right:{
+      type: Function,
+      default: null,
+    },
     // 列表数据
     tableData: {
       type: Array,
@@ -341,10 +348,14 @@ export default {
     sortChange (data) {
       this.$emit('sortChange', data)
     },
-    //点击table操作列按钮
+    //点击table操作列(左侧)按钮
     buttonOperationClick_left(row, item, index) {
       this.$emit("buttonOperationClick_left", row, item, index);
     },
+    //点击table操作列(右侧)按钮
+    buttonOperationClick_right(row, item, index) {
+      this.$emit("buttonOperationClick_right", row, item, index);
+    },
     // 全面筛选组件配置
     // 全面筛选组件内部显示/隐藏更改触发，同步当前的showSearchOverall值
     getShowSearchOverall(val){
diff --git a/PC/InterFace.Dash/src/components/umyTable/index.vue b/PC/InterFace.Dash/src/components/umyTable/index.vue
index 1294a08..065d98e 100644
--- a/PC/InterFace.Dash/src/components/umyTable/index.vue
+++ b/PC/InterFace.Dash/src/components/umyTable/index.vue
@@ -53,7 +53,8 @@
       </template>
       <template slot-scope="scope">
         <el-button
-          v-for="(itemButton, indexButton) in buttonOperationList_right"
+          v-for="(itemButton, indexButton) in buttonOperationList_right(scope.row)"
+          v-show="!itemButton.hide"
           :key="indexButton"
           type="text"
           size="mini"
@@ -372,6 +373,8 @@
       :append-to-body="true"
       :show-close="true"
       :title="'内容详情'"
+      :close-on-click-modal="true"
+      :close-on-press-escape="true"
     >
       {{ showDetailData ? showDetailData + "" : showDetailData }}
     </el-dialog>
@@ -470,7 +473,7 @@ export default {
     },
     // 操作列按钮(右侧)
     buttonOperationList_right:{
-      type: Array,
+      type: Function,
       default: null,
     },
     // 超出内容是否提示
diff --git a/PC/InterFace.Dash/src/views/menuList/MessageReceive.vue b/PC/InterFace.Dash/src/views/menuList/MessageReceive.vue
index 1c130ce..578107e 100644
--- a/PC/InterFace.Dash/src/views/menuList/MessageReceive.vue
+++ b/PC/InterFace.Dash/src/views/menuList/MessageReceive.vue
@@ -23,6 +23,8 @@
       :primarySearchOption="primarySearchOption"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
+      :buttonOperationList_right="buttonOperationList_right"
+      @buttonOperationClick_right="buttonOperationClick_right"
     ></tablePagination>
     <!-- 导出弹窗 -->
     <exportDrop 
@@ -44,7 +46,7 @@ import { getToken } from '@/utils/auth'
 import  * as tableColumns_api from "@/utils/tableColumns_api/index" //全局从接口缓存的表头
 import  * as tabsDesTions_api from "@/utils/tabsDesTions_api/index" //全局从接口缓存的详情
 import  * as detailsTableColumns_api from "@/utils/detailsTableColumns_api/index" //全局从接口缓存的详情
-
+import { messageReceiveUpdateStatsById } from "@/api/wms-business"
 
 export default {
   name: "MessageReceive",
@@ -75,6 +77,27 @@ export default {
     this.initApiColumns(tableColumns_api,tabsDesTions_api,detailsTableColumns_api)
     this.paging();
   },
+  methods:{
+    buttonOperationList_right(data){
+      let _btn = [{
+        label:'修改已接受',
+        name:'isRecept',
+        hide:true
+      }]
+      if(data.receiveStatus == '1'){
+        _btn[0].hide = false
+      }
+      return _btn
+    },
+    buttonOperationClick_right(row, item, index){
+      if(item.name == 'isRecept'){
+        messageReceiveUpdateStatsById(row.id).then(result => {
+          this.$successMsg("修改成功");
+          this.paging()
+        })
+      }
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>