From 79a9039511db0f5c3542c1fd0fa0172303b14e86 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Fri, 7 Oct 2022 21:05:34 +0800
Subject: [PATCH 1/7] =?UTF-8?q?feat=20=E5=A4=9A=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dynamicsource/DynamicDataSourceEdit.vue   | 76 +++++++++++++------
 .../dynamicsource/DynamicDataSourceList.vue   |  9 +--
 2 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue b/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue
index d3b58e1..d814a1c 100644
--- a/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue
+++ b/src/views/modules/develop/dynamicsource/DynamicDataSourceEdit.vue
@@ -19,58 +19,60 @@
           <a-input v-model="form.id" :disabled="showable"/>
         </a-form-model-item>
         <a-form-model-item
-          label="数据源编码"
+          label="编码"
           prop="code"
         >
-          <a-input v-model="form.code" :disabled="showable"/>
+          <a-input v-model="form.code" :disabled="showable" placeholder="请输入编码"/>
         </a-form-model-item>
         <a-form-model-item
-          label="数据源名称"
+          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="databaseType"
         >
-          <a-input v-model="form.databaseType" :disabled="showable"/>
+          <a-select v-model="form.databaseType" :disabled="showable">
+            <a-select-option key="mysql">MySQL</a-select-option>
+          </a-select>
         </a-form-model-item>
         <a-form-model-item
           label="驱动类"
           prop="dbDriver"
         >
-          <a-input v-model="form.dbDriver" :disabled="showable"/>
+          <a-input v-model="form.dbDriver" disabled/>
         </a-form-model-item>
         <a-form-model-item
           label="数据库地址"
           prop="dbUrl"
         >
-          <a-input v-model="form.dbUrl" :disabled="showable"/>
+          <a-input v-model="form.dbUrl" :disabled="showable" placeholder="请输入数据库地址"/>
         </a-form-model-item>
         <a-form-model-item
           label="数据库名称"
           prop="dbName"
         >
-          <a-input v-model="form.dbName" :disabled="showable"/>
+          <a-input v-model="form.dbName" :disabled="showable" placeholder="请输入数据库名称"/>
         </a-form-model-item>
         <a-form-model-item
           label="用户名"
           prop="dbUsername"
         >
-          <a-input v-model="form.dbUsername" :disabled="showable"/>
+          <a-input v-model="form.dbUsername" :disabled="showable" placeholder="请输入数据库用户名"/>
         </a-form-model-item>
         <a-form-model-item
           label="密码"
           prop="dbPassword"
         >
-          <a-input v-model="form.dbPassword" :disabled="showable"/>
+          <a-input v-model="form.dbPassword" :disabled="showable" placeholder="请输入数据库密码"/>
         </a-form-model-item>
         <a-form-model-item
           label="备注"
           prop="remark"
         >
-          <a-input v-model="form.remark" :disabled="showable"/>
+          <a-textarea v-model="form.remark" :disabled="showable" placeholder="请输入备注"/>
         </a-form-model-item>
       </a-form-model>
     </a-spin>
@@ -93,24 +95,45 @@ export default {
         id: null,
         code: null,
         name: null,
-        databaseType: null,
-        dbDriver: null,
+        databaseType: 'mysql',
+        dbDriver: 'com.mysql.cj.jdbc.Driver',
         dbUrl: null,
         dbName: null,
         dbUsername: null,
         dbPassword: null,
-        remark: null,
+        remark: null
       },
       rules: {
-        code: [],
-        name: [],
-        databaseType: [],
-        dbDriver: [],
-        dbUrl: [],
-        dbName: [],
-        dbUsername: [],
-        dbPassword: [],
-        remark: [],
+        code: [ { required: true, message: '请输入' } ],
+        name: [ { required: true, message: '请输入' } ],
+        databaseType: [ { required: true, message: '请选择' } ],
+        dbDriver: [ { required: true, message: '请输入' } ],
+        dbUrl: [ { required: true, message: '请输入' } ],
+        dbName: [ { required: true, message: '请输入' } ],
+        dbUsername: [ { required: true, message: '请输入' } ],
+        dbPassword: [ { required: true, message: '请输入' } ],
+        remark: []
+      }
+    }
+  },
+  watch: {
+    'form.databaseType': function (val) {
+      console.log(val)
+      switch (val) {
+        case 'mysql': {
+          this.form.dbDriver = 'com.mysql.cj.jdbc.Driver'
+          break
+        }
+        default: {
+          this.form.dbDriver = ''
+        }
+      }
+    }
+  },
+  computed: {
+    diff () {
+      return {
+        dbPassword: this.diffForm(this.form.dbPassword, this.rawForm.dbPassword)
       }
     }
   },
