修復

packages/index.vue

@@ -476,13 +476,13 @@ export default {
       const script = document.createElement('link')
       script.rel = 'stylesheet'
       script.type = 'text/css'
-      script.href = 'https://at.alicdn.com/t/font_1254447_zc9iezc230c.css'
+      // script.href = 'https://at.alicdn.com/t/font_1254447_zc9iezc230c.css'
       head.appendChild(script)
       // this.loadScript('css', 'https://at.alicdn.com/t/font_1254447_zc9iezc230c.css')
     },
     // Avue文档链接
     handleAvueDoc() {
-      window.open('https://avuejs.com/doc/form/form-doc', '_blank')
+      // window.open('https://avuejs.com/doc/form/form-doc', '_blank')
     },
     // 左侧字段点击
     handleFieldClick(item) {

src/api/report/userlog.js

@@ -12,6 +12,16 @@ export const getList = (current, size, params) => {
   })
 }
 
+export const getDownloadList = (params) => {
+  return request({
+    url: '/api/bank/userlog/getList',
+    method: 'get',
+    params: {
+      ...params,
+    }
+  })
+}
+
 export const getDetail = (id) => {
   return request({
     url: '/api/bank/userlog/detail',

src/components/common/returns-approve.vue

@@ -88,12 +88,12 @@
               }]
             },
             {
-              label: "客護名稱",
+              label: "客戶名稱",
               prop: "customerName",
               disabled: true,
               rules: [{
                 required: true,
-                message: "請輸入客護名稱",
+                message: "請輸入客戶名稱",
                 trigger: "blur"
               }]
             },
@@ -205,7 +205,7 @@
                 this.findObject(this.option.column, 'bankRemark').rules[0].required = value == '2'
               },
               rules: [{
-                required: false,
+                required: true,
                 message: "請輸入跟進情況",
                 trigger: "blur"
               }]

src/components/common/returns-comfire.vue

@@ -113,11 +113,11 @@
               }]
             },
             {
-              label: "客護名稱",
+              label: "客戶名稱",
               prop: "customerName",
               rules: [{
                 required: true,
-                message: "請輸入客護名稱",
+                message: "請輸入客戶名稱",
                 trigger: "blur"
               }]
             },
@@ -221,7 +221,7 @@
                 return res.data;
               },
               rules: [{
-                required: false,
+                required: true,
                 message: "請輸入跟進情況",
                 trigger: "blur"
               }]

src/components/common/returns-issue.vue

@@ -87,12 +87,12 @@
               }]
             },
             {
-              label: "客護名稱",
+              label: "客戶名稱",
               prop: "customerName",
               disabled: true,
               rules: [{
                 required: true,
-                message: "請輸入客護名稱",
+                message: "請輸入客戶名稱",
                 trigger: "blur"
               }]
             },
@@ -203,7 +203,7 @@
                 return res.data;
               },
               rules: [{
-                required: false,
+                required: true,
                 message: "請輸入跟進情況",
                 trigger: "blur"
               }]

src/components/confirmed/confirmed-postchange.vue

@@ -74,11 +74,11 @@
                      v-if="permission.postchange_download && row.process == 3 && type == 'view'"
                      @click="testExcel">下載Excel
           </el-button>
-          <a href="" download="網點出納主管及專管員崗位表更記錄表.xls" id="dl" style="display: none"></a>
+          <a href="" download="網點出納主管及專管員崗位變更記錄表.xls" id="dl" style="display: none"></a>
 
           <div id="mytable">
             <table v-show="false" border="1" cellpadding="5" cellspacing="5">
-              <caption>網點出納主管及專管員崗位表更記錄表</caption><!--可以生成表格的标题-->
+              <caption>網點出納主管及專管員崗位變更記錄表</caption><!--可以生成表格的标题-->
               <tr>
                 <th>銀行號</th>
                 <td>{{row.bankNo}}</td>
@@ -370,9 +370,9 @@
         selectionList: [],
         userList: [],
         option: {
-          addTitle: '新增【網點出納主管及專管員崗位表更記錄表】',
-          editTitle: '編輯【網點出納主管及專管員崗位表更記錄表】',
-          viewTitle: '查看【網點出納主管及專管員崗位表更記錄表】',
+          addTitle: '新增【網點出納主管及專管員崗位變更記錄表】',
+          editTitle: '編輯【網點出納主管及專管員崗位變更記錄表】',
+          viewTitle: '查看【網點出納主管及專管員崗位變更記錄表】',
           height:'auto',
           calcHeight: 30,
           tip: false,
@@ -984,7 +984,7 @@
           }
         }
         this.$Export.excel({
-          title: "網點出納主管及專管員崗位表更記錄表" || new Date().getTime(),
+          title: "網點出納主管及專管員崗位變更記錄表" || new Date().getTime(),
           columns: columns,
           data: this.selectionList
         });
@@ -1175,7 +1175,7 @@
             if (_this.approveFlag){
               _this.selectDisabled = true;
               _this.option.updateBtnText = '確認';
-              _this.option.editTitle = '信息審核【網點出納主管及專管員崗位表更記錄表】';
+              _this.option.editTitle = '信息審核【網點出納主管及專管員崗位變更記錄表】';
               _this.option.column.forEach(item => {
                 item.disabled = true;
               })
@@ -1206,7 +1206,7 @@
                 }
               });*/
               _this.option.updateBtnText = '提交';
