fangq 4 lat temu
rodzic
commit
7f19643b07
89 zmienionych plików z 823 dodań i 798 usunięć
  1. 1 1
      packages/WidgetConfig.vue
  2. 3 3
      packages/WidgetFormItem.vue
  3. 2 2
      packages/config/array.vue
  4. 5 5
      packages/config/select.vue
  5. 8 8
      packages/config/tree.vue
  6. 4 4
      packages/config/upload.vue
  7. 0 0
      public/cdn/avue/2.8.12/avue.min.js
  8. 1 1
      src/components/common/returns-comfire.vue
  9. 1 1
      src/components/common/returns-issue.vue
  10. 1 1
      src/components/confirmed/confirmed-goodsuse.vue
  11. 1 0
      src/components/confirmed/confirmed-postchange.vue
  12. 2 1
      src/components/confirmed/confirmed-returns.vue
  13. 1 1
      src/components/initiated/init-checklist.vue
  14. 1 1
      src/components/initiated/init-checkwarehouse.vue
  15. 1 1
      src/components/initiated/init-goodsuse.vue
  16. 4 4
      src/components/initiated/init-keypwd.vue
  17. 1 1
      src/components/initiated/init-returns.vue
  18. 1 1
      src/components/initiated/init-sealhandover.vue
  19. 1 1
      src/components/initiated/init-tellertrunk.vue
  20. 1 1
      src/components/release/release-returns.vue
  21. 1 1
      src/components/tobeconfirm/tobeconfirm-goodsuse.vue
  22. 1 0
      src/components/tobeconfirm/tobeconfirm-postchange.vue
  23. 1 1
      src/components/tobeconfirm/tobeconfirm-returns.vue
  24. 18 18
      src/option/system/dict.js
  25. 1 1
      src/page/index/top/top-lock.vue
  26. 1 1
      src/page/index/top/top-theme.vue
  27. 2 2
      src/page/lock/index.vue
  28. 1 1
      src/page/login/codelogin.vue
  29. 1 1
      src/page/login/index.vue
  30. 4 4
      src/page/login/userlogin.vue
  31. 4 0
      src/router/axios.js
  32. 23 23
      src/views/authority/apiscope.vue
  33. 25 25
      src/views/authority/datascope.vue
  34. 3 1
      src/views/bank/checklist.vue
  35. 1 1
      src/views/bank/checkwarehouse.vue
  36. 1 1
      src/views/bank/goodsuse-balance.vue
  37. 3 1
      src/views/bank/goodsuse.vue
  38. 2 2
      src/views/bank/handoverstandard.vue
  39. 2 2
      src/views/bank/keypwd-keep.vue
  40. 4 4
      src/views/bank/keypwd.vue
  41. 1 1
      src/views/bank/returns.vue
  42. 1 1
      src/views/bank/sealhandover-keep.vue
  43. 1 1
      src/views/bank/sealhandover.vue
  44. 1 1
      src/views/bank/tellertrunk.vue
  45. 2 2
      src/views/bank/user-log-view.vue
  46. 16 16
      src/views/base/region.vue
  47. 1 1
      src/views/desk/initiated.vue
  48. 10 10
      src/views/desk/mynotice.vue
  49. 16 16
      src/views/desk/notice.vue
  50. 8 8
      src/views/flow/deploy.vue
  51. 2 2
      src/views/flow/follow.vue
  52. 8 8
      src/views/flow/manager.vue
  53. 7 7
      src/views/flow/model.vue
  54. 11 11
      src/views/monitor/log/api.vue
  55. 10 10
      src/views/monitor/log/error.vue
  56. 10 10
      src/views/monitor/log/usual.vue
  57. 13 13
      src/views/report/abnormal-reportlist.vue
  58. 3 3
      src/views/report/reportlist-copy.vue
  59. 6 6
      src/views/report/reportlist.vue
  60. 27 13
      src/views/report/userlog.vue
  61. 11 11
      src/views/resource/attach.vue
  62. 12 12
      src/views/resource/oss.vue
  63. 12 12
      src/views/resource/sms.vue
  64. 14 14
      src/views/system/client.vue
  65. 26 26
      src/views/system/dept.vue
  66. 302 302
      src/views/system/dict.vue
  67. 6 6
      src/views/system/dictbiz.vue
  68. 14 14
      src/views/system/menu.vue
  69. 10 10
      src/views/system/post.vue
  70. 11 11
      src/views/system/tenant.vue
  71. 9 9
      src/views/system/topmenu.vue
  72. 15 15
      src/views/tool/code.vue
  73. 9 9
      src/views/tool/datasource.vue
  74. 11 11
      src/views/util/demo/dict-classic.vue
  75. 13 13
      src/views/util/demo/dict-horizontal.vue
  76. 13 13
      src/views/util/demo/dict-vertical.vue
  77. 6 6
      src/views/util/demo/dict.vue
  78. 6 6
      src/views/util/demo/dictbiz.vue
  79. 1 1
      src/views/util/form.vue
  80. 1 1
      src/views/util/logs.vue
  81. 1 1
      src/views/util/table.vue
  82. 3 3
      src/views/work/claim.vue
  83. 3 3
      src/views/work/done.vue
  84. 2 2
      src/views/work/process/leave/detail.vue
  85. 6 6
      src/views/work/process/leave/form.vue
  86. 4 4
      src/views/work/process/leave/handle.vue
  87. 3 3
      src/views/work/send.vue
  88. 3 3
      src/views/work/start.vue
  89. 3 3
      src/views/work/todo.vue

+ 1 - 1
packages/WidgetConfig.vue

@@ -12,7 +12,7 @@
                         v-if="data.type && !data.component">
             <el-select v-model="data.type"
                        style="width:100%;"
-                       placeholder="请选择类型"
+                       placeholder="請選擇类型"
                        @change="handleChangeType">
               <el-option-group v-for="group in fields"
                                :key="group.title"

+ 3 - 3
packages/WidgetFormItem.vue

@@ -67,9 +67,9 @@ export default {
     getPlaceholder (item) {
       const label = item.label;
       if (['select', 'checkbox', 'radio', 'tree', 'color', 'dates', 'date', 'datetime', 'datetimerange', 'daterange', 'week', 'month', 'year', 'map', 'icon'].includes(item.type))
-        return `请选择 ${label}`;
-      else return `输入 ${label}`;
+        return `請選擇 ${label}`;
+      else return `输入 ${label}`;
     },
   }
 }
-</script>
+</script>

+ 2 - 2
packages/config/array.vue

@@ -49,11 +49,11 @@ export default {
   },
   watch: {
     'data.required': function (val) {
-      if (val) this.validator.required = { required: true, message: `输入${this.data.label}` }
+      if (val) this.validator.required = { required: true, message: `输入${this.data.label}` }
       else this.validator.required = null
 
       this.generateRule()
     }
   }
 }
-</script>
+</script>

+ 5 - 5
packages/config/select.vue

@@ -61,9 +61,9 @@
                       placeholder="远端数据字典网址"></el-input>
             远程搜索
             <el-switch v-model="data.remote"></el-switch><br>
-            求方法
+            求方法
             <el-select v-model="data.dicMethod"
-                       placeholder="求方法"
+                       placeholder="求方法"
                        style="width: 100%;">
               <el-option label="POST"
                          value="post"></el-option>
@@ -71,7 +71,7 @@
                          value="get"></el-option>
             </el-select>
             <p v-if="data.dicMethod == 'post'">
-              求参数
+              求参数
               <avue-dynamic v-model="data.dicQueryConfig"
                             :children="option"></avue-dynamic>
             </p>
@@ -96,7 +96,7 @@
       </div>
     </div>
     <el-form-item v-if="data.dicOption == 'remote'"
-                  label="重新求字典(crud)"
+                  label="重新求字典(crud)"
                   label-width="150px">
       <el-switch v-model="data.dicFlag"></el-switch>
     </el-form-item>