@@ -123,6 +146,7 @@ export default {
         this.confirmLoading = true
         get(id).then(res => {
           this.form = res.data
+          this.rawForm = { ...res.data }
           this.confirmLoading = false
         })
       } else {
@@ -139,7 +163,11 @@ export default {
           if (this.type === 'add') {
             await add(this.form)
           } else if (this.type === 'edit') {
-            await update(this.form)
+            const form = {
+              ...this.form,
+              ...this.diff
+            }
+            await update(form)
           }
           this.confirmLoading = false
           this.$emit('ok')
diff --git a/src/views/modules/develop/dynamicsource/DynamicDataSourceList.vue b/src/views/modules/develop/dynamicsource/DynamicDataSourceList.vue
index fe40f72..ff39a1d 100644
--- a/src/views/modules/develop/dynamicsource/DynamicDataSourceList.vue
+++ b/src/views/modules/develop/dynamicsource/DynamicDataSourceList.vue
@@ -22,14 +22,11 @@
       :data="tableData"
     >
       <vxe-table-column type="seq" title="序号" width="60" />
-      <vxe-table-column field="code" title="数据源编码"/>
-      <vxe-table-column field="name" title="数据源名称"/>
-      <vxe-table-column field="databaseType" title="数据库类型"/>
+      <vxe-table-column field="code" title="编码"/>
+      <vxe-table-column field="name" title="名称"/>
+      <vxe-table-column field="databaseType" title="类型"/>
       <vxe-table-column field="dbDriver" title="驱动类"/>
-      <vxe-table-column field="dbUrl" title="数据库地址"/>
       <vxe-table-column field="dbName" title="数据库名称"/>
-      <vxe-table-column field="dbUsername" title="用户名"/>
-      <vxe-table-column field="dbPassword" title="密码"/>
       <vxe-table-column field="remark" title="备注"/>
       <vxe-table-column field="createTime" title="创建时间" />
       <vxe-table-column fixed="right" width="150" :showOverflow="false" title="操作">
-- 
Gitee


From 79e6d666ee2074e038c8cb424fecad7854cb7709 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sun, 9 Oct 2022 16:01:51 +0800
Subject: [PATCH 2/7] =?UTF-8?q?feat=20=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/UploadMixin.js                     |  1 -
 src/views/account/base/BasicSetting.vue       | 30 +++++++++++++++----
 .../third/wechat/media/WeChatMediaList.vue    | 29 ++++--------------
 3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/mixins/UploadMixin.js b/src/mixins/UploadMixin.js
index 130464e..776ac1e 100644
--- a/src/mixins/UploadMixin.js
+++ b/src/mixins/UploadMixin.js
@@ -38,7 +38,6 @@ export const UploadMixin = {
      */
     uploadSuccess (info) {
       this.$message.success(`${info.file.name} 上传成功!`)
-      this.init()
     },
 
     /**
diff --git a/src/views/account/base/BasicSetting.vue b/src/views/account/base/BasicSetting.vue
index 1747750..1df0dfb 100644
--- a/src/views/account/base/BasicSetting.vue
+++ b/src/views/account/base/BasicSetting.vue
@@ -18,7 +18,7 @@
               label="名称"
               prop="name"
             >
-              <a-input v-model="user.name"/>
+              <a-input v-model="user.name" :disabled="!edit" placeholder="请输入名称"/>
             </a-form-model-item>
             <a-form-model-item
               label="性别"
@@ -27,6 +27,8 @@
               <a-select
                 style="width: 100px"
                 v-model="user.sex"
+                :disabled="!edit"
+                placeholder="请选择性别"
               >
                 <a-select-option v-for="sex in sexList" :key="sex.code">{{ sex.name }}</a-select-option>
               </a-select>
@@ -38,21 +40,26 @@
               <a-date-picker
                 placeholder="请选择日期"
                 valueFormat="yyyy-MM-DD"
+                :disabled="!edit"
                 v-model="user.birthday"/>
             </a-form-model-item>
             <a-form-model-item>
-              <a-button type="primary" @click="handleOk">更新基础信息</a-button>
+              <a-button v-if="edit" type="primary" @click="handleOk">更新基础信息</a-button>
+              <a-button v-else @click="edit = true">编辑基础信息</a-button>
             </a-form-model-item>
           </a-form-model>
         </a-col>
         <a-col :order="1" :md="12" :lg="12" :style="{ minHeight: '180px' }">
-          <div class="ant-upload-preview" @click="$refs.modal.edit(1)" >
+          <div v-if="edit" class="ant-upload-preview" @click="$refs.modal.edit(1)" >
             <a-icon type="cloud-upload-o" class="upload-icon"/>
             <div class="mask">
               <a-icon type="plus" />
             </div>
             <img :src="avatarUrl||'/avatar2.jpg'"/>
           </div>
+          <div v-else class="ant-upload-preview">
+            <img :src="avatarUrl||'/avatar2.jpg'"/>
+          </div>
         </a-col>
       </a-row>
       <avatar-modal ref="modal" @ok="setAvatar"/>
@@ -75,6 +82,7 @@ export default {
   },
   data () {
     return {
+      edit: false,
       labelCol: {
         sm: { span: 3 }
       },
@@ -96,6 +104,7 @@ export default {
   },
   methods: {
     async init () {
+      this.edit = false
       this.confirmLoading = true
       // 获取用户信息
       await getUserBaseInfo().then(res => {
@@ -116,8 +125,19 @@ export default {
     handleOk () {
       this.$refs.form.validate(async valid => {
         if (valid) {
-          this.confirmLoading = true
-          updateBaseInfo(this.user).then(_ => this.confirmLoading = false)
+          this.$confirm({
+            title: '警告',
+            content: '是否更新用户基础信息',
+            okText: '确定',
+            cancelText: '取消',
+            onOk: () => {
+              this.confirmLoading = true
+              updateBaseInfo(this.user).then(() => {
+                this.confirmLoading = false
+                this.edit = false
+              })
+            }
+          })
         }
       })
     },
diff --git a/src/views/modules/third/wechat/media/WeChatMediaList.vue b/src/views/modules/third/wechat/media/WeChatMediaList.vue
index b999f9a..a160162 100644
--- a/src/views/modules/third/wechat/media/WeChatMediaList.vue
+++ b/src/views/modules/third/wechat/media/WeChatMediaList.vue
@@ -85,25 +85,16 @@
 <script>
 import { TableMixin } from '@/mixins/TableMixin'
 import { pageFile, deleteFile } from '@/api/third/weChatMedia'
-import storage from 'store'
-import { ACCESS_TOKEN } from '@/store/mutation-types'
+import { UploadMixin } from '@/mixins/UploadMixin'
 
 export default {
   name: 'WeChatMediaList',
-  mixins: [TableMixin],
+  mixins: [TableMixin, UploadMixin],
   computed: {
     // 上传地址
     uploadAction () {
       return process.env.VUE_APP_API_BASE_URL + '/wechat/media/uploadFile'
     },
-    // 请求头消息
-    tokenHeader () {
-      // 从 localstorage 获取 token
-      const token = storage.get(ACCESS_TOKEN)
-      return {
-        AccessToken: token
-      }
-    },
     // 表单信息
     uploadData () {
       return {
@@ -164,19 +155,11 @@ export default {
       })
     },
     /**
-     * 上传变动
+     * 上传成功
      */
-    uploadChange (info) {
-      if (info.file.status === 'done') {
-        if (!info.file.response.code) {
-          this.init()
-          this.$message.success(`${info.file.name} 上传成功!`)
-        } else {
-          this.$message.error(`${info.file.response.msg}`)
-        }
-      } else if (info.file.status === 'error') {
-        this.$message.error('上传失败')
-      }
+    uploadSuccess (info) {
+      this.$message.success(`${info.file.name} 上传成功!`)
+      this.init()
     }
   },
   created () {
-- 
Gitee


From 30da1567c76fe86c0e6c7a71a02e866a5ad1b9de Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Mon, 10 Oct 2022 14:35:34 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix=20addable/editable/showable,=20?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8D=E9=9A=8F=E5=8A=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/FormMixin.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/mixins/FormMixin.js b/src/mixins/FormMixin.js
index 9d01f7b..023e3c1 100644
--- a/src/mixins/FormMixin.js
+++ b/src/mixins/FormMixin.js
@@ -34,6 +34,10 @@ export const FormMixin = {
     init (record, type, ...vars) {
       this.type = type
       this.visible = true
+      this.visible = true
+      this.addable = false
+      this.editable = false
+      this.showable = false
       if (type && type === 'add') {
         this.addable = true
         this.title = '新增'
-- 
Gitee


From d943cb06710dda557c7dce962b91148e80c118c3 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Mon, 10 Oct 2022 22:14:48 +0800
Subject: [PATCH 4/7] =?UTF-8?q?style=20=E5=BE=AE=E8=B0=83=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/vxeTableConfig.js                   | 1 -
 src/views/modules/system/client/ClientEdit.vue | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/config/vxeTableConfig.js b/src/config/vxeTableConfig.js
index 11d098a..2a4afd6 100644
--- a/src/config/vxeTableConfig.js
+++ b/src/config/vxeTableConfig.js
@@ -40,6 +40,5 @@ VXETable.setup({
     position: { top: '9%', left: '35%' },
     // transfer: true,
     escClosable: true
-
   }
 })
diff --git a/src/views/modules/system/client/ClientEdit.vue b/src/views/modules/system/client/ClientEdit.vue
index 8d51e32..b288653 100644
--- a/src/views/modules/system/client/ClientEdit.vue
+++ b/src/views/modules/system/client/ClientEdit.vue
@@ -54,7 +54,7 @@
             :filter-option="search"
             :disabled="showable"
             style="width: 100%"
-            placeholder="选择关联的终端"
+            placeholder="选择关联的登录方式"
           >
             <a-select-option v-for="o in loginTypes" :key="o.id">
               {{ o.name }}
-- 
Gitee


From 1b57253eca059b9b853a40f1543685d1e16798cf Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Tue, 11 Oct 2022 17:33:42 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feat=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=99=A8=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/develop/codegen/CodeGenForm.vue   | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/develop/codegen/CodeGenForm.vue b/src/views/modules/develop/codegen/CodeGenForm.vue
index 550a714..c722336 100644
--- a/src/views/modules/develop/codegen/CodeGenForm.vue
+++ b/src/views/modules/develop/codegen/CodeGenForm.vue
@@ -17,11 +17,7 @@
       <a-form-model-item label="功能模块名称" prop="module">
         <a-row>
           <a-col :span="18">
-            <a-input v-model="form.module">
-<!--              <template #suffix>-->
-<!--                <a-tooltip title="提示文本"><a-icon type="info-circle"/></a-tooltip>-->
-<!--              </template>-->
-            </a-input>
+            <a-input v-model="form.module"/>
           </a-col>
           <a-col :span="6">
             <a-button style="width: 100%" @click="genParams">生成其他参数</a-button>
@@ -38,11 +34,22 @@
         prop="entityName">
         <a-input v-model="form.entityName"/>
       </a-form-model-item>
+      <a-form-model-item
+        label="vue版本"
+        prop="vueVersion">
+        <a-select
+          v-model="form.vueVersion"
+          :default-value="form.vueVersion"
+          style="width: 100%"
+          placeholder="选择vue版本">
+          <a-select-option key="v2">Vue2</a-select-option>
+          <a-select-option key="v3">Vue3</a-select-option>
+        </a-select>
+      </a-form-model-item>
       <a-form-model-item
         label="基类"
         prop="baseEntity">
         <a-select
-          allowClear
           v-model="form.baseEntity"
           :default-value="form.baseEntity"
           style="width: 100%"
@@ -111,6 +118,7 @@ export default {
         tableName: '',
         entityName: '',
         baseEntity: 'MpBaseEntity',
+        vueVersion: 'v2',
         corePack: '',
         paramPack: '',
         dtoPack: '',
-- 
Gitee


From d86bcc6dc4cb64fccabcd06a6482f81536f0dd46 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Tue, 11 Oct 2022 23:18:11 +0800
Subject: [PATCH 6/7] =?UTF-8?q?style=20=E5=BE=AE=E8=B0=83=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/client/ClientEdit.vue      |  1 +
 .../modules/system/client/ClientList.vue      | 36 +++++++------------
 .../modules/system/client/LoginTypeList.vue   | 36 +++++++------------
 3 files changed, 27 insertions(+), 46 deletions(-)

diff --git a/src/views/modules/system/client/ClientEdit.vue b/src/views/modules/system/client/ClientEdit.vue
index b288653..6c25257 100644
--- a/src/views/modules/system/client/ClientEdit.vue
+++ b/src/views/modules/system/client/ClientEdit.vue
@@ -158,6 +158,7 @@ export default {
         this.$refs.form.resetFields()
       })
     },
+    // 校验编码重复
     async validateCode (rule, value, callback) {
       const { code, id } = this.form
       let res
diff --git a/src/views/modules/system/client/ClientList.vue b/src/views/modules/system/client/ClientList.vue
index 413fca9..39dd86c 100644
--- a/src/views/modules/system/client/ClientList.vue
+++ b/src/views/modules/system/client/ClientList.vue
@@ -1,27 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="编码">
-              <a-input v-model="queryParam.code" placeholder="请输入编码"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="名称">
-              <a-input v-model="queryParam.name" placeholder="请输入名称"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-space>
-              <a-button type="primary" @click="query">查询</a-button>
-              <a-button @click="resetQuery">重置</a-button>
-            </a-space>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="8"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -91,6 +76,7 @@
 import { page, del } from '@/api/system/client'
 import ClientEdit from './ClientEdit'
 import { TableMixin } from '@/mixins/TableMixin'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 export default {
   name: 'ClientList',
   components: {
@@ -102,7 +88,11 @@ export default {
       queryParam: {
         code: '',
         name: ''
-      }
+      },
+      fields: [
+        { field: 'code', formType: STRING, name: '编码', placeholder: '请输入终端编码' },
+        { field: 'name', formType: STRING, name: '名称', placeholder: '请输入终端名称' }
+      ]
     }
   },
   methods: {
diff --git a/src/views/modules/system/client/LoginTypeList.vue b/src/views/modules/system/client/LoginTypeList.vue
index a602f71..f2e10b1 100644
--- a/src/views/modules/system/client/LoginTypeList.vue
+++ b/src/views/modules/system/client/LoginTypeList.vue
@@ -1,27 +1,12 @@
 <template>
   <a-card :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="10">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="终端代码">
-              <a-input v-model="queryParam.code" placeholder="请输入终端代码" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="终端名称">
-              <a-input v-model="queryParam.name" placeholder="请输入终端名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-space>
-              <a-button type="primary" @click="query">查询</a-button>
-              <a-button @click="resetQuery">重置</a-button>
-            </a-space>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="8"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
     <vxe-toolbar
       custom
       zoom
@@ -99,6 +84,7 @@
 import { page, del } from '@/api/system/loginType'
 import LoginTypeEdit from './LoginTypeEdit'
 import { TableMixin } from '@/mixins/TableMixin'
+import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 export default {
   name: 'ClientList',
   components: {
@@ -110,7 +96,11 @@ export default {
       queryParam: {
         code: '',
         name: ''
-      }
+      },
+      fields: [
+        { field: 'code', formType: STRING, name: '编码', placeholder: '请输入登录方式编码' },
+        { field: 'name', formType: STRING, name: '名称', placeholder: '请输入登录方式名称' }
+      ]
     }
   },
   methods: {
-- 
Gitee


From d43b727a6ac3528816cb676aa70e4925d23a6787 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Wed, 12 Oct 2022 18:29:55 +0800
Subject: [PATCH 7/7] =?UTF-8?q?feat=20=E6=B5=81=E7=A8=8B=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=9B=9E=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bpm/instance.js                       | 15 +++-
 .../modules/office/applyshow/TaskOperate.vue  | 89 ++++++++++++++-----
 .../modules/system/client/LoginTypeEdit.vue   | 10 ++-
 3 files changed, 86 insertions(+), 28 deletions(-)

diff --git a/src/api/bpm/instance.js b/src/api/bpm/instance.js
index ae6d9d0..9a93489 100644
--- a/src/api/bpm/instance.js
+++ b/src/api/bpm/instance.js
@@ -72,7 +72,18 @@ export function getFlowNodes (instanceId) {
 export function getCurrentNode (instanceId) {
   return axios({
     url: '/bpm/instance/getCurrentNode',
-    method: 'POST',
+    method: 'GET',
+    params: { instanceId }
+  })
+}
+
+/**
+ * 获取可回退节点信息
+ */
+export function getBackNodes (instanceId) {
+  return axios({
+    url: '/bpm/instance/getBackNodes',
+    method: 'GET',
     params: { instanceId }
   })
 }
@@ -86,4 +97,4 @@ export function close (instanceId) {
     method: 'POST',
     params: { instanceId }
   })
-}
\ No newline at end of file
+}
diff --git a/src/views/modules/office/applyshow/TaskOperate.vue b/src/views/modules/office/applyshow/TaskOperate.vue
index 5f2f33c..d1cafd9 100644
--- a/src/views/modules/office/applyshow/TaskOperate.vue
+++ b/src/views/modules/office/applyshow/TaskOperate.vue
@@ -2,7 +2,7 @@
   <a-card :bordered="false">
     <a-row :gutter="64">
       <a-col :span="8">
-        <a-card :bordered="false" v-if="currentNode||nextNode">
+        <a-card :bordered="false" v-if="currentNode||nextOrBackNode">
           <a-descriptions :column="{md: 1}" bordered v-if="currentNode">
             <a-descriptions-item label="当前环节名称">
               {{ currentNode.nodeName }}
@@ -24,24 +24,24 @@
             </a-descriptions-item>
           </a-descriptions>
           <a-divider/>
-          <a-descriptions :column="{md: 1}" bordered v-if="nextNode">
+          <a-descriptions :column="{md: 1}" bordered v-if="nextOrBackNode">
             <a-descriptions-item label="下一环节名称">
-              {{ nextNode.nodeName }}
+              {{ nextOrBackNode.nodeName }}
             </a-descriptions-item>
             <a-descriptions-item label="处理人类型">
-              {{ dictConvert('BpmTaskAssignType', nextNode.assignType) }}
+              {{ dictConvert('BpmTaskAssignType', nextOrBackNode.assignType) }}
             </a-descriptions-item>
-            <a-descriptions-item label="处理人" v-if="nextNode.assignShow">
-              {{ nextNode.assignShow }}
+            <a-descriptions-item label="处理人" v-if="nextOrBackNode.assignShow">
+              {{ nextOrBackNode.assignShow }}
             </a-descriptions-item>
             <a-descriptions-item label="多实例">
-              {{ nextNode.multi?nextNode.sequential?'串行':'并行':'否' }}
+              {{ nextOrBackNode.multi ? nextOrBackNode.sequential ? '串行' : '并行' : '否' }}
             </a-descriptions-item>
-            <a-descriptions-item label="或签" v-if="nextNode.orSign">
-              {{ nextNode.orSign?'是':'否' }}
+            <a-descriptions-item label="或签" v-if="nextOrBackNode.orSign">
+              {{ nextOrBackNode.orSign ? '是' : '否' }}
             </a-descriptions-item>
-            <a-descriptions-item label="按比例通过" v-if="nextNode.ratioPass">
-              {{ nextNode.passRatio }} %
+            <a-descriptions-item label="按比例通过" v-if="nextOrBackNode.ratioPass">
+              {{ nextOrBackNode.passRatio }} %
             </a-descriptions-item>
           </a-descriptions>
         </a-card>
@@ -58,25 +58,36 @@
               :rules="rules"
             >
               <a-form-model-item label="处理方式" prop="type">
-                <a-radio-group v-model="form.type" :default-value="1" button-style="solid">
+                <a-radio-group v-model="form.type" :default-value="1" button-style="solid" @change="changeType">
                   <a-radio-button value="pass">通过</a-radio-button>
                   <a-radio-button value="reject">驳回</a-radio-button>
+                  <a-radio-button value="back">退回</a-radio-button>
                   <a-radio-button value="notPass">不通过</a-radio-button>
                   <a-radio-button value="abstain">弃权</a-radio-button>
                 </a-radio-group>
               </a-form-model-item>
-              <a-form-model-item v-show="nextModes.length > 1" label="下一步环节" prop="nextNodeId">
+              <a-form-model-item v-show="nextModes.length > 1 && !['reject','back'].includes(this.form.type)" label="下一步环节" prop="nextNodeId">
                 <a-select
                   allowClear
                   v-model="form.nextNodeId"
                   style="width: 100%"
                   placeholder="选择下一步环节"
-                  @change="changeNextNode"
+                  @change="changeNextOrBackNode"
                   :options="nextModes"
                 />
               </a-form-model-item>
-              <a-form-model-item label="处理人" prop="assignShow" v-if="nextNode">
-                <a-input v-model="form.assignShow" placeholder="请选择下一步环节处理用户" disabled>
+              <a-form-model-item v-show="['back'].includes(this.form.type)" label="退回环节" prop="backNodeId">
+                <a-select
+                  allowClear
+                  v-model="form.backNodeId"
+                  style="width: 100%"
+                  placeholder="选择要退回的环节"
+                  @change="changeNextOrBackNode"
+                  :options="backModes"
+                />
+              </a-form-model-item>
+              <a-form-model-item label="处理人" prop="assignShow" v-if="nextOrBackNode && !['back'].includes(this.form.type)">
+                <a-input v-model="form.assignShow" placeholder="请选择下一步处理人" disabled>
                   <template #addonAfter>
                     <a href="javascript:" :disabled="showable" @click="selectUserShow">选择用户</a>
                   </template>
@@ -110,6 +121,7 @@ import { approve } from '@/api/bpm/task'
 import { getNextNodes, listByModelId } from '@/api/bpm/modelNode'
 import { SELECT } from '@/views/modules/bpm/model/BpmModelNodeCode'
 import BUserSelectModal from '@/components/Bootx/UserSelectModal/BUserSelectModal'
+import { getBackNodes } from '@/api/bpm/instance'
 
 export default {
   name: 'TaskOperate',
@@ -126,13 +138,15 @@ export default {
   data () {
     return {
       nextModes: [],
+      backModes: [],
       currentNode: {},
-      nextNode: { },
+      nextOrBackNode: {},
       userTaskNodes: {},
       form: {
         type: 'pass',
         reason: '',
         nextNodeId: undefined,
+        backNodeId: undefined,
         assignShow: '',
         nextAssign: undefined
       }
@@ -149,16 +163,17 @@ export default {
         type: [{ required: true, message: '请选择类型!' }],
         reason: [{ required: true, message: '请输入审批意见!' }],
         nextNodeId: [{ required: this.nextModes.length > 1 && this.form.type !== 'reject', message: '请选择下一环节的任务节点!' }],
+        backNodeId: [{ required: this.form.type === 'back', message: '请选择要退回的任务节点!' }],
         assignShow: [
           {
-            required: [SELECT].includes(this.nextNode?.assignType) && this.form.type !== 'reject',
+            required: [SELECT].includes(this.nextOrBackNode?.assignType) && !['reject', 'back'].includes(this.form.type),
             message: '请选择下一环节的处理人!'
           }
         ]
       }
     },
     nextMulti () {
-      return this.nextNode?.multi
+      return this.nextOrBackNode?.multi
     }
   },
   methods: {
@@ -179,14 +194,41 @@ export default {
       getNextNodes(this.instance.defId, task.nodeId).then(res => {
         this.nextModes = res.data
         if (this.nextModes.length === 1) {
-          this.nextNode = this.userTaskNodes.find(o => o.nodeId === this.nextModes[0].value)
+          this.nextOrBackNode = this.userTaskNodes.find(o => o.nodeId === this.nextModes[0].value)
         } else {
-          this.nextNode = null
+          this.nextOrBackNode = null
         }
       })
+      // 可回退的任务节点
+      getBackNodes(this.instance.instanceId).then(res => {
+        this.backModes = res.data
+      })
     },
-    changeNextNode () {
-      this.nextNode = this.userTaskNodes.find(o => o.nodeId === this.form.nextNodeId)
+    /**
+     * 类型切换
+     */
+    changeType () {
+      this.form.backNodeId = undefined
+      this.form.nextNodeId = undefined
+      if (this.form.type === 'back') {
+        this.nextOrBackNode = null
+        return
+      }
+      if (this.form.type === 'reject') {
+        this.nextOrBackNode = null
+        return
+      }
+      if (this.nextModes.length === 1) {
+        this.nextOrBackNode = this.userTaskNodes.find(o => o.nodeId === this.nextModes[0].value)
+      } else {
+        this.nextOrBackNode = null
+      }
+    },
+    /**
+     * 回退节点变动
+     */
+    changeNextOrBackNode () {
+      this.nextOrBackNode = this.userTaskNodes.find(o => o.nodeId === this.form.backNodeId)
     },
     /**
      * 提交处理
@@ -240,6 +282,7 @@ export default {
       this.$refs.form.validateField('assignShow')
     },
     resetForm () {
+      this.nextOrBackNode = null
       this.$nextTick(() => {
         this.$refs.form.resetFields()
       })
diff --git a/src/views/modules/system/client/LoginTypeEdit.vue b/src/views/modules/system/client/LoginTypeEdit.vue
index 503f8b5..952d242 100644
--- a/src/views/modules/system/client/LoginTypeEdit.vue
+++ b/src/views/modules/system/client/LoginTypeEdit.vue
@@ -21,13 +21,13 @@
           label="编码"
           prop="code"
         >
-          <a-input v-model="form.code" :disabled="showable||form.system"/>
+          <a-input v-model="form.code" :disabled="showable||form.system" placeholder="请输入登录方式编码"/>
         </a-form-model-item>
         <a-form-model-item
           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="类型"
@@ -68,8 +68,10 @@
           <a-input-number
             v-model="form.timeout"
             :disabled="showable"
+            :precision="0"
             :min="5"
             :step="5"
+            placeholder="请输入超时时间(分钟)"
           />
         </a-form-model-item>
         <a-form-model-item
@@ -79,16 +81,18 @@
         >
           <a-input-number
             v-model="form.pwdErrNum"
+            :precision="0"
             :disabled="showable"
             :min="-1"
             :step="1"
+            placeholder="请输入密码可错误次数"
           />
         </a-form-model-item>
         <a-form-model-item
           label="描述"
           prop="description"
         >
-          <a-textarea v-model="form.description" :disabled="showable"/>
+          <a-textarea v-model="form.description" :disabled="showable" placeholder="请输入描述"/>
         </a-form-model-item>
       </a-form-model>
     </a-spin>
-- 
Gitee