-              _this.option.editTitle = '編輯【網點出納主管及專管員崗位表更記錄表】';
+              _this.option.editTitle = '編輯【網點出納主管及專管員崗位變更記錄表】';
               _this.option.column.forEach(item => {
                 if (item.prop == 'bankNo' || item.prop == 'orgNo' || item.prop == 'applyDate'|| item.prop == 'personNo'){
                   item.disabled = true;

src/components/confirmed/confirmed-returns.vue

@@ -156,9 +156,9 @@
         },
         selectionList: [],
         option: {
-          addTitle: '新增【新開護退件登記表】',
-          editTitle: '編輯【新開護退件登記表】',
-          viewTitle: '查看【新開護退件登記表】',
+          addTitle: '新增【新開戶退件登記表】',
+          editTitle: '編輯【新開戶退件登記表】',
+          viewTitle: '查看【新開戶退件登記表】',
           height:'auto',
           calcHeight: 30,
           tip: false,
@@ -263,11 +263,11 @@
               }]
             },
             {
-              label: "客護名稱",
+              label: "客戶名稱",
               prop: "customerName",
               rules: [{
                 required: true,
-                message: "請輸入客護名稱",
+                message: "請輸入客戶名稱",
                 trigger: "blur"
               }]
             },
@@ -394,7 +394,7 @@
                 return res.data;
               },
               rules: [{
-                required: false,
+                required: true,
                 message: "請輸入跟進情況",
                 trigger: "blur"
               }]
@@ -578,7 +578,7 @@
           }
         }
         this.$Export.excel({
-          title: "新開護退件登記表" || new Date().getTime(),
+          title: "新開戶退件登記表" || new Date().getTime(),
           columns: columns,
           data: data
         });

src/components/initiated/init-checkwarehouse.vue

@@ -90,7 +90,7 @@
               drag: true,
               loadText: '模板上傳中，請稍等',
               span: 24,
-              fileSize: 1024,
+              fileSize: 5120,
               propsHttp: {
                 res: 'data'
               },

src/components/initiated/init-message.vue

@@ -91,7 +91,7 @@
               drag: true,
               loadText: '模板上傳中，請稍等',
               span: 24,
-              fileSize: 1024,
+              fileSize: 5120,
               propsHttp: {
                 res: 'data'
               },
@@ -327,7 +327,7 @@
           }
         }
         this.$Export.excel({
-          title: "新開護退件登記表" || new Date().getTime(),
+          title: "新開戶退件登記表" || new Date().getTime(),
           columns: columns,
           data: this.selectionList
         });

src/components/initiated/init-postchange.vue

@@ -74,11 +74,11 @@
                      v-if="permission.postchange_download && row.process == 3 && type == 'view'"
                      @click="testExcel">下載Excel
           </el-button>
-          <a href="" download="網點出納主管及專管員崗位表更記錄表.xls" id="dl" style="display: none"></a>
+          <a href="" download="網點出納主管及專管員崗位變更記錄表.xls" id="dl" style="display: none"></a>
 
           <div id="mytable">
             <table v-show="false" border="1" cellpadding="5" cellspacing="5">
-              <caption>網點出納主管及專管員崗位表更記錄表</caption><!--可以生成表格的标题-->
+              <caption>網點出納主管及專管員崗位變更記錄表</caption><!--可以生成表格的标题-->
               <tr>
                 <th>銀行號</th>
                 <td>{{row.bankNo}}</td>
@@ -370,9 +370,9 @@
         selectionList: [],
         userList: [],
         option: {
-          addTitle: '新增【網點出納主管及專管員崗位表更記錄表】',
-          editTitle: '編輯【網點出納主管及專管員崗位表更記錄表】',
-          viewTitle: '查看【網點出納主管及專管員崗位表更記錄表】',
+          addTitle: '新增【網點出納主管及專管員崗位變更記錄表】',
+          editTitle: '編輯【網點出納主管及專管員崗位變更記錄表】',
+          viewTitle: '查看【網點出納主管及專管員崗位變更記錄表】',
           height:'auto',
           calcHeight: 30,
           tip: false,
@@ -984,7 +984,7 @@
           }
         }
         this.$Export.excel({
-          title: "網點出納主管及專管員崗位表更記錄表" || new Date().getTime(),
+          title: "網點出納主管及專管員崗位變更記錄表" || new Date().getTime(),
           columns: columns,
           data: this.selectionList
         });
@@ -1175,7 +1175,7 @@
             if (_this.approveFlag){
               _this.selectDisabled = true;
               _this.option.updateBtnText = '確認';
-              _this.option.editTitle = '信息審核【網點出納主管及專管員崗位表更記錄表】';
+              _this.option.editTitle = '信息審核【網點出納主管及專管員崗位變更記錄表】';
               _this.option.column.forEach(item => {
                 item.disabled = true;
               })
@@ -1206,7 +1206,7 @@
                 }
               });*/
               _this.option.updateBtnText = '提交';