@@ -259,7 +259,7 @@ export default {
   },
   watch: {
     'data.required': function (val) {
-      if (val) this.validator.required = { required: true, message: `请选择${this.data.label}` }
+      if (val) this.validator.required = { required: true, message: `請選擇${this.data.label}` }
       else this.validator.required = null
 
       this.generateRule()

+ 8 - 8
packages/config/tree.vue

@@ -51,9 +51,9 @@
                       placeholder="远端数据字典网址"></el-input>
             远程搜索
             <el-switch v-model="data.remote"></el-switch><br>
-            求方法
+            求方法
             <el-select v-model="data.dicMethod"
-                       placeholder="求方法"
+                       placeholder="求方法"
                        style="width: 100%;">
               <el-option label="POST"
                          value="post"></el-option>
@@ -61,7 +61,7 @@
                          value="get"></el-option>
             </el-select>
             <p v-if="data.dicMethod == 'post'">
-              求参数
+              求参数
               <avue-dynamic v-model="data.dicQueryConfig"
                             :children="option"></avue-dynamic>
             </p>
@@ -85,7 +85,7 @@
       </div>
     </div>
     <el-form-item v-if="data.dicOption == 'remote'"
-                  label="重新求字典(crud)">
+                  label="重新求字典(crud)">
       <el-switch v-model="data.dicFlag"></el-switch>
     </el-form-item>
     <div class="el-form-item el-form-item--small el-form--label-top">
@@ -122,7 +122,7 @@
         </div>
       </div>
     <template v-if="data.type == 'tree'">
-      <el-form-item label="当有子级时,是否可选择父级"
+      <el-form-item label="当有子级时,是否可選擇父级"
                     label-width="200px">
         <el-switch v-model="data.parent"></el-switch>
       </el-form-item>
@@ -210,8 +210,8 @@ export default {
       dialogForm: {},
       dialogVisible: false,
       dialogRules: {
-        label: { required: true, message: '输入label' },
-        value: { required: true, message: '输入value' },
+        label: { required: true, message: '输入label' },
+        value: { required: true, message: '输入value' },
       },
       dialogStatus: 'add',
       selectData: undefined,
@@ -293,7 +293,7 @@ export default {
   },
   watch: {
     'data.required': function (val) {
-      if (val) this.validator.required = { required: true, message: `请选择${this.data.label}` }
+      if (val) this.validator.required = { required: true, message: `請選擇${this.data.label}` }
       else this.validator.required = null
 
       this.generateRule()

+ 4 - 4
packages/config/upload.vue

@@ -53,10 +53,10 @@
       <label class="el-form-item__label"
              style="padding: 0;">参数设置:</label>
       <div class="el-form-item__content">
-        求头
+        求头
         <avue-dynamic v-model="data.headersConfig"
                       :children="option"></avue-dynamic>
-        求体
+        求体
         <avue-dynamic v-model="data.dataConfig"
                       :children="option"></avue-dynamic>
       </div>
@@ -81,10 +81,10 @@
         <el-input v-model="data.propsHttp.res"
                   size="small"
                   placeholder="返回结构体的层次"></el-input>
-        文件名
+        文件名
         <el-input v-model="data.propsHttp.fileName"
                   size="small"
-                  placeholder="文件名,默认file"></el-input>
+                  placeholder="文件名,默认file"></el-input>
       </div>
     </div>
     <el-form-item label="是否显示已上传文件列表"

Plik diff jest za duży
+ 0 - 0
public/cdn/avue/2.8.12/avue.min.js


+ 1 - 1
src/components/common/returns-comfire.vue

@@ -221,7 +221,7 @@
                 return res.data;
               },
               rules: [{
-                required: true,
+                required: false,
                 message: "請輸入跟進情況",
                 trigger: "blur"
               }]

+ 1 - 1
src/components/common/returns-issue.vue

@@ -203,7 +203,7 @@
                 return res.data;
               },
               rules: [{
-                required: true,
+                required: false,
                 message: "請輸入跟進情況",
                 trigger: "blur"
               }]

+ 1 - 1
src/components/confirmed/confirmed-goodsuse.vue

@@ -705,7 +705,7 @@
         if (type === 'add'){
           this.form.writeOffNumber = 0;
           this.form.receiptNumber = 0;
-          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd HH:mm");
+          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
 
           this.calcBalance();
 

+ 1 - 0
src/components/confirmed/confirmed-postchange.vue

@@ -1455,6 +1455,7 @@
       onLoad(page, params = {}) {
         this.loading = true;
         params.process = 3;
+        params.personNo = this.userInfo.user_ehr;
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;

+ 2 - 1
src/components/confirmed/confirmed-returns.vue

@@ -394,7 +394,7 @@
                 return res.data;
               },
               rules: [{
-                required: true,
+                required: false,
                 message: "請輸入跟進情況",
                 trigger: "blur"
               }]
@@ -806,6 +806,7 @@
       onLoad(page, params = {}) {
         this.loading = true;
         params.process = 4; //確認
+        params.personId = this.userInfo.user_id;
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;

+ 1 - 1
src/components/initiated/init-checklist.vue

@@ -653,7 +653,7 @@
           this.form.checkNo =userInfo.content.user_ehr;
           this.form.checkName =userInfo.content.user_name;
           this.form.number = 1;
-          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd HH:mm");
+          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
           getCurrentDept().then(res => {
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;

+ 1 - 1
src/components/initiated/init-checkwarehouse.vue

@@ -577,7 +577,7 @@
         if (type === 'add'){
           let userInfo = localStorage.getItem("saber-userInfo");
           this.form.number = 1;
-          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd HH:mm");
+          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
           getCurrentDept().then(res => {
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;

+ 1 - 1
src/components/initiated/init-goodsuse.vue

@@ -704,7 +704,7 @@
         if (type === 'add'){
           this.form.writeOffNumber = 0;
           this.form.receiptNumber = 0;
-          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd HH:mm");
+          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
 
           this.calcBalance();
 

+ 4 - 4
src/components/initiated/init-keypwd.vue

@@ -114,9 +114,9 @@
         selectHandover: '',
         type: '',
         option: {
-          addTitle: '新增【網點瑣匙/密碼登記表】',
-          editTitle: '編輯【網點瑣匙/密碼登記表】',
-          viewTitle: '查看【網點瑣匙/密碼登記表】',
+          addTitle: '新增【網點鎖匙/密碼/實物交接登記表】',
+          editTitle: '編輯【網點鎖匙/密碼/實物交接登記表】',
+          viewTitle: '查看【網點鎖匙/密碼/實物交接登記表】',
           height:'auto',
           calcHeight: 30,
           tip: false,
@@ -576,7 +576,7 @@
         if (type === 'add'){
           let userInfo = localStorage.getItem("saber-userInfo");
           this.form.number = 1;
-          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd HH:mm");
+          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
           getCurrentDept().then(res => {
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;

+ 1 - 1
src/components/initiated/init-returns.vue

@@ -394,7 +394,7 @@
                 return res.data;
               },
               rules: [{
-                required: true,
+                required: false,
                 message: "請輸入跟進情況",
                 trigger: "blur"
               }]

+ 1 - 1
src/components/initiated/init-sealhandover.vue

@@ -533,7 +533,7 @@
         if (type === 'add'){
           let userInfo = localStorage.getItem("saber-userInfo");
           this.form.number = 1;
-          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd HH:mm");
+          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
           getCurrentDept().then(res => {
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;

+ 1 - 1
src/components/initiated/init-tellertrunk.vue

@@ -588,7 +588,7 @@
         if (type === 'add'){
           let userInfo = localStorage.getItem("saber-userInfo");
           this.form.number = 1;
-          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd HH:mm");
+          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
           getCurrentDept().then(res => {
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;

+ 1 - 1
src/components/release/release-returns.vue

@@ -394,7 +394,7 @@
                 return res.data;
               },
               rules: [{
-                required: true,
+                required: false,
                 message: "請輸入跟進情況",
                 trigger: "blur"
               }]

+ 1 - 1
src/components/tobeconfirm/tobeconfirm-goodsuse.vue

@@ -705,7 +705,7 @@
         if (type === 'add'){
           this.form.writeOffNumber = 0;
           this.form.receiptNumber = 0;
-          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd HH:mm");
+          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
 
           this.calcBalance();
 

+ 1 - 0
src/components/tobeconfirm/tobeconfirm-postchange.vue

@@ -1455,6 +1455,7 @@
       onLoad(page, params = {}) {
         this.loading = true;
         params.process = 2;
+        params.personNo = this.userInfo.user_ehr;
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;

+ 1 - 1
src/components/tobeconfirm/tobeconfirm-returns.vue

@@ -394,7 +394,7 @@
                 return res.data;
               },
               rules: [{
-                required: true,
+                required: false,
                 message: "請輸入跟進情況",
                 trigger: "blur"
               }]

+ 18 - 18
src/option/system/dict.js

@@ -13,7 +13,7 @@ export const optionParent = {
   dialogClickModal: false,
   column: [
     {
-      label: "字典编号",
+      label: "字典編號",
       prop: "code",
       search: true,
       slot: true,
@@ -21,20 +21,20 @@ export const optionParent = {
       rules: [
         {
           required: true,
-          message: "请输入字典编号",
+          message: "請輸入字典編號",
           trigger: "blur"
         }
       ]
     },
     {
-      label: "字典名",
+      label: "字典名",
       prop: "dictValue",
       search: true,
       align: "center",
       rules: [
         {
           required: true,
-          message: "请输入字典名称",
+          message: "請輸入字典名稱",
           trigger: "blur"
         }
       ]
@@ -48,7 +48,7 @@ export const optionParent = {
       rules: [
         {
           required: true,
-          message: "请输入字典排序",
+          message: "請輸入字典排序",
           trigger: "blur"
         }
       ]
@@ -74,13 +74,13 @@ export const optionParent = {
       rules: [
         {
           required: true,
-          message: "请选择封存",
+          message: "請選擇封存",
           trigger: "blur"
         }
       ]
     },
     {
-      label: "字典注",
+      label: "字典注",
       prop: "remark",
       hide: true
     }
@@ -103,7 +103,7 @@ export const optionChild = {
   dialogClickModal: false,
   column: [
     {
-      label: "字典编号",
+      label: "字典編號",
       prop: "code",
       addDisabled: true,
       editDisabled: true,
@@ -112,26 +112,26 @@ export const optionChild = {
       rules: [
         {
           required: true,
-          message: "请输入字典编号",
+          message: "請輸入字典編號",
           trigger: "blur"
         }
       ]
     },
     {
-      label: "字典名",
+      label: "字典名",
       prop: "dictValue",
       search: true,
       align: "center",
       rules: [
         {
           required: true,
-          message: "请输入字典名称",
+          message: "請輸入字典名稱",
           trigger: "blur"
         }
       ]
     },
     {
-      label: "上字典",
+      label: "上字典",
       prop: "parentId",
       type: "tree",
       dicData: [],
@@ -144,19 +144,19 @@ export const optionChild = {
       rules: [
         {
           required: false,
-          message: "请选择上级字典",
+          message: "請選擇上級字典",
           trigger: "click"
         }
       ]
     },
     {
-      label: "字典值",
+      label: "字典值",
       prop: "dictKey",
       width: 80,
       rules: [
         {
           required: true,
-          message: "请输入字典键值",
+          message: "請輸入字典鍵值",
           trigger: "blur"
         }
       ]
@@ -170,7 +170,7 @@ export const optionChild = {
       rules: [
         {
           required: true,
-          message: "请输入字典排序",
+          message: "請輸入字典排序",
           trigger: "blur"
         }
       ]
@@ -196,13 +196,13 @@ export const optionChild = {
       rules: [
         {
           required: true,
-          message: "请选择封存",
+          message: "請選擇封存",
           trigger: "blur"
         }
       ]
     },
     {
-      label: "字典注",
+      label: "字典注",
       prop: "remark",
       hide: true
     }

+ 1 - 1
src/page/index/top/top-lock.vue

@@ -13,7 +13,7 @@
                       prop="passwd"
                       :rules="[{ required: true, message: '锁屏密码不能为空'}]">
           <el-input v-model="form.passwd"
-                    placeholder="输入锁屏密码" />
+                    placeholder="输入锁屏密码" />
         </el-form-item>
       </el-form>
       <span slot="footer"

+ 1 - 1
src/page/index/top/top-theme.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="选择"
+    <el-dialog title="選擇"
                append-to-body
                :visible.sync="box"
                width="50%">

+ 2 - 2
src/page/lock/index.vue

@@ -4,7 +4,7 @@
       <div class="animated"
            :class="{'shake':passwdError,'bounceOut':pass}">
         <h3 class="title">{{userInfo.username}}</h3>
-        <el-input placeholder="输入登录密码"
+        <el-input placeholder="输入登录密码"
                   type="password"
                   class="input-with-select animated"
                   v-model="passwd"
@@ -57,7 +57,7 @@ export default {
       if (this.passwd !== this.lockPasswd) {
         this.passwd = "";
         this.$message({
-          message: "解锁密码错误,重新输入",
+          message: "解锁密码错误,重新输入",
           type: "error"
         });
         this.passwdError = true;

+ 1 - 1
src/page/login/codelogin.vue

@@ -55,7 +55,7 @@ export default {
     };
     const validateCode = (rule, value, callback) => {
       if (value.length !== 4) {
-        callback(new Error("输入4位数的验证码"));
+        callback(new Error("输入4位数的验证码"));
       } else {
         callback();
       }

+ 1 - 1
src/page/login/index.vue

@@ -99,7 +99,7 @@
         if (!validatenull(this.socialForm.source) && !validatenull(this.socialForm.code) && !validatenull(this.socialForm.state)) {
           const loading = this.$loading({
             lock: true,
-            text: '第三方系统登录中,稍后。。。',
+            text: '第三方系统登录中,稍后。。。',
             spinner: "el-icon-loading"
           });
           this.$store.dispatch("LoginBySocial", this.socialForm).then(() => {

+ 4 - 4
src/page/login/userlogin.vue

@@ -92,13 +92,13 @@
         },
         loginRules: {
           tenantId: [
-            {required: false, message: "输入租户ID", trigger: "blur"}
+            {required: false, message: "输入租户ID", trigger: "blur"}
           ],
           username: [
-            {required: true, message: "输入用户名", trigger: "blur"}
+            {required: true, message: "输入用户名", trigger: "blur"}
           ],
           password: [
-            {required: true, message: "输入密码", trigger: "blur"},
+            {required: true, message: "输入密码", trigger: "blur"},
             {min: 1, message: "密码长度最少为6位", trigger: "blur"}
           ]
         },
@@ -133,7 +133,7 @@
           if (valid) {
             const loading = this.$loading({
               lock: true,
-              text: '登录中,稍后。。。',
+              text: '登录中,稍后。。。',
               spinner: "el-icon-loading"
             });
             this.$store.dispatch("LoginByUsername", this.loginForm).then(() => {

+ 4 - 0
src/router/axios.js

@@ -17,6 +17,7 @@ import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 import error from "../views/monitor/log/error";
 import Bus from "../util/bus";
+import {dateFormat} from "../util/date";
 
 //默认超时时间
 axios.defaults.timeout = 10000;
@@ -78,6 +79,9 @@ axios.interceptors.response.use(res => {
     //十分鐘內的請求,都是同一個值傳過去
     Bus.$emit('notice', Math.floor(new Date().getTime() / (1000 * 10)));
   }
+  let token = JSON.parse(localStorage.getItem('saber-token'))
+  token.datetime = new Date().getTime();
+  localStorage.setItem('saber-token', JSON.stringify(token))
   //
   return res;
 }, error => {

+ 23 - 23
src/views/authority/apiscope.vue

@@ -128,13 +128,13 @@
           dialogClickModal: false,
           column: [
             {
-              label: "菜单名",
+              label: "菜单名",
               prop: "name",
               search: true,
               rules: [
                 {
                   required: true,
-                  message: "请输入菜单名称",
+                  message: "請输入菜单名稱",
                   trigger: "blur"
                 }
               ]
@@ -145,7 +145,7 @@
               rules: [
                 {
                   required: true,
-                  message: "输入路由地址",
+                  message: "输入路由地址",
                   trigger: "blur"
                 }
               ]
@@ -162,7 +162,7 @@
               rules: [
                 {
                   required: false,
-                  message: "请选择上级菜单",
+                  message: "請選擇上级菜单",
                   trigger: "click"
                 }
               ]
@@ -177,19 +177,19 @@
               rules: [
                 {
                   required: true,
-                  message: "输入菜单图标",
+                  message: "输入菜单图标",
                   trigger: "click"
                 }
               ]
             },
             {
-              label: "菜单编号",
+              label: "菜单編號",
               prop: "code",
               search: true,
               rules: [
                 {
                   required: true,
-                  message: "请输入菜单编号",
+                  message: "請输入菜单編號",
                   trigger: "blur"
                 }
               ]
@@ -212,7 +212,7 @@
               rules: [
                 {
                   required: true,
-                  message: "请选择菜单类型",
+                  message: "請選擇菜单类型",
                   trigger: "blur"
                 }
               ]
@@ -223,7 +223,7 @@
               rules: [
                 {
                   required: true,
-                  message: "输入菜单别名",
+                  message: "输入菜单别名",
                   trigger: "blur"
                 }
               ]
@@ -250,7 +250,7 @@
               rules: [
                 {
                   required: true,
-                  message: "请选择按钮功能",
+                  message: "請選擇按钮功能",
                   trigger: "blur"
                 }
               ]
@@ -263,7 +263,7 @@
               rules: [
                 {
                   required: true,
-                  message: "输入菜单排序",
+                  message: "输入菜单排序",
                   trigger: "blur"
                 }
               ]
@@ -315,23 +315,23 @@
           dialogClickModal: false,
           column: [
             {
-              label: "权限名",
+              label: "权限名",
               prop: "scopeName",
               search: true,
               rules: [{
                 required: true,
-                message: "请输入数据权限名称",
+                message: "請输入数据权限名稱",
                 trigger: "blur"
               }]
             },
             {
-              label: "权限编号",
+              label: "权限編號",
               prop: "resourceCode",
               search: true,
               width: 180,
               rules: [{
                 required: true,
-                message: "请输入数据权限编号",
+                message: "請输入数据权限編號",
                 trigger: "blur"
               }]
             },
@@ -341,7 +341,7 @@
               width: 180,
               rules: [{
                 required: true,
-                message: "请输入数据权限编号",
+                message: "請输入数据权限編號",
                 trigger: "blur"
               }]
             },
@@ -359,7 +359,7 @@
               prop: "scopeType",
               rules: [{
                 required: true,
-                message: "输入通知类型",
+                message: "输入通知类型",
                 trigger: "blur"
               }]
             },
@@ -429,7 +429,7 @@
         });
       },
       rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -466,10 +466,10 @@
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -562,7 +562,7 @@
         });
       },
       rowDelScope(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -580,10 +580,10 @@
       },
       handleDeleteScope() {
         if (this.selectionListScope.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 25 - 25
src/views/authority/datascope.vue

@@ -131,13 +131,13 @@
           dialogClickModal: false,
           column: [
             {
-              label: "菜单名",
+              label: "菜单名",
               prop: "name",
               search: true,
               rules: [
                 {
                   required: true,
-                  message: "请输入菜单名称",
+                  message: "請输入菜单名稱",
                   trigger: "blur"
                 }
               ]
@@ -148,7 +148,7 @@
               rules: [
                 {
                   required: true,
-                  message: "输入路由地址",
+                  message: "输入路由地址",
                   trigger: "blur"
                 }
               ]
@@ -165,7 +165,7 @@
               rules: [
                 {
                   required: false,
-                  message: "请选择上级菜单",
+                  message: "請選擇上级菜单",
                   trigger: "click"
                 }
               ]
@@ -180,19 +180,19 @@
               rules: [
                 {
                   required: true,
-                  message: "输入菜单图标",
+                  message: "输入菜单图标",
                   trigger: "click"
                 }
               ]
             },
             {
-              label: "菜单编号",
+              label: "菜单編號",
               prop: "code",
               search: true,
               rules: [
                 {
                   required: true,
-                  message: "请输入菜单编号",
+                  message: "請输入菜单編號",
                   trigger: "blur"
                 }
               ]
@@ -215,7 +215,7 @@
               rules: [
                 {
                   required: true,
-                  message: "请选择菜单类型",
+                  message: "請選擇菜单类型",
                   trigger: "blur"
                 }
               ]
@@ -226,7 +226,7 @@
               rules: [
                 {
                   required: true,
-                  message: "输入菜单别名",
+                  message: "输入菜单别名",
                   trigger: "blur"
                 }
               ]
@@ -253,7 +253,7 @@
               rules: [
                 {
                   required: true,
-                  message: "请选择按钮功能",
+                  message: "請選擇按钮功能",
                   trigger: "blur"
                 }
               ]
@@ -266,7 +266,7 @@
               rules: [
                 {
                   required: true,
-                  message: "输入菜单排序",
+                  message: "输入菜单排序",
                   trigger: "blur"
                 }
               ]
@@ -318,24 +318,24 @@
           dialogClickModal: false,
           column: [
             {
-              label: "权限名",
+              label: "权限名",
               prop: "scopeName",
               search: true,
               value: "",
               rules: [{
                 required: true,
-                message: "请输入数据权限名称",
+                message: "請输入数据权限名稱",
                 trigger: "blur"
               }]
             },
             {
-              label: "权限编号",
+              label: "权限編號",
               prop: "resourceCode",
               search: true,
               width: 100,
               rules: [{
                 required: true,
-                message: "请输入数据权限编号",
+                message: "請输入数据权限編號",
                 trigger: "blur"
               }]
             },
@@ -345,7 +345,7 @@
               width: 130,
               rules: [{
                 required: true,
-                message: "请输入数据权限编号",
+                message: "請输入数据权限編號",
                 trigger: "blur"
               }]
             },
@@ -363,7 +363,7 @@
               prop: "scopeType",
               rules: [{
                 required: true,
-                message: "输入通知类型",
+                message: "输入通知类型",
                 trigger: "blur"
               }]
             },
@@ -375,7 +375,7 @@
               value: "*",
               rules: [{
                 required: true,
-                message: "输入数据权限可见的字段",
+                message: "输入数据权限可见的字段",
                 trigger: "blur"
               }],
             },
@@ -386,7 +386,7 @@
               hide: true,
               rules: [{
                 required: true,
-                message: "输入MybatisMapper对应方法的完整类名路径",
+                message: "输入MybatisMapper对应方法的完整类名路径",
                 trigger: "blur"
               }],
             },
@@ -506,7 +506,7 @@
         });
       },
       rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -543,10 +543,10 @@
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -640,7 +640,7 @@
         });
       },
       rowDelScope(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -658,10 +658,10 @@
       },
       handleDeleteScope() {
         if (this.selectionListScope.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 3 - 1
src/views/bank/checklist.vue

@@ -212,6 +212,7 @@
                 let cycle = this.cycle;
                 for (let i = 0; i < data.length; i++) {
                   let item = data[i];
+                  item.disabled = item.isSealed == 1;
                   if (item.dictKey.indexOf(cycle) != -1){
                     result.push(item)
                   }
@@ -285,6 +286,7 @@
                 let cycle = this.cycle;
                 for (let i = 0; i < data.length; i++) {
                   let item = data[i];
+                  item.disabled = item.isSealed == 1;
                   if (item.dictKey.indexOf(cycle) != -1){
                     result.push(item)
                   }
@@ -652,7 +654,7 @@
           this.form.checkNo =userInfo.content.user_ehr;
           this.form.checkName =userInfo.content.user_name;
           this.form.number = 1;
-          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd HH:mm");
+          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
           getCurrentDept().then(res => {
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;

+ 1 - 1
src/views/bank/checkwarehouse.vue

@@ -582,7 +582,7 @@
         if (type === 'add'){
           let userInfo = localStorage.getItem("saber-userInfo");
           this.form.number = 1;
-          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd HH:mm");
+          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
           getCurrentDept().then(res => {
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;

+ 1 - 1
src/views/bank/goodsuse-balance.vue

@@ -276,7 +276,7 @@
         if (type === 'add'){
           this.form.writeOffNumber = 0;
           this.form.receiptNumber = 0;
-          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd HH:mm");
+          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
 
           this.calcBalance();
 

+ 3 - 1
src/views/bank/goodsuse.vue

@@ -706,7 +706,7 @@
         if (type === 'add'){
           this.form.writeOffNumber = 0;
           this.form.receiptNumber = 0;
-          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd HH:mm");
+          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
 
           this.calcBalance();
 
@@ -775,6 +775,8 @@
         }
       },
       selectionClear() {
+        let token = JSON.parse(localStorage.getItem('saber-token'))
+        let dd = dateFormat(new Date(token.datetime))
         debugger
         this.selectionList = [];
         this.$refs.crud.toggleSelection();

+ 2 - 2
src/views/bank/handoverstandard.vue

@@ -81,7 +81,7 @@
               disabled: true,
               dicData: [
                 {
-                  label: "網點瑣匙/密碼登記表", value: "keypwd"
+                  label: "網點鎖匙/密碼/實物交接登記表", value: "keypwd"
                 },
                 {
                   label: "業務印章交接登記表", value: "sealhandover"
@@ -160,7 +160,7 @@
     mounted() {
       let dicData = [
         {
-          label: "網點瑣匙/密碼登記表", value: "keypwd"
+          label: "網點鎖匙/密碼/實物交接登記表", value: "keypwd"
         },
         {
           label: "業務印章交接登記表", value: "sealhandover"

+ 2 - 2
src/views/bank/keypwd-keep.vue

@@ -336,7 +336,7 @@
           }
         }
         this.$Export.excel({
-          title: "網點瑣匙密碼保管人" || new Date().getTime(),
+          title: "網點鎖匙密碼實物保管人" || new Date().getTime(),
           columns: columns,
           data: this.selectionList
         });
@@ -453,7 +453,7 @@
         if (type === 'add'){
           let userInfo = localStorage.getItem("saber-userInfo");
           this.form.number = 1;
-          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd HH:mm");
+          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
           getCurrentDept().then(res => {
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;

+ 4 - 4
src/views/bank/keypwd.vue

@@ -113,9 +113,9 @@
         selectHandover: '',
         type: '',
         option: {
-          addTitle: '新增【網點瑣匙/密碼登記表】',
-          editTitle: '編輯【網點瑣匙/密碼登記表】',
-          viewTitle: '查看【網點瑣匙/密碼登記表】',
+          addTitle: '新增【網點鎖匙/密碼/實物交接登記表】',
+          editTitle: '編輯【網點鎖匙/密碼/實物交接登記表】',
+          viewTitle: '查看【網點鎖匙/密碼/實物交接登記表】',
           height:'auto',
           calcHeight: 30,
           tip: false,
@@ -575,7 +575,7 @@
         if (type === 'add'){
           let userInfo = localStorage.getItem("saber-userInfo");
           this.form.number = 1;
-          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd HH:mm");
+          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
           getCurrentDept().then(res => {
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;

+ 1 - 1
src/views/bank/returns.vue

@@ -393,7 +393,7 @@
                 return res.data;
               },
               rules: [{
-                required: true,
+                required: false,
                 message: "請輸入跟進情況",
                 trigger: "blur"
               }]

+ 1 - 1
src/views/bank/sealhandover-keep.vue

@@ -390,7 +390,7 @@
         if (type === 'add'){
           let userInfo = localStorage.getItem("saber-userInfo");
           this.form.number = 1;
-          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd HH:mm");
+          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
           getCurrentDept().then(res => {
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;

+ 1 - 1
src/views/bank/sealhandover.vue

@@ -532,7 +532,7 @@
         if (type === 'add'){
           let userInfo = localStorage.getItem("saber-userInfo");
           this.form.number = 1;
-          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd HH:mm");
+          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
           getCurrentDept().then(res => {
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;

+ 1 - 1
src/views/bank/tellertrunk.vue

@@ -589,7 +589,7 @@
         if (type === 'add'){
           let userInfo = localStorage.getItem("saber-userInfo");
           this.form.number = 1;
-          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd HH:mm");
+          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
           getCurrentDept().then(res => {
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;

+ 2 - 2
src/views/bank/user-log-view.vue

@@ -53,7 +53,7 @@
               disabled: true,
               dicData: [
                 {
-                  label: "網點瑣匙/密碼登記表", value: "keypwd"
+                  label: "網點鎖匙/密碼/實物交接登記表", value: "keypwd"
                 },
                 {
                   label: "業務印章交接登記表", value: "sealhandover"
@@ -152,7 +152,7 @@
           ]
         },
         keypwdGroup: [{
-          label: "網點瑣匙/密碼登記表",
+          label: "網點鎖匙/密碼/實物交接登記表",
           column: [
             {
               label: "分類種類",

+ 16 - 16
src/views/base/region.vue

@@ -22,7 +22,7 @@
       <basic-container>
         <avue-form ref="form" :option="regionOption" v-model="regionForm" @submit="handleSubmit">
           <template slot="code" slot-scope="{}">
-            <el-input placeholder="请输入 区划子编号" v-model="regionForm.subCode">
+            <el-input placeholder="請输入 区划子編號" v-model="regionForm.subCode">
               <template slot="prepend">{{regionForm.parentCode}}</template>
             </el-input>
           </template>
@@ -92,45 +92,45 @@
           labelWidth: 100,
           column: [
             {
-              label: "父区划编号",
+              label: "父区划編號",
               prop: "parentCode",
               span: 24,
               disabled: true,
               rules: [{
                 required: true,
-                message: "请输入父区划编号",
+                message: "請输入父区划編號",
                 trigger: "blur"
               }]
             },
             {
-              label: "父区划名",
+              label: "父区划名",
               prop: "parentName",
               span: 24,
               disabled: true,
             },
             {
-              label: "区划编号",
+              label: "区划編號",
               prop: "code",
               formslot: true,
               span: 24,
               rules: [{
                 required: true,
-                message: "请输入区划编号",
+                message: "請输入区划編號",
                 trigger: "blur"
               }]
             },
             {
-              label: "区划子编号",
+              label: "区划子編號",
               prop: "subCode",
               display: false,
             },
             {
-              label: "区划名",
+              label: "区划名",
               prop: "name",
               span: 24,
               rules: [{
                 required: true,
-                message: "请输入区划名称",
+                message: "請输入区划名稱",
                 trigger: "blur"
               }]
             },
@@ -147,7 +147,7 @@
               span: 24,
               rules: [{
                 required: true,
-                message: "请选择区划等级",
+                message: "請選擇区划等级",
                 trigger: "blur"
               }]
             },
@@ -158,7 +158,7 @@
               span: 24,
               rules: [{
                 required: true,
-                message: "输入区划排序",
+                message: "输入区划排序",
                 trigger: "blur"
               }]
             },
@@ -182,12 +182,12 @@
               prop: 'excelFile',
               type: 'upload',
               drag: true,
-              loadText: '模板上传中,稍等',
+              loadText: '模板上传中,稍等',
               span: 24,
               propsHttp: {
                 res: 'data'
               },
-              tip: '上传 .xls,.xlsx 标准格式文件',
+              tip: '上传 .xls,.xlsx 标准格式文件',
               action: "/api/blade-system/region/import-region"
             },
             {
@@ -211,7 +211,7 @@
               rules: [
                 {
                   required: true,
-                  message: "请选择是否覆盖",
+                  message: "請選擇是否覆盖",
                   trigger: "blur"
                 }
               ]
@@ -324,7 +324,7 @@
       },
       addChildren() {
         if (validatenull(this.regionForm.code) || validatenull(this.regionForm.name)) {
-          this.$message.warning("请先选择一项区划");
+          this.$message.warning("請先選擇一项区划");
           return;
         }
         this.regionForm.parentCode = this.regionForm.code;
@@ -353,7 +353,7 @@
       },
       handleDelete() {
         if (validatenull(this.regionForm.code)) {
-          this.$message.warning("请先选择一项区划");
+          this.$message.warning("請先選擇一项区划");
           return;
         }
         this.$confirm(`确定将 [${this.regionForm.name}] 数据删除?`, {

+ 1 - 1
src/views/desk/initiated.vue

@@ -1,7 +1,7 @@
 <template>
   <basic-container>
     <el-tabs type="border-card">
-      <el-tab-pane v-if="permission.keypwd_view" label="網點鎖匙/密碼登記表">
+      <el-tab-pane v-if="permission.keypwd_view" label="網點鎖匙/密碼/實物交接登記表">
         <init-keypwd></init-keypwd>
       </el-tab-pane>
       <el-tab-pane v-if="permission.sealhandover_view" label="業務印章交接登記表">

+ 10 - 10
src/views/desk/mynotice.vue

@@ -67,19 +67,19 @@
           dialogClickModal: false,
           column: [
             {
-              label: "通知标题",
+              label: "通知標題",
               prop: "title",
               span: 24,
               row: true,
               search: true,
               rules: [{
                 required: true,
-                message: "请输入通知标题",
+                message: "請輸入通知標題",
                 trigger: "blur"
               }]
             },
             /*{
-              label: "通知型",
+              label: "通知型",
               type: "select",
               dicUrl: "/api/blade-system/dict/dictionary?code=notice",
               props: {
@@ -92,12 +92,12 @@
               search: true,
               rules: [{
                 required: true,
-                message: "请输入通知类型",
+                message: "請輸入通知類型",
                 trigger: "blur"
               }]
             },
             {
-              label: "通知时间",
+              label: "通知時間",
               prop: "releaseTimeRange",
               type: "datetime",
               format: "yyyy-MM-dd HH:mm:ss",
@@ -110,7 +110,7 @@
               search: true,
               rules: [{
                 required: true,
-                message: "请输入通知时间",
+                message: "請輸入通知時間",
                 trigger: "blur"
               }]
             },
@@ -122,7 +122,7 @@
               valueFormat: "yyyy-MM-dd HH:mm:ss",
               rules: [{
                 required: true,
-                message: "请输入通知日期",
+                message: "請輸入通知日期",
                 trigger: "click"
               }]
             },*/
@@ -135,7 +135,7 @@
               disabled: true,
               dicData: [
                 {
-                  label: "網點瑣匙/密碼登記表", value: "keypwd"
+                  label: "網點鎖匙/密碼/實物交接登記表", value: "keypwd"
                 },
                 {
                   label: "業務印章交接登記表", value: "sealhandover"
@@ -201,7 +201,7 @@
               type: "radio",
               value: '1',
               dicData: [{
-                label: '系',
+                label: '系',
                 disabled: true,
                 value: '0'
               },{
@@ -318,7 +318,7 @@
               }]
             },
             {
-              label: "通知容",
+              label: "通知容",
               prop: "content",
               component: 'AvueUeditor',
               options: {

+ 16 - 16
src/views/desk/notice.vue

@@ -24,7 +24,7 @@
                    icon="el-icon-delete"
                    plain
                    v-if="permission.notice_delete"
-                   @click="handleDelete">
+                   @click="handleDelete">
         </el-button>
       </template>
       <template slot-scope="{row}"
@@ -78,19 +78,19 @@
           dialogClickModal: false,
           column: [
             {
-              label: "通知标题",
+              label: "通知標題",
               prop: "title",
               span: 24,
               row: true,
               search: true,
               rules: [{
                 required: true,
-                message: "请输入通知标题",
+                message: "請輸入通知標題",
                 trigger: "blur"
               }]
             },
             /*{
-              label: "通知型",
+              label: "通知型",
               type: "select",
               dicUrl: "/api/blade-system/dict/dictionary?code=notice",
               props: {
@@ -103,12 +103,12 @@
               search: true,
               rules: [{
                 required: true,
-                message: "请输入通知类型",
+                message: "請輸入通知類型",
                 trigger: "blur"
               }]
             },
             {
-              label: "通知时间",
+              label: "通知時間",
               prop: "releaseTimeRange",
               type: "datetime",
               format: "yyyy-MM-dd HH:mm:ss",
@@ -121,7 +121,7 @@
               search: true,
               rules: [{
                 required: true,
-                message: "请输入通知时间",
+                message: "請輸入通知時間",
                 trigger: "blur"
               }]
             },
@@ -133,7 +133,7 @@
               valueFormat: "yyyy-MM-dd HH:mm:ss",
               rules: [{
                 required: true,
-                message: "请输入通知日期",
+                message: "請輸入通知日期",
                 trigger: "click"
               }]
             },*/
@@ -146,7 +146,7 @@
               disabled: true,
               dicData: [
                 {
-                  label: "網點瑣匙/密碼登記表", value: "keypwd"
+                  label: "網點鎖匙/密碼/實物交接登記表", value: "keypwd"
                 },
                 {
                   label: "業務印章交接登記表", value: "sealhandover"
@@ -194,7 +194,7 @@
               type: "radio",
               value: '1',
               dicData: [{
-                label: '系',
+                label: '系',
                 disabled: true,
                 value: '0'
               },{
@@ -312,7 +312,7 @@
               }]
             },
             {
-              label: "通知容",
+              label: "通知容",
               prop: "content",
               component: 'AvueUeditor',
               options: {
@@ -394,8 +394,8 @@
         });
       },
       rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "定",
+        this.$confirm("確定將選擇數據刪除?", {
+          confirmButtonText: "定",
           cancelButtonText: "取消",
           type: "warning"
         })
@@ -429,11 +429,11 @@
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一條數據");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "定",
+        this.$confirm("確定將選擇數據刪除?", {
+          confirmButtonText: "定",
           cancelButtonText: "取消",
           type: "warning"
         })

+ 8 - 8
src/views/flow/deploy.vue

@@ -36,7 +36,7 @@
               rules: [
                 {
                   required: true,
-                  message: '请选择流程类型',
+                  message: '請選擇流程类型',
                   trigger: 'blur'
                 }
               ]
@@ -61,7 +61,7 @@
               rules: [
                 {
                   required: true,
-                  message: '请选择流程模式',
+                  message: '請選擇流程模式',
                   trigger: 'blur'
                 }
               ],
@@ -82,7 +82,7 @@
               rules: [
                 {
                   required: true,
-                  message: '请选择所属租户',
+                  message: '請選擇所属租户',
                   trigger: 'blur'
                 }
               ],
@@ -91,12 +91,12 @@
               label: '附件上传',
               prop: 'flowFile',
               type: 'upload',
-              loadText: '附件上传中,稍等',
+              loadText: '附件上传中,稍等',
               span: 24,
               propsHttp: {
                 res: 'data'
               },
-              tip: '上传 bpmn20.xml 标准格式文件',
+              tip: '上传 bpmn20.xml 标准格式文件',
               action: '/api/blade-flow/manager/check-upload'
             },
           ]
@@ -120,12 +120,12 @@
       },
       uploadAfter(res, done, loading) {
         if (!this.form.flowCategory) {
-          this.$message.warning('清先选择流程类型');
+          this.$message.warning('清先選擇流程类型');
           loading()
           return false;
         }
         if (this.form.flowMode === 2 && !this.form.tenantId) {
-          this.$message.warning('清先选择对应租户');
+          this.$message.warning('清先選擇对应租户');
           loading();
           return false;
         }
@@ -144,7 +144,7 @@
             }
           })
         } else {
-          this.$message.warning('上传 bpmn20.xml 标准格式文件');
+          this.$message.warning('上传 bpmn20.xml 标准格式文件');
           loading()
           return false;
         }

+ 2 - 2
src/views/flow/follow.vue

@@ -29,7 +29,7 @@
                label-width="80px">
         <el-form-item label="删除理由">
           <el-input v-model="deleteReason"
-                    placeholder="输入删除理由" />
+                    placeholder="输入删除理由" />
         </el-form-item>
       </el-form>
       <span slot="footer"
@@ -138,7 +138,7 @@
         this.processInstanceId = row.processInstanceId;
       },
       handleDelete() {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 8 - 8
src/views/flow/manager.vue

@@ -89,7 +89,7 @@
                ref="form"
                label-width="80px">
         <el-form-item label="流程状态">
-          <el-select v-model="flowState" placeholder="请选择" value="">
+          <el-select v-model="flowState" placeholder="請選擇" value="">
             <el-option
               v-for="item in stateOptions"
               :key="item.value"
@@ -157,7 +157,7 @@
           dialogClickModal: false,
           column: [
             {
-              label: '租户编号',
+              label: '租户編號',
               prop: 'tenantId',
               slot: true,
               width: 120,
@@ -173,12 +173,12 @@
               width: 150,
             },
             {
-              label: '流程名',
+              label: '流程名',
               prop: 'name',
               width: 150,
             },
             {
-              label: "流程分",
+              label: "流程分",
               type: "select",
               row: true,
               dicUrl: "/api/blade-system/dict/dictionary?code=flow",
@@ -261,10 +261,10 @@
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -282,7 +282,7 @@
           });
       },
       handleSlotDelete(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -307,7 +307,7 @@
         if (!this.flowState) {
           this.$message({
             type: "warn",
-            message: "请先选择流程状态!"
+            message: "請先選擇流程状态!"
           });
           return;
         }

+ 7 - 7
src/views/flow/model.vue

@@ -128,7 +128,7 @@
               span: 24,
               rules: [{
                 required: true,
-                message: "请选择流程类型",
+                message: "請選擇流程类型",
                 trigger: "blur"
               }]
             },
@@ -151,7 +151,7 @@
               rules: [
                 {
                   required: true,
-                  message: '请选择流程模式',
+                  message: '請選擇流程模式',
                   trigger: 'blur'
                 }
               ],
@@ -171,7 +171,7 @@
               rules: [
                 {
                   required: true,
-                  message: '请选择所属租户',
+                  message: '請選擇所属租户',
                   trigger: 'blur'
                 }
               ],
@@ -219,7 +219,7 @@
               width: 150,
             },
             {
-              label: '模型名',
+              label: '模型名',
               prop: 'name',
               search: true,
               width: 150,
@@ -311,10 +311,10 @@
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -350,7 +350,7 @@
         window.open(`${website.flowDesignUrl}/app/rest/models/${row.id}/bpmn20`);
       },
       handleSlotDelete(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 11 - 11
src/views/monitor/log/api.vue

@@ -50,24 +50,24 @@
           dialogType: 'drawer',
           column: [
             {
-              label: "服id",
+              label: "服id",
               prop: "serviceId",
               width:'120',
               hide: true,
             },
             {
-              label: "服host",
+              label: "服host",
               prop: "serverHost",
               hide: true,
             },
             {
-              label: "服ip",
+              label: "服ip",
               prop: "serverIp",
               hide: true,
               width:'160'
             },
             {
-              label: "软件环境",
+              label: "軟件環境",
               prop: "env",
               width:'80',
               hide: true,
@@ -78,16 +78,16 @@
               search: true,
             },
             {
-              label: "求方法",
+              label: "求方法",
               prop: "method",
               width:'80'
             },
             {
-              label: "求接口",
+              label: "求接口",
               prop: "requestUri"
             },
             {
-              label: "日志时间",
+              label: "日志時間",
               prop: "createTimeRange",
               search: true,
               hide: true,
@@ -98,7 +98,7 @@
               searchRange:true,
             },
             {
-              label: "日志时间",
+              label: "日志時間",
               prop: "createTime",
               width:'180'
             },
@@ -108,13 +108,13 @@
               width:'180'
             },
             {
-              label: "用代理",
+              label: "用代理",
               prop: "userAgent",
               span: 24,
               hide: true
             },
             {
-              label: "请求数据",
+              label: "請求數據",
               prop: "params",
               type: "textarea",
               span: 24,
@@ -176,7 +176,7 @@
           this.page.total = data.total;
           data.records.forEach(item => {
             if (!item.createBy){
-            //  tenantId=000000&username=mo153842&password=a5cfe98d240800a4e84eaa425abed1dd&grant_type=password&scope=all&type=account
+              //  tenantId=000000&username=mo153842&password=a5cfe98d240800a4e84eaa425abed1dd&grant_type=password&scope=all&type=account
               let arr = item.params.split('username=');
               if(arr.length > 1){
                 item.createBy = arr[1].split('&')[0]

+ 10 - 10
src/views/monitor/log/error.vue

@@ -50,49 +50,49 @@
           dialogType: 'drawer',
           column: [
             {
-              label: "服id",
+              label: "服id",
               prop: "serviceId",
               search: true,
               width:'120'
             },
             {
-              label: "服host",
+              label: "服host",
               prop: "serverHost",
               search: true,
               width:'150'
             },
             {
-              label: "服ip",
+              label: "服ip",
               prop: "serverIp",
               width:'160'
             },
             {
-              label: "软件环境",
+              label: "軟件環境",
               prop: "env",
               width:'80'
             },
             {
-              label: "求方法",
+              label: "求方法",
               prop: "method",
               width:'80'
             },
             {
-              label: "求接口",
+              label: "求接口",
               prop: "requestUri"
             },
             {
-              label: "日志时间",
+              label: "日志時間",
               prop: "createTime",
               width:'180'
             },
             {
-              label: "用代理",
+              label: "用代理",
               prop: "userAgent",
               span: 24,
               hide: true
             },
             {
-              label: "请求数据",
+              label: "請求數據",
               prop: "params",
               type: "textarea",
               span: 24,
@@ -100,7 +100,7 @@
               hide: true
             },
             {
-              label: "日志数据",
+              label: "日志數據",
               prop: "stackTrace",
               type: "textarea",
               span: 24,

+ 10 - 10
src/views/monitor/log/usual.vue

@@ -50,26 +50,26 @@
           dialogType: 'drawer',
           column: [
             {
-              label: "服id",
+              label: "服id",
               prop: "serviceId",
               search: true
             },
             {
-              label: "服host",
+              label: "服host",
               prop: "serverHost",
               search: true
             },
             {
-              label: "服ip",
+              label: "服ip",
               prop: "serverIp"
             },
             {
-              label: "软件环境",
+              label: "軟件環境",
               prop: "env",
               width:'80'
             },
             {
-              label: "日志级别",
+              label: "日志級別",
               prop: "logLevel"
             },
             {
@@ -77,22 +77,22 @@
               prop: "logId"
             },
             {
-              label: "求接口",
+              label: "求接口",
               prop: "requestUri"
             },
             {
-              label: "日志时间",
+              label: "日志時間",
               prop: "createTime",
               width:'180'
             },
             {
-              label: "用代理",
+              label: "用代理",
               prop: "userAgent",
               span: 24,
               hide: true
             },
             {
-              label: "日志数据",
+              label: "日志數據",
               prop: "logData",
               type: "textarea",
               span: 24,
@@ -100,7 +100,7 @@
               hide: true
             },
             {
-              label: "请求数据",
+              label: "請求數據",
               prop: "params",
               type: "textarea",
               span: 24,

+ 13 - 13
src/views/report/abnormal-reportlist.vue

@@ -98,7 +98,7 @@ export default {
             searchSpan: 4,
             rules: [{
               required: true,
-              message: "输入銀行號",
+              message: "输入銀行號",
               trigger: "blur"
             }]
           },
@@ -108,7 +108,7 @@ export default {
             disabled: true,
             rules: [{
               required: true,
-              message: "输入機構號",
+              message: "输入機構號",
               trigger: "blur"
             }]
           },
@@ -128,7 +128,7 @@ export default {
             checkStrictly: true,
             rules: [{
               required: true,
-              message: "输入機構號",
+              message: "输入機構號",
               trigger: "blur"
             }]
           },
@@ -140,7 +140,7 @@ export default {
             valueFormat: "yyyy-MM-dd",
             rules: [{
               required: true,
-              message: "输入核對日期",
+              message: "输入核對日期",
               trigger: "blur"
             }]
           },
@@ -158,7 +158,7 @@ export default {
             search: true,
             rules: [{
               required: true,
-              message: "输入交接日期",
+              message: "输入交接日期",
               trigger: "blur"
             }]
           },
@@ -179,7 +179,7 @@ export default {
             },
             rules: [{
               required: true,
-              message: "输入分類",
+              message: "输入分類",
               trigger: "blur"
             }]
           },
@@ -200,7 +200,7 @@ export default {
             },
             rules: [{
               required: true,
-              message: "输入核對項目",
+              message: "输入核對項目",
               trigger: "blur"
             }]
           },
@@ -218,7 +218,7 @@ export default {
             },
             rules: [{
               required: true,
-              message: "输入核對內容/標準",
+              message: "输入核對內容/標準",
               trigger: "blur"
             }]
           },
@@ -241,7 +241,7 @@ export default {
             disabled: true,
             rules: [{
               required: true,
-              message: "输入核對人姓名",
+              message: "输入核對人姓名",
               trigger: "blur"
             }]
           },
@@ -251,7 +251,7 @@ export default {
             disabled: true,
             rules: [{
               required: true,
-              message: "输入核對人員工號",
+              message: "输入核對人員工號",
               trigger: "blur"
             }]
           },
@@ -260,7 +260,7 @@ export default {
             prop: "remark",
             rules: [{
               required: false,
-              message: "输入備註",
+              message: "输入備註",
               trigger: "blur"
             }]
           },
@@ -271,7 +271,7 @@ export default {
             editDisplay: false,
             rules: [{
               required: true,
-              message: "输入填報時間",
+              message: "输入填報時間",
               trigger: "blur"
             }]
           },
@@ -309,7 +309,7 @@ export default {
   methods: {
     handleInit(){
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning("請選擇至少一条数据");
         return;
       }
       let checkedCount = 0, noCheckCount = 0;

+ 3 - 3
src/views/report/reportlist-copy.vue

@@ -121,7 +121,7 @@ export default {
       this.$router.push({path: `/myiframe/urlPath?name=designer-${name}&src=${this.website.reportUrl}/designer?_u=blade-${name}`});
     },
     rowDel(row) {
-      this.$confirm("确定将选择数据删除?", {
+      this.$confirm("确定将選擇数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -156,10 +156,10 @@ export default {
     },
     handleDelete() {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning("請選擇至少一条数据");
         return;
       }
-      this.$confirm("确定将选择数据删除?", {
+      this.$confirm("确定将選擇数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"

+ 6 - 6
src/views/report/reportlist.vue

@@ -91,7 +91,7 @@ export default {
             searchSpan: 4,
             rules: [{
               required: true,
-              message: "输入銀行號",
+              message: "输入銀行號",
               trigger: "blur"
             }]
           },*/
@@ -120,7 +120,7 @@ export default {
             checkStrictly: true,
             rules: [{
               required: true,
-              message: "输入機構號",
+              message: "输入機構號",
               trigger: "blur"
             }]
           },*/
@@ -183,7 +183,7 @@ export default {
             },
             rules: [{
               required: true,
-              message: "输入分類",
+              message: "输入分類",
               trigger: "blur"
             }]
           },
@@ -204,7 +204,7 @@ export default {
             },
             rules: [{
               required: true,
-              message: "输入核對項目",
+              message: "输入核對項目",
               trigger: "blur"
             }]
           },
@@ -219,7 +219,7 @@ export default {
             },
             rules: [{
               required: true,
-              message: "输入核對內容/標準",
+              message: "输入核對內容/標準",
               trigger: "blur"
             }]
           },*/
@@ -264,7 +264,7 @@ export default {
   methods: {
     handleInit(){
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning("請選擇至少一条数据");
         return;
       }
       let checkedCount = 0, noCheckCount = 0;

+ 27 - 13
src/views/report/userlog.vue

@@ -86,7 +86,7 @@
               prop: "bankNo",
               rules: [{
                 required: true,
-                message: "输入銀行號",
+                message: "输入銀行號",
                 trigger: "blur"
               }]
             },
@@ -96,7 +96,7 @@
               search: true,
               rules: [{
                 required: true,
-                message: "输入機構號",
+                message: "输入機構號",
                 trigger: "blur"
               }]
             },
@@ -139,7 +139,7 @@
               ],
               rules: [{
                 required: true,
-                message: "输入表名",
+                message: "输入表名",
                 trigger: "blur"
               }]
             },
@@ -149,7 +149,7 @@
               search: true,
               rules: [{
                 required: true,
-                message: "输入員工號",
+                message: "输入員工號",
                 trigger: "blur"
               }]
             },
@@ -158,7 +158,7 @@
               prop: "personName",
               rules: [{
                 required: true,
-                message: "输入用戶姓名",
+                message: "输入用戶姓名",
                 trigger: "blur"
               }]
             },
@@ -198,7 +198,7 @@
               ],
               rules: [{
                 required: true,
-                message: "输入操作類型",
+                message: "输入操作類型",
                 trigger: "blur"
               }]
             },
@@ -209,7 +209,7 @@
               hide: true,
               rules: [{
                 required: true,
-                message: "输入舊數據",
+                message: "输入舊數據",
                 trigger: "blur"
               }]
             },
@@ -220,7 +220,7 @@
               hide: true,
               rules: [{
                 required: true,
-                message: "输入新數據",
+                message: "输入新數據",
                 trigger: "blur"
               }]
             },
@@ -276,8 +276,23 @@
             type: "warning"
           })
             .then(() => {
+              let tableNameDict = {}, operationTypeDict = {};
+              let tableName = this.findObject(this.option.column, "tableName").dicData;
+              let operationType = this.findObject(this.option.column, "operationType").dicData;
+              tableName.forEach(item => {
+                tableNameDict[''+item.value] = item.label;
+              })
+              operationType.forEach(item => {
+                operationTypeDict[''+item.value] = item.label;
+              })
+
               getDownloadList(this.query).then(res => {
-                this.downLoadData(res.data.data, true)
+                let data = res.data.data;
+                data.forEach(item => {
+                  item.tableName = tableNameDict[''+item.tableName];
+                  item.operationType = operationTypeDict[''+item.operationType];
+                })
+                this.downLoadData(data, true)
               });
             })
         }else{
@@ -329,7 +344,7 @@
         });
       },
       rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -347,10 +362,10 @@
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -368,7 +383,6 @@
           });
       },
       beforeOpen(done, type) {
-          debugger
         if (["edit", "view"].includes(type)) {
           const newData = JSON.parse(this.form.newData);
           const tableName = this.form.tableName;

+ 11 - 11
src/views/resource/attach.vue

@@ -89,7 +89,7 @@
               prop: "link",
               rules: [{
                 required: true,
-                message: "输入附件地址",
+                message: "输入附件地址",
                 trigger: "blur"
               }]
             },
@@ -99,17 +99,17 @@
               search: true,
               rules: [{
                 required: true,
-                message: "输入附件域名",
+                message: "输入附件域名",
                 trigger: "blur"
               }]
             },
             {
-              label: "附件名",
+              label: "附件名",
               prop: "name",
               search: true,
               rules: [{
                 required: true,
-                message: "请输入附件名称",
+                message: "請输入附件名稱",
                 trigger: "blur"
               }]
             },
@@ -119,7 +119,7 @@
               search: true,
               rules: [{
                 required: true,
-                message: "输入附件原名",
+                message: "输入附件原名",
                 trigger: "blur"
               }]
             },
@@ -128,7 +128,7 @@
               prop: "extension",
               rules: [{
                 required: true,
-                message: "输入附件拓展名",
+                message: "输入附件拓展名",
                 trigger: "blur"
               }]
             },
@@ -138,7 +138,7 @@
               slot: true,
               rules: [{
                 required: true,
-                message: "输入附件大小",
+                message: "输入附件大小",
                 trigger: "blur"
               }]
             },
@@ -155,7 +155,7 @@
               prop: 'attachFile',
               type: 'upload',
               drag: true,
-              loadText: '模板上传中,稍等',
+              loadText: '模板上传中,稍等',
               span: 24,
               fileSize: 5120,
               propsHttp: {
@@ -202,7 +202,7 @@
         window.open(`${row.link}`);
       },
       rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -220,10 +220,10 @@
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 12 - 12
src/views/resource/oss.vue

@@ -93,7 +93,7 @@
           dialogClickModal: false,
           column: [
             {
-              label: "分",
+              label: "分",
               type: "radio",
               value: 1,
               span: 24,
@@ -114,19 +114,19 @@
               search: true,
               rules: [{
                 required: true,
-                message: "请选择分类",
+                message: "請選擇分類",
                 trigger: "blur"
               }]
             },
             {
-              label: "资源编号",
+              label: "资源編號",
               prop: "ossCode",
               span: 24,
               width: 120,
               search: true,
               rules: [{
                 required: true,
-                message: "请输入资源编号",
+                message: "請输入资源編號",
                 trigger: "blur"
               }]
             },
@@ -136,7 +136,7 @@
               span: 24,
               rules: [{
                 required: true,
-                message: "输入资源地址",
+                message: "输入资源地址",
                 trigger: "blur"
               }]
             },
@@ -147,7 +147,7 @@
               width: 120,
               rules: [{
                 required: true,
-                message: "输入空间名",
+                message: "输入空间名",
                 trigger: "blur"
               }]
             },
@@ -160,7 +160,7 @@
               overHidden: true,
               rules: [{
                 required: true,
-                message: "输入accessKey",
+                message: "输入accessKey",
                 trigger: "blur"
               }]
             },
@@ -172,7 +172,7 @@
               overHidden: true,
               rules: [{
                 required: true,
-                message: "输入secretKey",
+                message: "输入secretKey",
                 trigger: "blur"
               }]
             },
@@ -217,7 +217,7 @@
           submitText: "提交",
           column: [
             {
-              label: "资源编号",
+              label: "资源編號",
               prop: "code",
               disabled: true,
               span: 24,
@@ -301,7 +301,7 @@
         });
       },
       rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -366,10 +366,10 @@
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 12 - 12
src/views/resource/sms.vue

@@ -93,7 +93,7 @@
           dialogClickModal: false,
           column: [
             {
-              label: "分",
+              label: "分",
               type: "radio",
               value: 1,
               span: 24,
@@ -111,19 +111,19 @@
               search: true,
               rules: [{
                 required: true,
-                message: "请选择分类",
+                message: "請選擇分類",
                 trigger: "blur"
               }]
             },
             {
-              label: "资源编号",
+              label: "资源編號",
               prop: "smsCode",
               span: 24,
               width: 200,
               search: true,
               rules: [{
                 required: true,
-                message: "请输入资源编号",
+                message: "請输入资源編號",
                 trigger: "blur"
               }]
             },
@@ -135,7 +135,7 @@
               search: true,
               rules: [{
                 required: true,
-                message: "输入模版ID",
+                message: "输入模版ID",
                 trigger: "blur"
               }]
             },
@@ -146,7 +146,7 @@
               overHidden: true,
               rules: [{
                 required: true,
-                message: "输入accessKey",
+                message: "输入accessKey",
                 trigger: "blur"
               }],
             },
@@ -159,7 +159,7 @@
               hide: true,
               rules: [{
                 required: true,
-                message: "输入secretKey",
+                message: "输入secretKey",
                 trigger: "blur"
               }],
             },
@@ -178,7 +178,7 @@
               width: 200,
               rules: [{
                 required: true,
-                message: "输入短信签名",
+                message: "输入短信签名",
                 trigger: "blur"
               }],
             },
@@ -209,7 +209,7 @@
           submitText: "发送",
           column: [
             {
-              label: "资源编号",
+              label: "资源編號",
               prop: "code",
               disabled: true,
               span: 24,
@@ -314,7 +314,7 @@
         });
       },
       rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -368,10 +368,10 @@
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 14 - 14
src/views/system/client.vue

@@ -65,7 +65,7 @@
               search: true,
               rules: [{
                 required: true,
-                message: "输入客户端id",
+                message: "输入客户端id",
                 trigger: "blur"
               }]
             },
@@ -75,7 +75,7 @@
               search: true,
               rules: [{
                 required: true,
-                message: "输入客户端密钥",
+                message: "输入客户端密钥",
                 trigger: "blur"
               }]
             },
@@ -108,7 +108,7 @@
               ],
               rules: [{
                 required: true,
-                message: "输入授权类型",
+                message: "输入授权类型",
                 trigger: "blur"
               }]
             },
@@ -118,7 +118,7 @@
               value: "all",
               rules: [{
                 required: true,
-                message: "输入授权范围",
+                message: "输入授权范围",
                 trigger: "blur"
               }]
             },
@@ -129,7 +129,7 @@
               value: 3600,
               rules: [{
                 required: true,
-                message: "输入令牌过期秒数",
+                message: "输入令牌过期秒数",
                 trigger: "blur"
               }]
             },
@@ -141,7 +141,7 @@
               hide: true,
               rules: [{
                 required: true,
-                message: "输入刷新令牌过期秒数",
+                message: "输入刷新令牌过期秒数",
                 trigger: "blur"
               }]
             },
@@ -151,7 +151,7 @@
               hide: true,
               rules: [{
                 required: true,
-                message: "输入回调地址",
+                message: "输入回调地址",
                 trigger: "blur"
               }]
             },
@@ -160,7 +160,7 @@
               prop: "resourceIds",
               hide: true,
               rules: [{
-                message: "输入资源集合",
+                message: "输入资源集合",
                 trigger: "blur"
               }]
             },
@@ -169,7 +169,7 @@
               prop: "authorities",
               hide: true,
               rules: [{
-                message: "输入权限",
+                message: "输入权限",
                 trigger: "blur"
               }]
             },
@@ -178,7 +178,7 @@
               prop: "autoapprove",
               hide: true,
               rules: [{
-                message: "输入自动授权",
+                message: "输入自动授权",
                 trigger: "blur"
               }]
             },
@@ -188,7 +188,7 @@
               prop: "additionalInformation",
               span: 24,
               rules: [{
-                message: "输入附加说明",
+                message: "输入附加说明",
                 trigger: "blur"
               }]
             },
@@ -243,7 +243,7 @@
         });
       },
       rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -278,10 +278,10 @@
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 26 - 26
src/views/system/dept.vue

@@ -25,7 +25,7 @@
                    icon="el-icon-delete"
                    v-if="permission.dept_delete"
                    plain
-                   @click="handleDelete">
+                   @click="handleDelete">
         </el-button>
       </template>
       <template slot-scope="scope" slot="menu">
@@ -35,7 +35,7 @@
           size="small"
           @click.stop="handleAdd(scope.row,scope.index)"
           v-if="userInfo.role_name.includes('admin')"
-        >新增子
+        >新增子
         </el-button>
       </template>
       <template slot-scope="{row}"
@@ -86,17 +86,17 @@
           dialogClickModal: false,
           column: [
             {
-              label: "机构名称",
+              label: "機構名稱",
               prop: "deptName",
               search: true,
               rules: [{
                 required: true,
-                message: "请输入机构名称",
+                message: "請輸入機構名稱",
                 trigger: "blur"
               }]
             },
             {
-              label: "所属租户",
+              label: "所屬租戶",
               prop: "tenantId",
               type: "tree",
               dicUrl: "/api/blade-system/tenant/select",
@@ -112,17 +112,17 @@
               search: website.tenantMode,
               rules: [{
                 required: true,
-                message: "请输入所属租户",
+                message: "請輸入所屬租戶",
                 trigger: "click"
               }]
             },
             {
-              label: "机构全称",
+              label: "機構全稱",
               prop: "fullName",
               search: true,
               rules: [{
                 required: true,
-                message: "请输入机构全称",
+                message: "請輸入機構全稱",
                 trigger: "blur"
               }]
             },
@@ -149,7 +149,7 @@
               }]
             },
             {
-              label: "上级机构",
+              label: "上級機構",
               prop: "parentId",
               dicData: [],
               type: "tree",
@@ -160,12 +160,12 @@
               },
               rules: [{
                 required: false,
-                message: "请选择上级机构",
+                message: "請選擇上級機構",
                 trigger: "click"
               }]
             },
             {
-              label: "机构类型",
+              label: "機構類型",
               type: "select",
               dicUrl: "/api/blade-system/dict/dictionary?code=org_category",
               props: {
@@ -181,7 +181,7 @@
               slot: true,
               rules: [{
                 required: true,
-                message: "请输入机构类型",
+                message: "請輸入機構類型",
                 trigger: "blur"
               }]
             },
@@ -193,16 +193,16 @@
               width: 80,
               rules: [{
                 required: true,
-                message: "请输入排序",
+                message: "請輸入排序",
                 trigger: "blur"
               }]
             },
             {
-              label: "注",
+              label: "注",
               prop: "remark",
               rules: [{
                 required: false,
-                message: "请输入备注",
+                message: "請輸入備注",
                 trigger: "blur"
               }],
               hide: true
@@ -252,7 +252,7 @@
       },
       rowSave(row, done, loading) {
         add(row).then((res) => {
-          // 获取新增数据的相关字段
+          // 獲取新增數據的相關字段
           const data = res.data.data;
           row.id = data.id;
           row.deptCategoryName = data.deptCategoryName;
@@ -261,7 +261,7 @@
             type: "success",
             message: "操作成功!"
           });
-          // 数据回调进行刷新
+          // 數據回調進行刷新
           done(row);
         }, error => {
           window.console.log(error);
@@ -274,7 +274,7 @@
             type: "success",
             message: "操作成功!"
           });
-          // 数据回调进行刷新
+          // 數據回調進行刷新
           done(row);
         }, error => {
           window.console.log(error);
@@ -282,8 +282,8 @@
         });
       },
       rowDel(row, index, done) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "定",
+        this.$confirm("確定將選擇數據刪除?", {
+          confirmButtonText: "定",
           cancelButtonText: "取消",
           type: "warning"
         })
@@ -295,17 +295,17 @@
               type: "success",
               message: "操作成功!"
             });
-            // 数据回调进行刷新
+            // 數據回調進行刷新
             done(row);
           });
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一條數據");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "定",
+        this.$confirm("確定將選擇數據刪除?", {
+          confirmButtonText: "定",
           cancelButtonText: "取消",
           type: "warning"
         })
@@ -313,12 +313,12 @@
             return remove(this.ids);
           })
           .then(() => {
-            // 刷新表格数据并重载
+            // 刷新表格數據並重載
             this.data = [];
             this.parentId = 0;
             this.$refs.crud.refreshTable();
             this.$refs.crud.toggleSelection();
-            // 表格数据重载
+            // 表格數據重載
             this.onLoad(this.page);
             this.$message({
               type: "success",

+ 302 - 302
src/views/system/dict.vue

@@ -29,7 +29,7 @@
           v-if="permission.dict_delete"
           plain
           @click="handleDelete"
-        >
+        >
         </el-button>
       </template>
       <template slot-scope="scope" slot="menu">
@@ -81,7 +81,7 @@
             v-if="permission.dict_delete"
             plain
             @click="handleDelete"
-          >
+          >
           </el-button>
         </template>
         <template slot-scope="scope" slot="menu">
@@ -91,7 +91,7 @@
             size="small"
             @click.stop="handleAdd(scope.row,scope.index)"
             v-if="userInfo.role_name.includes('admin')"
-          >新增子
+          >新增子
           </el-button>
         </template>
         <template slot-scope="{row}" slot="isSealed">
@@ -103,341 +103,341 @@
 </template>
 
 <script>
-import {
-  getParentList,
-  getChildList,
-  remove,
-  update,
-  add,
-  getDict,
-  getDictTree
-} from "@/api/system/dict";
-import {optionParent, optionChild} from "@/option/system/dict";
-import {mapGetters} from "vuex";
+  import {
+    getParentList,
+    getChildList,
+    remove,
+    update,
+    add,
+    getDict,
+    getDictTree
+  } from "@/api/system/dict";
+  import {optionParent, optionChild} from "@/option/system/dict";
+  import {mapGetters} from "vuex";
 
-export default {
-  data() {
-    return {
-      dictValue: '暂无',
-      parentId: -1,
-      formParent: {},
-      formChild: {},
-      selectionList: [],
-      query: {},
-      box: false,
-      loading: true,
-      loadingChild: true,
-      pageParent: {
-        pageSize: 10,
-        pageSizes: [10, 30, 50, 100, 200],
-        currentPage: 1,
-        total: 0
-      },
-      pageChild: {
-        pageSize: 10,
-        pageSizes: [10, 30, 50, 100, 200],
-        currentPage: 1,
-        total: 0
-      },
-      dataParent: [],
-      dataChild: [],
-      optionParent: optionParent,
-      optionChild: optionChild,
-    };
-  },
-  computed: {
-    ...mapGetters(["userInfo", "permission"]),
-    permissionList() {
+  export default {
+    data() {
       return {
-        addBtn: this.vaildData(this.permission.dict_add, false),
-        delBtn: this.vaildData(this.permission.dict_delete, false),
-        editBtn: this.vaildData(this.permission.dict_edit, false),
-        viewBtn: false,
+        dictValue: '暫無',
+        parentId: -1,
+        formParent: {},
+        formChild: {},
+        selectionList: [],
+        query: {},
+        box: false,
+        loading: true,
+        loadingChild: true,
+        pageParent: {
+          pageSize: 10,
+          pageSizes: [10, 30, 50, 100, 200],
+          currentPage: 1,
+          total: 0
+        },
+        pageChild: {
+          pageSize: 10,
+          pageSizes: [10, 30, 50, 100, 200],
+          currentPage: 1,
+          total: 0
+        },
+        dataParent: [],
+        dataChild: [],
+        optionParent: optionParent,
+        optionChild: optionChild,
       };
     },
-    ids() {
-      let ids = [];
-      this.selectionList.forEach(ele => {
-        ids.push(ele.id);
-      });
-      return ids.join(",");
-    }
-  },
-  mounted() {
-    this.initData();
-  },
-  methods: {
-    initData() {
-      getDictTree().then(res => {
-        const column = this.findObject(this.optionChild.column, "parentId");
-        column.dicData = res.data.data;
-      });
-    },
-    handleAdd(row) {
-      this.formChild.dictValue = "";
-      this.formChild.dictKey = "";
-      this.formChild.sort = 0;
-      this.formChild.isSealed = 0;
-      this.formChild.remark = "";
-      this.formChild.parentId = row.id;
-      this.$refs.crudChild.rowAdd();
-    },
-    rowSave(row, done, loading) {
-      const form = {
-        ...row,
-        dictKey: -1,
-      };
-      add(form).then(() => {
-        this.onLoadParent(this.pageParent);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
+    computed: {
+      ...mapGetters(["userInfo", "permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.dict_add, false),
+          delBtn: this.vaildData(this.permission.dict_delete, false),
+          editBtn: this.vaildData(this.permission.dict_edit, false),
+          viewBtn: false,
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
         });
-        done();
-      }, error => {
-        window.console.log(error);
-        loading();
-      });
+        return ids.join(",");
+      }
     },
-    rowUpdate(row, index, done, loading) {
-      update(row).then(() => {
-        this.onLoadParent(this.pageParent);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        this.onLoadChild(this.pageChild);
-        done();
-      }, error => {
-        window.console.log(error);
-        loading();
-      });
+    mounted() {
+      this.initData();
     },
-    rowDel(row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          return remove(row.id);
-        })
-        .then(() => {
+    methods: {
+      initData() {
+        getDictTree().then(res => {
+          const column = this.findObject(this.optionChild.column, "parentId");
+          column.dicData = res.data.data;
+        });
+      },
+      handleAdd(row) {
+        this.formChild.dictValue = "";
+        this.formChild.dictKey = "";
+        this.formChild.sort = 0;
+        this.formChild.isSealed = 0;
+        this.formChild.remark = "";
+        this.formChild.parentId = row.id;
+        this.$refs.crudChild.rowAdd();
+      },
+      rowSave(row, done, loading) {
+        const form = {
+          ...row,
+          dictKey: -1,
+        };
+        add(form).then(() => {
           this.onLoadParent(this.pageParent);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
+          done();
+        }, error => {
+          window.console.log(error);
+          loading();
         });
-    },
-    handleRowClick(row) {
-      this.query = {};
-      this.parentId = row.id;
-      this.dictValue = row.dictValue;
-
-      const code = this.findObject(this.optionChild.column, "code");
-      code.value = row.code;
-      const parentId = this.findObject(this.optionChild.column, "parentId");
-      parentId.value = row.id;
-
-      this.box = true;
-      this.onLoadChild(this.pageChild);
-    },
-    searchReset() {
-      this.query = {};
-      this.onLoadParent(this.pageParent);
-    },
-    searchChange(params, done) {
-      this.query = params;
-      this.pageParent.currentPage = 1;
-      this.onLoadParent(this.pageParent, params);
-      done();
-    },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    handleDelete() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
-        return;
-      }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          return remove(this.ids);
-        })
-        .then(() => {
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
           this.onLoadParent(this.pageParent);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          this.$refs.crud.toggleSelection();
-        });
-    },
-    beforeOpen(done, type) {
-      if (["edit", "view"].includes(type)) {
-        getDict(this.formParent.id).then(res => {
-          this.formParent = res.data.data;
-        });
-      }
-      done();
-    },
-    currentChange(currentPage) {
-      this.pageParent.currentPage = currentPage;
-    },
-    sizeChange(pageSize) {
-      this.pageParent.pageSize = pageSize;
-    },
-    refreshChange() {
-      this.onLoadParent(this.pageParent, this.query);
-    },
-    rowSaveChild(row, done, loading) {
-      add(row).then(() => {
-        this.onLoadChild(this.pageChild);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
+          this.onLoadChild(this.pageChild);
+          done();
+        }, error => {
+          window.console.log(error);
+          loading();
         });
-        done();
-      }, error => {
-        window.console.log(error);
-        loading();
-      });
-    },
-    rowUpdateChild(row, index, done, loading) {
-      update(row).then(() => {
+      },
+      rowDel(row) {
+        this.$confirm("確定將選擇數據刪除?", {
+          confirmButtonText: "確定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoadParent(this.pageParent);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleRowClick(row) {
+        this.query = {};
+        this.parentId = row.id;
+        this.dictValue = row.dictValue;
+
+        const code = this.findObject(this.optionChild.column, "code");
+        code.value = row.code;
+        const parentId = this.findObject(this.optionChild.column, "parentId");
+        parentId.value = row.id;
+
+        this.box = true;
         this.onLoadChild(this.pageChild);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoadParent(this.pageParent);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.pageParent.currentPage = 1;
+        this.onLoadParent(this.pageParent, params);
         done();
-      }, error => {
-        window.console.log(error);
-        loading();
-      });
-    },
-    rowDelChild(row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          return remove(row.id);
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("請選擇至少一條數據");
+          return;
+        }
+        this.$confirm("確定將選擇數據刪除?", {
+          confirmButtonText: "確定",
+          cancelButtonText: "取消",
+          type: "warning"
         })
-        .then(() => {
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoadParent(this.pageParent);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDict(this.formParent.id).then(res => {
+            this.formParent = res.data.data;
+          });
+        }
+        done();
+      },
+      currentChange(currentPage) {
+        this.pageParent.currentPage = currentPage;
+      },
+      sizeChange(pageSize) {
+        this.pageParent.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoadParent(this.pageParent, this.query);
+      },
+      rowSaveChild(row, done, loading) {
+        add(row).then(() => {
           this.onLoadChild(this.pageChild);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
+          done();
+        }, error => {
+          window.console.log(error);
+          loading();
         });
-    },
-    searchResetChild() {
-      this.query = {};
-      this.onLoadChild(this.pageChild);
-    },
-    searchChangeChild(params, done) {
-      this.query = params;
-      this.pageChild.currentPage = 1;
-      this.onLoadChild(this.pageChild, params);
-      done();
-    },
-    selectionChangeChild(list) {
-      this.selectionList = list;
-    },
-    selectionClearChild() {
-      this.selectionList = [];
-      this.$refs.crudChild.toggleSelection();
-    },
-    handleDeleteChild() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
-        return;
-      }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          return remove(this.ids);
-        })
-        .then(() => {
+      },
+      rowUpdateChild(row, index, done, loading) {
+        update(row).then(() => {
           this.onLoadChild(this.pageChild);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          this.$refs.crudChild.toggleSelection();
+          done();
+        }, error => {
+          window.console.log(error);
+          loading();
         });
-    },
-    beforeOpenChild(done, type) {
-      if (["add", "edit"].includes(type)) {
-        this.initData();
-      }
-      if (["edit", "view"].includes(type)) {
-        getDict(this.formChild.id).then(res => {
-          this.formChild = res.data.data;
+      },
+      rowDelChild(row) {
+        this.$confirm("確定將選擇數據刪除?", {
+          confirmButtonText: "確定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoadChild(this.pageChild);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      searchResetChild() {
+        this.query = {};
+        this.onLoadChild(this.pageChild);
+      },
+      searchChangeChild(params, done) {
+        this.query = params;
+        this.pageChild.currentPage = 1;
+        this.onLoadChild(this.pageChild, params);
+        done();
+      },
+      selectionChangeChild(list) {
+        this.selectionList = list;
+      },
+      selectionClearChild() {
+        this.selectionList = [];
+        this.$refs.crudChild.toggleSelection();
+      },
+      handleDeleteChild() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("請選擇至少一條數據");
+          return;
+        }
+        this.$confirm("確定將選擇數據刪除?", {
+          confirmButtonText: "確定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoadChild(this.pageChild);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crudChild.toggleSelection();
+          });
+      },
+      beforeOpenChild(done, type) {
+        if (["add", "edit"].includes(type)) {
+          this.initData();
+        }
+        if (["edit", "view"].includes(type)) {
+          getDict(this.formChild.id).then(res => {
+            this.formChild = res.data.data;
+          });
+        }
+        done();
+      },
+      beforeCloseChild(done) {
+        this.$refs.crudChild.value.parentId = this.parentId;
+        this.$refs.crudChild.option.column.filter(item => {
+          if (item.prop === "parentId") {
+            item.value = this.parentId;
+          }
+        });
+        done();
+      },
+      currentChangeChild(currentPage) {
+        this.pageChild.currentPage = currentPage;
+      },
+      sizeChangeChild(pageSize) {
+        this.pageChild.pageSize = pageSize;
+      },
+      refreshChangeChild() {
+        this.onLoadChild(this.pageChild, this.query);
+      },
+      onLoadParent(page, params = {}) {
+        this.loading = true;
+        getParentList(
+          page.currentPage,
+          page.pageSize,
+          Object.assign(params, this.query)
+        ).then(res => {
+          const data = res.data.data;
+          this.pageParent.total = data.total;
+          this.dataParent = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      },
+      onLoadChild(page, params = {}) {
+        this.loadingChild = true;
+        getChildList(
+          page.currentPage,
+          page.pageSize,
+          this.parentId,
+          Object.assign(params, this.query)
+        ).then(res => {
+          this.dataChild = res.data.data;
+          this.loadingChild = false;
+          this.selectionClear();
         });
       }
-      done();
-    },
-    beforeCloseChild(done) {
-      this.$refs.crudChild.value.parentId = this.parentId;
-      this.$refs.crudChild.option.column.filter(item => {
-        if (item.prop === "parentId") {
-          item.value = this.parentId;
-        }
-      });
-      done();
-    },
-    currentChangeChild(currentPage) {
-      this.pageChild.currentPage = currentPage;
-    },
-    sizeChangeChild(pageSize) {
-      this.pageChild.pageSize = pageSize;
-    },
-    refreshChangeChild() {
-      this.onLoadChild(this.pageChild, this.query);
-    },
-    onLoadParent(page, params = {}) {
-      this.loading = true;
-      getParentList(
-        page.currentPage,
-        page.pageSize,
-        Object.assign(params, this.query)
-      ).then(res => {
-        const data = res.data.data;
-        this.pageParent.total = data.total;
-        this.dataParent = data.records;
-        this.loading = false;
-        this.selectionClear();
-      });
-    },
-    onLoadChild(page, params = {}) {
-      this.loadingChild = true;
-      getChildList(
-        page.currentPage,
-        page.pageSize,
-        this.parentId,
-        Object.assign(params, this.query)
-      ).then(res => {
-        this.dataChild = res.data.data;
-        this.loadingChild = false;
-        this.selectionClear();
-      });
     }
-  }
-};
+  };
 </script>
 

+ 6 - 6
src/views/system/dictbiz.vue

@@ -214,7 +214,7 @@
         });
       },
       rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -262,10 +262,10 @@
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -326,7 +326,7 @@
         });
       },
       rowDelChild(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -361,10 +361,10 @@
       },
       handleDeleteChild() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 14 - 14
src/views/system/menu.vue

@@ -84,13 +84,13 @@
           dialogClickModal: false,
           column: [
             {
-              label: "菜单名",
+              label: "菜单名",
               prop: "name",
               search: true,
               rules: [
                 {
                   required: true,
-                  message: "请输入菜单名称",
+                  message: "請输入菜单名稱",
                   trigger: "blur"
                 }
               ]
@@ -101,7 +101,7 @@
               rules: [
                 {
                   required: true,
-                  message: "输入路由地址",
+                  message: "输入路由地址",
                   trigger: "blur"
                 }
               ]
@@ -119,7 +119,7 @@
               rules: [
                 {
                   required: false,
-                  message: "请选择上级菜单",
+                  message: "請選擇上级菜单",
                   trigger: "click"
                 }
               ]
@@ -133,19 +133,19 @@
               rules: [
                 {
                   required: true,
-                  message: "输入菜单图标",
+                  message: "输入菜单图标",
                   trigger: "click"
                 }
               ]
             },
             {
-              label: "菜单编号",
+              label: "菜单編號",
               prop: "code",
               search: true,
               rules: [
                 {
                   required: true,
-                  message: "请输入菜单编号",
+                  message: "請输入菜单編號",
                   trigger: "blur"
                 }
               ]
@@ -168,7 +168,7 @@
               rules: [
                 {
                   required: true,
-                  message: "请选择菜单类型",
+                  message: "請選擇菜单类型",
                   trigger: "blur"
                 }
               ]
@@ -180,7 +180,7 @@
               rules: [
                 {
                   required: true,
-                  message: "输入菜单别名",
+                  message: "输入菜单别名",
                   trigger: "blur"
                 }
               ]
@@ -204,7 +204,7 @@
               rules: [
                 {
                   required: true,
-                  message: "请选择新窗口打开",
+                  message: "請選擇新窗口打开",
                   trigger: "blur"
                 }
               ]
@@ -218,7 +218,7 @@
               rules: [
                 {
                   required: true,
-                  message: "输入菜单排序",
+                  message: "输入菜单排序",
                   trigger: "blur"
                 }
               ]
@@ -311,7 +311,7 @@
         });
       },
       rowDel(row, index, done) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -330,10 +330,10 @@
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 10 - 10
src/views/system/post.vue

@@ -80,7 +80,7 @@
               hide: !website.tenantMode,
               rules: [{
                 required: true,
-                message: "输入所属租户",
+                message: "输入所属租户",
                 trigger: "click"
               }]
             },
@@ -98,27 +98,27 @@
               search: true,
               rules: [{
                 required: true,
-                message: "请选择岗位类型",
+                message: "請選擇岗位类型",
                 trigger: "blur"
               }]
             },
             {
-              label: "岗位编号",
+              label: "岗位編號",
               prop: "postCode",
               search: true,
               rules: [{
                 required: true,
-                message: "请输入岗位编号",
+                message: "請输入岗位編號",
                 trigger: "blur"
               }]
             },
             {
-              label: "岗位名",
+              label: "岗位名",
               prop: "postName",
               search: true,
               rules: [{
                 required: true,
-                message: "请输入岗位名称",
+                message: "請输入岗位名稱",
                 trigger: "blur"
               }]
             },
@@ -128,7 +128,7 @@
               type: "number",
               rules: [{
                 required: true,
-                message: "输入岗位排序",
+                message: "输入岗位排序",
                 trigger: "blur"
               }]
             },
@@ -191,7 +191,7 @@
         });
       },
       rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -209,10 +209,10 @@
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 11 - 11
src/views/system/tenant.vue

@@ -104,19 +104,19 @@ export default {
             span: 24,
             rules: [{
               required: true,
-              message: "输入租户ID",
+              message: "输入租户ID",
               trigger: "blur"
             }]
           },
           {
-            label: "租户名",
+            label: "租户名",
             prop: "tenantName",
             search: true,
             width: 180,
             span: 24,
             rules: [{
               required: true,
-              message: "请输入参数名称",
+              message: "請输入参数名稱",
               trigger: "blur"
             }]
           },
@@ -127,7 +127,7 @@ export default {
             search: true,
             rules: [{
               required: true,
-              message: "输入联系人",
+              message: "输入联系人",
               trigger: "blur"
             }]
           },
@@ -216,7 +216,7 @@ export default {
             },
             rules: [{
               required: true,
-              message: "请选择数据源",
+              message: "請選擇数据源",
               trigger: "blur"
             }]
           },
@@ -273,7 +273,7 @@ export default {
       });
     },
     rowDel(row) {
-      this.$confirm("确定将选择数据删除?", {
+      this.$confirm("确定将選擇数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -323,10 +323,10 @@ export default {
     },
     handleDelete() {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning("請選擇至少一条数据");
         return;
       }
-      this.$confirm("确定将选择数据删除?", {
+      this.$confirm("确定将選擇数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -345,7 +345,7 @@ export default {
     },
     handleSetting() {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning("請選擇至少一条数据");
         return;
       }
       if (this.selectionList.length === 1) {
@@ -362,11 +362,11 @@ export default {
     },
     handleDatasource() {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning("請選擇至少一条数据");
         return;
       }
       if (this.selectionList.length !== 1) {
-        this.$message.warning("只能选择一条数据");
+        this.$message.warning("只能選擇一条数据");
         return;
       }
       getDetail(this.selectionList[0].id).then(res => {

+ 9 - 9
src/views/system/topmenu.vue

@@ -108,7 +108,7 @@
               search: true,
               rules: [{
                 required: true,
-                message: "输入菜单名",
+                message: "输入菜单名",
                 trigger: "blur"
               }]
             },
@@ -121,18 +121,18 @@
               rules: [
                 {
                   required: true,
-                  message: "输入菜单图标",
+                  message: "输入菜单图标",
                   trigger: "click"
                 }
               ]
             },
             {
-              label: "菜单编号",
+              label: "菜单編號",
               prop: "code",
               search: true,
               rules: [{
                 required: true,
-                message: "请输入菜单编号",
+                message: "請输入菜单編號",
                 trigger: "blur"
               }]
             },
@@ -143,7 +143,7 @@
               slot: true,
               rules: [{
                 required: true,
-                message: "输入菜单排序",
+                message: "输入菜单排序",
                 trigger: "blur"
               }]
             },
@@ -216,7 +216,7 @@
         });
       },
       rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -234,10 +234,10 @@
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -256,7 +256,7 @@
       },
       handleMenuSetting() {
         if (this.selectionList.length !== 1) {
-          this.$message.warning("只能选择一条数据");
+          this.$message.warning("只能選擇一条数据");
           return;
         }
         this.menuTreeObj = [];

+ 15 - 15
src/views/tool/code.vue

@@ -90,7 +90,7 @@
               },
               rules: [{
                 required: true,
-                message: "请选择数据源",
+                message: "請選擇数据源",
                 trigger: "blur"
               }]
             },
@@ -100,7 +100,7 @@
               search: true,
               rules: [{
                 required: true,
-                message: "输入模块名",
+                message: "输入模块名",
                 trigger: "blur"
               }]
             },
@@ -110,7 +110,7 @@
               search: true,
               rules: [{
                 required: true,
-                message: "输入服务名",
+                message: "输入服务名",
                 trigger: "blur"
               }]
             },
@@ -119,7 +119,7 @@
               prop: "tableName",
               rules: [{
                 required: true,
-                message: "输入表名",
+                message: "输入表名",
                 trigger: "blur"
               }]
             },
@@ -129,7 +129,7 @@
               hide: true,
               rules: [{
                 required: true,
-                message: "输入表前缀",
+                message: "输入表前缀",
                 trigger: "blur"
               }]
             },
@@ -139,7 +139,7 @@
               hide: true,
               rules: [{
                 required: true,
-                message: "输入主键名",
+                message: "输入主键名",
                 trigger: "blur"
               }]
             },
@@ -149,7 +149,7 @@
               overHidden: true,
               rules: [{
                 required: true,
-                message: "输入包名",
+                message: "输入包名",
                 trigger: "blur"
               }]
             },
@@ -166,7 +166,7 @@
               hide: true,
               rules: [{
                 required: true,
-                message: "请选择基础业务",
+                message: "請選擇基础业务",
                 trigger: "blur"
               }]
             },
