From b61102458325309e308ae96e2b173063373d77ff Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sat, 12 Nov 2022 21:26:09 +0800
Subject: [PATCH 01/14] =?UTF-8?q?feat=20=E4=BC=81=E4=B8=9A=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E5=92=8C=E9=92=89=E9=92=89=E6=9C=BA=E5=99=A8=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{WecomRobotConfigEdit.vue => WeComRobotConfigEdit.vue}  | 2 +-
 .../modules/third/wecom/robot/WeComRobotConfigList.vue      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename src/views/modules/third/wecom/robot/{WecomRobotConfigEdit.vue => WeComRobotConfigEdit.vue} (98%)

diff --git a/src/views/modules/third/wecom/robot/WecomRobotConfigEdit.vue b/src/views/modules/third/wecom/robot/WeComRobotConfigEdit.vue
similarity index 98%
rename from src/views/modules/third/wecom/robot/WecomRobotConfigEdit.vue
rename to src/views/modules/third/wecom/robot/WeComRobotConfigEdit.vue
index ada2f96..1ed37d8 100644
--- a/src/views/modules/third/wecom/robot/WecomRobotConfigEdit.vue
+++ b/src/views/modules/third/wecom/robot/WeComRobotConfigEdit.vue
@@ -39,7 +39,7 @@
           label="备注"
           prop="remark"
         >
-          <a-input v-model="form.remark" :disabled="showable"/>
+          <a-textarea v-model="form.remark" :disabled="showable"/>
         </a-form-model-item>
       </a-form-model>
     </a-spin>
diff --git a/src/views/modules/third/wecom/robot/WeComRobotConfigList.vue b/src/views/modules/third/wecom/robot/WeComRobotConfigList.vue
index ec62765..fbcf40e 100644
--- a/src/views/modules/third/wecom/robot/WeComRobotConfigList.vue
+++ b/src/views/modules/third/wecom/robot/WeComRobotConfigList.vue
@@ -53,19 +53,19 @@
       :page-size="pagination.size"
       :total="pagination.total"
       @page-change="handleTableChange"/>
-    <wecom-robot-config-edit ref="wecomRobotConfigEdit" @ok="init"/>
+    <we-com-robot-config-edit ref="wecomRobotConfigEdit" @ok="init"/>
   </a-card>
 </template>
 
 <script>
 import { TableMixin } from '@/mixins/TableMixin'