-              _this.option.editTitle = '編輯【網點出納主管及專管員崗位表更記錄表】';
+              _this.option.editTitle = '編輯【網點出納主管及專管員崗位變更記錄表】';
               _this.option.column.forEach(item => {
                 if (item.prop == 'bankNo' || item.prop == 'orgNo' || item.prop == 'applyDate'|| item.prop == 'personNo'){
                   item.disabled = true;

src/components/initiated/init-returns.vue

@@ -156,9 +156,9 @@
         },
         selectionList: [],
         option: {
-          addTitle: '新增【新開護退件登記表】',
-          editTitle: '編輯【新開護退件登記表】',
-          viewTitle: '查看【新開護退件登記表】',
+          addTitle: '新增【新開戶退件登記表】',
+          editTitle: '編輯【新開戶退件登記表】',
+          viewTitle: '查看【新開戶退件登記表】',
           height:'auto',
           calcHeight: 30,
           tip: false,
@@ -263,11 +263,11 @@
               }]
             },
             {
-              label: "客護名稱",
+              label: "客戶名稱",
               prop: "customerName",
               rules: [{
                 required: true,
-                message: "請輸入客護名稱",
+                message: "請輸入客戶名稱",
                 trigger: "blur"
               }]
             },
@@ -394,7 +394,7 @@
                 return res.data;
               },
               rules: [{
-                required: false,
+                required: true,
                 message: "請輸入跟進情況",
                 trigger: "blur"
               }]
@@ -578,7 +578,7 @@
           }
         }
         this.$Export.excel({
-          title: "新開護退件登記表" || new Date().getTime(),
+          title: "新開戶退件登記表" || new Date().getTime(),
           columns: columns,
           data: data
         });

src/components/initiated/init-tellertrunk.vue

@@ -84,7 +84,7 @@
               drag: true,
               loadText: '模板上傳中，請稍等',
               span: 24,
-              fileSize: 1024,
+              fileSize: 5120,
               propsHttp: {
                 res: 'data'
               },

src/components/release/release-returns.vue

@@ -156,9 +156,9 @@
         },
         selectionList: [],
         option: {
-          addTitle: '新增【新開護退件登記表】',
-          editTitle: '編輯【新開護退件登記表】',
-          viewTitle: '查看【新開護退件登記表】',
+          addTitle: '新增【新開戶退件登記表】',
+          editTitle: '編輯【新開戶退件登記表】',
+          viewTitle: '查看【新開戶退件登記表】',
           height:'auto',
           calcHeight: 30,
           tip: false,
@@ -263,11 +263,11 @@
               }]
             },
             {
-              label: "客護名稱",
+              label: "客戶名稱",
               prop: "customerName",
               rules: [{
                 required: true,
-                message: "請輸入客護名稱",
+                message: "請輸入客戶名稱",
                 trigger: "blur"
               }]
             },
@@ -394,7 +394,7 @@
                 return res.data;
               },
               rules: [{
-                required: false,
+                required: true,
                 message: "請輸入跟進情況",
                 trigger: "blur"
               }]
@@ -578,7 +578,7 @@
           }
         }
         this.$Export.excel({
-          title: "新開護退件登記表" || new Date().getTime(),
+          title: "新開戶退件登記表" || new Date().getTime(),
           columns: columns,
           data: data
         });

src/components/select-dialog/select-dialog-user.vue

@@ -30,7 +30,7 @@
                 display: false
               },
               {
-                label: "用護姓名",
+                label: "用戶姓名",
                 prop: "name",
                 search: true,
                 display: false
@@ -48,13 +48,13 @@
                 display: false
               },
               /*{
-                label: "用護平臺",
+                label: "用戶平臺",
                 prop: "userTypeName",
                 slot: true,
                 display: false
               },
               {
-                label: "用護平臺",
+                label: "用戶平臺",
                 type: "select",
                 dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
                 props: {
@@ -68,7 +68,7 @@
                 prop: "userType",
                 rules: [{
                   required: true,
-                  message: "請選擇用護平臺",
+                  message: "請選擇用戶平臺",
                   trigger: "blur"
                 }]
               },*/

src/components/tobeconfirm/tobeconfirm-postchange.vue

@@ -74,11 +74,11 @@
                      v-if="permission.postchange_download && row.process == 3 && type == 'view'"
                      @click="testExcel">下載Excel
           </el-button>
-          <a href="" download="網點出納主管及專管員崗位表更記錄表.xls" id="dl" style="display: none"></a>
+          <a href="" download="網點出納主管及專管員崗位變更記錄表.xls" id="dl" style="display: none"></a>
 
           <div id="mytable">
             <table v-show="false" border="1" cellpadding="5" cellspacing="5">
-              <caption>網點出納主管及專管員崗位表更記錄表</caption><!--可以生成表格的标题-->
+              <caption>網點出納主管及專管員崗位變更記錄表</caption><!--可以生成表格的标题-->
               <tr>
                 <th>銀行號</th>
                 <td>{{row.bankNo}}</td>
@@ -370,9 +370,9 @@
         selectionList: [],
         userList: [],
         option: {
-          addTitle: '新增【網點出納主管及專管員崗位表更記錄表】',
-          editTitle: '編輯【網點出納主管及專管員崗位表更記錄表】',
-          viewTitle: '查看【網點出納主管及專管員崗位表更記錄表】',
+          addTitle: '新增【網點出納主管及專管員崗位變更記錄表】',
+          editTitle: '編輯【網點出納主管及專管員崗位變更記錄表】',
+          viewTitle: '查看【網點出納主管及專管員崗位變更記錄表】',
           height:'auto',
           calcHeight: 30,
           tip: false,
@@ -984,7 +984,7 @@
           }
         }
         this.$Export.excel({
-          title: "網點出納主管及專管員崗位表更記錄表" || new Date().getTime(),
+          title: "網點出納主管及專管員崗位變更記錄表" || new Date().getTime(),
           columns: columns,
           data: this.selectionList
         });