@@ -183,7 +183,7 @@
               hide: true,
               rules: [{
                 required: true,
-                message: "请选择包装器",
+                message: "請選擇包装器",
                 trigger: "blur"
               }]
             },
@@ -194,7 +194,7 @@
               hide: true,
               rules: [{
                 required: true,
-                message: "输入后端生成路径",
+                message: "输入后端生成路径",
                 trigger: "blur"
               }]
             },
@@ -205,7 +205,7 @@
               hide: true,
               rules: [{
                 required: true,
-                message: "输入前端生成路径",
+                message: "输入前端生成路径",
                 trigger: "blur"
               }]
             }
@@ -260,7 +260,7 @@
         });
       },
       rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -295,10 +295,10 @@
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -317,7 +317,7 @@
       },
       handleBuild() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
         this.$confirm("是否生成选中模块的代码?", {

+ 9 - 9
src/views/tool/datasource.vue

@@ -61,12 +61,12 @@
           dialogClickModal: false,
           column: [
             {
-              label: "名",
+              label: "名",
               prop: "name",
               width: 120,
               rules: [{
                 required: true,
-                message: "请输入数据源名称",
+                message: "請输入数据源名稱",
                 trigger: "blur"
               }]
             },
@@ -89,7 +89,7 @@
               width: 200,
               rules: [{
                 required: true,
-                message: "输入驱动类",
+                message: "输入驱动类",
                 trigger: "blur"
               }]
             },
@@ -99,7 +99,7 @@
               width: 120,
               rules: [{
                 required: true,
-                message: "输入用户名",
+                message: "输入用户名",
                 trigger: "blur"
               }]
             },
@@ -109,7 +109,7 @@
               hide: true,
               rules: [{
                 required: true,
-                message: "输入密码",
+                message: "输入密码",
                 trigger: "blur"
               }]
             },
