修復

src/api/bank/sealhandover.js

@@ -97,3 +97,10 @@ export const update = (row) => {
   })
 }
 
+export const getCurrentUserKeepList = () => {
+  return request({
+    url: '/api/bank/sealhandover/getCurrentUserKeepList',
+    method: 'get',
+  })
+}
+

src/components/common/cardswallow-comfirm.vue

@@ -51,6 +51,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               rules: [{
                 required: true,

src/components/common/cardswallow-issue.vue

@@ -19,6 +19,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
             },

src/components/common/goodsuse-sure.vue

@@ -18,6 +18,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               rules: [{

src/components/common/keypwd-sure.vue

@@ -34,6 +34,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               rules: [{

src/components/common/returns-approve.vue

@@ -49,6 +49,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               rules: [{

src/components/common/returns-comfire.vue

@@ -70,6 +70,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               rules: [{
                 required: true,

src/components/common/returns-issue.vue

@@ -49,6 +49,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               rules: [{

src/components/common/sealhandover-sure.vue

@@ -33,6 +33,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               rules: [{

src/components/confirmed/confirmed-cardswallow.vue

@@ -169,6 +169,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,

src/components/confirmed/confirmed-goodsuse.vue

@@ -151,6 +151,7 @@
               label: "銀行號",
               prop: "bankNo",
               hide: true,
+              span: 24,
               disabled: true,
               search: true,
               searchSpan: 4,

src/components/confirmed/confirmed-postchange.vue

@@ -391,6 +391,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,
@@ -567,6 +568,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               rules: [{

src/components/confirmed/confirmed-returns.vue

@@ -198,6 +198,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               search: true,
               searchSpan: 4,

src/components/initiated/init-cardswallow.vue

@@ -167,6 +167,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,

src/components/initiated/init-checklist.vue

@@ -141,6 +141,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,

src/components/initiated/init-checkwarehouse.vue

@@ -163,6 +163,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,

src/components/initiated/init-goodsuse.vue

@@ -149,6 +149,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,

src/components/initiated/init-keypwd.vue

@@ -145,6 +145,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,

src/components/initiated/init-postchange.vue

@@ -391,6 +391,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,
@@ -567,6 +568,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               rules: [{

src/components/initiated/init-returns.vue

@@ -198,6 +198,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               search: true,
               searchSpan: 4,

src/components/initiated/init-sealhandover.vue

@@ -148,6 +148,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,

src/components/initiated/init-tellertrunk.vue

@@ -134,6 +134,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,

src/components/release/release-cardswallow.vue

@@ -75,6 +75,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               rules: [{
                 required: true,

src/components/release/release-returns.vue

@@ -198,6 +198,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               search: true,
               searchSpan: 4,

src/components/tobeconfirm/tobeconfirm-cardswallow.vue

@@ -169,6 +169,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,

src/components/tobeconfirm/tobeconfirm-goodsuse.vue

@@ -150,6 +150,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,

src/components/tobeconfirm/tobeconfirm-keypwd.vue

@@ -0,0 +1,768 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               :search.sync="search"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   :disabled="delBatchBtn"
+                   plain
+                   v-if="permission.keypwd_delete"
+                   @click="handleDelete">刪 除
+        </el-button>
+        <el-button type="success"
+                   size="small"
+                   icon="el-icon-search"
+                   plain
+                   v-if="permission.keypwd_keep_view"
+                   @click="keepVisible = true">保管人查詢
+        </el-button>
+        <el-button type="primary"
+                   size="small"
+                   icon="el-icon-download"
+                   plain
+                   v-if="permission.keypwd_download"
+                   @click="handleDownload">下載
+        </el-button>
+      </template>
+
+      <template slot="menu" slot-scope="{row, index}">
+        <el-button size="small" class="el-button--text" v-if="permission.keypwd_edit && userInfo.user_id == row.createUser && 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.keypwd_delete && userInfo.user_id == row.createUser && 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.keypwd_sure && row.process == 2 && row.receiverId == userInfo.user_id" @click="approveForm=row,approveVisible=true"><i class="el-icon-check"></i> 確 認</el-button>
+      </template>
+
+      <template slot="receiverNameForm">
+        <select-dialog-user :id="form.receiverId" :name="form.receiverName" :ehr="form.receiverNo" :disabled="disabeldReceiver" :callback="selectCallback"></select-dialog-user>
+      </template>
+      <template slot="handoverPersonNameForm">
+        <select-dialog-user :id="form.handoverPersonId" :name="form.handoverPersonName" :ehr="form.handoverPersonNo" :disabled="disabeldHandover" :callback="handoverSelectCallback"></select-dialog-user>
+      </template>
+
+      <template slot-scope="{disabled,size}" slot="categorySearch">
+        <avue-input-tree :check-strictly="false" multiple v-model="search.category" placeholder="請選擇內容" type="tree" :dic="typeList" :props="props"></avue-input-tree>
+      </template>
+
+      <template slot="isTurnIn" slot-scope="{row}">
+        <el-tag size="small " type="success" plain v-if="row.isTurnIn">上繳</el-tag>
+        <el-tag size="small " type="danger" plain v-if="!row.isTurnIn">非上繳</el-tag>
+      </template>
+
+      <template slot="isTurnInForm" slot-scope="{row}">
+        <el-checkbox v-model="row.isTurnIn" @change="turnInChange"></el-checkbox>
+        <el-tag size="small " type="success" plain v-if="row.isTurnIn">上繳</el-tag>
+        <el-tag size="small " type="danger" plain v-if="!row.isTurnIn">非上繳</el-tag>
+      </template>
+
+      <template slot="process" slot-scope="{row, index}">
+        <el-tag size="small " type="warning" plain v-if="row.process == 2">待確認</el-tag>
+        <el-tag size="small " type="success" plain v-if="row.process == 3">已確認</el-tag>
+      </template>
+
+      <template slot="titleForm" slot-scope="{row, index}">
+        <div v-html="title" style="white-space: pre-line;color: red;font-weight: bold;"></div>
+      </template>
+      <template slot="titleLabel" slot-scope="{row, index}">
+        <span style="color: red;font-weight: bold;">注意事項：</span>
+      </template>
+
+
+    </avue-crud>
+
+    <el-dialog :append-to-body="true" :modal-append-to-body="false" :destroy-on-close="true" :fullscreen="true" :visible.sync="keepVisible" title="保管人查詢">
+      <keypwd-keep></keypwd-keep>
+    </el-dialog>
+
+    <el-dialog title="信息確認"
+               append-to-body
+               :visible.sync="approveVisible"
+               width="70%">
+      <keypwd-sure :form="approveForm" @close="approveVisible = false, onLoad(page)"></keypwd-sure>
+    </el-dialog>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove, getByCategoryAndType, getKeyType, getDownloadList, getCurrentUserKeepCategory} from "@/api/bank/keypwd";
+  import {mapGetters} from "vuex";
+  import {dateFormat} from "@/util/date";
+  import SelectDialogUser from "@/components/select-dialog/select-dialog-user";
+  import { getCurrentDept } from "@/api/system/dept";
+  import {getDeptTree, getTree} from "@/api/system/dept";
+  import KeypwdKeep from "@/views/bank/keypwd-keep";
+  import {getStandardByCode} from "@/api/bank/handoverstandard";
+  import KeypwdSure from "@/components/common/keypwd-sure";
+
+  export default {
+    name: "tobeconfirm-keypwd",
+    components: {KeypwdSure, KeypwdKeep, SelectDialogUser},
+    data() {
+      return {
+        title: "",
+        search: {},
+        typeList: [],
+        props:{
+          label: "dictValue",
+          value: "dictKey",
+        },
+
+        approveForm: {},
+        approveVisible: false,
+
+        delBatchBtn: true,
+        keepVisible: false,
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        disabeldReceiver: false,
+        disabeldHandover: true,
+        selectionList: [],
+        selectReceiver: '',
+        selectHandover: '',
+        type: '',
+        option: {
+          addTitle: '新增【網點鎖匙/密碼/實物交接登記表】',
+          editTitle: '編輯【網點鎖匙/密碼/實物交接登記表】',
+          viewTitle: '查看【網點鎖匙/密碼/實物交接登記表】',
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          editBtn: false,
+          delBtn: false,
+          selection: true,
+
+          dialogClickModal: false,
+          column: [
+            {
+              label: '注意事項',
+              prop: 'title',
+              formslot: true,
+              hide: true,
+              type: 'text',
+              span: 24
+            },
+            {
+              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,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "機構名稱",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "分類種類",
+              prop: "category",
+              search: true,
+              checkStrictly: true,
+              type: "tree",
+              multiple: true,
+              // dicUrl: "/api/blade-system/dict/dictionary?code=key_type",
+              dicData: [],
+              dataType: "string",
+              props:{
+                label: "dictValue",
+                value: "dictKey",
+              },
+              searchslot: true,
+              change: ({value, column}) => {
+                /*if (!value || value.length == 0 || this.type == 'view' || this.form.category == value) return;
+                getByCategoryAndType(value, this.form.orgNo).then(res => {
+                  const data = res.data.data;
+                  let $handoverNo = this.findObject(this.option.column, 'handoverPersonNo');
+                  let $handoverName = this.findObject(this.option.column, 'handoverPersonName');
+                  if (Object.keys(data).length == 0){
+                    // $handoverNo.disabled = false;
+                    this.form.handoverPersonNo = '';
+                    this.form.handoverPersonName = '';
+                  } else {
+                    $handoverNo.disabled = true;
+                    this.form.handoverPersonNo = data.receiverNo;
+                    this.form.handoverPersonName = data.receiverName;
+                  }
+                });*/
+              },
+              rules: [{
+                required: true,
+                message: "請輸入分類",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "區域/支行",
+              prop: "orgNos",
+              hide: true,
+              display: false,
+              searchMultiple: true,
+              search: true,
+              type: "tree",
+              dicData: [],
+              props: {
+                label: "title",
+                value: "key"
+              },
+              checkStrictly: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "交接日期",
+              prop: "handoverDateRange",
+              type: "datetime",
+              format: "yyyy-MM-dd HH:mm",
+              valueFormat: "yyyy-MM-dd HH:mm",
+              // searchValue: [_today + ' 00:00', _today + ' 23:59'],
+              // searchTime: ['00:00', '23:59'],
+              searchRange:true,
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              search: true,
+              rules: [{
+                required: true,
+                message: "請輸入交接日期",
+                trigger: "blur"
+              }]
+            },
+            /*{
+              label: "種類",
+              prop: "type",
+              type: "select",
+              dicUrl: "/api/blade-system/dict/dictionary?code={{key}}",
+              props:{
+                label: "dictValue",
+                value: "dictKey",
+              },
+              change: ({value, column}) => {
+                if (!value || this.type == 'view' || this.type == 'edit') return;
+                getByCategoryAndType(this.form.category, value, this.form.orgNo).then(res => {
+                  const data = res.data.data;
+                  let $handoverNo = this.findObject(this.option.column, 'handoverPersonNo');
+                  let $handoverName = this.findObject(this.option.column, 'handoverPersonName');
+                  if (Object.keys(data).length == 0){
+                    // $handoverNo.disabled = false;
+                    this.form.handoverPersonNo = '';
+                    this.form.handoverPersonName = '';
+                  } else {
+                    $handoverNo.disabled = true;
+                    this.form.handoverPersonNo = data.receiverNo;
+                    this.form.handoverPersonName = data.receiverName;
+                  }
+                });
+              },
+              rules: [{
+                required: true,
+                message: "請輸入種類",
+                trigger: "blur"
+              }]
+            },*/
+            {
+              label: "數量",
+              prop: "number",
+              type: "number",
+              disabled: true,
+              hide: true,
+              display: false,
+              rules: [{
+                required: true,
+                message: "請輸入數量",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "是否上繳",
+              prop: "isTurnIn",
+              formslot: true,
+              rules: [{
+                required: false,
+                message: "請勾選是否上繳",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "交出人",
+              prop: "handoverPersonName",
+              formslot:  true,
+              rules: [{
+                required: false,
+                message: "請輸入交出人姓名",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "交出人員工號",
+              prop: "handoverPersonNo",
+              disabled: true,
+              rules: [{
+                required: false,
+                message: "請輸入交出人員工號",
+                trigger: "blur"
+              }]
+            },
+
+            {
+              label: "接收人",
+              prop: "receiverName",
+              disabled: true,
+              search: true,
+              searchSpan: 4,
+              // formslot:  true,
+              disabled:  true,
+              rules: [{
+                required: true,
+                message: "請輸入接收人員工號",
+                trigger: "focus"
+              }]
+            },
+            {
+              label: "接收人員工號",
+              prop: "receiverNo",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入接收人員工號",
+                trigger: "change"
+              }]
+            },
+            {
+              label: "交接日期",
+              prop: "handoverDate",
+              type: "datetime",
+              format: "yyyy-MM-dd HH:mm",
+              valueFormat: "yyyy-MM-dd HH:mm",
+              change: ({value, culumn}) => {
+                if (!value) return;
+              },
+              rules: [{
+                required: true,
+                message: "請輸入交接日期",
+                trigger: "blur"
+              }]
+            },
+            /* {
+               label: "接收人姓名",
+               prop: "receiverName",
+               rules: [{
+                 required: true,
+                 message: "請輸入接收人姓名",
+                 trigger: "change  "
+               }]
+             },*/
+            {
+              label: "備註",
+              prop: "remark",
+              rules: [{
+                required: false,
+                message: "請輸入備註",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "填報時間",
+              prop: "fillingDate",
+              addDisplay: false,
+              editDisplay: false,
+              rules: [{
+                required: true,
+                message: "請輸入填報時間",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "填報人",
+              prop: "fillingPerson",
+              addDisplay: false,
+              editDisplay: false,
+              rules: [{
+                required: true,
+                message: "請輸入填報人",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "進度",
+              prop: "process",
+              display: false,
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      ...mapGetters(["userInfo"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.keypwd_add, false),
+          viewBtn: this.vaildData(this.permission.keypwd_view, false),
+          delBtn: this.vaildData(this.permission.keypwd_delete, false),
+          editBtn: this.vaildData(this.permission.keypwd_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    created() {
+      this.initTypeDict();
+      getDeptTree().then(res => {
+        const column = this.findObject(this.option.column, "orgNos");
+        let treeData = getTree(res.data.data, this.userInfo.dept_id);
+        column.dicData = treeData;
+      });
+      getStandardByCode("keypwd").then(res => {
+        const data = res.data.data;
+        if (Object.keys(data).length > 0){
+          this.title = data.content;
+        }else {
+          this.option.column.splice(0,1)
+        }
+      });
+    },
+    methods: {
+      turnInChange(value){
+        debugger
+        this.findObject(this.option.column, "receiverNo").rules[0].required = !value;
+        this.findObject(this.option.column, "receiverName").rules[0].required = !value;
+        this.form.receiverNo = null,this.form.receiverName = null;
+      },
+      handleDownload(){
+        if (this.selectionList.length === 0) {
+          let tip = "確定下載篩選的" + this.page.total + "條數據嗎？"
+          this.$confirm(tip, {
+            confirmButtonText: "確定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+            .then(() => {
+              getDownloadList(this.query).then(res => {
+                let data = res.data.data;
+                data.forEach(item => {item.isTurnIn = item.isTurnIn == 1 ? true : false})
+                this.downLoadData(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];
+          if (item.hide || item.prop == 'process'){
+            columns.splice(i, 1);
+            i--;
+          }
+          if (!isAll && (item.type == 'select' || item.type == 'tree')){
+            item.prop = '$' + item.prop;
+          }
+        }
+        this.$Export.excel({
+          title: "網點鎖匙密碼實物交接登記表" || new Date().getTime(),
+          columns: columns,
+          data: data
+        });
+      },
+      initTypeDict(){
+        getKeyType().then(res => {
+
+          let data = res.data.data;
+          let pid = new Set();
+          for (let i = 0; i < data.length; i++) {
+            let item = data[i];
+            pid.add(item.parentId);
+          }
+          let arr = [];
+          pid.forEach(id => {
+            data.forEach(item => {
+              if (id == item.id){
+                arr.push(item)
+              }
+            })
+          })
+          arr.forEach(item => {
+            data.forEach(it => {
+              if (item.id == it.parentId){
+                if (!item.children){
+                  item.children = [];
+                }
+                it.dictValue = item.dictValue + '-' + it.dictValue;
+                item.children.push(it)
+                item.hasChildren = true;
+              }
+            })
+          })
+          this.typeList = arr;
+          let formDicData = this.deepClone(arr);
+          formDicData.forEach(item => {
+            item.disabled = true;
+            if (item.hasChildren){
+              item.children.forEach(child => {
+                child.disabled = child.isSealed == 1;
+              })
+            }
+          });
+          this.findObject(this.option.column, 'category').dicData = formDicData;
+          return arr;
+        })
+      },
+      handoverSelectCallback(value){
+        this.form.handoverPersonNo = value.ehr;
+        this.form.handoverPersonName = value.name;
+      },
+      selectCallback(value){
+        this.form.receiverId = value.id;
+        this.form.receiverNo = value.ehr;
+        this.form.receiverName = value.name;
+      },
+      rowSave(row, done, loading) {
+        row.isTurnIn = !row.isTurnIn ? 0 : 1;
+        add(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        row.isTurnIn = !row.isTurnIn ? 0 : 1;
+        update(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("確定將選擇數據刪除?", {
+          confirmButtonText: "確定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("請選擇至少一條數據");
+          return;
+        }
+        this.$confirm("確定將選擇數據刪除?", {
+          confirmButtonText: "確定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        this.type = type;
+        if (type === 'add'){
+          this.form.number = 1;
+          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
+          getCurrentDept().then(res => {
+            const data =  res.data.data;
+            this.form.bankNo = data.bankNo;
+            if (data.deptCategory != 1){
+              //非管理部门
+              this.form.orgNo = data.orgNo;
+              this.form.orgName = data.deptName;
+              this.form.handoverPersonName = this.userInfo.user_name;
+              this.form.handoverPersonNo = this.userInfo.user_ehr;
+              this.form.handoverPersonId = this.userInfo.user_id;
+
+              let $category = this.findObject(this.option.column, 'category');
+              let dicDataOld = $category.dicData;
+              $category.dicData = [];
+              getCurrentUserKeepCategory().then(res => {
+                let data = res.data.data;
+                if (!data){
+                  this.$message.warning("當前用戶暫時並無持有相關鑰匙/密碼/實物！");
+                }else{
+                  let dicDataNew = [];
+                  dicDataOld.forEach(item => {
+                    item.disabled = true;
+                    if (item.hasChildren){
+                      item.children.forEach(child => {
+                        child.disabled = child.isSealed == 1;
+                        if (data.indexOf(child.dictKey) != -1){
+                          dicDataNew.push(child)
+                        }
+                      })
+                    }
+                  })
+                  $category.dicData = dicDataNew;
+                }
+              });
+            }else{
+              this.findObject(this.option.column, 'orgNo').disabled = false;
+              this.findObject(this.option.column, 'orgName').disabled = false;
+            }
+
+          });
+        }
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        if (params.category){
+          params.category = params.category.join();
+        }
+        if (params.orgNos){
+          params.orgNostr = params.orgNos.join();
+          params.orgNos = '';
+        }
+        if (params.handoverDateRange){
+          params.handoverDate_begin = params.handoverDateRange[0], params.handoverDate_end = params.handoverDateRange[1];
+          params.handoverDateRange = null;
+        }
+
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+        if (list && list.length > 0){
+          let delFlag = true;
+          // permission.keypwd_delete && userInfo.user_id == row.createUser
+          for (let i = 0; i < list.length; i++) {
+            let item = list[i];
+            delFlag = delFlag && item.createUser == this.userInfo.user_id;
+          }
+          this.delBatchBtn = !delFlag;
+        }else{
+          this.delBatchBtn = true;
+        }
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          data.records.forEach(item => {
+            item.isTurnIn = item.isTurnIn == 1;
+          })
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

src/components/tobeconfirm/tobeconfirm-postchange.vue

@@ -391,6 +391,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,
@@ -567,6 +568,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               rules: [{

src/components/tobeconfirm/tobeconfirm-returns.vue

@@ -198,6 +198,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               search: true,
               searchSpan: 4,

src/components/tobeconfirm/tobeconfirm-sealhandover.vue

@@ -0,0 +1,767 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               :search.sync="search"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   :disabled="delBatchBtn"
+                   v-if="permission.sealhandover_delete"
+                   @click="handleDelete">刪 除
+        </el-button>
+        <el-button type="success"
+                   size="small"
+                   icon="el-icon-search"
+                   plain
+                   v-if="permission.sealhandover_keep_view"
+                   @click="keepVisible = true">保管人查詢
+        </el-button>
+        <el-button type="primary"
+                   size="small"
+                   icon="el-icon-download"
+                   plain
+                   v-if="permission.sealhandover_download"
+                   @click="handleDownload">下載
+        </el-button>
+      </template>
+
+      <template slot="menu" slot-scope="{row, index}">
+        <el-button size="small" class="el-button--text" v-if="permission.sealhandover_edit && userInfo.user_id == row.createUser && 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.sealhandover_delete && userInfo.user_id == row.createUser && 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.sealhandover_sure && row.process == 2 && row.receiverId == userInfo.user_id" @click="approveForm=row,approveVisible=true"><i class="el-icon-check"></i> 確 認</el-button>
+      </template>
+
+      <template slot="receiverNameForm">
+        <div v-if="!hasOrgNo">
+          <select-dialog-user :id="form.receiverId" :name="form.receiverName" :ehr="form.receiverNo" :disabled="receiverDisabled" :callback="selectCallback"></select-dialog-user>
+        </div>
+        <div v-if="hasOrgNo">
+          <select-dialog-user v-if="hasOrgNo" :id="form.receiverId" :name="form.receiverName" :ehr="form.receiverNo" :disabled="receiverDisabled" :has-org-no="hasOrgNo" :callback="selectCallback"></select-dialog-user>
+        </div>
+      </template>
+      <!--<template slot="handoverPersonNameForm">
+        <select-dialog-user :name="form.handoverPersonName" :ehr="form.handoverPersonNo" :callback="handoverSelectCallback"></select-dialog-user>
+      </template>-->
+
+      <template slot-scope="{disabled,size}" slot="sealNoSearch">
+        <!--        <avue-input placeholder="請選擇內容" v-model="search.sealNos"></avue-input>-->
+        <el-input placeholder="請輸入印章編號" v-model="search.sealNo"></el-input>
+      </template>
+
+      <template slot="titleForm" slot-scope="{row, index}">
+        <div v-html="title" style="white-space: pre-line;color: red;font-weight: bold;"></div>
+      </template>
+      <template slot="titleLabel" slot-scope="{row, index}">
+        <span style="color: red;font-weight: bold;">注意事項：</span>
+      </template>
+
+      <template slot="isTurnIn" slot-scope="{row, index}">
+        <!--        <el-checkbox v-model="row.isTurnIn" @change="turnInChange"></el-checkbox>-->
+        <el-tag size="small " type="success" plain v-if="row.isTurnIn">上繳至上級單位</el-tag>
+        <el-tag size="small " type="danger" plain v-if="!row.isTurnIn">非上繳</el-tag>
+      </template>
+
+      <template slot="isTurnInForm" slot-scope="{row, index}">
+        <el-checkbox v-model="row.isTurnIn" @change="turnInChange"></el-checkbox>
+        <el-tag size="small " type="success" plain v-if="row.isTurnIn">上繳至上級單位</el-tag>
+        <el-tag size="small " type="danger" plain v-if="!row.isTurnIn">非上繳</el-tag>
+      </template>
+
+      <template slot="process" slot-scope="{row, index}">
+        <el-tag size="small " type="warning" plain v-if="row.process == 2">待確認</el-tag>
+        <el-tag size="small " type="success" plain v-if="row.process == 3">已確認</el-tag>
+      </template>
+
+    </avue-crud>
+
+    <el-dialog :append-to-body="true" :modal-append-to-body="false" :destroy-on-close="true" :fullscreen="true" :visible.sync="keepVisible" title="保管人查詢">
+      <sealhandover-keep></sealhandover-keep>
+    </el-dialog>
+
+    <el-dialog title="信息確認"
+               append-to-body
+               :visible.sync="approveVisible"
+               width="70%">
+      <sealhandover-sure :form="approveForm" @close="approveVisible = false, onLoad(page)"></sealhandover-sure>
+    </el-dialog>
+
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove, getByNoAndType, getDownloadList, getCurrentUserKeepList} from "@/api/bank/sealhandover";
+  import {mapGetters} from "vuex";
+  import { getCurrentDept } from "@/api/system/dept";
+  import {dateFormat} from "@/util/date";
+  import SelectDialogUser from "@/components/select-dialog/select-dialog-user";
+  import {getDeptTree, getTree, getChildsDept} from "@/api/system/dept";
+  import {getStandardByCode} from "@/api/bank/handoverstandard";
+  import SealhandoverSure from "@/components/common/sealhandover-sure";
+  import SealhandoverKeep from "@/views/bank/sealhandover-keep";
+
+  export default {
+    name: "tobeconfirm-sealhandover",
+    components: {SealhandoverKeep, SealhandoverSure,  SelectDialogUser},
+    data() {
+      return {
+        isManegeUser: false,
+        userKeepList: [],
+        currentDept: [],
+
+        title: "",
+        search: {},
+        receiverDisabled: false,
+        keepVisible: false,
+        delBatchBtn: true,
+
+        approveForm: {},
+        approveVisible: false,
+
+        type: '',
+        hasOrgNo: null,
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          addTitle: '新增【業務印章交接登記表】',
+          editTitle: '編輯【業務印章交接登記表】',
+          viewTitle: '查看【業務印章交接登記表】',
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          editBtn: false,
+          delBtn: false,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: '注意事項',
+              prop: 'title',
+              hide: true,
+              formslot: true,
+              type: 'text',
+              span: 24
+            },
+            {
+              label: "銀行號",
+              prop: "bankNo",
+              span: 24,
+              hide: true,
+              disabled: true,
+              span: 24,
+              search: true,
+              searchSpan: 4,
+              rules: [{
+                required: true,
+                message: "請輸入銀行號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "機構號",
+              prop: "orgNo",
+              hide: true,
+              disabled: true,
+              filterable: true,
+              type: "select",
+              // dicUrl: `/api/blade-system/expand/dept/getChildsDept`,
+              dicData: [],
+              props: {
+                label: "orgNo",
+                value: "orgNo"
+              },
+              change: ({value, column}) => {
+                if (!value) return;
+                let dicData = this.findObject(this.option.column, 'orgNo').dicData;
+                dicData.forEach(item => {
+                  if (item.orgNo == value){
+                    this.form.orgName = item.deptName;
+                  }
+                })
+              },
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "機構名稱",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "印章類型",
+              prop: "sealTypeSearch",
+              type: "select",
+              dicUrl: "/api/blade-system/dict/dictionary?code=seal_type",
+              props:{
+                label: "dictValue",
+                value: "dictKey",
+              },
+              dicFormatter: (res) => {
+                let dicData = this.deepClone(res.data);
+                // 处理完封存的，再填充给印章类型下拉
+                dicData.forEach(item => {item.disabled = item.isSealed == 1;})
+                this.findObject(this.option.column, 'sealType').dicData = dicData;
+                return res.data;
+              },
+              search: true,
+              hide: true,
+              display: false,
+              searchMultiple: true,
+            },
+            {
+              label: "印章類型",
+              prop: "sealType",
+              type: "select",
+              props:{
+                label: "dictValue",
+                value: "dictKey",
+              },
+              change: ({value, column}) => {
+                if (!value || this.type == 'view') return;
+                if (!this.form.sealNo){
+                  getByNoAndType(this.form.sealNo, value, this.form.orgNo).then(res => {
+                  const data = res.data.data;
+                  if (Object.keys(data).length == 0){
+                    this.receiverDisabled = false;
+                  } else {
+                    // 編輯時，若記錄為自己，則跳過
+                    if (this.form.id == data.id){
+                      return;
+                    }
+                    if (data.isTurnIn == 1){
+                      this.$message.warning("此印章已上繳，請重新選擇！");
+                      this.receiverDisabled = true;
+                      this.form.sealNo = null;
+                    }else{
+                      this.receiverDisabled = false;
+                    }
+                  }
+                });
+                }
+
+                //支行用户添加交接
+                if (!this.isManegeUser){
+                  let sealObj = value.split('-');
+                  this.form.sealType = sealObj[0];
+                  this.form.sealNo = sealObj[1];
+                }
+              },
+              rules: [{
+                required: true,
+                message: "請輸入印章類型",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "印章編號",
+              prop: "sealNo",
+              search: true,
+              searchSpan: 4,
+              searchslot: true,
+              change: ({value, column}) => {
+                if (!value ||!this.form.sealType || this.type == 'view') return;
+                getByNoAndType(value, this.form.sealType, this.form.orgNo).then(res => {
+                  const data = res.data.data;
+                  let $handoverNo = this.findObject(this.option.column, 'handoverPersonNo');
+                  if (Object.keys(data).length == 0){
+                    this.receiverDisabled = false;
+                  } else {
+                    // 編輯時，若記錄為自己，則跳過
+                    if (this.form.id == data.id){
+                      return;
+                    }
+                    if (data.isTurnIn == 1){
+                      this.$message.warning("此印章已上繳，請重新選擇！");
+                      this.receiverDisabled = true;
+                      this.form.sealNo = null;
+                    }else{
+                      this.receiverDisabled = false;
+                    }
+                  }
+                });
+              },
+              rules: [{
+                required: true,
+                message: "請輸入印章編號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "區域/支行",
+              prop: "orgNos",
+              hide: true,
+              display: false,
+              searchMultiple: true,
+              search: true,
+              type: "tree",
+              dicData: [],
+              props: {
+                label: "title",
+                value: "key"
+              },
+              checkStrictly: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
+
+            {
+              label: "交出人",
+              prop: "handoverPersonName",
+              // formslot: true,
+              disabled: true,
+              rules: [{
+                required: false,
+                message: "請輸入交出人姓名",
+                trigger: "change"
+              }]
+            },
+            {
+              label: "交出人員工號",
+              prop: "handoverPersonNo",
+              disabled: true,
+              rules: [{
+                required: false,
+                message: "請輸入交出人員工號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "交接日期",
+              prop: "handoverDate",
+              type: "datetime",
+              format: "yyyy-MM-dd HH:mm",
+              valueFormat: "yyyy-MM-dd HH:mm",
+              rules: [{
+                required: true,
+                message: "請輸入交接日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "是否上繳",
+              prop: "isTurnIn",
+              formslot: true,
+              rules: [{
+                required: false,
+                message: "請勾選是否上繳",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "接收人",
+              prop: "receiverName",
+              disabled: true,
+              search: true,
+              searchSpan: 4,
+              // formslot: true,
+              rules: [{
+                required: true,
+                message: "請輸入接收人姓名",
+                trigger: "change"
+              }]
+            },
+            {
+              label: "交接日期",
+              prop: "handoverDateRange",
+              type: "datetime",
+              format: "yyyy-MM-dd HH:mm",
+              valueFormat: "yyyy-MM-dd HH:mm",
+              searchRange:true,
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              search: true,
+              rules: [{
+                required: true,
+                message: "請輸入交接日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "接收人員工號",
+              prop: "receiverNo",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入接收人員工號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "備註",
+              prop: "remark",
+              rules: [{
+                required: false,
+                message: "請輸入備註",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "填報時間",
+              prop: "fillingDate",
+              addDisplay: false,
+              editDisplay: false,
+              rules: [{
+                required: true,
+                message: "請輸入填報時間",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "填報人",
+              prop: "fillingPerson",
+              addDisplay: false,
+              editDisplay: false,
+              rules: [{
+                required: true,
+                message: "請輸入填報人",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "進度",
+              prop: "process",
+              display: false,
+            },
+            {
+              label: "確認時間",
+              prop: "sureTime",
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              type: "datetime",
+              format: "yyyy-MM-dd HH:mm:ss",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      ...mapGetters(["userInfo"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.sealhandover_add, false),
+          viewBtn: this.vaildData(this.permission.sealhandover_view, false),
+          delBtn: this.vaildData(this.permission.sealhandover_delete, false),
+          editBtn: this.vaildData(this.permission.sealhandover_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    created() {
+      getDeptTree().then(res => {
+        const column = this.findObject(this.option.column, "orgNos");
+        let treeData = getTree(res.data.data, this.userInfo.dept_id);
+        column.dicData = treeData;
+        // this.findObject(this.option.column, "orgNo").dicData = treeData;
+      });
+      getChildsDept().then(res => {
+        let dicData = [];
+        let data = res.data.data;
+        data.forEach(item => {
+          if (item.orgNo.indexOf("999") == -1){
+            dicData.push(item)
+          }
+        })
+        this.findObject(this.option.column, "orgNo").dicData = dicData;
+      });
+      getStandardByCode("sealhandover").then(res => {
+        const data = res.data.data;
+        if (Object.keys(data).length > 0){
+          this.title = data.content;
+        }else {
+          this.option.column.splice(0,1)
+        }
+      });
+      getCurrentUserKeepList().then(res => {
+        this.userKeepList = res.data.data;
+      });
+      getCurrentDept().then(res => {
+        const data = res.data.data;
+        this.currentDept = data;
+      })
+    },
+    methods: {
+      turnInChange(value){
+        // this.findObject(this.option.column, "receiverNo").rules[0].required = !value;
+        // this.findObject(this.option.column, "receiverName").rules[0].required = !value;
+        this.hasOrgNo = value == true ? "51007" : null;
+        this.form.receiverNo = null,this.form.receiverName = null;
+      },
+      handleDownload(){
+        if (this.selectionList.length === 0) {
+          let tip = "確定下載篩選的" + this.page.total + "條數據嗎？"
+          this.$confirm(tip, {
+            confirmButtonText: "確定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+            .then(() => {
+              getDownloadList(this.query).then(res => {
+                let data = res.data.data;
+                data.forEach(item => {item.isTurnIn = item.isTurnIn == 1 ? true : false})
+                this.downLoadData(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];
+          if (item.hide || item.prop == 'process'){
+            columns.splice(i, 1);
+            i--;
+          }
+          if (!isAll && (item.type == 'select' || item.type == 'tree')){
+            item.prop = '$' + item.prop;
+          }
+        }
+        this.$Export.excel({
+          title: "業務印章交接登記表" || new Date().getTime(),
+          columns: columns,
+          data: data
+        });
+      },
+      handoverSelectCallback(value){
+        this.form.handoverPersonId = value.id;
+        this.form.handoverPersonNo = value.ehr;
+        this.form.handoverPersonName = value.name;
+      },
+      selectCallback(value){
+        this.form.receiverId = value.id;
+        this.form.receiverNo = value.ehr;
+        this.form.receiverName = value.name;
+      },
+      rowSave(row, done, loading) {
+        row.isTurnIn = !row.isTurnIn ? 0 : 1;
+        add(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        row.isTurnIn = !row.isTurnIn ? 0 : 1;
+        update(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("確定將選擇數據刪除?", {
+          confirmButtonText: "確定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("請選擇至少一條數據");
+          return;
+        }
+        this.$confirm("確定將選擇數據刪除?", {
+          confirmButtonText: "確定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        this.type = type;
+        if (type === 'add'){
+          this.form.handoverPersonId = this.userInfo.user_id;
+          this.form.handoverPersonNo = this.userInfo.user_ehr;
+          this.form.handoverPersonName = this.userInfo.user_name;
+          this.form.number = 1;
+          this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
+
+          const data =  this.currentDept;
+          this.form.bankNo = data.bankNo;
+          if (data.orgNo == '51007'){
+            this.isManegeUser = true;
+            this.findObject(this.option.column, 'orgNo').disabled = false;
+            this.findObject(this.option.column, 'sealNo').disabled = false;
+          }else{
+            debugger
+            this.isManegeUser = false;
+            this.findObject(this.option.column, 'orgNo').disabled = true;
+            this.findObject(this.option.column, 'sealNo').disabled = true;
+            this.form.orgNo = data.orgNo;
+            this.form.orgName = data.deptName;
+
+            // 支行用户自行添加交接，需要获取当前用户持有的列表作为下拉内容
+            this.findObject(this.option.column, 'sealType').dicData = this.userKeepList;
+          }
+
+
+          //恢复必填
+          this.findObject(this.option.column, "receiverNo").rules[0].required = true;
+          this.findObject(this.option.column, "receiverName").rules[0].required = true;
+          this.receiverDisabled = false;
+        }
+        if (this.form.isTurnIn){
+          this.turnInChange(true)
+        }
+        /*if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }*/
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        if (params.sealTypeSearch){
+          params.sealType = params.sealTypeSearch.join();
+          params.sealTypeSearch = [];
+        }
+        if (params.orgNos){
+          params.orgNostr = params.orgNos.join();
+          params.orgNos = '';
+        }
+        if (params.handoverDateRange){
+          params.handoverDate_begin = params.handoverDateRange[0], params.handoverDate_end = params.handoverDateRange[1];
+          params.handoverDateRange = null;
+        }
+
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+        if (list && list.length > 0){
+          let delFlag = true;
+          // permission.keypwd_delete && userInfo.user_id == row.createUser
+          for (let i = 0; i < list.length; i++) {
+            let item = list[i];
+            delFlag = delFlag && item.createUser == this.userInfo.user_id;
+          }
+          this.delBatchBtn = !delFlag;
+        }else{
+          this.delBatchBtn = true;
+        }
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          data.records.forEach(item => {
+            item.isTurnIn = item.isTurnIn == 1;
+          })
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

src/views/bank/cardswallow.vue

@@ -168,6 +168,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,

src/views/bank/checklist.vue

@@ -142,6 +142,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,

src/views/bank/checkwarehouse.vue

@@ -140,6 +140,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,

src/views/bank/goodsuse-balance.vue

@@ -75,6 +75,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               // search: true,

src/views/bank/goodsuse.vue

@@ -151,6 +151,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,

src/views/bank/keypwd-keep.vue

@@ -92,6 +92,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,

src/views/bank/keypwd.vue

@@ -105,7 +105,7 @@
   import {mapGetters} from "vuex";
   import {dateFormat} from "../../util/date";
   import SelectDialogUser from "../../components/select-dialog/select-dialog-user";
-  import { getCurrentDept } from "@/api/system/dept";
+  import { getCurrentDept, getChildsDept } from "@/api/system/dept";
   import {getDeptTree, getTree} from "@/api/system/dept";
   import KeypwdKeep from "./keypwd-keep";
   import {getStandardByCode} from "@/api/bank/handoverstandard";
@@ -115,6 +115,10 @@
     components: {KeypwdSure, KeypwdKeep, SelectDialogUser},
     data() {
       return {
+        isManageUser: false,
+        userKeepList: [],
+        currentDept: [],
+
         title: "",
         search: {},
         typeList: [],
@@ -171,6 +175,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,
@@ -184,8 +189,24 @@
             {
               label: "機構號",
               prop: "orgNo",
+              type: "select",
               hide: true,
               disabled: true,
+              filterable: true,
+              dicData: [],
+              props: {
+                label: "orgNo",
+                value: "orgNo"
+              },
+              change: ({value, column}) => {
+                if (!value) return;
+                let dicData = this.findObject(this.option.column, 'orgNo').dicData;
+                dicData.forEach(item => {
+                  if (item.orgNo == value){
+                    this.form.orgName = item.deptName;
+                  }
+                })
+              },
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -202,9 +223,30 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "分類種類",
+              prop: "categoryShow",
+              checkStrictly: true,
+              type: "tree",
+              multiple: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: true,
+              // dicUrl: "/api/blade-system/dict/dictionary?code=key_type",
+              dicData: [],
+              dataType: "string",
+              props:{
+                label: "dictValue",
+                value: "dictKey",
+              },
+            },
             {
               label: "分類種類",
               prop: "category",
+              hide: true,
+              addDisplay: true,
+              editDisplay: true,
+              viewDisplay: false,
               search: true,
               checkStrictly: true,
               type: "tree",
@@ -317,6 +359,8 @@
               prop: "number",
               type: "number",
               disabled: true,
+              hide: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入數量",
@@ -477,10 +521,54 @@
           this.option.column.splice(0,1)
         }
       });
+      getChildsDept().then(res => {
+        let dicData = [];
+        let data = res.data.data;
+        data.forEach(item => {
+          if (item.orgNo.indexOf("999") == -1){
+            dicData.push(item)
+          }
+        })
+        this.findObject(this.option.column, "orgNo").dicData = dicData;
+      });
+      getCurrentDept().then(res => {
+        const data =  res.data.data;
+        this.currentDept = data;
+        this.isManageUser = data.deptCategory == 1;
+        if (data.deptCategory != 1){
+          //非管理部门
+          let $category = this.findObject(this.option.column, 'category');
+          let dicDataOld = $category.dicData;
+          $category.dicData = [];
+          getCurrentUserKeepCategory().then(res => {
+            let data = res.data.data;
+            if (!data){
+              // this.$message.warning("當前用戶暫時並無持有相關鑰匙/密碼/實物！");
+            }else{
+              let dicDataNew = [];
+              dicDataOld.forEach(item => {
+                item.disabled = true;
+                if (item.hasChildren){
+                  item.children.forEach(child => {
+                    child.disabled = child.isSealed == 1;
+                    if (data.indexOf(child.dictKey) != -1){
+                      dicDataNew.push(child)
+                    }
+                  })
+                }
+              })
+              $category.dicData = dicDataNew;
+            }
+          });
+        }else{
+          this.findObject(this.option.column, 'orgNo').disabled = false;
+          this.findObject(this.option.column, 'orgName').disabled = false;
+        }
+
+      });
     },
     methods: {
       turnInChange(value){
-        debugger
         this.findObject(this.option.column, "receiverNo").rules[0].required = !value;
         this.findObject(this.option.column, "receiverName").rules[0].required = !value;
         this.form.receiverNo = null,this.form.receiverName = null;
@@ -524,7 +612,6 @@
       },
       initTypeDict(){
         getKeyType().then(res => {
-
           let data = res.data.data;
           let pid = new Set();
           for (let i = 0; i < data.length; i++) {
@@ -561,7 +648,9 @@
               })
             }
           });
+          debugger
           this.findObject(this.option.column, 'category').dicData = formDicData;
+          this.findObject(this.option.column, 'categoryShow').dicData = formDicData;
           return arr;
         })
       },
@@ -646,8 +735,8 @@
         if (type === 'add'){
           this.form.number = 1;
           this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
-          getCurrentDept().then(res => {
-            const data =  res.data.data;
+
+            const data =  this.currentDept;
             this.form.bankNo = data.bankNo;
             if (data.deptCategory != 1){
               //非管理部门
@@ -656,36 +745,11 @@
               this.form.handoverPersonName = this.userInfo.user_name;
               this.form.handoverPersonNo = this.userInfo.user_ehr;
               this.form.handoverPersonId = this.userInfo.user_id;
-
-              let $category = this.findObject(this.option.column, 'category');
-              let dicDataOld = $category.dicData;
-              $category.dicData = [];
-              getCurrentUserKeepCategory().then(res => {
-                let data = res.data.data;
-                if (!data){
-                  this.$message.warning("當前用戶暫時並無持有相關鑰匙/密碼/實物！");
-                }else{
-                  let dicDataNew = [];
-                  dicDataOld.forEach(item => {
-                    item.disabled = true;
-                    if (item.hasChildren){
-                      item.children.forEach(child => {
-                        child.disabled = child.isSealed == 1;
-                        if (data.indexOf(child.dictKey) != -1){
-                          dicDataNew.push(child)
-                        }
-                      })
-                    }
-                  })
-                  $category.dicData = dicDataNew;
-                }
-              });
             }else{
               this.findObject(this.option.column, 'orgNo').disabled = false;
               this.findObject(this.option.column, 'orgName').disabled = false;
             }
 
-          });
         }
         if (["edit", "view"].includes(type)) {
           getDetail(this.form.id).then(res => {
@@ -750,6 +814,7 @@
           this.page.total = data.total;
           data.records.forEach(item => {
             item.isTurnIn = item.isTurnIn == 1;
+            item.categoryShow = item.category;
           })
           this.data = data.records;
           this.loading = false;

src/views/bank/postchange.vue

@@ -156,7 +156,7 @@
                     <span v-if="item.ehr == row.holderDirector">{{item.text}}</span>
                   </span>
 
-                  <el-select v-if="type != 'view'" clearable v-model="row.holderDirector" placeholder="請選擇" :disabled="selectDisabled">
+                  <el-select v-if="type != 'view'" clearable filterable v-model="row.holderDirector" placeholder="請選擇" :disabled="selectDisabled" @clear="clearSelect('holder1')">
                     <el-option
                       v-for="item in userList"
                       :key="item.ehr"
@@ -179,7 +179,7 @@
                   <span v-if="type == 'view'" v-for="item in userList">
                     <span v-if="item.ehr == row.backupDirector1">{{item.text}}</span>
                   </span>
-                  <el-select v-if="type != 'view'" clearable  v-model="row.backupDirector1" placeholder="請選擇" :disabled="selectDisabled">
+                  <el-select v-if="type != 'view'" clearable filterable  v-model="row.backupDirector1" placeholder="請選擇" :disabled="selectDisabled" @clear="clearSelect('backup1')">
                     <el-option
                       v-for="item in userList"
                       :key="item.ehr"
@@ -192,7 +192,7 @@
                   <span v-if="type == 'view'" v-for="item in userList">
                     <span v-if="item.ehr == row.backupDirector2">{{item.text}}</span>
                   </span>
-                  <el-select v-if="type != 'view'" clearable  v-model="row.backupDirector2" placeholder="請選擇" :disabled="selectDisabled">
+                  <el-select v-if="type != 'view'" clearable filterable  v-model="row.backupDirector2" placeholder="請選擇" :disabled="selectDisabled" @clear="clearSelect('backup11')">
                     <el-option
                       v-for="item in userList"
                       :key="item.ehr"
@@ -210,7 +210,7 @@
                   <span v-if="type == 'view'" v-for="item in userList">
                     <span v-if="item.ehr == row.holderManage">{{item.text}}</span>
                   </span>
-                  <el-select v-if="type != 'view'" clearable  v-model="row.holderManage" placeholder="請選擇" :disabled="selectDisabled">
+                  <el-select v-if="type != 'view'" clearable filterable  v-model="row.holderManage" placeholder="請選擇" :disabled="selectDisabled" @clear="clearSelect('holder2')">
                     <el-option
                       v-for="item in userList"
                       :key="item.ehr"
@@ -233,7 +233,7 @@
                   <span v-if="type == 'view'" v-for="item in userList">
                     <span v-if="item.ehr == row.backupManage1">{{item.text}}</span>
                   </span>
-                  <el-select v-if="type != 'view'" clearable  v-model="row.backupManage1" placeholder="請選擇" :disabled="selectDisabled">
+                  <el-select v-if="type != 'view'" clearable filterable  v-model="row.backupManage1" placeholder="請選擇" :disabled="selectDisabled" @clear="clearSelect('backup2')">
                     <el-option
                       v-for="item in userList"
                       :key="item.ehr"
@@ -246,7 +246,7 @@
                   <span v-if="type == 'view'" v-for="item in userList">
                     <span v-if="item.ehr == row.backupManage2">{{item.text}}</span>
                   </span>
-                  <el-select v-if="type != 'view'" clearable  v-model="row.backupManage2" placeholder="請選擇" :disabled="selectDisabled">
+                  <el-select v-if="type != 'view'" clearable filterable  v-model="row.backupManage2" placeholder="請選擇" :disabled="selectDisabled" @clear="clearSelect('backup22')">
                     <el-option
                       v-for="item in userList"
                       :key="item.ehr"
@@ -392,6 +392,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,
@@ -568,6 +569,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               rules: [{
@@ -954,6 +956,15 @@
       });
     },
     methods: {
+      clearSelect(propPrefix){
+        let keyArr = Object.keys(this.form);
+        for (let i = 0; i < keyArr.length; i++) {
+          let prop = keyArr[i];
+          if (prop.indexOf(propPrefix) == 0 && prop.indexOf(propPrefix + '1') && prop.indexOf(propPrefix + '2') == -1){
+            this.form[''+prop] = false;
+          }
+        }
+      },
       testExcel(){
         let $a = document.getElementById("dl");
         $a.href = tableToExcel('mytable', 'testname');

src/views/bank/returns.vue

@@ -209,6 +209,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               search: true,
               searchSpan: 4,

src/views/bank/sealhandover-keep.vue

@@ -80,6 +80,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,

src/views/bank/sealhandover.vue

@@ -45,8 +45,8 @@
       </template>
 
       <template slot="menu" slot-scope="{row, index}">
-        <el-button size="small" class="el-button--text" v-if="permission.sealhandover_edit && 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="permission.sealhandover_delete && 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="permission.sealhandover_edit && userInfo.user_id == row.createUser && 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.sealhandover_delete && userInfo.user_id == row.createUser && 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.sealhandover_sure && row.process == 2 && row.receiverId == userInfo.user_id" @click="approveForm=row,approveVisible=true"><i class="el-icon-check"></i> 確 認</el-button>
       </template>
 
@@ -108,12 +108,12 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove, getByNoAndType, getDownloadList} from "@/api/bank/sealhandover";
+  import {getList, getDetail, add, update, remove, getByNoAndType, getDownloadList, getCurrentUserKeepList} from "@/api/bank/sealhandover";
   import {mapGetters} from "vuex";
   import { getCurrentDept } from "@/api/system/dept";
   import {dateFormat} from "../../util/date";
   import SelectDialogUser from "../../components/select-dialog/select-dialog-user";
-  import {getDeptTree, getTree} from "@/api/system/dept";
+  import {getDeptTree, getTree, getChildsDept} from "@/api/system/dept";
   import SealhandoverKeep from "./sealhandover-keep";
   import {getStandardByCode} from "@/api/bank/handoverstandard";
   import SealhandoverSure from "../../components/common/sealhandover-sure";
@@ -122,6 +122,10 @@
     components: {SealhandoverSure, SealhandoverKeep, SelectDialogUser},
     data() {
       return {
+        isManageUser: false,
+        userKeepList: [],
+        currentDept: [],
+
         title: "",
         search: {},
         receiverDisabled: false,
@@ -170,8 +174,10 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
+              span: 24,
               search: true,
               searchSpan: 4,
               rules: [{
@@ -185,6 +191,23 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              filterable: true,
+              type: "select",
+              // dicUrl: `/api/blade-system/expand/dept/getChildsDept`,
+              dicData: [],
+              props: {
+                label: "orgNo",
+                value: "orgNo"
+              },
+              change: ({value, column}) => {
+                if (!value) return;
+                let dicData = this.findObject(this.option.column, 'orgNo').dicData;
+                dicData.forEach(item => {
+                  if (item.orgNo == value){
+                    this.form.orgName = item.deptName;
+                  }
+                })
+              },
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -210,29 +233,37 @@
                 label: "dictValue",
                 value: "dictKey",
               },
+              dicFormatter: (res) => {
+                let dicData = this.deepClone(res.data);
+                // 处理完封存的，再填充给印章类型下拉
+                dicData.forEach(item => {item.disabled = item.isSealed == 1;})
+                this.findObject(this.option.column, 'sealType').dicData = dicData;
+                return res.data;
+              },
               search: true,
-              hide: true,
-              display: false,
+              // hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: true,
               searchMultiple: true,
             },
             {
               label: "印章類型",
               prop: "sealType",
               type: "select",
-              dicUrl: "/api/blade-system/dict/dictionary?code=seal_type",
+              hide: true,
+              addDisplay: true,
+              editDisplay: true,
+              viewDisplay: false,
               props:{
                 label: "dictValue",
                 value: "dictKey",
               },
-              dicFormatter: (res) => {
-                res.data.forEach(item => {item.disabled = item.isSealed == 1;})
-                return res.data;
-              },
               change: ({value, column}) => {
-                if (!value ||!this.form.sealNo || this.type == 'view') return;
-                getByNoAndType(this.form.sealNo, value, this.form.orgNo).then(res => {
+                if (!value || this.type == 'view') return;
+                if (!this.form.sealNo){
+                  getByNoAndType(this.form.sealNo, value, this.form.orgNo).then(res => {
                   const data = res.data.data;
-                  let $handoverNo = this.findObject(this.option.column, 'handoverPersonNo');
                   if (Object.keys(data).length == 0){
                     this.receiverDisabled = false;
                   } else {
@@ -249,6 +280,14 @@
                     }
                   }
                 });
+                }
+
+                //支行用户添加交接
+                if (!this.isManageUser && this.type == 'add'){
+                  let sealObj = value.split('-');
+                  this.form.sealType = sealObj[0];
+                  this.form.sealNo = sealObj[1];
+                }
               },
               rules: [{
                 required: true,
@@ -470,6 +509,17 @@
         const column = this.findObject(this.option.column, "orgNos");
         let treeData = getTree(res.data.data, this.userInfo.dept_id);
         column.dicData = treeData;
+        // this.findObject(this.option.column, "orgNo").dicData = treeData;
+      });
+      getChildsDept().then(res => {
+        let dicData = [];
+        let data = res.data.data;
+        data.forEach(item => {
+          if (item.orgNo.indexOf("999") == -1){
+            dicData.push(item)
+          }
+        })
+        this.findObject(this.option.column, "orgNo").dicData = dicData;
       });
       getStandardByCode("sealhandover").then(res => {
         const data = res.data.data;
@@ -479,6 +529,13 @@
           this.option.column.splice(0,1)
         }
       });
+      getCurrentUserKeepList().then(res => {
+        this.userKeepList = res.data.data;
+      });
+      getCurrentDept().then(res => {
+        const data = res.data.data;
+        this.currentDept = data;
+      })
     },
     methods: {
       turnInChange(value){
@@ -536,6 +593,10 @@
       },
       rowSave(row, done, loading) {
         row.isTurnIn = !row.isTurnIn ? 0 : 1;
+        if (row.sealType.indexOf('-') != -1){
+          let sealObj = row.sealType.split('-');
+          row.sealType = sealObj[0];
+        }
         add(row).then(() => {
           this.onLoad(this.page);
           this.$message({
@@ -550,6 +611,10 @@
       },
       rowUpdate(row, index, done, loading) {
         row.isTurnIn = !row.isTurnIn ? 0 : 1;
+        if (row.sealType.indexOf('-') != -1){
+          let sealObj = row.sealType.split('-');
+          row.sealType = sealObj[0];
+        }
         update(row).then(() => {
           this.onLoad(this.page);
           this.$message({
@@ -609,29 +674,43 @@
           this.form.handoverPersonName = this.userInfo.user_name;
           this.form.number = 1;
           this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
-          getCurrentDept().then(res => {
-            const data =  res.data.data;
-            this.form.bankNo = data.bankNo;
-            if (data.orgNo == '51007'){
-              this.findObject(this.option.column, 'orgNo').disabled = false;
-              this.findObject(this.option.column, 'orgName').disabled = false;
-            }else{
-              this.findObject(this.option.column, 'orgNo').disabled = true;
-              this.findObject(this.option.column, 'orgName').disabled = true;
-              this.form.orgNo = data.orgNo;
-              this.form.orgName = data.deptName;
-            }
 
-          });
+          const data =  this.currentDept;
+          this.form.bankNo = data.bankNo;
+          if (data.deptCategory == 1){
+            this.isManageUser = true;
+            this.findObject(this.option.column, 'orgNo').disabled = false;
+            this.findObject(this.option.column, 'sealType').disabled = false;
+            this.findObject(this.option.column, 'sealNo').disabled = false;
+          }else{
+            this.isManageUser = false;
+            this.findObject(this.option.column, 'orgNo').disabled = true;
+            this.findObject(this.option.column, 'sealType').disabled = false;
+            this.findObject(this.option.column, 'sealNo').disabled = true;
+            this.form.orgNo = data.orgNo;
+            this.form.orgName = data.deptName;
+
+            // 支行用户自行添加交接，需要获取当前用户持有的列表作为下拉内容
+            this.findObject(this.option.column, 'sealType').dicData = this.userKeepList;
+          }
 
           //恢复必填
           this.findObject(this.option.column, "receiverNo").rules[0].required = true;
           this.findObject(this.option.column, "receiverName").rules[0].required = true;
           this.receiverDisabled = false;
         }
+        if (type == 'edit'){
+          this.findObject(this.option.column, 'sealType').disabled = true;
+          this.findObject(this.option.column, 'sealNo').disabled = true;
+          // 支行用户自行添加交接，需要获取当前用户持有的列表作为下拉内容
+          this.findObject(this.option.column, 'sealType').dicData = this.userKeepList;
+        }
         if (this.form.isTurnIn){
           this.turnInChange(true)
         }
+        if (type == 'edit' && this.form.sealType.indexOf('-') == -1){
+          this.form.sealType = this.form.sealType + '-' + this.form.sealNo;
+        }
         /*if (["edit", "view"].includes(type)) {
           getDetail(this.form.id).then(res => {
             this.form = res.data.data;
@@ -696,6 +775,7 @@
           this.page.total = data.total;
           data.records.forEach(item => {
             item.isTurnIn = item.isTurnIn == 1;
+            item.sealTypeSearch = item.sealType;
           })
           this.data = data.records;
           this.loading = false;

src/views/bank/tellertrunk.vue

@@ -133,6 +133,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               search: true,

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

@@ -29,6 +29,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               disabled: true,
               rules: [{

src/views/desk/tobeconfirm.vue

@@ -1,6 +1,13 @@
 <template>
   <basic-container>
     <el-tabs type="border-card">
+      <el-tab-pane v-if="permission.keypwd_view" label="網點鎖匙/密碼/實物交接登記表">
+        <tobeconfirm-keypwd></tobeconfirm-keypwd>
+      </el-tab-pane>
+      <el-tab-pane v-if="permission.sealhandover_view" label="業務印章交接登記表">
+        <tobeconfirm-sealhandover></tobeconfirm-sealhandover>
+      </el-tab-pane>
+
       <el-tab-pane v-if="permission.postchange_view" label="網點出納主管及專管員崗位變更記錄表">
         <tobeconfirm-postchange></tobeconfirm-postchange>
       </el-tab-pane>
@@ -23,9 +30,14 @@
   import TobeconfirmGoodsuse from "../../components/tobeconfirm/tobeconfirm-goodsuse";
   import TobeconfirmReturns from "../../components/tobeconfirm/tobeconfirm-returns";
   import TobeconfirmCardswallow from "../../components/tobeconfirm/tobeconfirm-cardswallow";
+  import TobeconfirmKeypwd from "../../components/tobeconfirm/tobeconfirm-keypwd";
+  import TobeconfirmSealhandover from "../../components/tobeconfirm/tobeconfirm-sealhandover";
 
   export default {
-    components: {TobeconfirmCardswallow, TobeconfirmReturns, TobeconfirmGoodsuse, TobeconfirmPostchange},
+    components: {
+      TobeconfirmSealhandover,
+      TobeconfirmKeypwd,
+      TobeconfirmCardswallow, TobeconfirmReturns, TobeconfirmGoodsuse, TobeconfirmPostchange},
     data() {
       return {
 

src/views/report/userlog.vue

@@ -84,6 +84,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               rules: [{
                 required: true,

src/views/system/dept.vue

@@ -129,6 +129,7 @@
             {
               label: "銀行號",
               prop: "bankNo",
+              span: 24,
               hide: true,
               search: true,
               // addDisplay: false,