@@ -1175,7 +1175,7 @@
             if (_this.approveFlag){
               _this.selectDisabled = true;
               _this.option.updateBtnText = '確認';
-              _this.option.editTitle = '信息審核【網點出納主管及專管員崗位表更記錄表】';
+              _this.option.editTitle = '信息審核【網點出納主管及專管員崗位變更記錄表】';
               _this.option.column.forEach(item => {
                 item.disabled = true;
               })
@@ -1206,7 +1206,7 @@
                 }
               });*/
               _this.option.updateBtnText = '提交';
-              _this.option.editTitle = '編輯【網點出納主管及專管員崗位表更記錄表】';
+              _this.option.editTitle = '編輯【網點出納主管及專管員崗位變更記錄表】';
               _this.option.column.forEach(item => {
                 if (item.prop == 'bankNo' || item.prop == 'orgNo' || item.prop == 'applyDate'|| item.prop == 'personNo'){
                   item.disabled = true;

src/components/tobeconfirm/tobeconfirm-returns.vue

@@ -156,9 +156,9 @@
         },
         selectionList: [],
         option: {
-          addTitle: '新增【新開護退件登記表】',
-          editTitle: '編輯【新開護退件登記表】',
-          viewTitle: '查看【新開護退件登記表】',
+          addTitle: '新增【新開戶退件登記表】',
+          editTitle: '編輯【新開戶退件登記表】',
+          viewTitle: '查看【新開戶退件登記表】',
           height:'auto',
           calcHeight: 30,
           tip: false,
@@ -263,11 +263,11 @@
               }]
             },
             {
-              label: "客護名稱",
+              label: "客戶名稱",
               prop: "customerName",
               rules: [{
                 required: true,
-                message: "請輸入客護名稱",
+                message: "請輸入客戶名稱",
                 trigger: "blur"
               }]
             },
@@ -394,7 +394,7 @@
                 return res.data;
               },
               rules: [{
-                required: false,
+                required: true,
                 message: "請輸入跟進情況",
                 trigger: "blur"
               }]
@@ -578,7 +578,7 @@
           }
         }
         this.$Export.excel({
-          title: "新開護退件登記表" || new Date().getTime(),
+          title: "新開戶退件登記表" || new Date().getTime(),
           columns: columns,
           data: data
         });

src/config/env.js

@@ -1,6 +1,7 @@
 // 阿里矢量图标库配置
 let iconfontVersion = ['567566_pwc3oottzol'];
-let iconfontUrl = `//at.alicdn.com/t/font_$key.css`;
+// let iconfontUrl = `//at.alicdn.com/t/font_$key.css`;
+let iconfontUrl = ``;
 let uploadUrl="/api/blade-resource/disk/put-file";
 let baseUrl = '';
 let codeUrl = `${baseUrl}/code`

src/router/axios.js

@@ -74,8 +74,10 @@ axios.interceptors.response.use(res => {
     return Promise.reject(new Error(message))
   }
 
-  //十分鐘內的請求，都是同一個值傳過去
-  Bus.$emit('notice', Math.floor(new Date().getTime() / (1000 * 10)));
+  if (res.config.url != '/api/blade-auth/oauth/logout'){
+    //十分鐘內的請求，都是同一個值傳過去
+    Bus.$emit('notice', Math.floor(new Date().getTime() / (1000 * 10)));
+  }
   //
   return res;
 }, error => {

src/views/bank/cardswallow.vue

@@ -56,8 +56,8 @@
         <el-tag size="small " type="success" plain v-if="row.process == 4">已簽收</el-tag>
       </template>
       <template slot="menu" slot-scope="{row, index}">
-        <el-button size="small" class="el-button--text" v-if="row.process <= 3 && permission.cardswallow_edit" @click="$refs.crud.rowEdit(row, index)"><i class="el-icon-edit"></i> 編 輯</el-button>
-        <el-button size="small" class="el-button--text" v-if="row.process <= 3 && permission.cardswallow_delete" @click="$refs.crud.rowDel(row, index)"><i class="el-icon-delete"></i> 刪 除</el-button>
+        <el-button size="small" class="el-button--text" v-if="row.process <= 3 && permission.cardswallow_edit && ((row.personId && row.personId.indexOf(userInfo.user_id) != -1) || row.createUser == userInfo.user_id)" @click="$refs.crud.rowEdit(row, index)"><i class="el-icon-edit"></i> 編 輯</el-button>
+        <el-button size="small" class="el-button--text" v-if="row.process <= 3 && permission.cardswallow_delete&& ((row.personId && row.personId.indexOf(userInfo.user_id) != -1) || row.createUser == userInfo.user_id)" @click="$refs.crud.rowDel(row, index)"><i class="el-icon-delete"></i> 刪 除</el-button>
         <!--        <el-button size="mini " type="primary" plain v-if="permission.cardswallow_issue && row.process == 2 && row.personNo == userInfo.user_ehr" @click="form = row,issueVisible = true">去發佈</el-button>-->
         <el-button size="small" class="el-button--text" v-if="permission.cardswallow_confirm && row.process == 3" @click="form = row,issueVisible = true">去簽收</el-button>
       </template>
@@ -648,7 +648,7 @@
           // userInfo.user_id == row.createUser && row.process != 3
           for (let i = 0; i < list.length; i++) {
             let item = list[i];
-            delFlag = delFlag && item.createUser == this.userInfo.user_id && item.process <= 3;
+            delFlag = delFlag && item.process <= 3 && ((item.personId && item.personId.indexOf(this.userInfo.user_id) != -1) || item.createUser == this.userInfo.user_id);
             confirmFlag = confirmFlag && item.process == 3;
           }
           this.delBatchBtn = !delFlag;

src/views/bank/checkwarehouse.vue

@@ -89,7 +89,7 @@
               drag: true,
               loadText: '模板上傳中，請稍等',
               span: 24,
-              fileSize: 1024,
+              fileSize: 5120,
               propsHttp: {
                 res: 'data'
               },
@@ -458,7 +458,13 @@
         done(res);
       },
       uploadDelete(column,file) {
-        return this.$confirm(`是否確定移除該選項？`);
+        // return this.$confirm(`是否確定移除該選項？`);
+        return this.$confirm(`是否確定移除該選項？`).then(() => {
+          this.attachForm.attachFile = [];
+          this.form.enclosure = '';
+          this.form.enclosureName = '';
+          return true;
+        })
       },
       handleDownload(){
         if (this.selectionList.length === 0) {

src/views/bank/goodsuse.vue

@@ -81,7 +81,9 @@
     </el-dialog>
 
     <el-dialog :append-to-body="true" :modal-append-to-body="false" :visible.sync="transferVisible" title="一鍵移交">
-      <select-dialog-user :callback="transferCallback"></select-dialog-user>
+      <div v-if="transferVisible">
+        <select-dialog-user :callback="transferCallback"></select-dialog-user>
+      </div>
     </el-dialog>
 
     <el-dialog :append-to-body="true" :modal-append-to-body="false" :destroy-on-close="true" :fullscreen="true" :visible.sync="balanceVisible" title="餘額查詢">
@@ -573,7 +575,7 @@
         });
       },
       transferCallback(row){
-
+        debugger
         if (this.selectionList && this.selectionList.length > 0 && this.selectionList[0].personNo == row.ehr){
           this.$message.warning("移交人不能為原審批人，請重新選擇！")
           return;
@@ -773,6 +775,7 @@
         }
       },
       selectionClear() {
+        debugger
         this.selectionList = [];
         this.$refs.crud.toggleSelection();
       },

