```快速構建調整-修復

src/api/bank/autodata.js

@@ -48,11 +48,11 @@ export const update = (row) => {
   })
 }
 
-export const approveYes = (row) => {
+export const approveYes = (row, end) => {
   return request({
-    url: '/api/bank/autodata/approveYes',
+    url: '/api/bank/autodata/approveYes/' + end,
     method: 'post',
-    data: row
+    data: row,
   })
 }
 
@@ -72,3 +72,14 @@ export const approveNo = (row) => {
   })
 }
 
+
+export const setEnd = (id) => {
+  return request({
+    url: '/api/bank/autodata/setEnd',
+    method: 'post',
+    params: {
+      id,
+    }
+  })
+}
+

src/api/system/dept.js

@@ -99,6 +99,15 @@ export const getChildsDept = () => {
   })
 }
 
+export const getAllDept = () => {
+  return request({
+    url: '/api/blade-system/expand/dept/getAllDept',
+    method: 'get',
+    params: {
+    }
+  })
+}
+
 export const getDeptTree = () => {
   return request({
     url: '/api/blade-system/expand/dept/tree',

src/components/autostruct/create-auto-setting.vue

@@ -0,0 +1,80 @@
+<template>
+  <div>
+    <el-row>
+      <el-row v-if="processNum > 1">
+        <el-steps :active="active">
+          <el-step v-for="i in processNum" @click.native="stepClick(i)" :key="i"></el-step>
+        </el-steps>
+      </el-row>
+      <el-row  v-for="i in processNum" :key="i">
+        <div v-if="i == active">
+          <select-user :multiple="false" :name="selectPersonName" :callback="selectCallback"></select-user>
+        </div>
+      </el-row>
+    </el-row>
+
+
+  </div>
+</template>
+
+<script>
+  import SelectUser from "../select-dialog/select-user";
+  export default {
+    name: "create-auto-setting",
+    components: {SelectUser},
+    props: {
+      personSetting: {
+        type:  Object,
+        default: {}
+      },
+      processNum: {
+        type: Number
+      }
+    },
+    data(){
+      return {
+        active: 1,
+        selectPersonName: '',
+        settingPersons:[
+          {
+            id:'',
+            name:'',
+            ehr:'',
+          },
+        ],
+
+
+      }
+    },
+    created() {
+      this.settingPersons = JSON.parse(this.personSetting);
+    },
+    computed(){
+    },
+    methods: {
+      stepClick(step){
+        this.active = step;
+        let selectObj = this.settingPersons[step-1];
+        selectObj && (this.selectPersonName = selectObj.name);
+      },
+      selectCallback(selectList){
+        let row = selectList[0]
+        let item = {}
+        item.id = row.id;
+        item.name = row.name;
+        item.ehr = row.ehr;
+        this.settingPersons[this.active-1] = item;
+        if (this.settingPersons.length == this.processNum){
+          this.settingSave()
+        }
+      },
+      settingSave(){
+        this.$emit("callback", JSON.stringify(this.settingPersons))
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/components/common/cy-form-design.vue

@@ -30,37 +30,6 @@
         designVisible: false,
         options: {
           column: [
-            {
-              label: "銀行號",
-              prop: "bankNo",
-              span: 24,
-              hide: true,
-              disabled: true,
-              search: true,
-              searchSpan: 4,
-              rules: [{
-                required: true,
-                message: "請輸入銀行號",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "機構號",
-              prop: "orgNo",
-              hide: true,
-              disabled: true,
-              filterable: true,
-              dicData: [],
-              props: {
-                label: "orgNo",
-                value: "orgNo"
-              },
-              rules: [{
-                required: true,
-                message: "請輸入機構號",
-                trigger: "blur"
-              }]
-            },
             {
               label: "機構名稱",
               prop: "orgName",

src/components/common/returns-comfire.vue

@@ -73,6 +73,7 @@
               prop: "bankNo",
               span: 24,
               hide: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入銀行號",

src/components/common/returns-issue.vue

@@ -52,6 +52,7 @@
               span: 24,
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入銀行號",
@@ -63,6 +64,7 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -73,6 +75,7 @@
               label: "機構名稱",
               prop: "orgName",
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",

src/components/confirmed/confirmed-returns.vue

@@ -726,7 +726,6 @@
         }*/
         row.isPublic = this.getDictValueByLabel(this.dictBusinessType, row.isPublic);
         row.status = this.getDictValueByLabel(this.dictReturnsStatus, row.status);
-        debugger
 
         /*let userInfoStr = localStorage.getItem("saber-userInfo");
         let userInfo = JSON.parse(userInfoStr);

src/components/initiated/init-checkwarehouse.vue

@@ -208,7 +208,7 @@
               }]
             },
             {
-              label: "查庫時間",
+              label: "檢查時間",
               prop: "checkTimeRange",
               type: "datetime",
               format: "yyyy-MM-dd HH:mm",

src/components/initiated/init-returns.vue

@@ -726,7 +726,6 @@
         }*/
         row.isPublic = this.getDictValueByLabel(this.dictBusinessType, row.isPublic);
         row.status = this.getDictValueByLabel(this.dictReturnsStatus, row.status);
-        debugger
 
         /*let userInfoStr = localStorage.getItem("saber-userInfo");
         let userInfo = JSON.parse(userInfoStr);

src/components/initiated/init-tellertrunk.vue

@@ -201,7 +201,7 @@
               }]
             },
             {
-              label: "查庫時間",
+              label: "檢查時間",
               prop: "checkTimeRange",
               type: "datetime",
               format: "yyyy-MM-dd HH:mm",

src/components/release/release-returns.vue

@@ -726,7 +726,6 @@
         }*/
         row.isPublic = this.getDictValueByLabel(this.dictBusinessType, row.isPublic);
         row.status = this.getDictValueByLabel(this.dictReturnsStatus, row.status);
-        debugger
 
         /*let userInfoStr = localStorage.getItem("saber-userInfo");
         let userInfo = JSON.parse(userInfoStr);

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

@@ -188,6 +188,10 @@
       selectUser(){
         let nameArr = [];
         let selectList = [];
+        if (!this.multiple && this.selectionList.length > 1){
+          this.$alert("只能選擇一個人員！");
+          return
+        }
         this.selectionList.forEach(item => {
           nameArr.push(item.name)
           let obj = {};

src/components/tobeconfirm/tobeconfirm-returns.vue

@@ -726,7 +726,6 @@
         }*/
         row.isPublic = this.getDictValueByLabel(this.dictBusinessType, row.isPublic);
         row.status = this.getDictValueByLabel(this.dictReturnsStatus, row.status);
-        debugger
 
         /*let userInfoStr = localStorage.getItem("saber-userInfo");
         let userInfo = JSON.parse(userInfoStr);

src/views/bank/autodata.vue

@@ -18,6 +18,7 @@
                  :page.sync="page"
                  :permission="permissionList"
                  :before-open="beforeOpen"
+                 :cell-style="cellStyle"
                  v-model="form"
                  ref="crud"
                  @row-update="rowUpdate"
@@ -31,6 +32,12 @@
                  @refresh-change="refreshChange"
                  @on-load="onLoad">
         <template slot="menuLeft">
+          <el-button type="primary"
+                     size="small"
+                     icon="el-icon-download"
+                     v-if="isManageRole"
+                     @click="downLoadData"> 導 出
+          </el-button>
         </template>
 
         <template slot="fileForm" slot-scope="{row}">
@@ -39,20 +46,29 @@
         </template>
 
         <template slot="receiverNameForm" slot-scope="{row}">
-          <select-user :multiple="false" :name="approvePerson.name" :callback="selectCallback"></select-user>
+          <span v-if="createSettingType == 2">
+            <select-user :multiple="false" :name="approvePerson.name" :callback="selectCallback"></select-user>
+          </span>
+          <span v-if="createSettingType == 1">
+            <create-auto-setting :person-setting="createSetting" :process-num="approveNum" @callback="settingCallback"></create-auto-setting>
+          </span>
 <!--          <select-dialog-user :id="approvePerson.id" :name="approvePerson.name" :ehr="approvePerson.ehr" :disabled="false" :callback="selectCallback"></select-dialog-user>-->
+
         </template>
         <template slot="historyForm" slot-scope="{row}">
           <approve-history :data="row"></approve-history>
         </template>
         <template slot-scope="{row, index}" slot="menu">
-          <el-button size="small" class="el-button--text" v-if="userInfo.user_id == row.createUser && tableEditBtn && ((approveType == 1 && (row.processStatus == '已退回' || (row.processStatus == '待審核' && !row.approveHistory))) || (approveType == 2 && !row.approveHistory))"
+          <el-button size="small" class="el-button--text" v-if="approveSwitch == 0 || (approveSwitch == 1 && isManageRole && approveType == 1 && row.processStatus == '已關閉' )"
+                     @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.receiverId.indexOf(userInfo.user_id) > -1 && tableEditBtn && ((approveType == 1 && (row.processStatus == '已退回' || (row.processStatus == '待審批' && !row.approveHistory))) || (approveType == 2 && !row.approveHistory))"
                      @click="formEdit(row, index)"><i class="el-icon-edit"></i> 編 輯</el-button>
           <el-button type="text" icon="el-icon-download" size="small" v-if="row.file" @click="handleDownload(row)">下載</el-button>
           <el-button type="text" icon="el-icon-check" size="small"
                      v-if="approveSwitch == 1 && ( (approveType == 1 && row.process > 0 && row.process <= approveNum) || approveType == 2 )  && row.receiverId.indexOf(userInfo.user_id) > -1
-                     && userInfo.user_id != row.createUser && (!row.approveId || row.approveId.indexOf(userInfo.user_id) == -1) && row.processStatus == '待審核'"
+                     && userInfo.user_id != row.createUser && (!row.approveId || !(approveType == 2 && row.approveId.indexOf(userInfo.user_id) > -1)) && row.processStatus == '待審批'"
                      @click.native="approveShow(row)">審批</el-button>
+          <el-button type="text" icon="el-icon-close" size="small" v-if="isManageRole && approveSwitch == 1 && row.process > 0 && (row.processStatus == '待審批' || row.processStatus == '已退回')" @click="toSetEnd(row.id)">關閉結束流程</el-button>
 
         </template>
       </avue-crud>
@@ -62,7 +78,9 @@
         <div v-if="approveVisible">
           <avue-form ref="approveForm" :option="approveOption" v-model="approveForm" @submit="approveYes">
             <template slot="receiverName">
-              <select-user :multiple="false" :name="approvePerson.name" :callback="selectCallback"></select-user>
+              <span v-if="approveForm.createSettingType == 2">
+                <select-user :multiple="false" :name="approvePerson.name" :callback="selectCallback"></select-user>
+              </span>
 <!--              <select-dialog-user :id="approvePerson.id" :name="approvePerson.name" :ehr="approvePerson.ehr" :disabled="false" :callback="selectCallback"></select-dialog-user>-->
             </template>
 
@@ -71,10 +89,9 @@
             </template>
 
             <template slot-scope="scope" slot="menuForm">
-              <el-button type="warning" size="small" v-if="bohuiBtn" icon="el-icon-close" @click="toReject">退回</el-button>
-              <el-button type="danger" size="small"
-                         v-if="approveSwitch == 1 && approveType == 2"
-                         icon="el-icon-close" @click="approveNo">不通過</el-button>
+              <el-button type="primary" size="small" v-if="approveSwitch == 1 && approveType == 1 && settingType == 2" icon="el-icon-s-check" @click="approveYesEnd">同意並結束流程</el-button>
+              <el-button type="warning" size="small" v-if="bohuiBtn" icon="el-icon-back" @click="toReject">退回修改</el-button>
+              <el-button type="danger" size="small" v-if="approveSwitch == 1" icon="el-icon-close" @click="approveNo">不同意並結束流程</el-button>
             </template>
           </avue-form>
         </div>
@@ -84,7 +101,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove, approveYes, approveNo, approveReject} from "@/api/bank/autodata";
+  import {getList, getDetail, add, update, remove, approveYes, approveNo, approveReject, setEnd} from "@/api/bank/autodata";
   import {mapGetters} from "vuex";
   import {getSelectAndPermissionByDept} from "@/api/bank/autostruct";
   import {opStr2opObj} from "../../api/bank/autostruct";
@@ -93,9 +110,10 @@
   import SelectDialogUser from "../../components/select-dialog/select-dialog-user";
   import SelectUser from "../../components/select-dialog/select-user";
   import ApproveHistory from "../../components/process/approve-history";
+  import CreateAutoSetting from "../../components/autostruct/create-auto-setting";
 
   export default {
-    components: {ApproveHistory, SelectUser, SelectDialogUser},
+    components: {CreateAutoSetting, ApproveHistory, SelectUser, SelectDialogUser},
     data() {
       return {
 
@@ -123,12 +141,15 @@
           ]
         },
 
+        createSettingType: 0,
+        createSetting: '[]',
         approvePerson: {
           id: '',
           name: '',
           ehr: '',
         },
         tableEditBtn: false,
+        isManageRole: false,
         approveSwitch: false,
         approveType: '',
         settingType: '',
@@ -137,12 +158,13 @@
         approveVisible: false,
         approveForm: {},
         approveOption: {
-          submitText: "通過",
+          submitText: "同意",
           emptyBtn: false,
           column: []
         },
 
         show: false,
+        tableName: '',
         value: '',
         tableList: [],
 
@@ -231,6 +253,32 @@
             addDisplay: false,
             editDisplay: false
           },
+          {
+            label: "逐級設置方式",
+            prop: "createSettingType",
+            // span: 6,
+            type: "radio",
+            hide: true,
+            viewDisplay: false,
+            addDisplay: true,
+            editDisplay: true,
+            dicData: [{
+              label: '設置所有審批人',
+              value: 1
+            }, {
+              label: '逐級設置',
+              value: 2
+            }],
+            rules: [{
+              required: true,
+              message: "請選擇設置方式",
+              trigger: "blur"
+            }],
+            change: ({value}) => {
+              if (!value) return
+              this.createSettingType = value;
+            },
+          },
         ]
       };
     },
@@ -258,6 +306,74 @@
       this.initTableList();
     },
     methods: {
+      downLoadData(){
+        let columns = this.deepClone(this.option.column);
+        for (let i = 0; i < columns.length; i++) {
+          let item = columns[i];
+          if (item.hide || item.prop == 'process'){
+            columns.splice(i, 1);
+            i--;
+          }
+          if ( item.type == 'select' || item.type == 'tree' ){
+            item.prop = '$' + item.prop;
+          }
+        }
+        columns.push({ label: "審批歷史", prop: "approveHistory"});
+        let data = this.deepClone(this.data);
+        data.forEach(row => {
+          if (!!row.approveHistory){
+            let arr = ['【'+row.createUserName + '】於【' + row.createTime + '】【發起】'];
+            let ah = JSON.parse(row.approveHistory);
+            ah.forEach(item => {
+              let h = '【' + item.userName + '】於【' + item.approveTime + '】【' + item.approve + (item.remark? '】-審批意見【'+item.remark+'】':'】');
+              arr.push(h)
+            })
+            row.approveHistory = JSON.stringify(arr)
+          }
+        })
+        this.$Export.excel({
+          title: this.tableName + new Date().getTime(),
+          columns: columns,
+          data: data
+        });
+      },
+      cellStyle({row,column,rowIndex,columnIndex}){
+        if (column.label == '狀態' && column.property == 'processStatus' && this.approveSwitch == 1){
+          if (row.processStatus == '已完成'){
+            return {
+              color:'#85ce61',
+              fontWeight:'bold',
+            }
+          } else if (row.processStatus == '已退回'){
+            return {
+              color:'orange',
+              fontWeight:'bold',
+            }
+          }else if (row.processStatus == '不同意'){
+            return {
+              color:'red',
+              fontWeight:'bold',
+            }
+          }
+        }
+      },
+      toSetEnd(id){
+        this.$confirm("確定將此流程關閉結束嗎?", {
+          confirmButtonText: "確定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return setEnd(id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "流程關閉成功!"
+            });
+          });
+      },
       formEdit(row, index){
         let columns = this.option.column;
         for (let i = 0; i < columns.length; i++) {
@@ -266,12 +382,26 @@
         }
         this.$refs.crud.rowEdit(row, index);
       },
+      approveYesEnd(){
+        let row = this.deepClone(this.approveForm);
+        delete row.createTime,delete row.createUser,delete row.createUserName;
+        let form = this.beforeSave(row);
+        // form.id = row.id, form.remark = row.remark;
+        approveYes(form, true).then(res => {
+          this.approveVisible = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "審批成功!"
+          });
+        })
+      },
       approveYes(data, done){
         let row = this.deepClone(this.approveForm);
-        delete row.createTime,delete row.createUser,delete row.createUserName,delete row.history;
+        delete row.createTime,delete row.createUser,delete row.createUserName;
         let form = this.beforeSave(row);
-        form.id = row.id, form.remark = row.remark;
-        approveYes(form).then(res => {
+        // form.id = row.id, form.remark = row.remark;
+        approveYes(form, false).then(res => {
           this.approveVisible = false;
           this.onLoad(this.page);
           this.$message({
@@ -302,21 +432,21 @@
         let row = this.deepClone(this.approveForm);
         delete row.createTime,delete row.createUser,delete row.createUserName;
         let form = this.beforeSave(row);
-        form.id = row.id, form.remark = row.remark;
-        /*approveReject(form).then(res => {
+        // form.id = row.id, form.remark = row.remark;
+        approveReject(form).then(res => {
           this.approveVisible = false;
           this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "退回成功!"
           });
-        })*/
+        })
       },
       approveNo(){
         let row = this.deepClone(this.approveForm);
         delete row.createTime,delete row.createUser,delete row.createUserName;
         let form = this.beforeSave(row);
-        form.id = row.id, form.remark = row.remark;
+        // form.id = row.id, form.remark = row.remark;
         approveNo(form).then(res => {
           this.approveVisible = false;
           this.onLoad(this.page);
@@ -327,18 +457,27 @@
         })
       },
       approveShow(row){
-        if (this.approveType == 1 && this.settingType == 2 && row.process == this.approveNum){
+        if (this.approveType == 1 && this.settingType == 2){
           let $receiver = this.findObject(this.approveOption.column, "receiverName");
-          if ($receiver){
-            $receiver.display = false;
+          if (row.createSettingType == 1 || (row.createSettingType == 2 && row.process == this.approveNum)){
+            $receiver && ($receiver.display = false);
+          }else{
+            $receiver && ($receiver.display = true);
           }
+          this.findObject(this.approveOption.column, "createSettingType").display = false;
         }
-        this.bohuiBtn = row.process > 1;
+        this.bohuiBtn =  this.approveType == 1 && row.process > 0;
         this.approveForm = row;
         delete this.approveForm.receiverName;
         this.approvePerson.name = '';
         this.approveVisible = true;
       },
+      settingCallback(data){
+        this.form.createSetting = data;
+        this.form.createSettingType = this.createSettingType;
+        let one = JSON.parse(data)[0];
+        this.form.receiverName = one.name;
+      },
       selectCallback(list){
         let data = list[0];
         this.form.receiverName = data.name;
@@ -381,6 +520,7 @@
         let _this = this;
         this.show = false;
         let tableStruct = this.getItemById(value);
+        this.tableName = tableStruct.name;
         this.approveSwitch = tableStruct.approveSwitch;
         this.approveType = tableStruct.approveType;
         this.settingType = tableStruct.settingType;
@@ -388,14 +528,17 @@
         let option = opStr2opObj(tableStruct.columns);
         option.addBtn = tableStruct.canWrite;
         _this.deleteBatch = tableStruct.isManageRole;
-        option.delBtn = tableStruct.isManageRole;
-        option.excelBtn = tableStruct.isManageRole;
+        // option.delBtn = tableStruct.isManageRole;
+        // option.excelBtn = tableStruct.isManageRole;
+        this.isManageRole = tableStruct.isManageRole;
+        option.delBtn = false;
         option.editBtn = false;
         option.viewBtn = true;
         this.tableEditBtn = tableStruct.approveSwitch == 1;
         option.searchMenuSpan = 6;
         option.column.forEach((item, index) => {
-          item.search = index >= 3 && index < 7 && item.type != 'title';
+          // item.search = index >= 3 && index < 7 && item.type != 'title';
+          item.search = index >= 0 && index < 4 && item.type != 'title';
           item.editDisabled = true;
           if (item.dicUrl){
             item.dicFormatter = (res) => {
@@ -403,20 +546,24 @@
               return res.data;
             };
           }
-          if (item.prop === 'file'){
+          if (item.prop === 'file' || item.type === 'title'){
             item.hide = true;
           }
         });
         option.column.push(this.defaultColumn[0]);
         option.column.push(this.defaultColumn[1]);
-        option.column.push(this.defaultColumn[4]);
-        option.column.push(this.defaultColumn[5]);
+
         //開流程 && 串行 && 逐級審批
         if (tableStruct.approveSwitch == 1 ){
+          if (tableStruct.settingType == 2){
+            option.column.push(this.defaultColumn[6]);
+          }
           // 增加審批人選擇
           this.defaultColumn[2].addDisplay = tableStruct.approveType == 1 && tableStruct.settingType == 2;
           this.defaultColumn[2].editDisplay = tableStruct.approveType == 1 && tableStruct.settingType == 2;
-          option.column.push(this.defaultColumn[2])
+          option.column.push(this.defaultColumn[2]);
+          option.column.push(this.defaultColumn[4]);
+          option.column.push(this.defaultColumn[5]);
         }
         this.option = option;
         this.approveOption.column = this.deepClone(option.column);
@@ -451,13 +598,18 @@
           let item = {};
           if (keys[i].indexOf("$") == 0 || keys[i] == ("id") || keys[i] == "createTime" || keys[i]=="createUser" || keys[i]=="createDept" || keys[i]=="receiverId" || keys[i]=="receiverName"
             || keys[i]=="receiverNo" || keys[i]=="approveId" || keys[i]=="approveName" || keys[i]=="approveNo" || keys[i]=="remark" || keys[i] == "process" || keys[i] == "key"
-            || keys[i] == "processStatus" || keys[i] == "approveHistory"){
+            || keys[i] == "processStatus" || keys[i] == "approveHistory"|| keys[i] == "createSettingType" || keys[i] == "createSetting" || keys[i] == "history"){
           }else{
             item['' + keys[i]] = row[''+keys[i]];
             form['params'+(n++)] = JSON.stringify(item);
           }
         }
         form.tableId = this.value;
+        form.id = row.id,form.process = row.process, form.remark = row.remark, form.approveHistory = row.approveHistory;
+        form.receiverId = row.receiverId, form.receiverNo = row.receiverNo, form.receiverName = row.receiverName;
+        form.approveId = row.approveId, form.approveName = row.approveName, form.approveNo = row.approveNo;
+        form.createSetting = row.createSetting, form.createSettingType = row.createSettingType;
+
         if (this.approvePerson.id && this.approvePerson.name && this.approvePerson.ehr){
           form.receiverId = this.approvePerson.id;
           form.receiverName = this.approvePerson.name;
@@ -467,7 +619,9 @@
       },
       rowSave(row, done, loading) {
         delete row.createTime,delete row.createUser,delete row.createUserName;
+        console.log(row)
         let form = this.beforeSave(row)
+        console.log(form)
         add(form).then(() => {
           this.onLoad(this.page);
           this.$message({
@@ -485,7 +639,7 @@
         delete formTem.$index,delete formTem.createDept,delete formTem.createTime,delete formTem.createUser,delete formTem.createUserName;
       // ,delete formTem.id
         let form = this.beforeSave(formTem);
-        form.id = row.id;
+        // form.id = row.id;
         let columns = this.option.column;
         update(form).then(() => {
           columns.forEach(item => {
@@ -564,8 +718,6 @@
         if (type == 'add'){
           getCurrentDept().then(res => {
             const data =  res.data.data;
-            this.form.bankNo = data.bankNo;
-            this.form.orgNo = data.orgNo;
             this.form.orgName = data.deptName;
           });
         }
@@ -578,9 +730,16 @@
 
       initSearchParams(params){
         let keys = Object.keys(params);
+        let column = this.deepClone(this.option.column)
+        for (let i = 0; i < column.length; i++) {
+          if (column[i].type == 'title'){
+            column.splice(i,1);
+            break
+          }
+        }
         let resultParams = {};
         keys.forEach(key => {
-          this.option.column.forEach((item, index) => {
+          column.forEach((item, index) => {
             if (item.prop == key){
               let obj = {};
               let value = params[''+key];
@@ -628,8 +787,8 @@
           delete row.receiverId, delete row.receiverNo, delete row.receiverName;
           form.process = row.process, form.remark = row.remark, form.approveId = row.approveId, form.approveName = row.approveName, form.approveNo = row.approveNo;
           delete row.process, delete row.remark, delete row.approveId, delete row.approveName, delete row.approveNo;
-          form.approveHistory = row.approveHistory;
-          delete row.key, delete row.approveHistory;
+          form.approveHistory = row.approveHistory,form.createSettingType = row.createSettingType,form.createSetting = row.createSetting;
+          delete row.key, delete row.approveHistory, delete row.createSettingType, delete row.createSetting;
           let keys = Object.keys(row);
           for (let j = 0; j < keys.length; j++) {
             let key = keys[j];

src/views/bank/checkwarehouse.vue

@@ -207,7 +207,7 @@
               }]
             },
             {
-              label: "查庫時間",
+              label: "檢查時間",
               prop: "checkTimeRange",
               type: "datetime",
               format: "yyyy-MM-dd HH:mm",

src/views/bank/keypwd.vue

@@ -574,6 +574,7 @@
 
           //控制字段顯隱
           this.findObject(this.option.column, "bankNo").display = false;
+          debugger
           this.findObject(this.option.column, "orgNo").display = this.isManageUser;
           this.findObject(this.option.column, "orgName").span = this.isManageUser ? 12 : 24;
         });

src/views/bank/postchange.vue

@@ -413,6 +413,7 @@
               span: 24,
               hide: true,
               disabled: true,
+              display: false,
               search: false,
               searchSpan: 4,
               rules: [{
@@ -426,6 +427,7 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -436,6 +438,7 @@
               label: "機構名稱",
               prop: "orgName",
               disabled: true,
+              span: 24,
               rules: [{
                 required: true,
                 message: "請輸入機構號",

src/views/bank/returns.vue

@@ -725,7 +725,6 @@
         }*/
         row.isPublic = this.getDictValueByLabel(this.dictBusinessType, row.isPublic);
         row.status = this.getDictValueByLabel(this.dictReturnsStatus, row.status);
-        debugger
 
         /*let userInfoStr = localStorage.getItem("saber-userInfo");
         let userInfo = JSON.parse(userInfoStr);

src/views/bank/tellertrunk.vue

@@ -200,7 +200,7 @@
               }]
             },
             {
-              label: "查庫時間",
+              label: "檢查時間",
               prop: "checkTimeRange",
               type: "datetime",
               format: "yyyy-MM-dd HH:mm",

src/views/report/userlog.vue

@@ -52,6 +52,8 @@
   import {getList, getDownloadList, add, update, remove} from "@/api/report/userlog";
   import {mapGetters} from "vuex";
   import UserLogView from "../bank/user-log-view";
+  import { getChildsDept, getAllDept } from "@/api/system/dept";
+
 
   export default {
     components: {UserLogView},
@@ -96,7 +98,6 @@
               label: "機構號",
               prop: "orgNo",
               hide: true,
-              search: true,
               rules: [{
                 required: true,
                 message: "請输入機構號",
@@ -106,7 +107,15 @@
             {
               label: "機構名稱",
               prop: "orgName",
+              search: true,
               disabled: true,
+              type: "select",
+              filterable: true,
+              dicData: [],
+              props: {
+                label: "deptName",
+                value: "deptName"
+              },
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -282,6 +291,20 @@
         return ids.join(",");
       }
     },
+    mounted() {
+      getAllDept().then(res => {
+        let dicData = [];
+        let data = res.data.data;
+        debugger
+        data.forEach(item => {
+          if (item.orgNo.indexOf("999") == -1){
+            dicData.push(item)
+          }
+        })
+        this.findObject(this.option.column, "orgNo").dicData = dicData;
+        this.findObject(this.option.column, "orgName").dicData = dicData;
+      });
+    },
     methods: {
       handleDownload(){
         if (this.selectionList.length === 0) {