fangq 4 lat temu
rodzic
commit
18403717be

+ 1 - 1
LICENSE

@@ -27,7 +27,7 @@ BladeX系列产品知识产权归上海布雷德网络科技独立所有
 5. BladeX团队可能会按照官方制定的答疑规则为您进行答疑,但BladeX团队没有为根据本协议许可的产品提供技术支持的义务或责任。
 
 六、 权利和所有权的保留:
-BladeX团队保留所有未在本协议中明确授予您的所有权利。BladeX团队保留随时更新本协议的权利,并只需公示于对应产品项目的LICENSE文,无需征得您的事先同意且无需另行通知,更新后的内容应于公示即时生效。您可以随时访问产品地址并查阅最新版许可条款,在更新生效后您继续使用本产品则被视作您已接受了新的条款。
+BladeX团队保留所有未在本协议中明确授予您的所有权利。BladeX团队保留随时更新本协议的权利,并只需公示于对应产品项目的LICENSE文,无需征得您的事先同意且无需另行通知,更新后的内容应于公示即时生效。您可以随时访问产品地址并查阅最新版许可条款,在更新生效后您继续使用本产品则被视作您已接受了新的条款。
 
 七、 协议终止
 1. 您一旦开始复制、下载、安装或者使用本产品,即被视为完全理解并接受本协议的各项条款,在享有上述条款授予的许可权力同时,也受到相关的约束和限制,本协议许可范围以外的行为,将直接违反本协议并构成侵权。

+ 2 - 2
build.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-echo "====================打包文===================="
+echo "====================打包文===================="
 yarn build
-echo "====================传输文===================="
+echo "====================传输文===================="
 
 scp -P 22 -r ./dist/** root@192.168.0.157:/docker/nginx/web/html
 

+ 12 - 12
packages/config/upload.vue

@@ -6,12 +6,12 @@
                 clearable
                 placeholder="上传地址"></el-input>
     </el-form-item>
-    <el-form-item label="接受文类型"
+    <el-form-item label="接受文类型"
                   label-width="110px"
                   v-if="!data.oss">
       <el-input v-model="data.accept"
                 clearable
-                placeholder="接受文类型,如:image/png,image/jpg"></el-input>
+                placeholder="接受文类型,如:image/png,image/jpg"></el-input>
     </el-form-item>
     <el-form-item label="OSS">
       <template slot="label">
@@ -33,11 +33,11 @@
                   label-width="110px">
       <el-switch v-model="data.drag"></el-switch>
     </el-form-item>
-    <el-form-item label="文列表类型"
+    <el-form-item label="文列表类型"
                   label-width="110px"
                   v-if="!data.drag">
       <el-select v-model="data.listType"
-                 placeholder="文列表类型"
+                 placeholder="文列表类型"
                  clearable>
         <el-option label="附件"
                    value="text"></el-option>
@@ -81,20 +81,20 @@
         <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="是否显示已上传文列表"
+    <el-form-item label="是否显示已上传文列表"
                   label-width="180px">
       <el-switch v-model="data.showFileList"></el-switch>
     </el-form-item>
-    <el-form-item label="文大小">
+    <el-form-item label="文大小">
       <el-input-number v-model="data.fileSize"
                        controls-position="right"
-                       placeholder="文大小限制(字节)"
+                       placeholder="文大小限制(字节)"
                        :min="0"
                        style="width: 100%;"></el-input-number>
     </el-form-item>
@@ -110,16 +110,16 @@
                 clearable
                 placeholder="上传中提示"></el-input>
     </el-form-item>
-    <el-form-item label="是否多文上传"
+    <el-form-item label="是否多文上传"
                   label-width="130px">
       <el-switch v-model="data.multiple"></el-switch>
     </el-form-item>
     <el-form-item v-if="data.multiple"
-                  label="多文数量限制"
+                  label="多文数量限制"
                   label-width="130px">
       <el-input-number v-model="data.limit"
                        controls-position="right"
-                       placeholder="多文上传数量限制"
+                       placeholder="多文上传数量限制"
                        :min="1"
                        style="width: 100%;"></el-input-number>
     </el-form-item>

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


+ 0 - 1
src/api/system/user.js

@@ -19,7 +19,6 @@ export const getList = (current, size, params, deptId) => {
       ...params,
       current,
       size,
-      deptId,
     }
   })
 }

+ 1 - 2
src/components/common/keypwd-sure.vue

@@ -186,8 +186,6 @@
             {
               label: "填報人",
               prop: "fillingPerson",
-              type: "datetime",
-              format: "yyyy-MM-dd HH:mm",
               disabled: true,
               rules: [{
                 required: true,
@@ -206,6 +204,7 @@
 
     },
     mounted() {
+      debugger
       this.initTypeDict();
     },
     methods: {

+ 3 - 3
src/components/confirmed/confirmed-cardswallow.vue

@@ -71,7 +71,7 @@
       <flow-settings :id="personId" :ehr="personNo" :name="personName" :callback="settingCallback" @close="settingVisible = false"></flow-settings>
     </el-dialog>
 
-    <el-dialog title="檔上傳"
+    <el-dialog title="檔上傳"
                append-to-body
                :visible.sync="attachBox"
                width="555px">
@@ -125,11 +125,11 @@
           emptyBtn: false,
           column: [
             {
-              label: '檔上傳',
+              label: '檔上傳',
               prop: 'attachFile',
               type: 'upload',
               drag: true,
-              loadText: '檔上傳中,請稍等',
+              loadText: '檔上傳中,請稍等',
               span: 24,
               propsHttp: {
                 res: 'data'

+ 4 - 4
src/components/confirmed/confirmed-returns.vue

@@ -71,7 +71,7 @@
       </template>
     </avue-crud>
 
-    <el-dialog title="文上傳"
+    <el-dialog title="文上傳"
                append-to-body
                :visible.sync="attachBox"
                width="555px">
@@ -89,7 +89,7 @@
       <returns-comfire :data="data2"></returns-comfire>
     </el-dialog>
 
-    <el-dialog title="批量審核"
+    <el-dialog title="批量確認"
                append-to-body
                :visible.sync="approveBatchVisible"
                width="70%">
@@ -511,11 +511,11 @@
           emptyBtn: false,
           column: [
             {
-              label: '文上傳',
+              label: '文上傳',
               prop: 'attachFile',
               type: 'upload',
               drag: true,
-              loadText: '文上傳中,請稍等',
+              loadText: '文上傳中,請稍等',
               span: 24,
               propsHttp: {
                 res: 'data'

+ 3 - 3
src/components/confirmed/confirmed-sealhandover.vue

@@ -709,9 +709,9 @@
             });
           }
         }
-        if (this.form.isTurnIn){
-          this.turnInChange(true)
-        }
+        /*if (this.form.isTurnIn){
+          // this.turnInChange(true)
+        }*/
         if (type == 'edit' && this.form.sealType.indexOf('-') == -1){
           this.form.sealType = this.form.sealType + '-' + this.form.sealNo;
         }

