fangq 4 лет назад
Родитель
Сommit
911051ad66

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

@@ -34,12 +34,17 @@
                    @click="handleDownload">下載
         </el-button>
       </template>
+
+      <template slot-scope="{row}" slot="menu">
+        <el-button type="text" icon="el-icon-download" size="small" v-if="permission.checkwarehouse_download_file && row.enclosure" @click="fileDownload(row)">附件下載</el-button>
+      </template>
+
       <template slot="checkPersonNameForm">
         <select-dialog-user :name="form.checkPersonName" :ehr="form.checkPersonNo" :disabled="false" :callback="selectCallback"></select-dialog-user>
       </template>
 
       <template slot="enclosureForm" slot-scope="{row}">
-        <avue-form ref="form" :option="attachOption" v-model="attachForm" :upload-after="uploadAfter" :upload-error="uploadError" :upload-delete="uploadDelete">
+        <avue-form ref="form" :option="attachOption" v-model="attachForm" :upload-after="uploadAfter" :upload-error="uploadError" :upload-delete="uploadDelete" :upload-preview="uploadPreview">
         </avue-form>
       </template>
 
@@ -60,6 +65,7 @@
   import SelectDialogUser from "@/components/select-dialog/select-dialog-user";
   import {getDeptTree, getTree} from "@/api/system/dept";
   import {getStandardByCode} from "@/api/bank/handoverstandard";