@@ -119,7 +119,7 @@
               span: 24,
               rules: [{
                 required: true,
-                message: "输入连接地址",
+                message: "输入连接地址",
                 trigger: "blur"
               }]
             },
@@ -182,7 +182,7 @@
         });
       },
       rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -200,10 +200,10 @@
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 11 - 11
src/views/util/demo/dict-classic.vue

@@ -83,27 +83,27 @@
           dialogWidth: 880,
           column: [
             {
-              label: "字典编号",
+              label: "字典編號",
               prop: "code",
               search: true,
               span: 24,
               rules: [
                 {
                   required: true,
-                  message: "请输入字典编号",
+                  message: "請输入字典編號",
                   trigger: "blur"
                 }
               ]
             },
             {
-              label: "字典名",
+              label: "字典名",
               prop: "dictValue",
               search: true,
               align: "center",
               rules: [
                 {
                   required: true,
-                  message: "请输入字典名称",
+                  message: "請输入字典名稱",
                   trigger: "blur"
                 }
               ]
@@ -120,7 +120,7 @@
               rules: [
                 {
                   required: false,
-                  message: "请选择上级字典",
+                  message: "請選擇上级字典",
                   trigger: "click"
                 }
               ]
@@ -132,7 +132,7 @@
               rules: [
                 {
                   required: true,
-                  message: "输入字典键值",
+                  message: "输入字典键值",
                   trigger: "blur"
                 }
               ]
@@ -144,7 +144,7 @@
               rules: [
                 {
                   required: true,
-                  message: "输入字典排序",
+                  message: "输入字典排序",
                   trigger: "blur"
                 }
               ]
@@ -167,7 +167,7 @@
               rules: [
                 {
                   required: true,
-                  message: "请选择封存",
+                  message: "請選擇封存",
                   trigger: "blur"
                 }
               ]
@@ -250,7 +250,7 @@
         });
       },
       rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -285,10 +285,10 @@
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 13 - 13
src/views/util/demo/dict-horizontal.vue