src/views/bank/handoverstandard.vue

@@ -87,7 +87,7 @@
                   label: "業務印章交接登記表", value: "sealhandover"
                 },
                 {
-                  label: "網點出納主管及專管員崗位表更記錄表", value: "postchange"
+                  label: "網點出納主管及專管員崗位變更記錄表", value: "postchange"
                 },
                 {
                   label: "查庫流水帳記錄表", value: "checkwarehouse"
@@ -108,7 +108,7 @@
                   label: "使用及出入庫登記表", value: "goodsuse"
                 },
                 {
-                  label: "新開護退件登記表", value: "returns"
+                  label: "新開戶退件登記表", value: "returns"
                 },
                 {
                   label: "自助設備吞沒卡處理", value: "cardswallow"
@@ -166,7 +166,7 @@
           label: "業務印章交接登記表", value: "sealhandover"
         },
         {
-          label: "網點出納主管及專管員崗位表更記錄表", value: "postchange"
+          label: "網點出納主管及專管員崗位變更記錄表", value: "postchange"
         },
         {
           label: "查庫流水帳記錄表", value: "checkwarehouse"
@@ -187,7 +187,7 @@
           label: "使用及出入庫登記表", value: "goodsuse"
         },
         {
-          label: "新開護退件登記表", value: "returns"
+          label: "新開戶退件登記表", value: "returns"
         },
         {
           label: "自助設備吞沒卡處理", value: "cardswallow"

src/views/bank/message.vue

@@ -90,7 +90,7 @@
               drag: true,
               loadText: '模板上傳中，請稍等',
               span: 24,
-              fileSize: 1024,
+              fileSize: 5120,
               propsHttp: {
                 res: 'data'
               },
@@ -326,7 +326,7 @@
           }
         }
         this.$Export.excel({
-          title: "新開護退件登記表" || new Date().getTime(),
+          title: "新開戶退件登記表" || new Date().getTime(),
           columns: columns,
           data: this.selectionList
         });

src/views/bank/postchange.vue

@@ -74,11 +74,11 @@
                      v-if="permission.postchange_download && row.process == 3 && type == 'view'"
                      @click="testExcel">下載Excel
           </el-button>
-          <a href="" download="網點出納主管及專管員崗位表更記錄表.xls" id="dl" style="display: none"></a>
+          <a href="" download="網點出納主管及專管員崗位變更記錄表.xls" id="dl" style="display: none"></a>
 
           <div id="mytable">
             <table v-show="false" border="1" cellpadding="5" cellspacing="5">
-              <caption>網點出納主管及專管員崗位表更記錄表</caption><!--可以生成表格的标题-->
+              <caption>網點出納主管及專管員崗位變更記錄表</caption><!--可以生成表格的标题-->
               <tr>
                 <th>銀行號</th>
                 <td>{{row.bankNo}}</td>
@@ -321,7 +321,9 @@
     </div>
 
     <el-dialog :append-to-body="true" :modal-append-to-body="false" :visible.sync="transferVisible" title="一鍵移交">
-      <select-dialog-user :callback="transferCallback"></select-dialog-user>
+      <div v-if="transferVisible">
+        <select-dialog-user :callback="transferCallback"></select-dialog-user>
+      </div>
     </el-dialog>
 
   </basic-container>