+  import {downloadFileBase64} from "@/util/util";
 
   export default {
     components: {SelectDialogUser},
@@ -76,6 +82,7 @@
               // label: '附件上传',
               prop: 'attachFile',
               type: 'upload',
+              disabled: true,
               drag: true,
               loadText: '模板上传中,请稍等',
               span: 24,
@@ -432,6 +439,11 @@
       });
     },
     methods: {
+      fileDownload(row){
+        downloadFileBase64(row.enclosure, row.enclosureName);
+      },
+      uploadPreview(){
+      },
       uploadError(error,column){
         this.$message.warning(error + ',不能大于' + column.fileSize + 'KB');
       },
@@ -546,6 +558,7 @@
           });
       },
       beforeOpen(done, type) {
+        this.attachOption.column[0].disabled = type == 'view';
         if (type === 'add'){
           let userInfo = localStorage.getItem("saber-userInfo");
           this.form.number = 1;

+ 3 - 8
src/views/bank/message.vue

@@ -42,12 +42,7 @@
       </template>
 
       <template slot-scope="scope" slot="menu">
-        <el-button type="text"
-                   icon="el-icon-download"
-                   size="small"
-                   v-if="permission.message_download"
-                   @click="handleDownload(scope.row)">下载
-        </el-button>
+        <el-button type="text" icon="el-icon-download" size="small" v-if="permission.message_download" @click="handleDownload(scope.row)">下载</el-button>
       </template>
     </avue-crud>
 
@@ -245,7 +240,7 @@
       });
     },
     methods: {
-      handleDownload(){
+      /*handleDownload(){
         if (this.selectionList.length === 0) {
           this.$message.warning("请选择至少一条数据");
           return;
@@ -266,7 +261,7 @@
           columns: columns,
           data: this.selectionList
         });
-      },
+      },*/
       uploadError(error,column){
         this.$message.warning(error + ',不能大于' + column.fileSize + 'KB');
       },

+ 24 - 8
src/views/bank/postchange.vue

@@ -29,14 +29,14 @@
                    size="small"
                    icon="el-icon-setting"
                    plain
-                   v-if="permission.postchange_download"
+                   v-if="permission.postchange_setting"
                    @click="handleSetting">设置審批人
         </el-button>
         <el-button type="primary"
                    size="small"
                    icon="el-icon-download"
                    plain
-                   v-if="permission.postchange_setting"
+                   v-if="permission.postchange_download"
                    @click="handleDownload">下載
         </el-button>
       </template>
@@ -68,7 +68,7 @@
   import { getCurrentDept } from "@/api/system/dept";
   import {dateFormat} from "../../util/date";
   import FlowSettings from "../../components/common/flow-settings";
-  import {getUserList} from "@/api/system/user";
+  import {getPage as getUserList} from "@/api/system/user";
   import {getDeptTree, getTree} from "@/api/system/dept";
   import {getStandardByCode} from "@/api/bank/handoverstandard";
 
@@ -128,14 +128,26 @@
               label: "機構號",
               prop: "orgNo",
               disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入機構號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "区域/支行",
+              prop: "orgNos",
+              hide: true,
+              display: false,
+              searchMultiple: true,
               search: true,
-              searchSpan: 4,
               type: "tree",
               dicData: [],
               props: {
-                label: "key",
+                label: "title",
                 value: "key"
               },
+              checkStrictly: true,
               rules: [{
                 required: true,
                 message: "请输入機構號",
@@ -529,8 +541,8 @@
     },
     created() {
       const _this = this;
-      getUserList().then(res => {
-        const data = res.data.data;
+      getUserList(1,500, {}).then(res => {
+        const data = res.data.data.records;
         for (let i = 0; i < data.length; i++) {
           let item = data[i];
           item.text = item.name + '-' + item.ehr;
@@ -552,7 +564,7 @@
     },
     mounted() {
       getDeptTree().then(res => {
-        const column = this.findObject(this.option.column, "orgNo");
+        const column = this.findObject(this.option.column, "orgNos");
         let treeData = getTree(res.data.data, this.userInfo.dept_id);
         column.dicData = treeData;
       });
@@ -913,6 +925,10 @@
           params.effectiveDate_begin = params.effectiveDateRange[0], params.effectiveDate_end = params.effectiveDateRange[1];
           params.effectiveDateRange = null;
         }
+        if (params.orgNos){
+          params.orgNostr = params.orgNos.join();
+          params.orgNos = '';
+        }
 
         this.query = params;
         this.page.currentPage = 1;

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

@@ -169,7 +169,28 @@
                 value: "dictKey",
               },
               search: true,
+              hide: true,
+              display: false,
               searchMultiple: true,
+            },
+            {
+              label: "印章類型",
+              prop: "sealTypeSearch",
+              type: "select",
+              dicUrl: "/api/blade-system/dict/dictionary?code=seal_type",
+              props:{
+                label: "dictValue",
+                value: "dictKey",
+              },
+              dicFormatter: (res) => {
+                let data = res.data;
+                // data[0].disabled = true;
+                for (let i = 0; i < data.length; i++) {
+                  let item = data[i];
+                  item.disabled = item.isSealed == 1;
+                }
+                return data;
+              },
               rules: [{
                 required: true,
                 message: "请输入印章類型",
@@ -508,8 +529,8 @@
         this.onLoad(this.page);
       },
       searchChange(params, done) {
-        if (params.sealType){
-          params.sealType = params.sealType.join();
+        if (params.sealTypeSearch){
+          params.sealType = params.sealTypeSearch.join();
         }
         if (params.orgNos){
           params.orgNostr = params.orgNos.join();

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

@@ -34,12 +34,17 @@
                    @click="handleDownload">下載
         </el-button>
       </template>
+
+      <template slot-scope="{row}" slot="menu">
+        <el-button type="text" icon="el-icon-download" size="small" v-if="permission.tellertrunk_download_file && row.enclosure" @click="fileDownload(row)">附件下載</el-button>
+      </template>
+
       <template slot="checkPersonNameForm">
         <select-dialog-user :name="form.checkPersonName" :ehr="form.checkPersonNo" :disabled="false" :callback="selectCallback"></select-dialog-user>
       </template>
 
       <template slot="enclosureForm" slot-scope="{row}">
-        <avue-form ref="form" :option="attachOption" v-model="attachForm" :upload-after="uploadAfter" :upload-error="uploadError" :upload-delete="uploadDelete">
+        <avue-form ref="form" :option="attachOption" v-model="attachForm" :upload-after="uploadAfter" :upload-error="uploadError" :upload-delete="uploadDelete" :upload-preview="uploadPreview">
         </avue-form>
       </template>
 
@@ -59,6 +64,7 @@
   import SelectDialogUser from "../../components/select-dialog/select-dialog-user";
   import {getDeptTree, getTree} from "@/api/system/dept";
   import {getStandardByCode} from "@/api/bank/handoverstandard";
+  import {downloadFileBase64} from "@/util/util";
 
   export default {
     components: {SelectDialogUser},
@@ -450,6 +456,9 @@
       });
     },
     methods: {
+      fileDownload(row){
+        downloadFileBase64(row.enclosure, row.enclosureName);
+      },
       handleDownload(){
         if (this.selectionList.length === 0) {
           this.$message.warning("请选择至少一条数据");
@@ -472,6 +481,8 @@
           data: this.selectionList
         });
       },
+      uploadPreview(){
+      },
       uploadError(error,column){
         this.$message.warning(error + ',不能大于' + column.fileSize + 'KB');
       },
@@ -563,6 +574,7 @@
           });
       },
       beforeOpen(done, type) {
+        this.attachOption.column[0].disabled = type == 'view';
         if (type === 'add'){
           let userInfo = localStorage.getItem("saber-userInfo");
           this.form.number = 1;