+ 3 - 3
src/components/initiated/init-cardswallow.vue

@@ -69,7 +69,7 @@
       <flow-settings :id="personId" :ehr="personNo" :name="personName" :callback="settingCallback" @close="settingVisible = false"></flow-settings>
     </el-dialog>
 
-    <el-dialog title="檔上傳"
+    <el-dialog title="檔上傳"
                append-to-body
                :visible.sync="attachBox"
                width="555px">
@@ -123,11 +123,11 @@
           emptyBtn: false,
           column: [
             {
-              label: '檔上傳',
+              label: '檔上傳',
               prop: 'attachFile',
               type: 'upload',
               drag: true,
-              loadText: '檔上傳中,請稍等',
+              loadText: '檔上傳中,請稍等',
               span: 24,
               propsHttp: {
                 res: 'data'

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

@@ -71,7 +71,7 @@
       </template>
     </avue-crud>
 
-    <el-dialog title="文上傳"
+    <el-dialog title="文上傳"
                append-to-body
                :visible.sync="attachBox"
                width="555px">
@@ -89,7 +89,7 @@
       <returns-comfire :data="data2"></returns-comfire>
     </el-dialog>
 
-    <el-dialog title="批量審核"
+    <el-dialog title="批量確認"
                append-to-body
                :visible.sync="approveBatchVisible"
                width="70%">
@@ -511,11 +511,11 @@
           emptyBtn: false,
           column: [
             {
-              label: '文上傳',
+              label: '文上傳',
               prop: 'attachFile',
               type: 'upload',
               drag: true,
-              loadText: '文上傳中,請稍等',
+              loadText: '文上傳中,請稍等',
               span: 24,
               propsHttp: {
                 res: 'data'

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

@@ -709,9 +709,9 @@
             });
           }
         }
-        if (this.form.isTurnIn){
+        /*if (this.form.isTurnIn){
           this.turnInChange(true)
-        }
+        }*/
         if (type == 'edit' && this.form.sealType.indexOf('-') == -1){
           this.form.sealType = this.form.sealType + '-' + this.form.sealNo;
         }

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

@@ -71,7 +71,7 @@
       </template>
     </avue-crud>
 
-    <el-dialog title="文上傳"
+    <el-dialog title="文上傳"
                append-to-body
                :visible.sync="attachBox"
                width="555px">
@@ -89,7 +89,7 @@
       <returns-comfire :data="data2"></returns-comfire>
     </el-dialog>
 
-    <el-dialog title="批量審核"
+    <el-dialog title="批量確認"
                append-to-body
                :visible.sync="approveBatchVisible"
                width="70%">
@@ -511,11 +511,11 @@
           emptyBtn: false,
           column: [
             {
-              label: '文上傳',
+              label: '文上傳',
               prop: 'attachFile',
               type: 'upload',
               drag: true,
-              loadText: '文上傳中,請稍等',
+              loadText: '文上傳中,請稍等',
               span: 24,
               propsHttp: {
                 res: 'data'

+ 3 - 3
src/components/tobeconfirm/tobeconfirm-cardswallow.vue

@@ -71,7 +71,7 @@
       <flow-settings :id="personId" :ehr="personNo" :name="personName" :callback="settingCallback" @close="settingVisible = false"></flow-settings>
     </el-dialog>
 
-    <el-dialog title="檔上傳"
+    <el-dialog title="檔上傳"
                append-to-body
                :visible.sync="attachBox"
                width="555px">
@@ -125,11 +125,11 @@
           emptyBtn: false,
           column: [
             {
-              label: '檔上傳',
+              label: '檔上傳',
               prop: 'attachFile',
               type: 'upload',
               drag: true,
-              loadText: '檔上傳中,請稍等',
+              loadText: '檔上傳中,請稍等',
               span: 24,
               propsHttp: {
                 res: 'data'

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

@@ -71,7 +71,7 @@
       </template>
     </avue-crud>
 
-    <el-dialog title="文上傳"
+    <el-dialog title="文上傳"
                append-to-body
                :visible.sync="attachBox"
                width="555px">
@@ -89,7 +89,7 @@
       <returns-comfire :data="data2"></returns-comfire>
     </el-dialog>
 
-    <el-dialog title="批量審核"
+    <el-dialog title="批量確認"
                append-to-body
                :visible.sync="approveBatchVisible"
                width="70%">
@@ -511,11 +511,11 @@
           emptyBtn: false,
           column: [
             {
-              label: '文上傳',
+              label: '文上傳',
               prop: 'attachFile',
               type: 'upload',
               drag: true,
-              loadText: '文上傳中,請稍等',
+              loadText: '文上傳中,請稍等',
               span: 24,
               propsHttp: {
                 res: 'data'

+ 2 - 2
src/components/tobeconfirm/tobeconfirm-sealhandover.vue

@@ -709,9 +709,9 @@
             });
           }
         }
-        if (this.form.isTurnIn){
+        /*if (this.form.isTurnIn){
           this.turnInChange(true)
-        }
+        }*/
         if (type == 'edit' && this.form.sealType.indexOf('-') == -1){
           this.form.sealType = this.form.sealType + '-' + this.form.sealNo;
         }

+ 1 - 1
src/config/website.js

@@ -1,5 +1,5 @@
 /**
- * 全局配置文
+ * 全局配置文
  */
 export default {
   title: "營運實物處理登記簿系統",

+ 2 - 2
src/lang/zh.js

@@ -48,7 +48,7 @@ export default {
     }
   },
   route: {
-    info: '個人資訊',
+    info: '個人信息',
     website: 'bladex官網',
     avuexwebsite: 'avuex官網',
     dashboard: '首頁',
@@ -86,7 +86,7 @@ export default {
   },
   navbar: {
     logOut: '退出登錄',
-    userinfo: '個人資訊',
+    userinfo: '個人信息',
     dashboard: '首頁',
     lock: '鎖屏',
     bug: '沒有錯誤日誌',

+ 2 - 2
src/router/avue-router.js

@@ -87,7 +87,7 @@ RouterPlugin.install = function (vue, option = {}) {
     // 路由是专门的一个接口获取
       /**
        * aMenu: 接受到的动态路由数据 menu的结构外层有父级path 里面有一个childen 记录頁面的路由
-       * first: 为了区分外界 调用formatRoutes 和 当前文调用 formatRoutes
+       * first: 为了区分外界 调用formatRoutes 和 当前文调用 formatRoutes
       */
     formatRoutes: function (aMenu = [], first) {
       // window.console.log('aMenu')
@@ -118,7 +118,7 @@ RouterPlugin.install = function (vue, option = {}) {
               return oMenu[propsDefault.path]
             }
           })(),
-          //特殊处理组件 执行完这个 component 也就是精确到具体的文件了  views文件夹下面就是具体的頁面代码
+          //特殊处理组件 执行完这个 component 也就是精确到具体的文檔了  views文檔夹下面就是具体的頁面代码
           component = 'views' + oMenu.path,
           name = oMenu[propsDefault.label],
           icon = oMenu[propsDefault.icon],

+ 1 - 1
src/router/views/index.js

@@ -67,7 +67,7 @@ export default [{
   redirect: '/info/index',
   children: [{
     path: 'index',
-    name: '個人資訊',
+    name: '個人信息',
     meta: {
       i18n: 'info'
     },

+ 7 - 7
src/util/util.js

@@ -310,9 +310,9 @@ export const getQueryString = (name) => {
 }
 
 /**
- * 下载文
- * @param {String} path - 文地址
- * @param {String} name - 文名,eg: test.png
+ * 下载文
+ * @param {String} path - 文地址
+ * @param {String} name - 文名,eg: test.png
  */
 export const downloadFileBlob = (path, name) => {
   const xhr = new XMLHttpRequest();
@@ -340,9 +340,9 @@ export const downloadFileBlob = (path, name) => {
 }
 
 /**
- * 下载文
- * @param {String} path - 文地址
- * @param {String} name - 文名,eg: test.png
+ * 下载文
+ * @param {String} path - 文地址
+ * @param {String} name - 文名,eg: test.png
  */
 export const downloadFileBase64 = (path, name) => {
   const xhr = new XMLHttpRequest();
@@ -353,7 +353,7 @@ export const downloadFileBase64 = (path, name) => {
     if (this.status === 200 || this.status === 304) {
 
       let blob = this.response; //使用response作为返回,而非responseText
-      const objectURL = URL.createObjectURL(new Blob([blob], { type: 'text/xls' })) // chrome不受文件你大小限制导出文件
+      const objectURL = URL.createObjectURL(new Blob([blob], { type: 'text/xls' })) // chrome不受文檔你大小限制导出文檔
       // let reader = new FileReader();
       // reader.readAsDataURL(blob); // 转换为base64,可以直接放入a标签href
       // objectURL.onload = function(e) {

+ 3 - 3
src/views/bank/cardswallow.vue

@@ -71,7 +71,7 @@
       <flow-settings :id="personId" :ehr="personNo" :name="personName" :callback="settingCallback" @close="settingVisible = false"></flow-settings>
     </el-dialog>
 
-    <el-dialog title="檔上傳"
+    <el-dialog title="檔上傳"
                append-to-body
                :visible.sync="attachBox"
                width="555px">
@@ -124,11 +124,11 @@
           emptyBtn: false,
           column: [
             {
-              label: '檔上傳',
+              label: '檔上傳',
               prop: 'attachFile',
               type: 'upload',
               drag: true,
-              loadText: '檔上傳中,請稍等',
+              loadText: '檔上傳中,請稍等',
               span: 24,
               propsHttp: {
                 res: 'data'

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

@@ -71,7 +71,7 @@
       </template>
     </avue-crud>
 
-    <el-dialog title="文上傳"
+    <el-dialog title="文上傳"
                append-to-body
                :visible.sync="attachBox"
                width="555px">
@@ -89,7 +89,7 @@
       <returns-comfire :data="data2"></returns-comfire>
     </el-dialog>
 
-    <el-dialog title="批量審核"
+    <el-dialog title="批量確認"
                append-to-body
                :visible.sync="approveBatchVisible"
                width="70%">
@@ -510,11 +510,11 @@
           emptyBtn: false,
           column: [
             {
-              label: '文上傳',
+              label: '文上傳',
               prop: 'attachFile',
               type: 'upload',
               drag: true,
-              loadText: '文上傳中,請稍等',
+              loadText: '文上傳中,請稍等',
               span: 24,
               propsHttp: {
                 res: 'data'

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

@@ -708,9 +708,9 @@
             });
           }
         }
-        if (this.form.isTurnIn){
+        /*if (this.form.isTurnIn){
           // this.turnInChange(true)
-        }
+        }*/
         if (type == 'edit' && this.form.sealType.indexOf('-') == -1){
           this.form.sealType = this.form.sealType + '-' + this.form.sealNo;
         }

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

@@ -187,7 +187,7 @@
               propsHttp: {
                 res: 'data'
               },
-              tip: '請上传 .xls,.xlsx 标准格式文',
+              tip: '請上传 .xls,.xlsx 标准格式文',
               action: "/api/blade-system/region/import-region"
             },
             {

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

@@ -96,7 +96,7 @@
               propsHttp: {
                 res: 'data'
               },
-              tip: '請上传 bpmn20.xml 标准格式文',
+              tip: '請上传 bpmn20.xml 标准格式文',
               action: '/api/blade-flow/manager/check-upload'
             },
           ]
@@ -144,7 +144,7 @@
             }
           })
         } else {
-          this.$message.warning('請上传 bpmn20.xml 标准格式文');
+          this.$message.warning('請上传 bpmn20.xml 标准格式文');
           loading()
           return false;
         }

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

@@ -77,7 +77,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "文名",
+            label: "文名",
             prop: "name",
             search: true,
             slot: true,

+ 11 - 7
src/views/system/user.vue

@@ -228,6 +228,7 @@
         initFlag: true,
         selectionList: [],
         query: {},
+        params: {},
         loading: true,
         platformLoading: false,
         page: {
@@ -376,7 +377,7 @@
           ],
           group: [
             {
-              label: '基礎資訊',
+              label: '基礎信息',
               prop: 'baseInfo',
               icon: 'el-icon-user-solid',
               column: [
@@ -471,7 +472,7 @@
               ]
             },
             {
-              label: '詳細資訊',
+              label: '詳細信息',
               prop: 'detailInfo',
               icon: 'el-icon-s-order',
               column: [
@@ -546,7 +547,7 @@
               ]
             },
             {
-              label: '職責資訊',
+              label: '職責信息',
               prop: 'dutyInfo',
               icon: 'el-icon-s-custom',
               column: [
@@ -834,13 +835,14 @@
           }
         }
         this.$Export.excel({
-          title: "用戶資訊表" || new Date().getTime(),
+          title: "用戶信息表" || new Date().getTime(),
           columns: columns,
           data: data
         });
       },
       nodeClick(data) {
         this.treeDeptId = data.id;
+        this.params.deptId = data.id;
         this.page.currentPage = 1;
         this.onLoad(this.page);
       },
@@ -929,10 +931,12 @@
       searchReset() {
         this.query = {};
         this.treeDeptId = '';
+        this.params = {};
         this.onLoad(this.page);
       },
       searchChange(params, done) {
         this.query = params;
+        this.params = params;
         this.page.currentPage = 1;
         this.onLoad(this.page, params);
         done();
@@ -1070,10 +1074,10 @@
       onLoad(page, params = {}) {
         this.loading = true;
         let deptId = this.treeDeptId;
-        if (params.deptId){
-          deptId = params.deptId;
+        if (!this.params.deptId && this.treeDeptId){
+          this.params.deptId = deptId;
         }
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query), deptId).then(res => {
+        getList(page.currentPage, page.pageSize, Object.assign(this.params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;

+ 1 - 1
src/views/wel/index.vue

@@ -137,7 +137,7 @@
               click: (item) => {
                 this.$router.push({path: "/desk/confirmed"})
               },
-              count: '44',
+              count: '0',
               title: '已處理',
               icon: 'el-icon-setting',
               color: '#5daf34'

+ 1 - 1
vue.config.js

@@ -4,7 +4,7 @@ module.exports = {
   lintOnSave: true,
   productionSourceMap: false,
   chainWebpack: (config) => {
-    //忽略的打包文
+    //忽略的打包文
     config.externals({
       'vue': 'Vue',
       'vue-router': 'VueRouter',

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