@@ -129,14 +129,14 @@
           dialogWidth: 880,
           column: [
             {
-              label: "字典编号",
+              label: "字典編號",
               prop: "code",
               search: true,
               span: 24,
               rules: [
                 {
                   required: true,
-                  message: "请输入字典编号",
+                  message: "請输入字典編號",
                   trigger: "blur"
                 }
               ]
@@ -148,20 +148,20 @@
               rules: [
                 {
                   required: true,
-                  message: "输入字典键值",
+                  message: "输入字典键值",
                   trigger: "blur"
                 }
               ]
             },
             {
-              label: "字典名",
+              label: "字典名",
               prop: "dictValue",
               search: true,
               align: "center",
               rules: [
                 {
                   required: true,
-                  message: "请输入字典名称",
+                  message: "請输入字典名稱",
                   trigger: "blur"
                 }
               ]
@@ -173,7 +173,7 @@
               rules: [
                 {
                   required: true,
-                  message: "输入字典排序",
+                  message: "输入字典排序",
                   trigger: "blur"
                 }
               ]
@@ -196,7 +196,7 @@
               rules: [
                 {
                   required: true,
-                  message: "请选择封存",
+                  message: "請選擇封存",
                   trigger: "blur"
                 }
               ]
@@ -257,7 +257,7 @@
         });
       },
       rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -296,10 +296,10 @@
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -360,7 +360,7 @@
         });
       },
       rowDelChild(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -395,10 +395,10 @@
       },
       handleDeleteChild() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 13 - 13