@@ -369,9 +371,9 @@
         selectionList: [],
         userList: [],
         option: {
-          addTitle: '新增【網點出納主管及專管員崗位表更記錄表】',
-          editTitle: '編輯【網點出納主管及專管員崗位表更記錄表】',
-          viewTitle: '查看【網點出納主管及專管員崗位表更記錄表】',
+          addTitle: '新增【網點出納主管及專管員崗位變更記錄表】',
+          editTitle: '編輯【網點出納主管及專管員崗位變更記錄表】',
+          viewTitle: '查看【網點出納主管及專管員崗位變更記錄表】',
           height:'auto',
           calcHeight: 30,
           tip: false,
@@ -983,7 +985,7 @@
           }
         }
         this.$Export.excel({
-          title: "網點出納主管及專管員崗位表更記錄表" || new Date().getTime(),
+          title: "網點出納主管及專管員崗位變更記錄表" || new Date().getTime(),
           columns: columns,
           data: this.selectionList
         });
@@ -1174,7 +1176,7 @@
             if (_this.approveFlag){
               _this.selectDisabled = true;
               _this.option.updateBtnText = '確認';
-              _this.option.editTitle = '信息審核【網點出納主管及專管員崗位表更記錄表】';
+              _this.option.editTitle = '信息審核【網點出納主管及專管員崗位變更記錄表】';
               _this.option.column.forEach(item => {
                 item.disabled = true;
               })
@@ -1205,7 +1207,7 @@
                 }
               });*/
               _this.option.updateBtnText = '提交';
-              _this.option.editTitle = '編輯【網點出納主管及專管員崗位表更記錄表】';
+              _this.option.editTitle = '編輯【網點出納主管及專管員崗位變更記錄表】';
               _this.option.column.forEach(item => {
                 if (item.prop == 'bankNo' || item.prop == 'orgNo' || item.prop == 'applyDate'|| item.prop == 'personNo'){
                   item.disabled = true;

src/views/bank/returns.vue

@@ -34,13 +34,13 @@
                    v-if="permission.returns_upload"
                    @click="handleUpload">上 傳
         </el-button>
-        <el-button type="success"
+        <!--<el-button type="success"
                    size="small"
                    icon="el-icon-setting"
                    plain
                    v-if="permission.returns_setting"
                    @click="handleSetting">設置發佈人
-        </el-button>
+        </el-button>-->
         <el-button type="primary"
                    size="small"
                    icon="el-icon-download"
@@ -54,9 +54,9 @@
 
       <template slot="menu" slot-scope="{row, index}">
         <el-button size="small" class="el-button--text" v-if="permission.returns_view" @click="$refs.crud.rowView(row, index)"><i class="el-icon-view"></i> 查 看</el-button>
-        <el-button size="small" class="el-button--text" v-if="permission.returns_edit && row.process <= 2" @click="$refs.crud.rowEdit(row, index)"><i class="el-icon-edit"></i> 編 輯</el-button>
-        <el-button size="small" class="el-button--text" v-if="permission.returns_delete && row.process <= 2" @click="$refs.crud.rowDel(row, index)"><i class="el-icon-delete"></i> 刪 除</el-button>
-        <el-button size="small" class="el-button--text" v-if="permission.returns_issue && row.process == 2 && row.personNo == userInfo.user_ehr" @click="form = row,issueVisible = true">去發佈</el-button>
+        <el-button size="small" class="el-button--text" v-if="permission.returns_edit && row.process <= 2 && ((row.personId && row.personId.indexOf(userInfo.user_id) != -1) || row.createUser == userInfo.user_id)" @click="$refs.crud.rowEdit(row, index)"><i class="el-icon-edit"></i> 編 輯</el-button>
+        <el-button size="small" class="el-button--text" v-if="permission.returns_delete && row.process <= 2 && ((row.personId && row.personId.indexOf(userInfo.user_id) != -1) || row.createUser == userInfo.user_id)" @click="$refs.crud.rowDel(row, index)"><i class="el-icon-delete"></i> 刪 除</el-button>
+        <el-button size="small" class="el-button--text" v-if="permission.returns_issue && row.process == 2 && (row.personId && row.personId.indexOf(userInfo.user_id) != -1)" @click="form = row,issueVisible = true">去發佈</el-button>
         <el-button size="small" class="el-button--text" v-if="permission.returns_approve && row.process == 3" @click="approve(row, index)"><i class="el-icon-check"></i> 確 認</el-button>
       </template>
 
@@ -155,9 +155,9 @@
         },
         selectionList: [],
         option: {
-          addTitle: '新增【新開護退件登記表】',
-          editTitle: '編輯【新開護退件登記表】',
-          viewTitle: '查看【新開護退件登記表】',
+          addTitle: '新增【新開戶退件登記表】',
+          editTitle: '編輯【新開戶退件登記表】',
+          viewTitle: '查看【新開戶退件登記表】',
           height:'auto',
           calcHeight: 30,
           tip: false,
@@ -262,11 +262,11 @@
               }]
             },
             {
-              label: "客護名稱",
+              label: "客戶名稱",
               prop: "customerName",
               rules: [{
                 required: true,
-                message: "請輸入客護名稱",
+                message: "請輸入客戶名稱",
                 trigger: "blur"
               }]
             },
@@ -393,7 +393,7 @@
                 return res.data;
               },
               rules: [{
-                required: false,
+                required: true,
                 message: "請輸入跟進情況",
                 trigger: "blur"
               }]