-import WecomRobotConfigEdit from './WecomRobotConfigEdit'
+import WeComRobotConfigEdit from './WeComRobotConfigEdit'
 import { del, page } from '@/api/third/weComRobotConfig'
 import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 
 export default {
   name: 'WeComRobotConfigList',
-  components: { WecomRobotConfigEdit },
+  components: { WeComRobotConfigEdit },
   mixins: [TableMixin],
   data () {
     return {
-- 
Gitee


From 9a0e8e906dae817d7dd9e6de64453a1341dc21e7 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sun, 13 Nov 2022 20:39:29 +0800
Subject: [PATCH 02/14] =?UTF-8?q?feat=20=E6=B5=81=E7=A8=8B=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=A0=B7=E5=BC=8F=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bpm/modelNode.js                         | 11 -----------
 src/views/modules/bpm/model/BpmModelList.vue     |  4 ++--
 src/views/modules/bpm/model/BpmModelNodeList.vue |  8 ++++----
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/api/bpm/modelNode.js b/src/api/bpm/modelNode.js
index b0c842a..a965b39 100644
--- a/src/api/bpm/modelNode.js
+++ b/src/api/bpm/modelNode.js
@@ -1,16 +1,5 @@
 import { axios } from '@/utils/request'
 
-/**
- * 分页
- */
-export function page (params) {
-  return axios({
-    url: '/bpm/model/node/page',
-    method: 'GET',
-    params: params
-  })
-}
-
 /**
  * 查询全部
  */
diff --git a/src/views/modules/bpm/model/BpmModelList.vue b/src/views/modules/bpm/model/BpmModelList.vue
index 6caa24b..1c8d0a6 100644
--- a/src/views/modules/bpm/model/BpmModelList.vue
+++ b/src/views/modules/bpm/model/BpmModelList.vue
@@ -151,8 +151,8 @@ export default {
     /**
      * 任务节点列表
      */
-    taskNodeShow (record, edit) {
-      this.$refs.bpmModelNodeList.list(record, edit)
+    taskNodeShow (record) {
+      this.$refs.bpmModelNodeList.list(record)
     },
     remove (record) {
       this.$confirm({
diff --git a/src/views/modules/bpm/model/BpmModelNodeList.vue b/src/views/modules/bpm/model/BpmModelNodeList.vue
index ae50ccd..8888cb2 100644
--- a/src/views/modules/bpm/model/BpmModelNodeList.vue
+++ b/src/views/modules/bpm/model/BpmModelNodeList.vue
@@ -1,7 +1,7 @@
 <template>
   <a-drawer
     :visible="visible"
-    :title="title"
+    :title="title + ' 列表'"
     :maskClosable="true"
     width="85%"
     placement="right"
@@ -89,8 +89,8 @@ export default {
     return {
       model: {},
       modelPublish: false,
-      title: '',
       isEdit: true,
+      title: '',
       visible: false,
       modelId: null
     }
@@ -99,10 +99,10 @@ export default {
     /**
      * 展示列表
      */
-    list (record, edit) {
+    list (record) {
       this.model = record
       this.modelPublish = record.publish === 'published'
-      this.isEdit = edit
+      this.isEdit = record.publish !== 'published'
       this.modelId = record.id
       this.title = record.name
       this.visible = true
-- 
Gitee


From c58ad3fe80917b77fd7ec1e609e416d5bdb7e497 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sun, 13 Nov 2022 21:42:07 +0800
Subject: [PATCH 03/14] =?UTF-8?q?feat=20=E6=B5=81=E7=A8=8B=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/bpm/model/BpmModelNodeEdit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/bpm/model/BpmModelNodeEdit.vue b/src/views/modules/bpm/model/BpmModelNodeEdit.vue
index 6ed8590..e4f5861 100644
--- a/src/views/modules/bpm/model/BpmModelNodeEdit.vue
+++ b/src/views/modules/bpm/model/BpmModelNodeEdit.vue
@@ -20,7 +20,7 @@
         </a-form-model-item>
         <a-form-model-item
           label="任务节点id"
-          prop="taskId"
+          prop="nodeId"
         >
           <a-input v-model="form.nodeId" disabled/>
         </a-form-model-item>
-- 
Gitee


From 6b2a08258276241803ab059c21e125225c724819 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Mon, 14 Nov 2022 22:47:19 +0800
Subject: [PATCH 04/14] =?UTF-8?q?feat=20=E4=B8=80=E4=BA=9B=E9=81=97?=
 =?UTF-8?q?=E6=BC=8F=E5=B0=8F=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bpm/TaskAdmin.js                         | 2 +-
 src/api/bpm/instance.js                          | 4 ++--
 src/views/modules/bpm/instance/InstanceList.vue  | 4 +---
 src/views/modules/bpm/model/BpmModelNodeEdit.vue | 1 +
 src/views/modules/bpm/task/TodoTaskList.vue      | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/api/bpm/TaskAdmin.js b/src/api/bpm/TaskAdmin.js
index aeb078a..617fff0 100644
--- a/src/api/bpm/TaskAdmin.js
+++ b/src/api/bpm/TaskAdmin.js
@@ -19,4 +19,4 @@ export function pageByDone (params) {
     method: 'GET',
     params: params
   })
-}
\ No newline at end of file
+}
diff --git a/src/api/bpm/instance.js b/src/api/bpm/instance.js
index 9a93489..dbfa490 100644
--- a/src/api/bpm/instance.js
+++ b/src/api/bpm/instance.js
@@ -17,7 +17,7 @@ export function start (obj) {
 export function suspend (instanceId) {
   return axios({
     url: '/bpm/instance/suspend',
-    method: 'GET',
+    method: 'POST',
     params: { instanceId }
   })
 }
@@ -28,7 +28,7 @@ export function suspend (instanceId) {
 export function activate (instanceId) {
   return axios({
     url: '/bpm/instance/activate',
-    method: 'GET',
+    method: 'POST',
     params: { instanceId }
   })
 }
diff --git a/src/views/modules/bpm/instance/InstanceList.vue b/src/views/modules/bpm/instance/InstanceList.vue
index efcfe23..7ad89f1 100644
--- a/src/views/modules/bpm/instance/InstanceList.vue
+++ b/src/views/modules/bpm/instance/InstanceList.vue
@@ -56,7 +56,7 @@
 <script>
 import { TableMixin } from '@/mixins/TableMixin'
 import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
-import { close, pageMyApply } from '@/api/bpm/instance'
+import { close } from '@/api/bpm/instance'
 import ApplyFormShow from '@/views/modules/office/applyshow/ApplyFormShow'
 import { page } from '@/api/bpm/instanceAdmin'
 
@@ -66,7 +66,6 @@ export default {
   mixins: [TableMixin],
   data () {
     return {
-      currentBpmModelId: undefined,
       fields: [
         { field: 'code', type: STRING, name: '流程编号', placeholder: '请输入流程编号' },
         { field: 'name', type: STRING, name: '流程名称', placeholder: '请输入流程名称' }
@@ -111,7 +110,6 @@ export default {
     }
   },
   mounted () {
-    this.initData()
     this.init()
   }
 }
diff --git a/src/views/modules/bpm/model/BpmModelNodeEdit.vue b/src/views/modules/bpm/model/BpmModelNodeEdit.vue
index e4f5861..19882e5 100644
--- a/src/views/modules/bpm/model/BpmModelNodeEdit.vue
+++ b/src/views/modules/bpm/model/BpmModelNodeEdit.vue
@@ -90,6 +90,7 @@
             :options="assignTypeList"
             style="width: 100%"
             placeholder="选择处理人分配类型"
+            @change="assignTypeChange"
           />
         </a-form-model-item>
         <a-form-model-item
diff --git a/src/views/modules/bpm/task/TodoTaskList.vue b/src/views/modules/bpm/task/TodoTaskList.vue
index 41a059c..34ea82f 100644
--- a/src/views/modules/bpm/task/TodoTaskList.vue
+++ b/src/views/modules/bpm/task/TodoTaskList.vue
@@ -59,7 +59,7 @@ import ApplyFormShow from '@/views/modules/office/applyshow/ApplyFormShow'
 import BUserSelectModal from '@/components/Bootx/UserSelectModal/BUserSelectModal'
 import { TableMixin } from '@/mixins/TableMixin'
 import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
-import { assignee, pageMyTodo } from '@/api/bpm/task'
+import { assignee } from '@/api/bpm/task'
 import { pageByTodo } from '@/api/bpm/TaskAdmin'
 
 export default {
-- 
Gitee


From 70e37700ea6119fb4c7b840614873508f3ef67b7 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Thu, 17 Nov 2022 16:55:14 +0800
Subject: [PATCH 05/14] =?UTF-8?q?perf=20=E8=AF=B7=E6=B1=82=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/notice/siteMessage.js                            | 4 ++--
 src/views/modules/bpm/task/DoneTaskList.vue              | 2 +-
 src/views/modules/notice/site/sender/SiteMessageEdit.vue | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/api/notice/siteMessage.js b/src/api/notice/siteMessage.js
index ce4bcec..2c3a643 100644
--- a/src/api/notice/siteMessage.js
+++ b/src/api/notice/siteMessage.js
@@ -90,9 +90,9 @@ export function send (id) {
 /**
  * 保存草稿
  */
-export function save (obj) {
+export function saveOrUpdate (obj) {
   return axios({
-    url: '/site/message/save',
+    url: '/site/message/saveOrUpdate',
     method: 'POST',
     data: obj
   })
diff --git a/src/views/modules/bpm/task/DoneTaskList.vue b/src/views/modules/bpm/task/DoneTaskList.vue
index 78756bc..ff1d940 100644
--- a/src/views/modules/bpm/task/DoneTaskList.vue
+++ b/src/views/modules/bpm/task/DoneTaskList.vue
@@ -86,7 +86,7 @@ export default {
     retrieve (record) {
       this.$confirm({
         title: '警告',
-        content: '确实要完成当前任务!',
+        content: '确实要取回当前任务!',
         okText: '确定',
         cancelText: '取消',
         onOk: () => {
diff --git a/src/views/modules/notice/site/sender/SiteMessageEdit.vue b/src/views/modules/notice/site/sender/SiteMessageEdit.vue
index a86b0a4..4a3a10a 100644
--- a/src/views/modules/notice/site/sender/SiteMessageEdit.vue
+++ b/src/views/modules/notice/site/sender/SiteMessageEdit.vue
@@ -56,7 +56,7 @@
 <script>
 import { FormMixin } from '@/mixins/FormMixin'
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
-import { save, findById } from '@/api/notice/siteMessage'
+import { saveOrUpdate, findById } from '@/api/notice/siteMessage'
 import '@wangeditor/editor/dist/css/style.css'
 import XEUtils from 'xe-utils'
 
@@ -108,7 +108,7 @@ export default {
       this.$refs.form.validate(async valid => {
         if (valid) {
           this.confirmLoading = true
-          await save(this.form)
+          await saveOrUpdate(this.form)
           this.confirmLoading = false
           this.$emit('ok')
           this.visible = false
@@ -132,7 +132,6 @@ export default {
   mounted () {
     const date = XEUtils.getWhatDay(new Date(), 30)
     this.efficientTime = XEUtils.toDateString(date, 'yyyy-MM-dd')
-    console.log(this.efficientTime)
   }
 }
 </script>
-- 
Gitee


From 4bd6de58d5cc551415cf0dbb9a5542f543c2426c Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sat, 19 Nov 2022 20:05:57 +0800
Subject: [PATCH 06/14] =?UTF-8?q?perf=20=E5=AF=8C=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/components.less                |  2 +-
 .../NoticeIcon/NoticeIconReader.vue           | 26 +------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/src/assets/css/components.less b/src/assets/css/components.less
index 2825f94..dd003d1 100644
--- a/src/assets/css/components.less
+++ b/src/assets/css/components.less
@@ -4,7 +4,7 @@
 
 /* wangEditor start */
 .editor-content-view {
-  border: 3px solid #ccc;
+  //border: 3px solid #ccc;
   border-radius: 5px;
   padding: 0 10px;
   margin-top: 20px;
diff --git a/src/components/NoticeIcon/NoticeIconReader.vue b/src/components/NoticeIcon/NoticeIconReader.vue
index 5cb858e..2b6c854 100644
--- a/src/components/NoticeIcon/NoticeIconReader.vue
+++ b/src/components/NoticeIcon/NoticeIconReader.vue
@@ -13,7 +13,7 @@
         :description="'发布人：'+message.senderName + ' 发布时间： ' + message.senderTime">
       </a-card-meta>
       <a-divider />
-      <span v-html="message.content" class="article-content"></span>
+      <div class="editor-content-view" v-html="message.content"/>
     </a-card>
     <template #footer>
       <a-button key="cancel" @click="handleCancel">取消</a-button>
@@ -80,28 +80,4 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.daily-article {
-  .article-button {
-    font-size: 1.2rem !important;
-  }
-  .ant-card-body {
-    padding: 18px !important;
-  }
-  .ant-card-head {
-    padding: 0 1rem;
-  }
-  .ant-card-meta {
-    margin-bottom: 1rem;
-  }
-  .article-content {
-    p {
-      word-wrap: break-word;
-      word-break: break-all;
-      text-overflow: initial;
-      white-space: normal;
-      font-size: .9rem !important;
-      margin-bottom: .8rem;
-    }
-  }
-}
 </style>
-- 
Gitee


From b8c906bfaada55e5eab0a9c03a154b70da2bfde5 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Tue, 22 Nov 2022 21:51:52 +0800
Subject: [PATCH 07/14] =?UTF-8?q?style=20=E8=A1=A8=E5=8D=95=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=A1=A5=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/FormMixin.js                       |  8 +++++
 .../notice/template/TemplateRender.vue        |  3 +-
 .../channel/alipay/AliPayConfigEdit.vue       | 34 ++++++++++---------
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/mixins/FormMixin.js b/src/mixins/FormMixin.js
index 6cf8df8..f9cbe3e 100644
--- a/src/mixins/FormMixin.js
+++ b/src/mixins/FormMixin.js
@@ -109,6 +109,14 @@ export const FormMixin = {
     // 判断脱敏参数是否被修改的参数, 未修改返回空值
     diffForm (o1, o2) {
       return o1 === o2 ? null : o1
+    },
+    // 判断脱敏参数是否被修改的参数, 未修改返回空值 rawForm 后端获取到的原始数据, editForm 修改后的数据, keys 字段名称
+    diffFormNew (rawForm, editForm, ...keys) {
+      const form = {}
+      for (const key of keys) {
+        form[key] = rawForm[key] === editForm[key] ? undefined : editForm[key]
+      }
+      return form
     }
   }
 }
diff --git a/src/views/modules/notice/template/TemplateRender.vue b/src/views/modules/notice/template/TemplateRender.vue
index 9ea8db8..5922639 100644
--- a/src/views/modules/notice/template/TemplateRender.vue
+++ b/src/views/modules/notice/template/TemplateRender.vue
@@ -67,7 +67,6 @@ export default {
     init (id) {
       this.visible = true
       this.renderContent = ''
-      this.renderContent = ''
       this.template = {}
       this.confirmLoading = true
       get(id).then(({ data }) => {
@@ -83,7 +82,7 @@ export default {
       try {
         json = JSON.parse(this.paramMap || '{}')
       } catch (err) {
-        this.$message.error('测试数据格式不对')
+        this.$message.error('测试数据格式不不正确，请检查是否是json格式数据')
         return
       }
       render(this.template.code, json).then(({ data }) => {
diff --git a/src/views/modules/payment/channel/alipay/AliPayConfigEdit.vue b/src/views/modules/payment/channel/alipay/AliPayConfigEdit.vue
index 3cb1997..5e90d53 100644
--- a/src/views/modules/payment/channel/alipay/AliPayConfigEdit.vue
+++ b/src/views/modules/payment/channel/alipay/AliPayConfigEdit.vue
@@ -14,21 +14,23 @@
         :label-col="labelCol"
         :wrapper-col="wrapperCol"
       >
-        <a-form-model-item prop="id" hidden="true" />
+        <a-form-model-item prop="id" hidden="true">
+          <a-input disabled v-model="form.id"/>
+        </a-form-model-item>
         <a-form-model-item label="名称" prop="name" >
-          <a-input :disabled="showable" v-model="form.name"/>
+          <a-input :disabled="showable" v-model="form.name" placeholder="请输入名称"/>
         </a-form-model-item>
         <a-form-model-item label="AppId" prop="appId" >
-          <a-input :disabled="showable" v-model="form.appId"/>
+          <a-input :disabled="showable" v-model="form.appId" placeholder="请输入AppId"/>
         </a-form-model-item>
         <a-form-model-item label="异步通知URL" prop="notifyUrl" >
-          <a-input :disabled="showable" v-model="form.notifyUrl"/>
+          <a-input :disabled="showable" v-model="form.notifyUrl" placeholder="请输入异步通知URL"/>
         </a-form-model-item>
         <a-form-model-item label="同步通知URL" prop="returnUrl" >
-          <a-input :disabled="showable" v-model="form.returnUrl"/>
+          <a-input :disabled="showable" v-model="form.returnUrl" placeholder="请输入同步通知URL"/>
         </a-form-model-item>
         <a-form-model-item label="支付网关URL" prop="serverUrl" >
-          <a-input :disabled="showable" v-model="form.serverUrl"/>
+          <a-input :disabled="showable" v-model="form.serverUrl" placeholder="请输入支付网关URL"/>
         </a-form-model-item>
         <a-form-model-item label="默认支付超时配置(分钟)" prop="expireTime" >
           <a-input-number
@@ -36,6 +38,7 @@
             :max="12000"
             :step="1"
             :disabled="showable"
+            placeholder="请输入超时配置"
             v-model="form.expireTime"/>
         </a-form-model-item>
         <a-form-model-item label="支持支付方式" prop="payWayList">
@@ -85,25 +88,24 @@
           </a-select>
         </a-form-model-item>
         <a-form-model-item v-show="form.authType === 1" label="支付宝公钥" prop="alipayPublicKey" >
-          <a-textarea :disabled="showable" v-model="form.alipayPublicKey"/>
+          <a-textarea :disabled="showable" v-model="form.alipayPublicKey" placeholder="请输入支付宝公钥内容"/>
         </a-form-model-item>
-        <a-form-model-item v-show="form.authType === 2 " label="应用公钥证书" prop="appCert" >
-          <a-textarea :disabled="showable" v-model="form.appCert">
-          </a-textarea>
+        <a-form-model-item v-show="form.authType === 2" label="应用公钥证书" prop="appCert" >
+          <a-textarea :disabled="showable" v-model="form.appCert" placeholder="请输入应用公钥证书内容"/>
         </a-form-model-item>
-        <a-form-model-item v-show="form.authType === 2 " label="支付宝公钥证书" prop="alipayCert" >
-          <a-textarea :disabled="showable" v-model="form.alipayCert">
+        <a-form-model-item v-show="form.authType === 2" label="支付宝公钥证书" prop="alipayCert" >
+          <a-textarea :disabled="showable" v-model="form.alipayCert" placeholder="请输入支付宝公钥证书内容">
           </a-textarea>
         </a-form-model-item>
-        <a-form-model-item v-show="form.authType === 2 " label="CA根证书文件" prop="alipayRootCert" >
-          <a-textarea :disabled="showable" v-model="form.alipayRootCert">
+        <a-form-model-item v-show="form.authType === 2" label="支付宝CA根证书" prop="alipayRootCert" >
+          <a-textarea :disabled="showable" v-model="form.alipayRootCert" placeholder="请输入支付宝CA根证书内容">
           </a-textarea>
         </a-form-model-item>
         <a-form-model-item label="应用私钥" prop="privateKey" >
-          <a-textarea :disabled="showable" v-model="form.privateKey"/>
+          <a-textarea :disabled="showable" v-model="form.privateKey" placeholder="请输入应用私钥内容"/>
         </a-form-model-item>
         <a-form-model-item label="备注" prop="remark" >
-          <a-textarea :disabled="showable" v-model="form.remark"/>
+          <a-textarea :disabled="showable" v-model="form.remark" placeholder="请输入备注"/>
         </a-form-model-item>
 
       </a-form-model>
-- 
Gitee


From 66ccd1c08a4b1d8abb089ff2ab0c8ac3098218b0 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sun, 27 Nov 2022 23:10:52 +0800
Subject: [PATCH 08/14] =?UTF-8?q?style=20=E9=94=99=E8=AF=AF=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E5=92=8C=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/payment/wechatPayConfig.js                       | 9 ---------
 src/components/Bootx/SuperQuery/BSuperQuery.vue          | 6 +++---
 src/components/Bootx/SuperQuery/SuperQueryModel.vue      | 6 ++----
 .../modules/payment/channel/wechat/WeChatConfigList.vue  | 1 -
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/api/payment/wechatPayConfig.js b/src/api/payment/wechatPayConfig.js
index 10e1747..67ccb5f 100644
--- a/src/api/payment/wechatPayConfig.js
+++ b/src/api/payment/wechatPayConfig.js
@@ -21,15 +21,6 @@ export function get (id) {
     params: { id }
   })
 }
-/**
- * 获取微信支持支付方式
- */
-export function findPayTypeList () {
-  return axios({
-    url: '/wechat/pay/findPayTypeList',
-    method: 'GET'
-  })
-}
 
 export function add (obj) {
   return axios({
diff --git a/src/components/Bootx/SuperQuery/BSuperQuery.vue b/src/components/Bootx/SuperQuery/BSuperQuery.vue
index 4f95b5b..aa8534a 100644
--- a/src/components/Bootx/SuperQuery/BSuperQuery.vue
+++ b/src/components/Bootx/SuperQuery/BSuperQuery.vue
@@ -12,7 +12,7 @@
       </a-button>
     </a-tooltip>
     <a-button v-else style="margin-left: 8px" @click="supperQueryShow">{{ buttonTitle }}</a-button>
-    <super-query-modal
+    <super-query-model
       ref="superQueryModal"
       :fields="fields"
       :width="width"
@@ -23,11 +23,11 @@
 </template>
 
 <script>
-import SuperQueryModal from './SuperQueryModel'
+import SuperQueryModel from './SuperQueryModel'
 export default {
   name: 'BSupperQuery',
   components: {
-    SuperQueryModal
+    SuperQueryModel
   },
   props: {
     // 是否在进行查询
diff --git a/src/components/Bootx/SuperQuery/SuperQueryModel.vue b/src/components/Bootx/SuperQuery/SuperQueryModel.vue
index d64ef1f..a4b6f95 100644
--- a/src/components/Bootx/SuperQuery/SuperQueryModel.vue
+++ b/src/components/Bootx/SuperQuery/SuperQueryModel.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal
-    title="超级查询器"
+    :title="modelTitle"
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
@@ -38,7 +38,7 @@
 
 import SuperQueryItem from './SuperQueryItem'
 export default {
-  name: 'SuperQueryModal',
+  name: 'SuperQueryModel',
   components: {
     SuperQueryItem
   },
@@ -47,8 +47,6 @@ export default {
       visible: false,
       // 查询条件
       queryParams: [],
-      // 查询字段属性
-      fieldList: [],
       confirmLoading: false
     }
   },
diff --git a/src/views/modules/payment/channel/wechat/WeChatConfigList.vue b/src/views/modules/payment/channel/wechat/WeChatConfigList.vue
index d7ee268..56df05b 100644
--- a/src/views/modules/payment/channel/wechat/WeChatConfigList.vue
+++ b/src/views/modules/payment/channel/wechat/WeChatConfigList.vue
@@ -21,7 +21,6 @@
       :loading="loading"
       :data="tableData"
     >
-
       <vxe-column type="seq" title="序号" width="60" />
       <vxe-column field="name" title="名称"/>
       <vxe-column field="mchId" title="商户号"/>
-- 
Gitee


From 76f955e903167b3af641bc4fd5f52da6ae734b5b Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Mon, 28 Nov 2022 23:53:10 +0800
Subject: [PATCH 09/14] =?UTF-8?q?style=20=E8=B6=85=E7=BA=A7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=99=A8=E6=96=87=E6=9C=AC=E6=9B=B4=E6=96=B0,=20?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=BC=96=E8=BE=91=E6=A0=A1=E9=AA=8C=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Bootx/SuperQuery/SuperQueryItem.vue  | 11 ++++++-----
 src/views/modules/demo/query/SuperQueryDemoList.vue |  2 +-
 src/views/modules/system/menu/MenuEdit.vue          | 11 ++++-------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/components/Bootx/SuperQuery/SuperQueryItem.vue b/src/components/Bootx/SuperQuery/SuperQueryItem.vue
index 40e34c1..23cb7ad 100644
--- a/src/components/Bootx/SuperQuery/SuperQueryItem.vue
+++ b/src/components/Bootx/SuperQuery/SuperQueryItem.vue
@@ -133,7 +133,8 @@ export default {
         { type: 'is_null', name: '为空' },
         { type: 'not_null', name: '不为空' }
       ],
-      fieldTemps: []
+      // 页面中查询字段对应的字段属性相关信息的存储, 顺序与查询条件参数一致
+      queryFields: []
     }
   },
   methods: {
@@ -150,20 +151,20 @@ export default {
     // 删除
     handleDel (index) {
       this.queryParams.splice(index, 1)
-      this.fieldTemps.splice(index, 1)
+      this.queryFields.splice(index, 1)
     },
     // 变更查询字段
     fieldChange (value, index, queryParam) {
       // 查询出对应的字段
       const field = this.fields.filter(o => o.field === value)
       if (field && field.length > 0) {
-        this.$set(this.fieldTemps, index, field[0])
+        this.$set(this.queryFields, index, field[0])
         this.$delete(queryParam, 'paramValue')
       }
     },
     // 输入类型切换判断
     paramTypeJudge (index, types) {
-      const field = this.fieldTemps[index]
+      const field = this.queryFields[index]
       for (const argument of arguments) {
         if (field && field.type === argument) {
           return true
@@ -173,7 +174,7 @@ export default {
     },
     // 获取下拉选择的数据
     getSelectData (index) {
-      return this.fieldTemps[index].list || []
+      return this.queryFields[index].list || []
     }
   }
 }
diff --git a/src/views/modules/demo/query/SuperQueryDemoList.vue b/src/views/modules/demo/query/SuperQueryDemoList.vue
index 3e33ac5..93620f2 100644
--- a/src/views/modules/demo/query/SuperQueryDemoList.vue
+++ b/src/views/modules/demo/query/SuperQueryDemoList.vue
@@ -114,7 +114,7 @@ export default {
       politicalList: [],
       fields: [
         { field: 'name', name: '姓名', type: STRING },
-        { field: 'remark', name: '姓名', type: STRING }
+        { field: 'remark', name: '备注', type: STRING }
       ],
       queryParam: {
       }
diff --git a/src/views/modules/system/menu/MenuEdit.vue b/src/views/modules/system/menu/MenuEdit.vue
index d381107..a466ac3 100644
--- a/src/views/modules/system/menu/MenuEdit.vue
+++ b/src/views/modules/system/menu/MenuEdit.vue
@@ -31,12 +31,8 @@
         <a-form-model-item
           v-show="form.menuType!==0"
           label="上级菜单"
-          :validate-status="validateStatus"
-          :hasFeedback="true"
-          :required="true">
-          <template #help>
-            <span>{{ validateStatus==='error'?'请选择上级菜单':'&nbsp;&nbsp;' }}</span>
-          </template>
+          prop="parentId"
+          :hasFeedback="true">
           <a-tree-select
             style="width:100%"
             :dropdown-style="{ maxHeight: '200px', overflow: 'auto' }"
@@ -220,7 +216,7 @@ export default {
       clientCode: '',
       form: {
         id: '',
-        parentId: '',
+        parentId: undefined,
         title: '',
         name: '',
         path: '',
@@ -244,6 +240,7 @@ export default {
   computed: {
     rules () {
       return {
+        parentId: [{ required: this.form.menuType === 1, message: '请选择父级菜单', trigger: ['blur', 'change'] }],
         title: [ { required: true, message: '请输入菜单或权限名称' } ],
         name: [ { required: true, message: '请输入路由名称' } ],
         path: [ { required: true, message: '请输入菜单路径' } ],
-- 
Gitee


From d5fa5711f181dfd14515c2fe6a09ad450f337f87 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Tue, 29 Nov 2022 23:02:42 +0800
Subject: [PATCH 10/14] =?UTF-8?q?pref=20diffForm=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/FormMixin.js                       | 13 +++++-----
 .../data/sensitive/DataSensitiveDemoEdit.vue  | 19 +--------------
 .../modules/demo/query/SuperQueryDemoEdit.vue | 12 +++++-----
 .../dynamicsource/DynamicDataSourceEdit.vue   | 13 +---------
 .../modules/notice/mail/MailConfigEdit.vue    | 13 +---------
 .../channel/alipay/AliPayConfigEdit.vue       | 16 +------------
 .../channel/wechat/WeChatConfigEdit.vue       | 24 ++++---------------
 src/views/modules/system/user/UserEdit.vue    | 21 ++++------------
 .../dingtalk/config/DingTalkConfigEdit.vue    | 14 +----------
 .../dingtalk/robot/DingRobotConfigEdit.vue    | 13 +---------
 .../wecom/robot/WeComRobotConfigEdit.vue      | 12 +---------
 11 files changed, 28 insertions(+), 142 deletions(-)

diff --git a/src/mixins/FormMixin.js b/src/mixins/FormMixin.js
index f9cbe3e..e8553b4 100644
--- a/src/mixins/FormMixin.js
+++ b/src/mixins/FormMixin.js
@@ -106,12 +106,13 @@ export const FormMixin = {
     async getDictItemsByNumberAsync (dictCode) {
       return getDictItemsByNumberAsync(dictCode)
     },
-    // 判断脱敏参数是否被修改的参数, 未修改返回空值
-    diffForm (o1, o2) {
-      return o1 === o2 ? null : o1
-    },
-    // 判断脱敏参数是否被修改的参数, 未修改返回空值 rawForm 后端获取到的原始数据, editForm 修改后的数据, keys 字段名称
-    diffFormNew (rawForm, editForm, ...keys) {
+    /**
+     * 判断脱敏参数是否被修改的参数, 未修改返回空值
+     * rawForm 后端获取到的原始数据,
+     * editForm 修改后的数据,
+     * keys 字段名称
+     */
+    diffForm (rawForm, editForm, ...keys) {
       const form = {}
       for (const key of keys) {
         form[key] = rawForm[key] === editForm[key] ? undefined : editForm[key]
diff --git a/src/views/modules/demo/data/sensitive/DataSensitiveDemoEdit.vue b/src/views/modules/demo/data/sensitive/DataSensitiveDemoEdit.vue
index 36f2ef0..50dd995 100644
--- a/src/views/modules/demo/data/sensitive/DataSensitiveDemoEdit.vue
+++ b/src/views/modules/demo/data/sensitive/DataSensitiveDemoEdit.vue
@@ -93,19 +93,6 @@ export default {
       }
     }
   },
-  computed: {
-    diff () {
-      return {
-        chineseName: this.diffForm(this.form.chineseName, this.rawForm.chineseName),
-        password: this.diffForm(this.form.password, this.rawForm.password),
-        idCard: this.diffForm(this.form.idCard, this.rawForm.idCard),
-        mobilePhone: this.diffForm(this.form.mobilePhone, this.rawForm.mobilePhone),
-        carLicense: this.diffForm(this.form.carLicense, this.rawForm.carLicense),
-        email: this.diffForm(this.form.email, this.rawForm.email),
-        other: this.diffForm(this.form.other, this.rawForm.other)
-      }
-    }
-  },
   methods: {
     edit (id, type) {
       if (['edit', 'show'].includes(type)) {
@@ -126,11 +113,7 @@ export default {
           if (this.type === 'add') {
             await add(this.form)
           } else if (this.type === 'edit') {
-            const form = {
-              ...this.form,
-              ...this.diff
-            }
-            await update(form)
+            await update({ ...this.form, ...this.diffForm(this.rawForm, this.form, 'chineseName', 'password', 'idCard', 'mobilePhone', 'carLicense', 'email', 'other') })
           }
           setTimeout(() => {
             this.confirmLoading = false
diff --git a/src/views/modules/demo/query/SuperQueryDemoEdit.vue b/src/views/modules/demo/query/SuperQueryDemoEdit.vue
index 25776f0..cbedadd 100644
--- a/src/views/modules/demo/query/SuperQueryDemoEdit.vue
+++ b/src/views/modules/demo/query/SuperQueryDemoEdit.vue
@@ -21,13 +21,13 @@
         label="名称"
         prop="name"
       >
-        <a-input v-model="form.name" :disabled="showable"/>
+        <a-input v-model="form.name" :disabled="showable" placeholder="请输入名称"/>
       </a-form-model-item>
       <a-form-model-item
         label="年龄"
         prop="age"
       >
-        <a-input-number v-model="form.age" :disabled="showable" :precision="0"/>
+        <a-input-number v-model="form.age" :disabled="showable" :precision="0" placeholder="请输入年龄"/>
       </a-form-model-item>
       <a-form-model-item
         label="是否vip"
@@ -63,9 +63,7 @@
         label="政治面貌"
         prop="political"
       >
-        <a-select v-model="form.political" :disabled="showable">
-          <a-select-option v-for="o in politicalList" :key="o.code">{{ o.name }}</a-select-option>
-        </a-select>
+        <a-select v-model="form.political" :options="politicalList" :disabled="showable" placeholder="请选择政治面貌"/>
       </a-form-model-item>
       <a-form-model-item
         label="备注"
@@ -114,7 +112,9 @@ export default {
   },
   methods: {
     edit (id, type) {
-      this.politicalList = this.getDictItemsByNumber('Political')
+      this.getDictDropDownNumberAsync('Political').then((value) => {
+        this.politicalList = value
+      })
       if (['edit', 'show'].includes(type)) {
         this.confirmLoading = true
         get(id).then(res => {
diff --git a/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue b/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue
index d814a1c..564242a 100644
--- a/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue
+++ b/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue
@@ -130,13 +130,6 @@ export default {
       }
     }
   },
-  computed: {
-    diff () {
-      return {
-        dbPassword: this.diffForm(this.form.dbPassword, this.rawForm.dbPassword)
-      }
-    }
-  },
   methods: {
     /**
      * 编辑
@@ -163,11 +156,7 @@ export default {
           if (this.type === 'add') {
             await add(this.form)
           } else if (this.type === 'edit') {
-            const form = {
-              ...this.form,
-              ...this.diff
-            }
-            await update(form)
+            await update({ ...this.form, ...this.diffForm(this.rawForm, this.form, 'dbPassword') })
           }
           this.confirmLoading = false
           this.$emit('ok')
diff --git a/src/views/modules/notice/mail/MailConfigEdit.vue b/src/views/modules/notice/mail/MailConfigEdit.vue
index 9c9faae..7049637 100644
--- a/src/views/modules/notice/mail/MailConfigEdit.vue
+++ b/src/views/modules/notice/mail/MailConfigEdit.vue
@@ -166,14 +166,6 @@ export default {
       }
     }
   },
-  computed: {
-    diff () {
-      return {
-        username: this.diffForm(this.form.username, this.rawForm.username),
-        password: this.diffForm(this.form.password, this.rawForm.password)
-      }
-    }
-  },
   methods: {
     edit (id, type) {
       this.securityTypeList = this.getDictItemsByNumber(this.mailSecurityCode)
@@ -195,10 +187,7 @@ export default {
           if (this.type === 'add') {
             await add(this.form)
           } else if (this.type === 'edit') {
-            await update({
-              ...this.form,
-              ...this.diff
-            })
+            await update({ ...this.form, ...this.diffForm(this.rawForm, this.form, 'username', 'password') })
           }
           setTimeout(() => {
             this.confirmLoading = false
diff --git a/src/views/modules/payment/channel/alipay/AliPayConfigEdit.vue b/src/views/modules/payment/channel/alipay/AliPayConfigEdit.vue
index 5e90d53..2df0dad 100644
--- a/src/views/modules/payment/channel/alipay/AliPayConfigEdit.vue
+++ b/src/views/modules/payment/channel/alipay/AliPayConfigEdit.vue
@@ -168,16 +168,6 @@ export default {
         expireTime: [ { required: true, message: '请输入默认超时配置' } ],
         payWayList: [ { required: true, message: '请选择支持的支付类型' } ]
       }
-    },
-    diff () {
-      return {
-        appId: this.diffForm(this.form.appId, this.rawForm.appId),
-        alipayPublicKey: this.diffForm(this.form.alipayPublicKey, this.rawForm.alipayPublicKey),
-        appCert: this.diffForm(this.form.appCert, this.rawForm.appCert),
-        alipayCert: this.diffForm(this.form.alipayCert, this.rawForm.alipayCert),
-        alipayRootCert: this.diffForm(this.form.alipayRootCert, this.rawForm.alipayRootCert),
-        privateKey: this.diffForm(this.form.privateKey, this.rawForm.privateKey)
-      }
     }
   },
   methods: {
@@ -203,11 +193,7 @@ export default {
           if (this.type === 'add') {
             await add(this.form)
           } else if (this.type === 'edit') {
-            const form = {
-              ...this.form,
-              ...this.diff
-            }
-            await update(form)
+            await update({ ...this.form, ...this.diffForm(this.rawForm, this.form, 'appId', 'alipayPublicKey', 'appCert', 'alipayCert', 'alipayRootCert', 'privateKey') })
           }
           setTimeout(() => {
             this.confirmLoading = false
diff --git a/src/views/modules/payment/channel/wechat/WeChatConfigEdit.vue b/src/views/modules/payment/channel/wechat/WeChatConfigEdit.vue
index 6819002..62f586a 100644
--- a/src/views/modules/payment/channel/wechat/WeChatConfigEdit.vue
+++ b/src/views/modules/payment/channel/wechat/WeChatConfigEdit.vue
@@ -22,7 +22,7 @@
           <a-input :disabled="showable" v-model="form.mchId" placeholder="请输入商户号"/>
         </a-form-model-item>
         <a-form-model-item label="应用编号" prop="appId" >
-          <a-input :disabled="showable" v-model="form.appId" placeholder="请输入应用编号"/>
+          <a-input :disabled="showable" v-model="form.appId" placeholder="请输入应用编号(AppId)"/>
         </a-form-model-item>
         <a-form-model-item label="AppSecret" prop="appSecret" >
           <a-input :disabled="showable" v-model="form.appSecret" placeholder="请输入AppSecret"/>
@@ -107,10 +107,10 @@
           <a-textarea :disabled="showable" v-model="form.keyPem" placeholder="请填入私钥内容"/>
         </a-form-model-item>
         <a-form-model-item label="异步通知URL" prop="notifyUrl" >
-          <a-input :disabled="showable" v-model="form.notifyUrl" placeholder="请输入备注"/>
+          <a-input :disabled="showable" v-model="form.notifyUrl" placeholder="请输入异步通知URL"/>
         </a-form-model-item>
         <a-form-model-item label="同步通知URL" prop="returnUrl" >
-          <a-input :disabled="showable" v-model="form.returnUrl" placeholder="请输入备注"/>
+          <a-input :disabled="showable" v-model="form.returnUrl" placeholder="请输入同步通知URL"/>
         </a-form-model-item>
         <a-form-model-item label="应用域名" prop="domain" >
           <a-input :disabled="showable" v-model="form.domain" placeholder="请输入domain"/>
@@ -156,17 +156,6 @@ export default {
         payWayList: [ { required: true, message: '请选择支持的支付类型' } ]
       }
     },
-    diff () {
-      return {
-        mchId: this.diffForm(this.form.mchId, this.rawForm.mchId),
-        appId: this.diffForm(this.form.appId, this.rawForm.appId),
-        appSecret: this.diffForm(this.form.appSecret, this.rawForm.appSecret),
-        apiKeyV2: this.diffForm(this.form.apiKeyV2, this.rawForm.apiKeyV2),
-        apiKeyV3: this.diffForm(this.form.apiKeyV3, this.rawForm.apiKeyV3),
-        keyPem: this.diffForm(this.form.keyPem, this.rawForm.keyPem),
-        certPem: this.diffForm(this.form.certPem, this.rawForm.certPem)
-      }
-    },
     // 上传地址
     uploadAction () {
       return process.env.VUE_APP_API_BASE_URL + '/file/upload'
@@ -230,12 +219,7 @@ export default {
           if (this.type === 'add') {
             await add(this.form)
           } else if (this.type === 'edit') {
-            const form = {
-              ...this.form,
-              ...this.diff
-            }
-            console.log(form)
-            await update(form)
+            await update({ ...this.form, ...this.diffForm(this.rawForm, this.form, 'mchId', 'appId', 'appSecret', 'apiKeyV2', 'apiKeyV3', 'keyPem', 'certPem') })
           }
           setTimeout(() => {
             this.confirmLoading = false
diff --git a/src/views/modules/system/user/UserEdit.vue b/src/views/modules/system/user/UserEdit.vue
index 10ea014..7c76855 100644
--- a/src/views/modules/system/user/UserEdit.vue
+++ b/src/views/modules/system/user/UserEdit.vue
@@ -84,14 +84,6 @@ export default {
       }
     }
   },
-  computed: {
-    diff () {
-      return {
-        phone: this.diffForm(this.form.phone, this.rawForm.phone),
-        email: this.diffForm(this.form.email, this.rawForm.email)
-      }
-    }
-  },
   methods: {
     edit (id) {
       this.confirmLoading = true
@@ -107,15 +99,10 @@ export default {
       this.$refs.form.validate(async valid => {
         if (valid) {
           this.confirmLoading = true
-          await update({
-            ...this.form,
-            ...this.diff
-          })
-          setTimeout(() => {
-            this.confirmLoading = false
-            this.$emit('ok')
-            this.visible = false
-          }, 200)
+          await update({ ...this.form, ...this.diffForm(this.rawForm, this.form, 'phone', 'email') })
+          this.confirmLoading = false
+          this.$emit('ok')
+          this.visible = false
         } else {
           return false
         }
diff --git a/src/views/modules/third/dingtalk/config/DingTalkConfigEdit.vue b/src/views/modules/third/dingtalk/config/DingTalkConfigEdit.vue
index b79174b..cde4809 100644
--- a/src/views/modules/third/dingtalk/config/DingTalkConfigEdit.vue
+++ b/src/views/modules/third/dingtalk/config/DingTalkConfigEdit.vue
@@ -80,14 +80,6 @@ export default {
       }
     }
   },
-  computed: {
-    diff () {
-      return {
-        appKey: this.diffForm(this.form.appKey, this.rawForm.appKey),
-        appSecret: this.diffForm(this.form.appSecret, this.rawForm.appSecret)
-      }
-    }
-  },
   methods: {
     edit (id, type) {
       if (['edit', 'show'].includes(type)) {
@@ -108,11 +100,7 @@ export default {
           if (this.type === 'add') {
             await add(this.form)
           } else if (this.type === 'edit') {
-            const form = {
-              ...this.form,
-              ...this.diff
-            }
-            await update(form)
+            await update({ ...this.form, ...this.diffForm(this.rawForm, this.form, 'appKey', 'appSecret') })
           }
           setTimeout(() => {
             this.confirmLoading = false
diff --git a/src/views/modules/third/dingtalk/robot/DingRobotConfigEdit.vue b/src/views/modules/third/dingtalk/robot/DingRobotConfigEdit.vue
index dc14a1e..56eeeb6 100644
--- a/src/views/modules/third/dingtalk/robot/DingRobotConfigEdit.vue
+++ b/src/views/modules/third/dingtalk/robot/DingRobotConfigEdit.vue
@@ -99,14 +99,6 @@ export default {
       }
     }
   },
-  computed: {
-    diff () {
-      return {
-        accessToken: this.diffForm(this.form.accessToken, this.rawForm.accessToken),
-        signSecret: this.diffForm(this.form.signSecret, this.rawForm.signSecret)
-      }
-    }
-  },
   methods: {
     edit (id, type) {
       if (['edit', 'show'].includes(type)) {
@@ -127,10 +119,7 @@ export default {
           if (this.type === 'add') {
             await add(this.form)
           } else if (this.type === 'edit') {
-            await update({
-              ...this.form,
-              ...this.diff
-            })
+            await update({ ...this.form, ...this.diffForm(this.rawForm, this.form, 'accessToken', 'signSecret') })
           }
           this.confirmLoading = false
           this.$emit('ok')
diff --git a/src/views/modules/third/wecom/robot/WeComRobotConfigEdit.vue b/src/views/modules/third/wecom/robot/WeComRobotConfigEdit.vue
index 1ed37d8..b376995 100644
--- a/src/views/modules/third/wecom/robot/WeComRobotConfigEdit.vue
+++ b/src/views/modules/third/wecom/robot/WeComRobotConfigEdit.vue
@@ -82,13 +82,6 @@ export default {
       }
     }
   },
-  computed: {
-    diff () {
-      return {
-        webhookKey: this.diffForm(this.form.webhookKey, this.rawForm.webhookKey)
-      }
-    }
-  },
   methods: {
     edit (id, type) {
       if (['edit', 'show'].includes(type)) {
@@ -109,10 +102,7 @@ export default {
           if (this.type === 'add') {
             await add(this.form)
           } else if (this.type === 'edit') {
-            await update({
-              ...this.form,
-              ...this.diff
-            })
+            await update({ ...this.form, ...this.diffForm(this.rawForm, this.form, 'webhookKey') })
           }
           this.confirmLoading = false
           this.$emit('ok')
-- 
Gitee


From ad731fbd747058a9aa9b4a81ade4cc558498252b Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Wed, 30 Nov 2022 23:28:54 +0800
Subject: [PATCH 11/14] =?UTF-8?q?pref=20=E6=94=AF=E4=BB=98=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E8=AE=B0=E5=BD=95=E6=9F=A5=E7=9C=8B=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   1 +
 src/api/payment/pay.js                        |  22 ---
 .../payment/notify/PayNotifyRecordInfo.vue    |  50 +++---
 .../payment/notify/PayNotifyRecordList.vue    |   1 -
 .../payment/order/payment/PaymentInfo.vue     |  96 +++++------
 .../payment/order/payment/RefundModel.vue     |  25 ++-
 .../payment/order/refund/RefundRecordInfo.vue | 150 +++++++++---------
 yarn.lock                                     |  18 ++-
 8 files changed, 181 insertions(+), 182 deletions(-)

diff --git a/package.json b/package.json
index e081b17..358be04 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
     "vue-clipboard2": "^0.3.3",
     "vue-codemirror-lite": "^1.0.4",
     "vue-cropper": "0.5.8",
+    "vue-json-viewer": "2",
     "vue-qr": "^2.5.0",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.5.2",
diff --git a/src/api/payment/pay.js b/src/api/payment/pay.js
index d7cddf8..2e8ddd7 100644
--- a/src/api/payment/pay.js
+++ b/src/api/payment/pay.js
@@ -11,28 +11,6 @@ export function cancelByPaymentId (paymentId) {
   })
 }
 
-/**
- * 取消支付(业务id)
- */
-export function cancelByBusinessId (businessId) {
-  return axios({
-    url: '/uni_pay/cancelByBusinessId',
-    method: 'POST',
-    params: { businessId }
-  })
-}
-
-/**
- * 全额退款(支付id)
- */
-export function refundByBusinessId (businessId) {
-  return axios({
-    url: '/uni_pay/refundByBusinessId',
-    method: 'POST',
-    params: { businessId }
-  })
-}
-
 /**
  * 退款
  */
diff --git a/src/views/modules/payment/notify/PayNotifyRecordInfo.vue b/src/views/modules/payment/notify/PayNotifyRecordInfo.vue
index d2e786b..8bd9b0d 100644
--- a/src/views/modules/payment/notify/PayNotifyRecordInfo.vue
+++ b/src/views/modules/payment/notify/PayNotifyRecordInfo.vue
@@ -7,30 +7,32 @@
     :maskClosable="false"
     @cancel="handleCancel"
   >
-    <a-descriptions
-      title=""
-      :column="{md: 1, sm: 1, xs: 1}"
-    >
-      <a-descriptions-item label="业务id">
-        {{ form.paymentId }}
-      </a-descriptions-item>
-      <a-descriptions-item label="支付通道">
-        {{ dictConvert('PayChannel',form.payChannel) }}
-      </a-descriptions-item>
-      <a-descriptions-item label="通知消息">
-        {{ form.notifyInfo }}
-      </a-descriptions-item>
-      <a-descriptions-item label="状态">
-        {{ form.status === 1 ? '成功':'失败' }}
-      </a-descriptions-item>
-      <a-descriptions-item label="提示消息">
-        {{ form.msg }}
-      </a-descriptions-item>
-      <a-descriptions-item label="通知时间">
-        {{ form.notifyTime }}
-      </a-descriptions-item>
+    <a-spin :spinning="confirmLoading">
+      <a-descriptions
+        title=""
+        :column="{md: 1, sm: 1, xs: 1}"
+      >
+        <a-descriptions-item label="业务id">
+          {{ form.paymentId }}
+        </a-descriptions-item>
+        <a-descriptions-item label="支付通道">
+          {{ dictConvert('PayChannel',form.payChannel) }}
+        </a-descriptions-item>
+        <a-descriptions-item label="通知消息">
+          <json-viewer preview-mode boxed :value="JSON.parse(form.notifyInfo || '{}')"/>
+        </a-descriptions-item>
+        <a-descriptions-item label="状态">
+          {{ form.status === 1 ? '成功':'失败' }}
+        </a-descriptions-item>
+        <a-descriptions-item label="提示消息">
+          {{ form.msg }}
+        </a-descriptions-item>
+        <a-descriptions-item label="通知时间">
+          {{ form.notifyTime }}
+        </a-descriptions-item>
 
-    </a-descriptions>
+      </a-descriptions>
+    </a-spin>
     <template #footer>
       <a-button key="cancel" @click="handleCancel">取消</a-button>
     </template>
@@ -39,10 +41,12 @@
 
 <script>
   import { FormMixin } from '@/mixins/FormMixin'
+  import JsonViewer from 'vue-json-viewer'
   import { get, add, update } from '@/api/payment/payNotifyRecord'
   export default {
     name: 'PayNotifyRecordInfo',
     mixins: [FormMixin],
+    components: { JsonViewer },
     data () {
       return {
         form: {
diff --git a/src/views/modules/payment/notify/PayNotifyRecordList.vue b/src/views/modules/payment/notify/PayNotifyRecordList.vue
index 0870547..4d37834 100644
--- a/src/views/modules/payment/notify/PayNotifyRecordList.vue
+++ b/src/views/modules/payment/notify/PayNotifyRecordList.vue
@@ -20,7 +20,6 @@
     >
       <vxe-column type="seq" title="序号" width="60" />
       <vxe-column field="paymentId" title="支付号" />
-      <vxe-column field="notifyInfo" title="通知消息" />
       <vxe-column field="payChannel" title="支付通道">
         <template v-slot="{row}">
           {{ dictConvert('PayChannel',row.payChannel) }}
diff --git a/src/views/modules/payment/order/payment/PaymentInfo.vue b/src/views/modules/payment/order/payment/PaymentInfo.vue
index fb8f980..a71f334 100644
--- a/src/views/modules/payment/order/payment/PaymentInfo.vue
+++ b/src/views/modules/payment/order/payment/PaymentInfo.vue
@@ -7,53 +7,55 @@
     :maskClosable="false"
     @cancel="handleCancel"
   >
-    <a-descriptions
-      title=""
-      :column="{md: 2, sm: 1, xs: 1}"
-    >
-      <a-descriptions-item label="用户id">
-        {{ form.userId }}
-      </a-descriptions-item>
-      <a-descriptions-item label="标题">
-        {{ form.title }}
-      </a-descriptions-item>
-      <a-descriptions-item label="业务id">
-        {{ form.businessId }}
-      </a-descriptions-item>
-      <a-descriptions-item label="金额">
-        {{ form.amount }}
-      </a-descriptions-item>
-      <a-descriptions-item label="可退余额">
-        {{ form.refundableBalance }}
-      </a-descriptions-item>
-      <a-descriptions-item label="支付状态">
-        {{ dictConvert('PayStatus',form.payStatus) }}
-      </a-descriptions-item>
-      <a-descriptions-item label="是否是异步支付">
-        {{ form.asyncPayMode?'是':'否' }}
-      </a-descriptions-item>
-      <a-descriptions-item label="异步支付方式">
-        {{ dictConvert('PayChannel',form.asyncPayChannel) }}
-      </a-descriptions-item>
-      <a-descriptions-item label="支付信息">
-        <a-tag v-for="o in form.payChannelInfo" :key="o.payChannel">{{ dictConvert('PayChannel',o.payChannel) }}: {{ o.amount }}</a-tag>
-      </a-descriptions-item>
-      <a-descriptions-item label="可退款信息">
-        <a-tag v-for="o in form.refundableInfo" :key="o.payChannel">{{ dictConvert('PayChannel',o.payChannel) }}: {{ o.amount }}</a-tag>
-      </a-descriptions-item>
-      <a-descriptions-item label="客户IP">
-        {{ form.clientIp }}
-      </a-descriptions-item>
-      <a-descriptions-item label="描述">
-        {{ form.description }}
-      </a-descriptions-item>
-      <a-descriptions-item label="错误码">
-        {{ form.errorCode }}
-      </a-descriptions-item>
-      <a-descriptions-item label="错误信息">
-        {{ form.errorMsg }}
-      </a-descriptions-item>
-    </a-descriptions>
+    <a-spin :spinning="confirmLoading">
+      <a-descriptions
+        title=""
+        :column="{md: 2, sm: 1, xs: 1}"
+      >
+        <a-descriptions-item label="用户id">
+          {{ form.userId }}
+        </a-descriptions-item>
+        <a-descriptions-item label="标题">
+          {{ form.title }}
+        </a-descriptions-item>
+        <a-descriptions-item label="业务id">
+          {{ form.businessId }}
+        </a-descriptions-item>
+        <a-descriptions-item label="金额">
+          {{ form.amount }}
+        </a-descriptions-item>
+        <a-descriptions-item label="可退余额">
+          {{ form.refundableBalance }}
+        </a-descriptions-item>
+        <a-descriptions-item label="支付状态">
+          {{ dictConvert('PayStatus',form.payStatus) }}
+        </a-descriptions-item>
+        <a-descriptions-item label="是否是异步支付">
+          {{ form.asyncPayMode?'是':'否' }}
+        </a-descriptions-item>
+        <a-descriptions-item label="异步支付方式">
+          {{ dictConvert('PayChannel',form.asyncPayChannel) }}
+        </a-descriptions-item>
+        <a-descriptions-item label="支付信息">
+          <a-tag v-for="o in form.payChannelInfo" :key="o.payChannel">{{ dictConvert('PayChannel',o.payChannel) }}: {{ o.amount }}</a-tag>
+        </a-descriptions-item>
+        <a-descriptions-item label="可退款信息">
+          <a-tag v-for="o in form.refundableInfo" :key="o.payChannel">{{ dictConvert('PayChannel',o.payChannel) }}: {{ o.amount }}</a-tag>
+        </a-descriptions-item>
+        <a-descriptions-item label="客户IP">
+          {{ form.clientIp }}
+        </a-descriptions-item>
+        <a-descriptions-item label="描述">
+          {{ form.description }}
+        </a-descriptions-item>
+        <a-descriptions-item label="错误码">
+          {{ form.errorCode }}
+        </a-descriptions-item>
+        <a-descriptions-item label="错误信息">
+          {{ form.errorMsg }}
+        </a-descriptions-item>
+      </a-descriptions>
+    </a-spin>
     <template #footer>
       <a-button key="cancel" @click="handleCancel">取消</a-button>
     </template>
diff --git a/src/views/modules/payment/order/payment/RefundModel.vue b/src/views/modules/payment/order/payment/RefundModel.vue
index 31fe6a0..1feac59 100644
--- a/src/views/modules/payment/order/payment/RefundModel.vue
+++ b/src/views/modules/payment/order/payment/RefundModel.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal
-    title="退款"
+    title="退款申请"
     :width="300"
     :visible="visible"
     :confirmLoading="confirmLoading"
@@ -13,7 +13,6 @@
       <a-form-model
         ref="form"
         :model="form"
-        :rules="rules"
         :label-col="labelCol"
         :wrapper-col="wrapperCol"
       >
@@ -39,13 +38,6 @@ import { refund } from '@/api/payment/pay'
 export default {
   name: 'RefundModel',
   mixins: [FormMixin],
-  computed: {
-    rules () {
-      return {
-
-      }
-    }
-  },
   data () {
     return {
       // 订单
@@ -68,13 +60,18 @@ export default {
       })
     },
     handleOk () {
-      this.confirmLoading = true
-      refund(this.form).then(_ => {
-        this.visible = false
-        this.$emit('ok')
+      this.$confirm({
+        title: '警告',
+        content: '确实要申请退款',
+        onOk: () => {
+          this.confirmLoading = true
+          refund(this.form).then(_ => {
+            this.visible = false
+            this.$emit('ok')
+          })
+        }
       })
     }
-
   }
 }
 </script>
diff --git a/src/views/modules/payment/order/refund/RefundRecordInfo.vue b/src/views/modules/payment/order/refund/RefundRecordInfo.vue
index 4d18c39..edacb86 100644
--- a/src/views/modules/payment/order/refund/RefundRecordInfo.vue
+++ b/src/views/modules/payment/order/refund/RefundRecordInfo.vue
@@ -1,53 +1,55 @@
 <template>
   <a-modal
-    `:title="title"
+    :title="title"
     :width="modalWidth"
     :visible="visible"
     :confirmLoading="confirmLoading"
     :maskClosable="false"
-    @cancel="handleCancel"`
+    @cancel="handleCancel"
   >
-    <a-descriptions
-      title=""
-      :column="{md: 1, sm: 1, xs: 1}"
-    >
-      <a-descriptions-item label="付款记录ID">
-        {{ form.paymentId }}
-      </a-descriptions-item>
-      <a-descriptions-item label="业务ID">
-        {{ form.businessId }}
-      </a-descriptions-item>
-      <a-descriptions-item label="多次退款业务号">
-        {{ form.refundRequestNo }}
-      </a-descriptions-item>
-      <a-descriptions-item label="标题">
-        {{ form.title }}
-      </a-descriptions-item>
-      <a-descriptions-item label="退款金额">
-        {{ form.amount }}
-      </a-descriptions-item>
-      <a-descriptions-item label="剩余可退款金额">
-        {{ form.refundableBalance }}
-      </a-descriptions-item>
-      <a-descriptions-item label="退款时间">
-        {{ form.refundTime }}
-      </a-descriptions-item>
-      <a-descriptions-item label="退款状态">
-        <a-tag>{{ form.refundStatus?'成功':'失败' }}</a-tag>
-      </a-descriptions-item>
-      <a-descriptions-item label="退款终端ip">
-        {{ form.clientIp }}
-      </a-descriptions-item>
-      <a-descriptions-item label="退款信息">
-        <a-tag v-for="o in form.refundableInfo" :key="o.payChannel">{{ dictConvert('PayChannel',o.payChannel) }}: {{ o.amount }}</a-tag>
-      </a-descriptions-item>
-      <a-descriptions-item label="错误码">
-        {{ form.errorCode }}
-      </a-descriptions-item>
-      <a-descriptions-item label="错误信息">
-        {{ form.errorMsg }}
-      </a-descriptions-item>
-    </a-descriptions>
+    <a-spin :spinning="confirmLoading">
+      <a-descriptions
+        title=""
+        :column="{md: 1, sm: 1, xs: 1}"
+      >
+        <a-descriptions-item label="付款记录ID">
+          {{ form.paymentId }}
+        </a-descriptions-item>
+        <a-descriptions-item label="业务ID">
+          {{ form.businessId }}
+        </a-descriptions-item>
+        <a-descriptions-item label="多次退款业务号">
+          {{ form.refundRequestNo }}
+        </a-descriptions-item>
+        <a-descriptions-item label="标题">
+          {{ form.title }}
+        </a-descriptions-item>
+        <a-descriptions-item label="退款金额">
+          {{ form.amount }}
+        </a-descriptions-item>
+        <a-descriptions-item label="剩余可退款金额">
+          {{ form.refundableBalance }}
+        </a-descriptions-item>
+        <a-descriptions-item label="退款时间">
+          {{ form.refundTime }}
+        </a-descriptions-item>
+        <a-descriptions-item label="退款状态">
+          <a-tag>{{ form.refundStatus?'成功':'失败' }}</a-tag>
+        </a-descriptions-item>
+        <a-descriptions-item label="退款终端ip">
+          {{ form.clientIp }}
+        </a-descriptions-item>
+        <a-descriptions-item label="退款信息">
+          <a-tag v-for="o in form.refundableInfo" :key="o.payChannel">{{ dictConvert('PayChannel',o.payChannel) }}: {{ o.amount }}</a-tag>
+        </a-descriptions-item>
+        <a-descriptions-item label="错误码">
+          {{ form.errorCode }}
+        </a-descriptions-item>
+        <a-descriptions-item label="错误信息">
+          {{ form.errorMsg }}
+        </a-descriptions-item>
+      </a-descriptions>
+    </a-spin>
     <template #footer>
       <a-button key="cancel" @click="handleCancel">取消</a-button>
     </template>
@@ -55,40 +57,40 @@
 </template>
 
 <script>
-  import { FormMixin } from '@/mixins/FormMixin'
-  import { get } from '@/api/payment/refundRecord'
-  export default {
-    name: 'RefundRecordInfo',
-    mixins: [FormMixin],
-    data () {
-      return {
-        form: {
-          id: null,
-          refundOrderId: null,
-          paymentId: null,
-          refundRequestNo: null,
-          userId: null,
-          title: null,
-          amount: null,
-          refundableInfo: null,
-          refundStatus: null,
-          refundTime: null,
-          clientIp: null,
-          errorCode: null,
-          errorMsg: null,
-        }
-      }
-    },
-    methods: {
-      edit (id, type) {
-          this.confirmLoading = true
-          get(id).then(res => {
-            this.form = res.data
-            this.confirmLoading = false
-          })
+import { FormMixin } from '@/mixins/FormMixin'
+import { get } from '@/api/payment/refundRecord'
+export default {
+  name: 'RefundRecordInfo',
+  mixins: [FormMixin],
+  data () {
+    return {
+      form: {
+        id: null,
+        paymentId: null,
+        refundRequestNo: null,
+        userId: null,
+        title: null,
+        amount: null,
+        refundableInfo: null,
+        refundStatus: null,
+        refundTime: null,
+        clientIp: null,
+        errorCode: null,
+        errorMsg: null
       }
     }
+  },
+  methods: {
+    edit (id) {
+      this.visible = true
+      this.confirmLoading = true
+      get(id).then(res => {
+        this.form = res.data
+        this.confirmLoading = false
+      })
+    }
   }
+}
 </script>
 
 <style scoped>
diff --git a/yarn.lock b/yarn.lock
index 1fcbb1d..bb351c6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3398,6 +3398,15 @@ clipboard@^2.0.0:
     select "^1.1.2"
     tiny-emitter "^2.0.0"
 
+clipboard@^2.0.4:
+  version "2.0.11"
+  resolved "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz#62180360b97dd668b6b3a84ec226975762a70be5"
+  integrity sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==
+  dependencies:
+    good-listener "^1.2.2"
+    select "^1.1.2"
+    tiny-emitter "^2.0.0"
+
 clipboardy@^2.3.0:
   version "2.3.0"
   resolved "https://registry.npmmirror.com/clipboardy/-/clipboardy-2.3.0.tgz#3c2903650c68e46a91b388985bc2774287dba290"
@@ -7799,7 +7808,7 @@ min-dash@^3.0.0, min-dash@^3.5.0, min-dash@^3.5.2, min-dash@^3.8.1:
   resolved "https://registry.npmmirror.com/min-dash/-/min-dash-3.8.1.tgz#09a8bd8a041d65eec4732042cde9cb24a6e84b0d"
   integrity sha512-evumdlmIlg9mbRVPbC4F5FuRhNmcMS5pvuBUbqb1G9v09Ro0ImPEgz5n3khir83lFok1inKqVDjnKEg3GpDxQg==
 
-min-dom@^3.1.2, min-dom@^3.1.3:
+min-dom@^3.1.2, min-dom@^3.1.3, min-dom@^3.2.1:
   version "3.2.1"
   resolved "https://registry.npmmirror.com/min-dom/-/min-dom-3.2.1.tgz#c272a814397d8bfe97edd12670e7ac34123c043f"
   integrity sha512-v6YCmnDzxk4rRJntWTUiwggLupPw/8ZSRqUq0PDaBwVZEO/wYzCH4SKVBV+KkEvf3u0XaWHly5JEosPtqRATZA==
@@ -11298,6 +11307,13 @@ vue-jest@^3.0.5:
     tsconfig "^7.0.0"
     vue-template-es2015-compiler "^1.6.0"
 
+vue-json-viewer@2:
+  version "2.2.22"
+  resolved "https://registry.npmmirror.com/vue-json-viewer/-/vue-json-viewer-2.2.22.tgz#7ea7454b8aac3701245b88acf39de876cc54221e"
+  integrity sha512-3oPH5BxoUWva/qp7wNJj+15FBXyi9Yu5VDW4mCWivjHR1pUpMv34fjqqxML7jh2uOqm1S/3Xks5nQ5JjC5+OWw==
+  dependencies:
+    clipboard "^2.0.4"
+
 "vue-loader-v16@npm:vue-loader@^16.1.0":
   version "16.2.0"
   resolved "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.2.0.tgz#046a53308dd47e58efe20ddec1edec027ce3b46e"
-- 
Gitee


From 0f70572e67964995b4551602a17756d974c65105 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Thu, 1 Dec 2022 23:45:35 +0800
Subject: [PATCH 12/14] =?UTF-8?q?pref=20=E6=94=AF=E4=BB=98=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E8=AE=B0=E5=BD=95=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/office/applyshow/TaskHistory.vue         | 2 +-
 src/views/modules/office/applyshow/TaskOperate.vue         | 4 ++--
 src/views/modules/payment/notify/PayNotifyRecordInfo.vue   | 3 ++-
 .../modules/payment/order/refund/RefundRecordInfo.vue      | 1 +
 src/views/modules/payment/voucher/VoucherGeneration.vue    | 7 ++++---
 src/views/modules/payment/voucher/VoucherInfo.vue          | 1 +
 src/views/modules/payment/voucher/VoucherList.vue          | 3 +--
 src/views/modules/payment/wallet/list/WalletInfo.vue       | 1 +
 src/views/modules/payment/wallet/list/WalletList.vue       | 2 +-
 9 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/office/applyshow/TaskHistory.vue b/src/views/modules/office/applyshow/TaskHistory.vue
index de9dfbb..e1ebc92 100644
--- a/src/views/modules/office/applyshow/TaskHistory.vue
+++ b/src/views/modules/office/applyshow/TaskHistory.vue
@@ -17,7 +17,7 @@
       </a-col>
       <a-col :span="16">
         <a-card title="流程信息" :bordered="false">
-          <a-descriptions :column="{md: 1}" bordered>
+          <a-descriptions bordered :column="{md: 1}">
             <a-descriptions-item label="流程实例名称">
               {{ instance.instanceName }}
             </a-descriptions-item>
diff --git a/src/views/modules/office/applyshow/TaskOperate.vue b/src/views/modules/office/applyshow/TaskOperate.vue
index d1cafd9..24f2ce7 100644
--- a/src/views/modules/office/applyshow/TaskOperate.vue
+++ b/src/views/modules/office/applyshow/TaskOperate.vue
@@ -3,7 +3,7 @@
     <a-row :gutter="64">
       <a-col :span="8">
         <a-card :bordered="false" v-if="currentNode||nextOrBackNode">
-          <a-descriptions :column="{md: 1}" bordered v-if="currentNode">
+          <a-descriptions bordered :column="{md: 1}" v-if="currentNode">
             <a-descriptions-item label="当前环节名称">
               {{ currentNode.nodeName }}
             </a-descriptions-item>
@@ -24,7 +24,7 @@
             </a-descriptions-item>
           </a-descriptions>
           <a-divider/>
-          <a-descriptions :column="{md: 1}" bordered v-if="nextOrBackNode">
+          <a-descriptions bordered :column="{md: 1}" v-if="nextOrBackNode">
             <a-descriptions-item label="下一环节名称">
               {{ nextOrBackNode.nodeName }}
             </a-descriptions-item>
diff --git a/src/views/modules/payment/notify/PayNotifyRecordInfo.vue b/src/views/modules/payment/notify/PayNotifyRecordInfo.vue
index 8bd9b0d..2930bde 100644
--- a/src/views/modules/payment/notify/PayNotifyRecordInfo.vue
+++ b/src/views/modules/payment/notify/PayNotifyRecordInfo.vue
@@ -9,6 +9,7 @@
   >
     <a-spin :spinning="confirmLoading">
       <a-descriptions
+        bordered
         title=""
         :column="{md: 1, sm: 1, xs: 1}"
       >
@@ -19,7 +20,7 @@
           {{ dictConvert('PayChannel',form.payChannel) }}
         </a-descriptions-item>
         <a-descriptions-item label="通知消息">
-          <json-viewer preview-mode boxed :value="JSON.parse(form.notifyInfo || '{}')"/>
+          <json-viewer preview-mode :value="JSON.parse(form.notifyInfo || '{}')"/>
         </a-descriptions-item>
         <a-descriptions-item label="状态">
           {{ form.status === 1 ? '成功':'失败' }}
diff --git a/src/views/modules/payment/order/refund/RefundRecordInfo.vue b/src/views/modules/payment/order/refund/RefundRecordInfo.vue
index edacb86..9c88259 100644
--- a/src/views/modules/payment/order/refund/RefundRecordInfo.vue
+++ b/src/views/modules/payment/order/refund/RefundRecordInfo.vue
@@ -9,6 +9,7 @@
   >
     <a-spin :spinning="confirmLoading">
       <a-descriptions
+        bordered
         title=""
         :column="{md: 1, sm: 1, xs: 1}"
       >
diff --git a/src/views/modules/payment/voucher/VoucherGeneration.vue b/src/views/modules/payment/voucher/VoucherGeneration.vue
index b737240..b634dac 100644
--- a/src/views/modules/payment/voucher/VoucherGeneration.vue
+++ b/src/views/modules/payment/voucher/VoucherGeneration.vue
@@ -1,7 +1,6 @@
 <template>
   <a-modal
     title="储值卡生成"
-    :destroyOnClose="true"
     :width="640"
     :visible="visible"
     :confirmLoading="confirmLoading"
@@ -51,10 +50,11 @@
         </a-form-model-item>
         <a-form-model-item
           label="有效期"
-          prop="enduring"
+          prop="dataTime"
           v-if="!form.enduring"
         >
           <a-range-picker
+            v-model="form.dataTime"
             valueFormat="yyyy-MM-DD"
             @change="changeTime"
           />
@@ -91,7 +91,7 @@ export default {
         count: [{ required: true, message: '请输入要生成的数量' }],
         faceValue: [{ required: true, message: '请输入储值卡的面值' }],
         enduring: [{ required: true, message: '请选择储值卡有效期类型' }],
-        dataTime: [{ required: !this.enduring, message: '请选择有效时间范围' }],
+        dataTime: [{ required: !this.form.enduring, message: '请选择有效时间范围' }],
         status: [{ required: true, message: '请选择默认状态' }]
       }
     }
@@ -135,6 +135,7 @@ export default {
       this.form.endTime = times[1] + ' 23:59:59'
     },
     resetForm () {
+      console.log(123)
       this.$nextTick(() => {
         this.$refs.form.resetFields()
       })
diff --git a/src/views/modules/payment/voucher/VoucherInfo.vue b/src/views/modules/payment/voucher/VoucherInfo.vue
index c1b2846..20ea0fe 100644
--- a/src/views/modules/payment/voucher/VoucherInfo.vue
+++ b/src/views/modules/payment/voucher/VoucherInfo.vue
@@ -8,6 +8,7 @@
     @cancel="handleCancel"
   >
     <a-descriptions
+      bordered
       title=""
       :column="{md: 1, sm: 1, xs: 1}"
     >
diff --git a/src/views/modules/payment/voucher/VoucherList.vue b/src/views/modules/payment/voucher/VoucherList.vue
index 7532195..d9646c6 100644
--- a/src/views/modules/payment/voucher/VoucherList.vue
+++ b/src/views/modules/payment/voucher/VoucherList.vue
@@ -134,7 +134,6 @@ export default {
      * @param type true 锁定, false 解锁
      */
     lockConfirm (voucherId, type) {
-      const that = this
       this.$confirm({
         title: type ? '是否停用该储值卡' : '是否启用该储值卡',
         okText: '确定',
@@ -145,7 +144,7 @@ export default {
           } else {
             await unlock(voucherId)
           }
-          that.init()
+          this.init()
         }
       })
     }
diff --git a/src/views/modules/payment/wallet/list/WalletInfo.vue b/src/views/modules/payment/wallet/list/WalletInfo.vue
index d1940f3..90a675e 100644
--- a/src/views/modules/payment/wallet/list/WalletInfo.vue
+++ b/src/views/modules/payment/wallet/list/WalletInfo.vue
@@ -8,6 +8,7 @@
     @cancel="handleCancel"
   >
     <a-descriptions
+      bordered
       title=""
       :column="{md: 1, sm: 1, xs: 1}"
     >
diff --git a/src/views/modules/payment/wallet/list/WalletList.vue b/src/views/modules/payment/wallet/list/WalletList.vue
index 86e9cab..0badeaa 100644
--- a/src/views/modules/payment/wallet/list/WalletList.vue
+++ b/src/views/modules/payment/wallet/list/WalletList.vue
@@ -137,7 +137,7 @@ export default {
       this.$refs.walletChanger.init(walletId)
     },
     /**
-     * 禁用钱包
+     * 锁定/解锁 钱包
      * @param walletId 钱包id
      * @param type true 锁定, false 解锁
      */
-- 
Gitee


From 337906970eae8dd32eabcd327edbee23a5427237 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sat, 3 Dec 2022 13:43:25 +0800
Subject: [PATCH 13/14] =?UTF-8?q?feat=20=E7=94=A8=E6=88=B7=E5=92=8C?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E9=80=89=E6=8B=A9=E5=99=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RoleSelectModal/BRoleSelectModal.vue      |   9 +-
 .../UserSelectModal/BUserSelectModal.vue      |   9 +-
 .../payment/wallet/list/UserSelectModal.vue   | 103 ------------------
 .../payment/wallet/list/WalletList.vue        |  12 +-
 .../payment/wallet/list/WalletLogList.vue     |   3 +-
 5 files changed, 25 insertions(+), 111 deletions(-)
 delete mode 100644 src/views/modules/payment/wallet/list/UserSelectModal.vue

diff --git a/src/components/Bootx/RoleSelectModal/BRoleSelectModal.vue b/src/components/Bootx/RoleSelectModal/BRoleSelectModal.vue
index b95c051..0a57e22 100644
--- a/src/components/Bootx/RoleSelectModal/BRoleSelectModal.vue
+++ b/src/components/Bootx/RoleSelectModal/BRoleSelectModal.vue
@@ -67,6 +67,13 @@ export default {
       default () {
         return true
       }
+    },
+    // 数据源
+    dataSource: {
+      type: Function,
+      default () {
+        return page
+      }
     }
   },
   computed: {
@@ -118,7 +125,7 @@ export default {
      */
     queryPage () {
       this.loading = true
-      page({
+      this.dataSource({
         ...this.queryParam,
         ...this.pages
       }).then(res => {
diff --git a/src/components/Bootx/UserSelectModal/BUserSelectModal.vue b/src/components/Bootx/UserSelectModal/BUserSelectModal.vue
index 86d04f9..2926314 100644
--- a/src/components/Bootx/UserSelectModal/BUserSelectModal.vue
+++ b/src/components/Bootx/UserSelectModal/BUserSelectModal.vue
@@ -67,6 +67,13 @@ export default {
       default () {
         return true
       }
+    },
+    // 数据源
+    dataSource: {
+      type: Function,
+      default () {
+        return page
+      }
     }
   },
   computed: {
@@ -118,7 +125,7 @@ export default {
      */
     queryPage () {
       this.loading = true
-      page({
+      this.dataSource({
         ...this.queryParam,
         ...this.pages
       }).then(res => {
diff --git a/src/views/modules/payment/wallet/list/UserSelectModal.vue b/src/views/modules/payment/wallet/list/UserSelectModal.vue
deleted file mode 100644
index 9542206..0000000
--- a/src/views/modules/payment/wallet/list/UserSelectModal.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-  <a-modal
-    title="选择开通钱包的用户"
-    destroyOnClose
-    :width="640"
-    :visible="visible"
-    :confirmLoading="loading"
-    :maskClosable="false"
-    @cancel="handleCancel"
-  >
-    <vxe-toolbar>
-      <template #buttons>
-        <b-query
-          v-model="queryParam"
-          :fields="fields"
-          :default-item-md="8"
-          @query="query"
-          @reset="() => queryParam = {}"
-        />
-      </template>
-    </vxe-toolbar>
-    <vxe-table
-      :height="350"
-      row-id="id"
-      ref="table"
-      :checkbox-config="{reserve: true}"
-      :loading="loading"
-      :data="tableData"
-    >
-      <vxe-column type="checkbox" width="40"/>
-      <vxe-column field="name" title="用户名称" />
-      <vxe-column field="username" title="用户账号" />
-    </vxe-table>
-    <vxe-pager
-      border
-      size="medium"
-      :loading="loading"
-      :current-page="pagination.current"
-      :page-size="pagination.size"
-      :total="pagination.total"
-      @page-change="handleTableChange">
-    </vxe-pager>
-    <template #footer>
-      <a-button key="cancel" @click="handleCancel">取消</a-button>
-      <a-button key="forward" type="primary" @click="handleOk">选择</a-button>
-    </template>
-  </a-modal>
-</template>
-
-<script>
-import { TableMixin } from '@/mixins/TableMixin'
-import { pageByNotWallet } from '@/api/payment/wallet'
-import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
-
-export default {
-  name: 'UserSelectModal',
-  mixins: [TableMixin],
-  data () {
-    return {
-      visible: false,
-      queryParam: {
-        name: '',
-        username: ''
-      },
-      fields: [
-        { field: 'name', type: STRING, name: '账号', placeholder: '输入用户名称' },
-        { field: 'username', type: STRING, name: '账号', placeholder: '输入用户账号' }
-      ]
-    }
-  },
-  methods: {
-    init () {
-      this.visible = true
-      this.queryPage()
-    },
-    queryPage () {
-      this.loading = true
-      pageByNotWallet({
-        ...this.queryParam,
-        ...this.pages
-      }).then(res => {
-        this.pageQueryResHandel(res, this)
-      })
-    },
-    handleOk () {
-      // 非本页选中的
-      const reserveUsers = this.$refs.table.getCheckboxReserveRecords()
-      // 本页选中的
-      const checkUsers = this.$refs.table.getCheckboxRecords()
-      const userIds = reserveUsers.concat(checkUsers).map(res => res.id)
-      this.visible = false
-      this.$emit('ok', userIds)
-    },
-    handleCancel () {
-      this.visible = false
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/modules/payment/wallet/list/WalletList.vue b/src/views/modules/payment/wallet/list/WalletList.vue
index 0badeaa..261aeda 100644
--- a/src/views/modules/payment/wallet/list/WalletList.vue
+++ b/src/views/modules/payment/wallet/list/WalletList.vue
@@ -69,16 +69,16 @@
       @page-change="handleTableChange"/>
     <wallet-info ref="walletInfo"/>
     <wallet-log-list ref="walletLogList"/>
-    <user-select-modal ref="userSelectModal" @ok="createWalletBatch"/>
+    <b-user-select-modal ref="userSelectModal" :data-source="pageByNotWallet" @ok="createWalletBatch"/>
     <wallet-changer ref="walletChanger" @ok="init"/>
   </a-card>
 </template>
 
 <script>
 import { TableMixin } from '@/mixins/TableMixin'
-import { createWalletBatch, lock, page, unlock } from '@/api/payment/wallet'
+import { createWalletBatch, lock, page, pageByNotWallet, unlock } from '@/api/payment/wallet'
 import WalletInfo from './WalletInfo'
-import UserSelectModal from './UserSelectModal'
+import BUserSelectModal from '@/components/Bootx/UserSelectModal/BUserSelectModal'
 import WalletChanger from './WalletChanger'
 import WalletLogList from './WalletLogList'
 import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
@@ -89,7 +89,7 @@ export default {
   components: {
     WalletLogList,
     WalletInfo,
-    UserSelectModal,
+    BUserSelectModal,
     WalletChanger
   },
   data () {
@@ -114,6 +114,10 @@ export default {
         this.pageQueryResHandel(res, this)
       })
     },
+    // 查询为未开通钱包的用户
+    pageByNotWallet (params) {
+      return pageByNotWallet(params)
+    },
     // 查看详情
     show (record) {
       this.$refs.walletInfo.init(record.id, 'show')
diff --git a/src/views/modules/payment/wallet/list/WalletLogList.vue b/src/views/modules/payment/wallet/list/WalletLogList.vue
index 339f426..b1b474f 100644
--- a/src/views/modules/payment/wallet/list/WalletLogList.vue
+++ b/src/views/modules/payment/wallet/list/WalletLogList.vue
@@ -1,7 +1,7 @@
 <template>
   <a-drawer
     :visible="visible"
-    title="字典列表"
+    title="钱包日志列表"
     :maskClosable="true"
     :width="1000"
     placement="right"
@@ -64,7 +64,6 @@ export default {
       visible: false,
       walletId: null,
       queryParam: {
-
       }
     }
   },
-- 
Gitee


From b2e4ddaf4d652ddc198c712fb055c21dc44ff372 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Tue, 6 Dec 2022 16:32:55 +0800
Subject: [PATCH 14/14] =?UTF-8?q?style=20=E6=97=A0=E7=94=A8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=B8=85=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/websocket/userGlobalWebSocker.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/websocket/userGlobalWebSocker.js b/src/websocket/userGlobalWebSocker.js
index cfd4a32..c78e343 100644
--- a/src/websocket/userGlobalWebSocker.js
+++ b/src/websocket/userGlobalWebSocker.js
@@ -73,11 +73,8 @@ function websocketOnmessage (e) {
 export async function initWebSocket () {
   // 获取token
   const token = storage.get(ACCESS_TOKEN)
-  // 判断一下token是否有效
-  if (!wsUrl) {
-    const { data: url } = await findByParamKey(WEBSOCKET_SERVER_URL)
-    wsUrl = url
-  }
+  const { data: url } = await findByParamKey(WEBSOCKET_SERVER_URL)
+  wsUrl = url
   const websocketUrl = wsUrl + '/ws/user?AccessToken=' + token
   websocket = new WebSocket(websocketUrl)
   close = false
-- 
Gitee