src/views/util/demo/dict-vertical.vue

@@ -134,14 +134,14 @@
           dialogWidth: 880,
           column: [
             {
-              label: "字典编号",
+              label: "字典編號",
               prop: "code",
               search: true,
               span: 24,
               rules: [
                 {
                   required: true,
-                  message: "请输入字典编号",
+                  message: "請输入字典編號",
                   trigger: "blur"
                 }
               ]
@@ -153,20 +153,20 @@
               rules: [
                 {
                   required: true,
-                  message: "输入字典键值",
+                  message: "输入字典键值",
                   trigger: "blur"
                 }
               ]
             },
             {
-              label: "字典名",
+              label: "字典名",
               prop: "dictValue",
               search: true,
               align: "center",
               rules: [
                 {
                   required: true,
-                  message: "请输入字典名称",
+                  message: "請输入字典名稱",
                   trigger: "blur"
                 }
               ]
@@ -178,7 +178,7 @@
               rules: [
                 {
                   required: true,
-                  message: "输入字典排序",
+                  message: "输入字典排序",
                   trigger: "blur"
                 }
               ]
@@ -201,7 +201,7 @@
               rules: [
                 {
                   required: true,
-                  message: "请选择封存",
+                  message: "請選擇封存",
                   trigger: "blur"
                 }
               ]
@@ -262,7 +262,7 @@
         });
       },
       rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -301,10 +301,10 @@
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -365,7 +365,7 @@
         });
       },
       rowDelChild(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -400,10 +400,10 @@
       },
       handleDeleteChild() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 6 - 6