@@ -577,7 +577,7 @@
           }
         }
         this.$Export.excel({
-          title: "新開護退件登記表" || new Date().getTime(),
+          title: "新開戶退件登記表" || new Date().getTime(),
           columns: columns,
           data: data
         });
@@ -776,8 +776,8 @@
           let issueFlag = true, approveFlag = true, delFlag = true;
           for (let i = 0; i < list.length; i++) {
             let item = list[i];
-            delFlag = delFlag && item.process <= 2;
-            issueFlag = issueFlag && item.process == 2 && item.personNo == this.userInfo.user_ehr;
+            delFlag = delFlag && item.process <= 2 && ((item.personId && item.personId.indexOf(this.userInfo.user_id) != -1) || item.createUser == this.userInfo.user_id);
+            issueFlag = issueFlag && item.process == 2  && (item.personId && item.personId.indexOf(this.userInfo.user_id) != -1);
             approveFlag = approveFlag && item.process == 3;
           }
           this.delBatchBtn = !delFlag;

src/views/bank/sealhandover.vue

@@ -414,8 +414,8 @@
     },
     methods: {
       turnInChange(value){
-        // this.findObject(this.option.column, "receiverNo").rules[0].required = !value;
-        // this.findObject(this.option.column, "receiverName").rules[0].required = !value;
+        this.findObject(this.option.column, "receiverNo").rules[0].required = !value;
+        this.findObject(this.option.column, "receiverName").rules[0].required = !value;
         this.receiverDisabled = !!value;
       },
       handleDownload(){

src/views/bank/tellertrunk.vue

@@ -83,7 +83,7 @@
               drag: true,
               loadText: '模板上傳中，請稍等',
               span: 24,
-              fileSize: 1024,
+              fileSize: 5120,
               propsHttp: {
                 res: 'data'
               },
@@ -505,6 +505,8 @@
       uploadDelete(column,file) {
         return this.$confirm(`是否確定移除該選項？`).then(() => {
           this.attachForm.attachFile = [];
+          this.form.enclosure = '';
+          this.form.enclosureName = '';
           return true;
         })
         // return this.$confirm(`是否確定移除該選項？`);

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

@@ -59,7 +59,7 @@
                   label: "業務印章交接登記表", value: "sealhandover"
                 },
                 {
-                  label: "網點出納主管及專管員崗位表更記錄表", value: "postchange"
+                  label: "網點出納主管及專管員崗位變更記錄表", value: "postchange"
                 },
                 {
                   label: "查庫流水帳記錄表", value: "checkwarehouse"
@@ -74,7 +74,7 @@
                   label: "使用及出入庫登記表", value: "goodsuse"
                 },
                 {
-                  label: "新開護退件登記表", value: "returns"
+                  label: "新開戶退件登記表", value: "returns"
                 },
                 {
                   label: "自助設備吞沒卡處理", value: "cardswallow"
@@ -90,7 +90,7 @@
               disabled: true,
             },
             {
-              label: "用護姓名",
+              label: "用戶姓名",
               prop: "personName",
               disabled: true,
             },
@@ -124,6 +124,9 @@
                 {
                   label: "簽收", value: "signin"
                 },
+                {
+                  label: "一鍵移交", value: "transfer"
+                },
               ],
             },
             {
@@ -272,7 +275,7 @@
           ]
         }],
         postchangeGroup: [{
-          label: "網點出納主管及專管員崗位表更記錄表",
+          label: "網點出納主管及專管員崗位變更記錄表",
           column: [
             {
               label: "機構號",
@@ -730,7 +733,7 @@
           ]
         }],
         returnsGroup: [{
-          label: "新開護退件登記表",
+          label: "新開戶退件登記表",
           column: [
             {
               label: "業務類型",
@@ -761,7 +764,7 @@
               prop: "subOrgNo",
             },
             {
-              label: "客護名稱",
+              label: "客戶名稱",
               prop: "customerName",
             },
             {

src/views/desk/confirmed.vue

@@ -1,7 +1,7 @@
 <template>
   <basic-container>
     <el-tabs type="border-card">
-      <el-tab-pane v-if="permission.postchange_view" label="網點出納主管及專管員崗位表更">
+      <el-tab-pane v-if="permission.postchange_view" label="網點出納主管及專管員崗位變更記錄表">
         <confirmed-postchange></confirmed-postchange>
       </el-tab-pane>
       <el-tab-pane v-if="permission.goodsuse_view" label="網點各項憑證/實物使用及出入庫">

src/views/desk/initiated.vue

@@ -7,7 +7,7 @@
       <el-tab-pane v-if="permission.sealhandover_view" label="業務印章交接登記表">
         <init-sealhandover></init-sealhandover>
       </el-tab-pane>
-      <el-tab-pane v-if="permission.postchange_view" label="網點出納主管及專管員崗位表更">
+      <el-tab-pane v-if="permission.postchange_view" label="網點出納主管及專管員崗位變更記錄表">
         <init-postchange></init-postchange>
       </el-tab-pane>
 

src/views/desk/mynotice.vue

@@ -141,7 +141,7 @@
                   label: "業務印章交接登記表", value: "sealhandover"
                 },
                 {
-                  label: "網點出納主管及專管員崗位表更記錄表", value: "postchange"
+                  label: "網點出納主管及專管員崗位變更記錄表", value: "postchange"
                 },
                 {
                   label: "查庫流水帳記錄表", value: "checkwarehouse"
@@ -162,7 +162,7 @@
                   label: "使用及出入庫登記表", value: "goodsuse"
                 },
                 {
-                  label: "新開護退件登記表", value: "returns"
+                  label: "新開戶退件登記表", value: "returns"
                 },
                 {
                   label: "自助設備吞沒卡處理", value: "cardswallow"
@@ -336,6 +336,11 @@
               label: "發佈者",
               prop: "createUserName",
               display: false
+            },
+            {
+              label: "發佈時間",
+              prop: "createTime",
+              display: false
             }
           ]
         },

src/views/desk/notice.vue

@@ -33,8 +33,8 @@
       </template>
 
       <template slot-scope="{row}" slot="menu">
-        <el-button size="small" class="el-button--text" v-if="userInfo.user_id == row.createUser" @click="$refs.crud.rowEdit(row, index)"><i class="el-icon-edit"></i> 編 輯</el-button>
-        <el-button size="small" class="el-button--text" v-if="userInfo.user_id == row.createUser" @click="$refs.crud.rowDel(row, index)"><i class="el-icon-delete"></i> 刪 除</el-button>
+        <el-button size="small" class="el-button--text" v-if="userInfo.user_id == row.createUser && row.type != 0" @click="$refs.crud.rowEdit(row, index)"><i class="el-icon-edit"></i> 編 輯</el-button>
+        <el-button size="small" class="el-button--text" v-if="userInfo.user_id == row.createUser && row.type != 0" @click="$refs.crud.rowDel(row, index)"><i class="el-icon-delete"></i> 刪 除</el-button>
       </template>
 
     </avue-crud>
@@ -152,7 +152,7 @@
                   label: "業務印章交接登記表", value: "sealhandover"
                 },
                 {
-                  label: "網點出納主管及專管員崗位表更記錄表", value: "postchange"
+                  label: "網點出納主管及專管員崗位變更記錄表", value: "postchange"
                 },
                 {
                   label: "查庫流水帳記錄表", value: "checkwarehouse"
@@ -173,7 +173,7 @@
                   label: "使用及出入庫登記表", value: "goodsuse"
                 },
                 {
-                  label: "新開護退件登記表", value: "returns"
+                  label: "新開戶退件登記表", value: "returns"
                 },
                 {
                   label: "自助設備吞沒卡處理", value: "cardswallow"
@@ -289,7 +289,7 @@
               }]
             },
             {
-              label: "查閱部門",
+              label: "查閱人員",
               prop: "targetNames",
               display: false
             },
