```

src/components/confirmed/confirmed-keypwd.vue

@@ -764,6 +764,9 @@
                 done();
               });
             }else{
+              this.form.handoverPersonName = this.userInfo.user_name;
+              this.form.handoverPersonNo = this.userInfo.user_ehr;
+              this.form.handoverPersonId = this.userInfo.user_id;
               this.findObject(this.option.column, 'orgNo').disabled = false;
               this.findObject(this.option.column, 'orgName').disabled = false;
               done();

src/components/confirmed/confirmed-postchange.vue

@@ -343,7 +343,7 @@
   import { getCurrentDept } from "@/api/system/dept";
   import {dateFormat} from "../../util/date";
   import FlowSettings from "../../components/common/flow-settings";
-  import {getPage as getUserList} from "@/api/system/user";
+  import {getUserListDeptChild} from "@/api/system/user";
   import {getDeptTree, getTree} from "@/api/system/dept";
   import {getStandardByCode} from "@/api/bank/handoverstandard";
   import SelectDialogUser from "../../components/select-dialog/select-dialog-user";
@@ -935,8 +935,8 @@
     },
     created() {
       const _this = this;
-      getUserList(1,500, {}).then(res => {
-        const data = res.data.data.records;
+      getUserListDeptChild().then(res => {
+        const data = res.data.data;
         for (let i = 0; i < data.length; i++) {
           let item = data[i];
           item.text = item.name + '-' + item.ehr;
@@ -1314,7 +1314,7 @@
             }
           }else{
             _this.form = data;
-            if (_this.form.previousId){
+            if (_this.form.previousId && _this.form.previousId > 0){
               getDetail(_this.form.previousId).then(res => {
                 let preData = res.data.data;
                 let preholderStr = preData.holder.replace(/holder/ig, 'preholder');

src/components/initiated/init-cardswallow.vue

@@ -34,13 +34,13 @@
                    v-if="permission.cardswallow_setting"
                    @click="handleSetting">設置發佈人
         </el-button>-->
-        <!--<el-button type="primary"
+        <el-button type="primary"
                    size="small"
                    icon="el-icon-upload"
                    plain
                    v-if="permission.cardswallow_upload"
                    @click="attachBox = true">上 傳
-        </el-button>-->
+        </el-button>
         <el-button type="primary"
                    size="small"
                    icon="el-icon-download"
@@ -56,8 +56,10 @@
         <el-tag size="small " type="success" plain v-if="row.process == 4">已簽收</el-tag>
       </template>
       <template slot="menu" slot-scope="{row, index}">
-        <el-button size="small" class="el-button--text" v-if="row.process <= 3 && permission.cardswallow_edit" @click="$refs.crud.rowEdit(row, index)"><i class="el-icon-edit"></i> 編 輯</el-button>
-        <el-button size="small" class="el-button--text" v-if="row.process <= 3 && permission.cardswallow_delete" @click="$refs.crud.rowDel(row, index)"><i class="el-icon-delete"></i> 刪 除</el-button>
+        <el-button size="small" class="el-button--text" v-if="row.process <= 3 && permission.cardswallow_edit && ((row.personId && row.personId.indexOf(userInfo.user_id) != -1) || row.createUser == userInfo.user_id)" @click="$refs.crud.rowEdit(row, index)"><i class="el-icon-edit"></i> 編 輯</el-button>
+        <el-button size="small" class="el-button--text" v-if="row.process <= 3 && permission.cardswallow_delete&& ((row.personId && row.personId.indexOf(userInfo.user_id) != -1) || row.createUser == userInfo.user_id)" @click="$refs.crud.rowDel(row, index)"><i class="el-icon-delete"></i> 刪 除</el-button>
+        <!--        <el-button size="mini " type="primary" plain v-if="permission.cardswallow_issue && row.process == 2 && row.personNo == userInfo.user_ehr" @click="form = row,issueVisible = true">去發佈</el-button>-->
+        <el-button size="small" class="el-button--text" v-if="permission.cardswallow_confirm && row.process == 3" @click="form = row,issueVisible = true">去簽收</el-button>
       </template>
     </avue-crud>
 

src/components/initiated/init-keypwd.vue

@@ -752,7 +752,7 @@
                     if (item.hasChildren){
                       item.children.forEach(child => {
                         child.disabled = child.isSealed == 1;
-                        if (data.indexOf(child.dictKey) != -1){
+                        if (data.indexOf(child.dictKey + ',') != -1){
                           dicDataNew.push(child)
                         }
                       })
@@ -764,6 +764,9 @@
                 done();
               });
             }else{
+              this.form.handoverPersonName = this.userInfo.user_name;
+              this.form.handoverPersonNo = this.userInfo.user_ehr;
+              this.form.handoverPersonId = this.userInfo.user_id;
               this.findObject(this.option.column, 'orgNo').disabled = false;
               this.findObject(this.option.column, 'orgName').disabled = false;
               done();

src/components/initiated/init-postchange.vue

@@ -343,7 +343,7 @@
   import { getCurrentDept } from "@/api/system/dept";
   import {dateFormat} from "../../util/date";
   import FlowSettings from "../../components/common/flow-settings";
-  import {getPage as getUserList} from "@/api/system/user";
+  import {getUserListDeptChild} from "@/api/system/user";
   import {getDeptTree, getTree} from "@/api/system/dept";
   import {getStandardByCode} from "@/api/bank/handoverstandard";
   import SelectDialogUser from "../../components/select-dialog/select-dialog-user";
@@ -935,8 +935,8 @@
     },
     created() {
       const _this = this;
-      getUserList(1,500, {}).then(res => {
-        const data = res.data.data.records;
+      getUserListDeptChild().then(res => {
+        const data = res.data.data;
         for (let i = 0; i < data.length; i++) {
           let item = data[i];
           item.text = item.name + '-' + item.ehr;
@@ -1314,7 +1314,7 @@
             }
           }else{
             _this.form = data;
-            if (_this.form.previousId){
+            if (_this.form.previousId && _this.form.previousId > 0){
               getDetail(_this.form.previousId).then(res => {
                 let preData = res.data.data;
                 let preholderStr = preData.holder.replace(/holder/ig, 'preholder');

src/components/tobeconfirm/tobeconfirm-keypwd.vue

@@ -764,6 +764,9 @@
                 done();
               });
             }else{
+              this.form.handoverPersonName = this.userInfo.user_name;
+              this.form.handoverPersonNo = this.userInfo.user_ehr;
+              this.form.handoverPersonId = this.userInfo.user_id;
               this.findObject(this.option.column, 'orgNo').disabled = false;
               this.findObject(this.option.column, 'orgName').disabled = false;
               done();

src/components/tobeconfirm/tobeconfirm-postchange.vue

@@ -343,7 +343,7 @@
   import { getCurrentDept } from "@/api/system/dept";
   import {dateFormat} from "../../util/date";
   import FlowSettings from "../../components/common/flow-settings";
-  import {getPage as getUserList} from "@/api/system/user";
+  import {getUserListDeptChild} from "@/api/system/user";
   import {getDeptTree, getTree} from "@/api/system/dept";
   import {getStandardByCode} from "@/api/bank/handoverstandard";
   import SelectDialogUser from "../../components/select-dialog/select-dialog-user";
@@ -935,8 +935,8 @@
     },
     created() {
       const _this = this;
-      getUserList(1,500, {}).then(res => {
-        const data = res.data.data.records;
+      getUserListDeptChild().then(res => {
+        const data = res.data.data;
         for (let i = 0; i < data.length; i++) {
           let item = data[i];
           item.text = item.name + '-' + item.ehr;
@@ -1314,7 +1314,7 @@
             }
           }else{
             _this.form = data;
-            if (_this.form.previousId){
+            if (_this.form.previousId && _this.form.previousId > 0){
               getDetail(_this.form.previousId).then(res => {
                 let preData = res.data.data;
                 let preholderStr = preData.holder.replace(/holder/ig, 'preholder');

src/util/util.js

@@ -1,4 +1,6 @@
 import {validatenull} from './validate'
+import request from '@/router/axios';
+
 //表单序列化
 export const serialize = data => {
   let list = [];
@@ -315,7 +317,7 @@ export const getQueryString = (name) => {
  * @param {String} name - 文檔名,eg: test.png
  */
 export const downloadFileBlob = (path, name) => {
-  const xhr = new XMLHttpRequest();
+  /*const xhr = new XMLHttpRequest();
   xhr.open('get', path);
   xhr.responseType = 'blob';
   xhr.send();
@@ -336,7 +338,31 @@ export const downloadFileBlob = (path, name) => {
       document.body.removeChild(a);
       URL.revokeObjectURL(url);
     }
-  };
+  };*/
+
+  request({
+    url: path,
+    method: 'get',
+    params: {
+    },
+    responseType: 'blob'
+  }).then(res => {
+    const blob = new Blob([response.data]);
+    const fileName = 'xxx.xls';
+    const linkNode = document.createElement('a');
+
+    linkNode.download = fileName;
+    linkNode.style.display = 'none';
+    linkNode.href = URL.createObjectURL(blob);
+    document.body.appendChild(linkNode);
+    linkNode.click();
+
+    URL.revokeObjectURL(linkNode.href);
+    document.body.removeChild(linkNode);
+  }).catch(function (error) {
+    console.log(error);
+  })
+
 }
 
 /**

src/views/system/dept.vue

@@ -52,6 +52,7 @@
     remove,
     update,
     add,
+    getTree,
     getDept,
     getDeptTree
   } from "@/api/system/dept";
@@ -154,12 +155,16 @@
             {
               label: "上級機構",
               prop: "parentId",
-              dicData: [],
               type: "tree",
+              dicData: [],
               hide: true,
+              // multiple: true,
+              // dataType: "string",
+              checkStrictly: false,
               addDisabled: false,
               props: {
-                label: "title"
+                label: "title",
+                // value: "value"
               },
               rules: [{
                 required: true,
@@ -233,6 +238,9 @@
         return ids.join(",");
       }
     },
+    mounted() {
+      this.initData();
+    },
     methods: {
       initData() {
         getDeptTree().then(res => {
@@ -349,18 +357,20 @@
         this.$refs.crud.toggleSelection();
       },
       beforeOpen(done, type) {
-        let $bank = this.findObject(this.option.column, 'bankNo');
-        const column = this.findObject(this.option.column, "parentId");
-        $bank.addDisplay = !column.addDisabled;
-        if (["add", "edit"].includes(type)) {
-          this.initData();
-        }
-        if (["edit", "view"].includes(type)) {
-          $bank.disabled = true;
-          getDept(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
+        console.log(this.form)
+
+        // let $bank = this.findObject(this.option.column, 'bankNo');
+        // const column = this.findObject(this.option.column, "parentId");
+        // $bank.addDisplay = !column.addDisabled;
+        // /*if (["add", "edit"].includes(type)) {
+        //   this.initData();
+        // }*/
+        // if (["edit", "view"].includes(type)) {
+        //   $bank.disabled = true;
+        //   getDept(this.form.id).then(res => {
+        //     this.form = res.data.data;
+        //   });
+        // }
         done();
       },
       beforeClose(done) {