src/views/util/demo/dict.vue

@@ -222,7 +222,7 @@
         });
       },
       rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -273,10 +273,10 @@
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -337,7 +337,7 @@
         });
       },
       rowDelChild(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -372,10 +372,10 @@
       },
       handleDeleteChild() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 6 - 6
src/views/util/demo/dictbiz.vue

@@ -216,7 +216,7 @@
         });
       },
       rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -267,10 +267,10 @@
       },
       handleDelete() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -331,7 +331,7 @@
         });
       },
       rowDelChild(row) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -366,10 +366,10 @@
       },
       handleDeleteChild() {
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
+          this.$message.warning("請選擇至少一条数据");
           return;
         }
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将選擇数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

+ 1 - 1
src/views/util/form.vue

@@ -32,7 +32,7 @@
               row: true
             },
             {
-              label: "申日期",
+              label: "申日期",
               prop: "date",
               type: "date",
               row: true

+ 1 - 1
src/views/util/logs.vue

@@ -1,6 +1,6 @@
 <template>
   <basic-container>
-    <h3>打开浏览器控制台,然后点击下面的按钮</h3>
+    <h3>打开浏览器控制台,然后点击下面的按钮</h3>
     <el-button type="danger"
                size="small"
                @click="handleNewError">触发一个错误

+ 1 - 1
src/views/util/table.vue

@@ -103,7 +103,7 @@
               row: true
             },
             {
-              label: "申日期",
+              label: "申日期",
               prop: "date",
               type: "date",
               span: 14,

+ 3 - 3
src/views/work/claim.vue

@@ -104,7 +104,7 @@
           dialogClickModal: false,
           column: [
             {
-              label: "流程分",
+              label: "流程分",
               type: "select",
               row: true,
               dicUrl: "/api/blade-system/dict/dictionary?code=flow",
@@ -120,7 +120,7 @@
               width: 100,
             },
             {
-              label: '流程名',
+              label: '流程名',
               prop: 'processDefinitionName',
               search: true,
             },
@@ -135,7 +135,7 @@
               width: 80,
             },
             {
-              label: '申时间',
+              label: '申时间',
               prop: 'createTime',
               width: 165,
             },

+ 3 - 3
src/views/work/done.vue

@@ -97,7 +97,7 @@
           dialogClickModal: false,
           column: [
             {
-              label: "流程分",
+              label: "流程分",
               type: "select",
               row: true,
               dicUrl: "/api/blade-system/dict/dictionary?code=flow",
@@ -113,7 +113,7 @@
               width: 100,
             },
             {
-              label: '流程名',
+              label: '流程名',
               prop: 'processDefinitionName',
               search: true,
             },
@@ -128,7 +128,7 @@
               width: 80,
             },
             {
-              label: '申时间',
+              label: '申时间',
               prop: 'createTime',
               width: 165,
             },

+ 2 - 2
src/views/work/process/leave/detail.vue

@@ -10,7 +10,7 @@
         <div slot="header">
           <span>审批信息</span>
         </div>
-        <el-form-item label="申人">
+        <el-form-item label="申人">
           <el-input :disabled="true" v-model="form.flow.assigneeName" />
         </el-form-item>
         <el-row>
@@ -25,7 +25,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="假理由">
+        <el-form-item label="假理由">
           <el-input :disabled="true" type="textarea" v-model="form.reason" />
         </el-form-item>
       </el-card>

+ 6 - 6
src/views/work/process/leave/form.vue

@@ -15,7 +15,7 @@
           group: [
             {
               icon: 'el-icon-info',
-              label: '假基础信息',
+              label: '假基础信息',
               prop: 'group1',
               column: [
                 {
@@ -31,7 +31,7 @@
                   rules: [
                     {
                       required: true,
-                      message: '请选择审批人员',
+                      message: '請選擇审批人员',
                       trigger: 'blur'
                     }
                   ]
@@ -44,7 +44,7 @@
                   rules: [
                     {
                       required: true,
-                      message: '请选择开始时间',
+                      message: '請選擇开始时间',
                       trigger: 'blur'
                     }
                   ]
@@ -57,20 +57,20 @@
                   rules: [
                     {
                       required: true,
-                      message: '请选择结束时间',
+                      message: '請選擇结束时间',
                       trigger: 'blur'
                     }
                   ]
                 },
                 {
-                  label: '假理由',
+                  label: '假理由',
                   prop: 'reason',
                   type: 'textarea',
                   span: 24,
                   rules: [
                     {
                       required: true,
-                      message: '请输入请假理由',
+                      message: '請输入請假理由',
                       trigger: 'blur'
                     }
                   ]

+ 4 - 4
src/views/work/process/leave/handle.vue

@@ -12,7 +12,7 @@
         <div slot="header">
           <span>审批信息</span>
         </div>
-        <el-form-item label="申人">
+        <el-form-item label="申人">
           <el-input :disabled="true" v-model="form.flow.assigneeName"/>
         </el-form-item>
         <el-row>
@@ -27,7 +27,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="假理由">
+        <el-form-item label="假理由">
           <el-input :disabled="true" type="textarea" v-model="form.reason"/>
         </el-form-item>
         <el-form-item label="批复意见">
@@ -120,7 +120,7 @@
       },
       handleAgree() {
         if (!this.form.comment) {
-          this.$message.warning('先填写批复意见');
+          this.$message.warning('先填写批复意见');
           return;
         }
         const params = {
@@ -142,7 +142,7 @@
       },
       handleDisagree() {
         if (!this.form.comment) {
-          this.$message.warning('先填写批复意见');
+          this.$message.warning('先填写批复意见');
           return;
         }
         const params = {

+ 3 - 3
src/views/work/send.vue

@@ -101,7 +101,7 @@
           dialogClickModal: false,
           column: [
             {
-              label: "流程分",
+              label: "流程分",
               type: "select",
               row: true,
               dicUrl: "/api/blade-system/dict/dictionary?code=flow",
@@ -117,7 +117,7 @@
               width: 100,
             },
             {
-              label: '流程名',
+              label: '流程名',
               prop: 'processDefinitionName',
               search: true,
             },
@@ -138,7 +138,7 @@
               width: 80,
             },
             {
-              label: '申时间',
+              label: '申时间',
               prop: 'createTime',
               width: 165,
             },

+ 3 - 3
src/views/work/start.vue

@@ -116,13 +116,13 @@
           dialogClickModal: false,
           column: [
             {
-              label: '租户编号',
+              label: '租户編號',
               prop: 'tenantId',
               slot: true,
               width: 120,
             },
             {
-              label: "流程分",
+              label: "流程分",
               type: "select",
               row: true,
               dicUrl: "/api/blade-system/dict/dictionary?code=flow",
@@ -141,7 +141,7 @@
               prop: 'key',
             },
             {
-              label: '流程名',
+              label: '流程名',
               prop: 'name',
               search: true,
             },

+ 3 - 3
src/views/work/todo.vue

@@ -104,7 +104,7 @@
           dialogClickModal: false,
           column: [
             {
-              label: "流程分",
+              label: "流程分",
               type: "select",
               row: true,
               dicUrl: "/api/blade-system/dict/dictionary?code=flow",
@@ -120,7 +120,7 @@
               width: 100,
             },
             {
-              label: '流程名',
+              label: '流程名',
               prop: 'processDefinitionName',
               search: true,
             },
@@ -135,7 +135,7 @@
               width: 80,
             },
             {
-              label: '申时间',
+              label: '申时间',
               prop: 'createTime',
               width: 165,
             },

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików