修復-钥匙印章增加确认流程

src/api/bank/keypwd.js

@@ -24,14 +24,29 @@ export const getDownloadList = (params) => {
 }
 
 
-export const getKeepList = (current, size, params) => {
+export const getCurrentUserKeepCategory = () => {
+  return request({
+    url: '/api/bank/keypwd/getCurrentUserKeepCategory',
+    method: 'get',
+    params: {
+    }
+  })
+}
+
+export const sure = (row) => {
+  return request({
+    url: '/api/bank/keypwd/sure',
+    method: 'post',
+    data: row
+  })
+}
+
+export const getKeepList = (params) => {
   return request({
     url: '/api/bank/keypwd/getKeepList',
     method: 'get',
     params: {
       ...params,
-      current,
-      size,
     }
   })
 }

src/api/bank/sealhandover.js

@@ -81,6 +81,14 @@ export const add = (row) => {
   })
 }
 
+export const sure = (row) => {
+  return request({
+    url: '/api/bank/sealhandover/sure',
+    method: 'post',
+    data: row
+  })
+}
+
 export const update = (row) => {
   return request({
     url: '/api/bank/sealhandover/submit',

src/api/system/user.js

@@ -130,7 +130,7 @@ export const grant = (userIds, roleIds) => {
   })
 }
 
-export const getPage = (current, size, params, deptId) => {
+export const getPage = (current, size, params, hasOrgNo) => {
   return request({
     url: '/api/blade-system/expand/user/page',
     method: 'get',
@@ -138,7 +138,7 @@ export const getPage = (current, size, params, deptId) => {
       ...params,
       current,
       size,
-      deptId,
+      hasOrgNo,
     }
   })
 }

src/components/common/keypwd-sure.vue

@@ -0,0 +1,266 @@
+<template>
+  <div>
+    <avue-form :option="option"
+               @submit="submit"
+               v-model="form"
+               ref="form">
+      <!--<template slot-scope="scope" slot="menuForm">
+        <el-button @click="tip">自定義按鈕</el-button>
+      </template>-->
+      <template slot="isTurnIn">
+        <!--        <el-checkbox v-model="row.isTurnIn" @change="turnInChange"></el-checkbox>-->
+        <el-tag size="small " type="success" plain v-if="form.isTurnIn">上繳</el-tag>
+        <el-tag size="small " type="danger" plain v-if="!form.isTurnIn">非上繳</el-tag>
+      </template>
+    </avue-form>
+  </div>
+</template>
+
+<script>
+  import {sure} from "@/api/bank/keypwd";
+  import {getKeyType} from "@/api/bank/keypwd";
+
+  export default {
+    name: "keypwd-sure",
+    data(){
+      return {
+        loading: false,
+        option: {
+          mockBtn: false,
+          submitText: '確認',
+          printBtn: false,
+          emptyBtn: false,
+          column: [
+            {
+              label: "銀行號",
+              prop: "bankNo",
+              hide: true,
+              disabled: true,
+              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",
+              disabled: true,
+              multiple: true,
+              // dicUrl: "/api/blade-system/dict/dictionary?code=key_type",
+              dicData: [],
+              dataType: "string",
+              props:{
+                label: "dictValue",
+                value: "dictKey",
+              },
+              rules: [{
+                required: true,
+                message: "請輸入分類",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "數量",
+              prop: "number",
+              type: "number",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入數量",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "是否上繳",
+              prop: "isTurnIn",
+              formslot: true,
+              rules: [{
+                required: false,
+                message: "請勾選是否上繳",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "交出人",
+              prop: "handoverPersonName",
+              disabled:  true,
+              rules: [{
+                required: false,
+                message: "請輸入交出人姓名",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "交出人員工號",
+              prop: "handoverPersonNo",
+              disabled: true,
+              rules: [{
+                required: false,
+                message: "請輸入交出人員工號",
+                trigger: "blur"
+              }]
+            },
+
+            {
+              label: "接收人",
+              prop: "receiverName",
+              disabled:  true,
+              rules: [{
+                required: true,
+                message: "請輸入接收人員工號",
+                trigger: "focus"
+              }]
+            },
+            {
+              label: "接收人員工號",
+              prop: "receiverNo",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入接收人員工號",
+                trigger: "change"
+              }]
+            },
+            {
+              label: "交接日期",
+              prop: "handoverDate",
+              type: "datetime",
+              disabled: true,
+              format: "yyyy-MM-dd HH:mm",
+              valueFormat: "yyyy-MM-dd HH:mm",
+              rules: [{
+                required: true,
+                message: "請輸入交接日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "備註",
+              prop: "remark",
+              rules: [{
+                required: false,
+                message: "請輸入備註",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "填報時間",
+              prop: "fillingDate",
+              disabled: true,
+              type: "datetime",
+              format: "yyyy-MM-dd HH:mm",
+              rules: [{
+                required: true,
+                message: "請輸入填報時間",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "填報人",
+              prop: "fillingPerson",
+              type: "datetime",
+              format: "yyyy-MM-dd HH:mm",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入填報人",
+                trigger: "blur"
+              }]
+            },
+          ]
+        }
+      }
+    },
+    props: {
+      form: {
+        type: Object
+      },
+
+    },
+    mounted() {
+      this.initTypeDict();
+    },
+    methods: {
+      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;
+        })
+      },
+      submit(row, done){
+        row.isTurnIn = !row.isTurnIn ? 0 : 1;
+        sure(row).then(() => {
+          this.$message.success("操作成功！");
+          this.$emit("close")
+          done();
+        });
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/components/common/sealhandover-sure.vue

@@ -0,0 +1,203 @@
+<template>
+  <div>
+    <avue-form :option="option"
+               @submit="submit"
+               v-model="form"
+               ref="form">
+      <!--<template slot-scope="scope" slot="menuForm">
+        <el-button @click="tip">自定義按鈕</el-button>
+      </template>-->
+      <template slot="isTurnIn">
+        <!--        <el-checkbox v-model="row.isTurnIn" @change="turnInChange"></el-checkbox>-->
+        <el-tag size="small " type="success" plain v-if="form.isTurnIn">上繳至上級單位</el-tag>
+        <el-tag size="small " type="danger" plain v-if="!form.isTurnIn">非上繳</el-tag>
+      </template>
+    </avue-form>
+  </div>
+</template>
+
+<script>
+  import {sure} from "@/api/bank/sealhandover";;
+
+  export default {
+    name: "sealhandover-sure",
+    data(){
+      return {
+        loading: false,
+        option: {
+          mockBtn: false,
+          submitText: '確認',
+          printBtn: false,
+          emptyBtn: false,
+          column: [
+            {
+              label: "銀行號",
+              prop: "bankNo",
+              hide: true,
+              disabled: true,
+              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: "sealType",
+              type: "select",
+              disabled: true,
+              dicUrl: "/api/blade-system/dict/dictionary?code=seal_type",
+              props:{
+                label: "dictValue",
+                value: "dictKey",
+              },
+            },
+            {
+              label: "印章編號",
+              prop: "sealNo",
+              disabled: true,
+            },
+            {
+              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",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入交接日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "是否上繳",
+              prop: "isTurnIn",
+              slot: true,
+              rules: [{
+                required: false,
+                message: "請勾選是否上繳",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "接收人",
+              prop: "receiverName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入接收人姓名",
+                trigger: "change"
+              }]
+            },
+            {
+              label: "接收人員工號",
+              prop: "receiverNo",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入接收人員工號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "備註",
+              prop: "remark",
+              disabled: false,
+              rules: [{
+                required: false,
+                message: "請輸入備註",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "填報時間",
+              prop: "fillingDate",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入填報時間",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "填報人",
+              prop: "fillingPerson",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入填報人",
+                trigger: "blur"
+              }]
+            },
+          ]
+        }
+      }
+    },
+    props: {
+      form: {
+        type: Object
+      },
+
+    },
+    mounted() {
+
+    },
+    methods: {
+      submit(row, done){
+        row.isTurnIn = !row.isTurnIn ? 0 : 1;
+        sure(row).then(() => {
+          this.$message.success("操作成功！");
+          this.$emit("close")
+          done();
+        });
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -119,6 +119,9 @@
         type: Boolean,
         default: false
       },
+      hasOrgNo: {
+        type: String,
+      }
     },
     watch: {
       name(newVal, oldVal){
@@ -128,6 +131,14 @@
         setTimeout(function(){
           _this.visible = true;
         },100)
+      },
+      hasOrgNo(newVal, oldVal){
+        // if (!newVal) return;
+        this.visible = false;
+        let _this = this;
+        setTimeout(function(){
+          _this.visible = true;
+        },100)
       }
     },
     created() {
@@ -155,7 +166,7 @@
           return
         }
         //分頁查詢信息
-        getPage(page.currentPage, page.pageSize, data).then(res => {
+        getPage(page.currentPage, page.pageSize, data, this.hasOrgNo).then(res => {
           var data = res.data.data;
           callback({total: data.total, data: data.records});
         })

src/views/bank/keypwd-keep.vue

@@ -149,6 +149,8 @@
               prop: "category",
               search: true,
               checkStrictly: true,
+              multiple: true,
+              dataType: "string",
               type: "tree",
               // dicUrl: "/api/blade-system/dict/dictionary?code=key_type",
               dicData: [],
@@ -519,10 +521,9 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
-        getKeepList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        getKeepList(params).then(res => {
           const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
+          this.data = data;
           this.loading = false;
           this.selectionClear();
         });

src/views/bank/keypwd.vue

@@ -45,13 +45,14 @@
       </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" @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" @click="$refs.crud.rowDel(row, index)"><i class="el-icon-delete"></i> 刪 除</el-button>
+<!--        <el-button size="small" class="el-button&#45;&#45;text" v-if="permission.keypwd_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.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">
+      <template slot="receiverNameForm">
         <select-dialog-user :name="form.receiverName" :ehr="form.receiverNo" :disabled="disabeldReceiver" :callback="selectCallback"></select-dialog-user>
-      </template>-->
+      </template>
       <template slot="handoverPersonNameForm">
         <select-dialog-user :name="form.handoverPersonName" :ehr="form.handoverPersonNo" :disabled="disabeldHandover" :callback="handoverSelectCallback"></select-dialog-user>
       </template>
@@ -60,6 +61,17 @@
         <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="titleForm" slot-scope="{row, index}">
         <div v-html="title" style="white-space: pre-line;color: red;font-weight: bold;"></div>
       </template>
@@ -72,11 +84,18 @@
     <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} from "@/api/bank/keypwd";
+  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";
@@ -84,11 +103,10 @@
   import {getDeptTree, getTree} from "@/api/system/dept";
   import KeypwdKeep from "./keypwd-keep";
   import {getStandardByCode} from "@/api/bank/handoverstandard";
-
-  let _today = dateFormat(new Date(), 'yyyy-MM-dd');
+  import KeypwdSure from "../../components/common/keypwd-sure";
 
   export default {
-    components: {KeypwdKeep, SelectDialogUser},
+    components: {KeypwdSure, KeypwdKeep, SelectDialogUser},
     data() {
       return {
         title: "",
@@ -99,6 +117,9 @@
           value: "dictKey",
         },
 
+        approveForm: {},
+        approveVisible: false,
+
         delBatchBtn: true,
         keepVisible: false,
         form: {},
@@ -181,15 +202,17 @@
               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 || this.type == 'view' || this.form.category == value) return;
+                /*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');
@@ -203,7 +226,7 @@
                     this.form.handoverPersonNo = data.receiverNo;
                     this.form.handoverPersonName = data.receiverName;
                   }
-                });
+                });*/
               },
               rules: [{
                 required: true,
@@ -294,6 +317,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "是否上繳",
+              prop: "isTurnIn",
+              formslot: true,
+              rules: [{
+                required: false,
+                message: "請勾選是否上繳",
+                trigger: "blur"
+              }]
+            },
             {
               label: "交出人",
               prop: "handoverPersonName",
@@ -314,6 +347,7 @@
                 trigger: "blur"
               }]
             },
+
             {
               label: "接收人",
               prop: "receiverName",
@@ -434,6 +468,11 @@
       });
     },
     methods: {
+      turnInChange(value){
+        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 + "條數據嗎？"
@@ -444,10 +483,13 @@
           })
             .then(() => {
               getDownloadList(this.query).then(res => {
-                this.downLoadData(res.data.data, true)
+                let data = res.data.data;
+                data.forEach(item => {item.isTurnIn = item.isTurnIn == 1 ? true : false})
+                this.downLoadData(data, true)
               });
             })
         }else{
+          debugger
           this.downLoadData(this.selectionList, false)
         }
       },
@@ -517,6 +559,7 @@
         this.form.handoverPersonName = value.name;
       },
       selectCallback(value){
+        this.form.receiverId = value.id;
         this.form.receiverNo = value.ehr;
         this.form.receiverName = value.name;
       },
@@ -588,16 +631,47 @@
       beforeOpen(done, type) {
         this.type = type;
         if (type === 'add'){
-          this.form.receiverNo = this.userInfo.user_ehr;
-          this.form.receiverName = 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;
-            this.form.orgNo = data.orgNo;
-            this.form.orgName = data.deptName;
-            this.form.orgName = data.deptName;
+            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)) {
@@ -661,6 +735,9 @@
         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();

src/views/bank/returns.vue

@@ -672,7 +672,6 @@
         }else if (row.status == '完成'){
           row.status = '3';
         }
-debugger
         /*let userInfoStr = localStorage.getItem("saber-userInfo");
         let userInfo = JSON.parse(userInfoStr);
         row.bankConfirmNo = userInfo.content.user_ehr;

src/views/bank/sealhandover.vue

@@ -45,16 +45,22 @@
       </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&#45;&#45;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_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 :name="form.receiverName" :ehr="form.receiverNo" :disabled="receiverDisabled" :callback="selectCallback"></select-dialog-user>
-      </template>-->
-      <template slot="handoverPersonNameForm">
-        <select-dialog-user :name="form.handoverPersonName" :ehr="form.handoverPersonNo" :disabled="true" :callback="handoverSelectCallback"></select-dialog-user>
+      <template slot="receiverNameForm">
+        <div v-if="!hasOrgNo">
+          <select-dialog-user :name="form.receiverName" :ehr="form.receiverNo" :disabled="receiverDisabled" :callback="selectCallback"></select-dialog-user>
+        </div>
+        <div v-if="hasOrgNo">
+          <select-dialog-user v-if="hasOrgNo" :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>-->
@@ -80,12 +86,24 @@
         <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>
 
@@ -98,9 +116,10 @@
   import {getDeptTree, getTree} from "@/api/system/dept";
   import SealhandoverKeep from "./sealhandover-keep";
   import {getStandardByCode} from "@/api/bank/handoverstandard";
+  import SealhandoverSure from "../../components/common/sealhandover-sure";
 
   export default {
-    components: {SealhandoverKeep, SelectDialogUser},
+    components: {SealhandoverSure, SealhandoverKeep, SelectDialogUser},
     data() {
       return {
         title: "",
@@ -109,7 +128,11 @@
         keepVisible: false,
         delBatchBtn: true,
 
+        approveForm: {},
+        approveVisible: false,
+
         type: '',
+        hasOrgNo: null,
         form: {},
         query: {},
         loading: true,
@@ -211,12 +234,8 @@
                   const data = res.data.data;
                   let $handoverNo = this.findObject(this.option.column, 'handoverPersonNo');
                   if (Object.keys(data).length == 0){
-                    // $handoverNo.disabled = false;
-                    this.form.handoverPersonNo = '';
-                    delete this.form.handoverPersonName;
                     this.receiverDisabled = false;
                   } else {
-                    // $handoverNo.disabled = true;
                     // 編輯時，若記錄為自己，則跳過
                     if (this.form.id == data.id){
                       return;
@@ -224,11 +243,10 @@
                     if (data.isTurnIn == 1){
                       this.$message.warning("此印章已上繳，請重新選擇！");
                       this.receiverDisabled = true;
+                      this.form.sealNo = null;
                     }else{
                       this.receiverDisabled = false;
                     }
-                    this.form.handoverPersonNo = data.receiverNo;
-                    this.form.handoverPersonName = data.receiverName;
                   }
                 });
               },
@@ -250,12 +268,8 @@
                   const data = res.data.data;
                   let $handoverNo = this.findObject(this.option.column, 'handoverPersonNo');
                   if (Object.keys(data).length == 0){
-                    // $handoverNo.disabled = false;
-                    this.form.handoverPersonNo = '';
-                    delete this.form.handoverPersonName;
                     this.receiverDisabled = false;
                   } else {
-                    // $handoverNo.disabled = true;
                     // 編輯時，若記錄為自己，則跳過
                     if (this.form.id == data.id){
                       return;
@@ -263,11 +277,10 @@
                     if (data.isTurnIn == 1){
                       this.$message.warning("此印章已上繳，請重新選擇！");
                       this.receiverDisabled = true;
+                      this.form.sealNo = null;
                     }else{
                       this.receiverDisabled = false;
                     }
-                    this.form.handoverPersonNo = data.receiverNo;
-                    this.form.handoverPersonName = data.receiverName;
                   }
                 });
               },
@@ -301,7 +314,8 @@
             {
               label: "交出人",
               prop: "handoverPersonName",
-              formslot: true,
+              // formslot: true,
+              disabled: true,
               rules: [{
                 required: false,
                 message: "請輸入交出人姓名",
@@ -412,6 +426,19 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "進度",
+              prop: "process",
+              display: false,
+            },
+            {
+              label: "確認時間",
+              prop: "sureTime",
+              hide: true,
+              type: "datetime",
+              format: "yyyy-MM-dd HH:mm:ss",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+            },
           ]
         },
         data: []
@@ -453,11 +480,10 @@
     },
     methods: {
       turnInChange(value){
-        this.form.receiverNo = value == true ? null : this.userInfo.user_ehr;
-        this.form.receiverName = value == true ? null : this.userInfo.user_name;
-        this.findObject(this.option.column, "receiverNo").rules[0].required = !value;
-        this.findObject(this.option.column, "receiverName").rules[0].required = !value;
-        this.receiverDisabled = !!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 ? "51614" : null;
+        this.form.receiverNo = null,this.form.receiverName = null;
       },
       handleDownload(){
         if (this.selectionList.length === 0) {
@@ -469,7 +495,9 @@
           })
             .then(() => {
               getDownloadList(this.query).then(res => {
-                this.downLoadData(res.data.data, true)
+                let data = res.data.data;
+                data.forEach(item => {item.isTurnIn = item.isTurnIn == 1 ? true : false})
+                this.downLoadData(data, true)
               });
             })
         }else{
@@ -495,10 +523,12 @@
         });
       },
       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;
       },
@@ -572,15 +602,24 @@
       beforeOpen(done, type) {
         this.type = type;
         if (type === 'add'){
-          this.form.receiverNo = this.userInfo.user_ehr;
-          this.form.receiverName = this.userInfo.user_name;
+          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");
           getCurrentDept().then(res => {
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;
-            this.form.orgNo = data.orgNo;
-            this.form.orgName = data.deptName;
+            if (data.orgNo == '51614'){
+              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;
+            }
+
           });
 
           //恢复必填

src/views/system/user.vue

@@ -409,8 +409,8 @@
                     trigger: "blur"
                   }],
                 },
-                /*{
-                  label: "用戶平臺",
+                {
+                  label: "用戶類型",
                   type: "select",
                   dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
                   props: {
@@ -425,10 +425,10 @@
                   hide: true,
                   rules: [{
                     required: true,
-                    message: "請選擇用戶平臺",
+                    message: "請選擇用戶類型",
                     trigger: "blur"
                   }]
-                },*/
+                },
                 {
                   label: "是否為ldap用戶",
                   prop: "isLdapuser",