@@ -326,6 +326,12 @@
               minRows: 6,
               span: 24,
             },
+            {
+              label: "發佈時間",
+              prop: "createTime",
+              display: false
+            }
+
           ]
         },
         data: []

src/views/desk/tobeconfirm.vue

@@ -1,7 +1,7 @@
 <template>
   <basic-container>
     <el-tabs type="border-card">
-      <el-tab-pane v-if="permission.postchange_view" label="網點出納主管及專管員崗位表更">
+      <el-tab-pane v-if="permission.postchange_view" label="網點出納主管及專管員崗位變更記錄表">
         <tobeconfirm-postchange></tobeconfirm-postchange>
       </el-tab-pane>
       <el-tab-pane v-if="permission.goodsuse_view" label="網點各項憑證/實物使用及出入庫">

src/views/report/userlog.vue

@@ -49,7 +49,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/report/userlog";
+  import {getList, getDownloadList, add, update, remove} from "@/api/report/userlog";
   import {mapGetters} from "vuex";
   import UserLogView from "../bank/user-log-view";
 
@@ -113,7 +113,7 @@
                   label: "業務印章交接登記表", value: "sealhandover"
                 },
                 {
-                  label: "網點出納主管及專管員崗位表更記錄表", value: "postchange"
+                  label: "網點出納主管及專管員崗位變更記錄表", value: "postchange"
                 },
                 {
                   label: "查庫流水賬記錄表", value: "checkwarehouse"
@@ -192,6 +192,9 @@
                 {
                   label: "簽收", value: "signin"
                 },
+                {
+                  label: "一鍵移交", value: "transfer"
+                },
               ],
               rules: [{
                 required: true,
@@ -266,9 +269,22 @@
     methods: {
       handleDownload(){
         if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
+          let tip = "確定下載篩選的" + this.page.total + "條數據嗎？"
+          this.$confirm(tip, {
+            confirmButtonText: "確定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+            .then(() => {
+              getDownloadList(this.query).then(res => {
+                this.downLoadData(res.data.data, true)
+              });
+            })
+        }else{
+          this.downLoadData(this.selectionList, false)
         }
+      },
+      downLoadData(data, isAll){
         let columns = this.deepClone(this.option.column);
         for (let i = 0; i < columns.length; i++) {
           let item = columns[i];
@@ -276,14 +292,14 @@
             columns.splice(i, 1);
             i--;
           }
-          if (item.type == 'select' || item.type == 'tree'){
+          if (!isAll && (item.type == 'select' || item.type == 'tree')){
             item.prop = '$' + item.prop;
           }
         }
         this.$Export.excel({
           title: "填報軌跡記錄表" || new Date().getTime(),
           columns: columns,
-          data: this.selectionList
+          data: data
         });
       },
       rowSave(row, done, loading) {

src/views/resource/attach.vue

@@ -157,7 +157,7 @@
               drag: true,
               loadText: '模板上传中，请稍等',
               span: 24,
-              fileSize: 1024,
+              fileSize: 5120,
               propsHttp: {
                 res: 'data'
               },