echarts 图表 首页 统计

package.json

@@ -28,6 +28,7 @@
     "vue": "^2.6.10",
     "vue-axios": "^2.1.2",
     "vue-i18n": "^8.7.0",
+    "echarts": "^5.2.0",
     "vue-router": "^3.0.1",
     "vuex": "^3.1.1"
   },

src/api/bank/cardswallow.js

@@ -65,7 +65,6 @@ export const getSetting = () => {
   })
 }
 
-
 export const cardswallowSubmit = (row) => {
   return request({
     url: '/api/bank/cardswallow/cardswallowSubmit',

src/api/bank/home.js

@@ -9,3 +9,30 @@ export const getMyInitiated = () => {
   })
 }
 
+export const getToBeConfirmed = () => {
+  return request({
+    url: '/api/bank/home/toBeConfirmed',
+    method: 'get',
+    params: {
+    }
+  })
+}
+
+export const getMyConfirmation = () => {
+  return request({
+    url: '/api/bank/home/myConfirmation',
+    method: 'get',
+    params: {
+    }
+  })
+}
+
+export const getToBoReleased = () => {
+  return request({
+    url: '/api/bank/home/toBoReleased',
+    method: 'get',
+    params: {
+    }
+  })
+}
+

src/api/bank/returns.js

@@ -56,6 +56,16 @@ export const returnsSubmit = (row) => {
   })
 }
 
+
+export const issue = (row) => {
+  return request({
+    url: '/api/bank/returns/issue',
+    method: 'post',
+    data: row
+  })
+}
+
+
 export const returnsApprove = (row) => {
   return request({
     url: '/api/bank/returns/returnsApprove',
@@ -64,5 +74,21 @@ export const returnsApprove = (row) => {
   })
 }
 
+export const settingSave = (row) => {
+  return request({
+    url: '/api/bank/returns/settingSave',
+    method: 'post',
+    data: row
+  })
+}
+
+export const getSetting = () => {
+  return request({
+    url: '/api/bank/returns/getSetting',
+    method: 'get',
+    params: {
+    }
+  })
+}
 
 

src/components/common/returns-approve.vue

@@ -21,7 +21,7 @@
         loading: false,
         option: {
           mockBtn: false,
-          submitText: '確認並發佈',
+          submitText: '確認',
           printBtn: false,
           emptyBtn: false,
           column: [

src/components/common/returns-issue.vue

@@ -0,0 +1,273 @@
+<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>-->
+    </avue-form>
+  </div>
+</template>
+
+<script>
+  import {issue} from "@/api/bank/returns";;
+
+  export default {
+    name: "returns-issue",
+    data(){
+      return {
+        loading: false,
+        option: {
+          mockBtn: false,
+          submitText: '發佈',
+          printBtn: false,
+          emptyBtn: false,
+          column: [
+            {
+              label: "業務類型",
+              prop: "isPublic",
+              type: "select",
+              dataType: "string",
+              disabled: true,
+              dicUrl: `/api/blade-system/dict/dictionary?code=business_type`,
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: true,
+                message: "请输入業務類型",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "銀行號",
+              prop: "bankNo",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入銀行號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "機構號",
+              prop: "orgNo",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入機構號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "序號",
+              prop: "serialNo",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入序號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支行",
+              prop: "subBank",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入支行",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "客戶名稱",
+              prop: "customerName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入客戶名稱",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "狀態",
+              prop: "status",
+              type: "select",
+              disabled: true,
+              dataType: "string",
+              dicUrl: `/api/blade-system/dict/dictionary?code=returns_status`,
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: true,
+                message: "请输入狀態",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "退件原因",
+              prop: "reason",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入退件原因",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "備註",
+              prop: "remark",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入備註",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "條碼",
+              prop: "barCode",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入條碼",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "接辦行經辦",
+              prop: "handlingBank",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入接辦行經辦",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "接辦行覆核",
+              prop: "handlingBankReview",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入接辦行覆核",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "處理日期",
+              prop: "handlingDate",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入處理日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "經辦",
+              prop: "handler",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入經辦",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "處理狀態",
+              prop: "handlingStatus",
+              type: "select",
+              disabled: true,
+              dataType: "string",
+              dicUrl: `/api/blade-system/dict/dictionary?code=processing_status`,
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: true,
+                message: "请输入處理狀態",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支行備註",
+              prop: "bankRemark",
+              display: false,
+              disabled: true,
+              rules: [{
+                required: false,
+                message: "请输入支行備註",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支行確認人員工號",
+              prop: "bankConfirmNo",
+              display: false,
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入支行確認人員工號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支行確認人姓名",
+              prop: "bankConfirmName",
+              display: false,
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入支行確認人姓名",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "確認日期",
+              prop: "bankConfirmTime",
+              type: "datetime",
+              disabled: true,
+              format: "yyyy-MM-dd HH:mm:ss",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+              display: false,
+              rules: [{
+                required: true,
+                message: "请输入確認日期",
+                trigger: "blur"
+              }]
+            },
+
+          ]
+        }
+      }
+    },
+    props: {
+      form: {
+        type: Object
+      },
+
+    },
+    mounted() {
+
+    },
+    methods: {
+      submit(row, index, done, loading){
+        issue(row).then(() => {
+          this.$message.success("發佈成功！")
+          this.$emit("close")
+        });
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/components/confirmed/confirmed-goodsuse.vue

@@ -0,0 +1,415 @@
+<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-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+
+      <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="menu" slot-scope="{row, index}">
+        <el-button size="small" class="el-button--text" @click="$refs.crud.rowView(row, index)"><i class="el-icon-view"></i> 查 看</el-button>
+      </template>
+    </avue-crud>
+
+
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove, getSetting, settingSave} from "@/api/bank/goodsuse";
+  import {mapGetters} from "vuex";
+  import FlowSettings from "../../components/common/flow-settings";
+  import {dateFormat} from "../../util/date";
+  import { getCurrentDept } from "@/api/system/dept";
+  import SelectDialogUser from "../../components/select-dialog/select-dialog-user";
+  import GoodsuseSure from "../../components/common/goodsuse-sure";
+
+  export default {
+    components: {GoodsuseSure, SelectDialogUser, FlowSettings},
+    name: "confirmed-goodsuse",
+    data() {
+      return {
+
+        personId: null,
+        personNo: null,
+        personName: null,
+        settingVisible: false,
+
+        sureVisible: false,
+
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          addBtn: false,
+          viewBtn: false,
+          editBtn: false,
+          delBtn: false,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "銀行號",
+              prop: "bankNo",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入銀行號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "機構號",
+              prop: "orgNo",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入機構號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "日期",
+              prop: "date",
+              type: "datetime",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              rules: [{
+                required: true,
+                message: "请输入日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "憑證/實物種類",
+              prop: "type",
+              type: "select",
+              dicUrl: "/api/blade-system/dict/dictionary?code=voucher_type",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: true,
+                message: "请输入憑證/實物種類",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "使用數量",
+              prop: "useNumber",
+              type: "number",
+              rules: [{
+                required: true,
+                message: "请输入使用數量",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "領入數量",
+              prop: "receiptNumber",
+              type: "number",
+              rules: [{
+                required: false,
+                message: "请输入領入數量",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "註銷數量",
+              prop: "writeOffNumber",
+              type: "number",
+              rules: [{
+                required: false,
+                message: "请输入註銷數量",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "開始編號",
+              prop: "beginNo",
+              rules: [{
+                required: false,
+                message: "请输入開始編號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "結束編號",
+              prop: "endNo",
+              rules: [{
+                required: false,
+                message: "请输入結束編號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "餘額",
+              prop: "balance",
+              rules: [{
+                required: true,
+                message: "请输入餘額",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "備註",
+              prop: "remark",
+              rules: [{
+                required: false,
+                message: "请输入備註",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "填報人員工號",
+              prop: "fillingNo",
+              addDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入填報人員工號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "填報人姓名",
+              prop: "fillingName",
+              addDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入填報人姓名",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "確認人員工號",
+              prop: "confirmNo",
+              hide: true,
+              addDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入確認人員工號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "確認人姓名",
+              prop: "confirmName",
+              hide: true,
+              addDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入確認人姓名",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "填報時間",
+              prop: "fillingDate",
+              addDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入填報日期及時間",
+                trigger: "blur"
+              }]
+            },
+
+            {
+              label: "確認人",
+              prop: "personName",
+              hide: true,
+              // addDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入審批人",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "確認人員工號",
+              prop: "personNo",
+              hide: true,
+              // addDisplay: false,
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "審批時間",
+              prop: "approveTime",
+              hide: true,
+              addDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入審批時間",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "節點",
+              prop: "process",
+              addDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入節點",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "是否已完成",
+              prop: "isCompleted",
+              hide: true,
+              addDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入是否已完成",
+                trigger: "blur"
+              }]
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.goodsuse_add, false),
+          viewBtn: this.vaildData(this.permission.goodsuse_view, false),
+          delBtn: this.vaildData(this.permission.goodsuse_delete, false),
+          editBtn: this.vaildData(this.permission.goodsuse_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      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) {
+        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) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      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;
+        params.process = 3;// 待确认
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

src/components/confirmed/confirmed-postchange.vue

@@ -0,0 +1,508 @@
+<template>
+  <basic-container>
+    <avue-crud :option="optionForm"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+
+      <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="menu" slot-scope="{row, index}">
+        <el-button size="small" class="el-button--text" @click="handleView(row, index)"><i class="el-icon-view"></i> 查 看</el-button>
+      </template>
+    </avue-crud>
+
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, getDictByCode} from "@/api/bank/postchange";
+  import {mapGetters} from "vuex";
+  import {getUserList} from "@/api/system/user";
+
+  export default {
+    name: "confirmed-postchange",
+    data() {
+      return {
+        approveFlag: false,
+
+        form: {},
+        viewForm: {},
+        query: {},
+        loading: true,
+        settingVisible: false,
+        viewVisible: false,
+        personId: null,
+        personNo: null,
+        personName: null,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        userList: [],
+
+        optionForm: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: false,
+          addBtn: false,
+          editBtn: false,
+          delBtn: false,
+          selection: true,
+          dialogClickModal: false,
+          submitText: "確認",
+          column: [
+            {
+              label: "銀行號",
+              prop: "bankNo",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入銀行號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "機構號",
+              prop: "orgNo",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入機構號",
+                trigger: "blur"
+              }]
+            },
+
+            {
+              label: "申請日期",
+              prop: "applyDate",
+              type: "datetime",
+              disabled: true,
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              rules: [{
+                required: true,
+                message: "请输入申請日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "生效日期",
+              prop: "effectiveDate",
+              type: "datetime",
+              disabled: true,
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              rules: [{
+                required: true,
+                message: "请输入生效日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "備註",
+              prop: "remark",
+              disabled: true,
+              rules: [{
+                required: false,
+                message: "请输入備註",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "进度",
+              prop: "process",
+              // slot: true,
+              display: true
+            },
+          ],
+          group: [
+            {
+              label: "人員配置",
+              prop: "personSetting",
+              column: [
+                {
+                  label: "網點出納主管",
+                  prop: "director",
+                  type: "text",
+                  span: 4,
+                },
+                {
+                  label: "上期持有人",
+                  prop: "preholder1",
+                  span: 5,
+                  type: "select",
+                  multiple: true,
+                  props: {
+                    label: "text",
+                    value: "ehr"
+                  },
+                  rules: [{
+                    required: true,
+                    message: "请输入持有人",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "目前持有人",
+                  prop: "holder1",
+                  span: 5,
+                  type: "select",
+                  multiple: true,
+                  props: {
+                    label: "text",
+                    value: "ehr"
+                  },
+                  rules: [{
+                    required: true,
+                    message: "请输入持有人",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "上期後備人員",
+                  prop: "prebackupPerson1",
+                  span: 5,
+                  type: "select",
+                  multiple: true,
+                  props: {
+                    label: "text",
+                    value: "ehr"
+                  },
+
+                  rules: [{
+                    required: true,
+                    message: "请输入後備人員",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "目前後備人員",
+                  prop: "backupPerson1",
+                  span: 5,
+                  type: "select",
+                  multiple: true,
+                  props: {
+                    label: "text",
+                    value: "ehr"
+                  },
+
+                  rules: [{
+                    required: true,
+                    message: "请输入後備人員",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "網點出納專管員",
+                  prop: "manager",
+                  type: "text",
+                  span: 4,
+                },
+                {
+                  label: "上期持有人",
+                  prop: "preholder2",
+                  span: 5,
+                  type: "select",
+                  multiple: true,
+                  props: {
+                    label: "text",
+                    value: "ehr"
+                  },
+                  rules: [{
+                    required: true,
+                    message: "请输入持有人",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "目前持有人",
+                  prop: "holder2",
+                  span: 5,
+                  type: "select",
+                  multiple: true,
+                  props: {
+                    label: "text",
+                    value: "ehr"
+                  },
+                  rules: [{
+                    required: true,
+                    message: "请输入持有人",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "後備人員",
+                  prop: "prebackupPerson2",
+                  span: 5,
+                  type: "select",
+                  multiple: true,
+                  props: {
+                    label: "text",
+                    value: "ehr"
+                  },
+                  rules: [{
+                    required: true,
+                    message: "请输入後備人員",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "目前後備人員",
+                  prop: "backupPerson2",
+                  span: 5,
+                  type: "select",
+                  multiple: true,
+                  props: {
+                    label: "text",
+                    value: "ehr"
+                  },
+                  rules: [{
+                    required: true,
+                    message: "请输入後備人員",
+                    trigger: "blur"
+                  }]
+                },
+              ]
+            },
+          ],
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.postchange_add, false),
+          viewBtn: this.vaildData(this.permission.postchange_view, false),
+          delBtn: this.vaildData(this.permission.postchange_delete, false),
+          editBtn: this.vaildData(this.permission.postchange_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    created() {
+      const _this = this;
+      getUserList().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;
+        }
+        this.userList = data;
+        this.optionForm.group[0].column.forEach(item => {
+          if (item.prop.indexOf('holder') > -1 || item.prop.indexOf('backup') > -1){
+            item.dicData = data;
+          }
+          item.disabled = true;
+        })
+        this.initForm();
+      })
+    },
+    mounted() {
+    },
+    methods: {
+
+      handleView(row, index){
+        this.viewForm = row;
+        this.$refs.crud.rowView(row, index)
+        getDetail(this.viewForm.id).then(res => {
+          let data = res.data.data;
+          let holder = JSON.parse(data.holder);
+          let backupPerson = JSON.parse(data.backupPerson);
+          Object.assign(data, holder, backupPerson)
+          this.viewForm = data;
+
+          this.viewForm.previousId && getDetail(this.viewForm.previousId).then(res => {
+            let preData = res.data.data;
+            let preholderStr = preData.holder.replaceAll('holder', 'preholder');
+            let prebackupPersonStr = preData.backupPerson.replaceAll('backupPerson', 'prebackupPerson');
+            let propreholder = JSON.parse(preholderStr);
+            let prebackupPerson = JSON.parse(prebackupPersonStr);
+            Object.assign(data, propreholder, prebackupPerson)
+            this.viewForm = data;
+          })
+        });
+        // this.viewForm = row;
+        // this.$refs.crud.rowView(row, index)
+      },
+
+      beforeOpen(done, type) {
+        getDetail(this.form.id).then(res => {
+          let data = res.data.data;
+          let holder = JSON.parse(data.holder);
+          let backupPerson = JSON.parse(data.backupPerson);
+          Object.assign(data, holder, backupPerson)
+          // this.option.group = this.groupView;
+          this.form = data;
+          if (this.form.previousId){
+            console.log(new Date().getTime())
+            getDetail(this.form.previousId).then(res => {
+              console.log(new Date().getTime())
+
+              let preData = res.data.data;
+              let preholderStr = preData.holder.replaceAll('holder', 'preholder');
+              let prebackupPersonStr = preData.backupPerson.replaceAll('backupPerson', 'prebackupPerson');
+              let propreholder = JSON.parse(preholderStr);
+              let prebackupPerson = JSON.parse(prebackupPersonStr);
+              Object.assign(data, propreholder, prebackupPerson)
+              console.log(new Date().getTime())
+
+              this.form = data;
+            })
+          }
+
+        });
+        done();
+      },
+      initForm(){
+        let holderObj = {
+          label: "持有人",
+          prop: "holder",
+          span: 11,
+          type: "select",
+          multiple: true,
+          dicData: this.userList,
+          props: {
+            label: "text",
+            value: "ehr"
+          },
+        }
+        let backupObj = {
+          label: "後備人員",
+          prop: "backupPerson",
+          span: 11,
+          type: "select",
+          multiple: true,
+          dicData: this.userList,
+          props: {
+            label: "text",
+            value: "ehr"
+          },
+        }
+
+        getDictByCode("cashier_key_type").then(res => {
+          const data = res.data.data;
+          let $groupView = this.optionForm.group;
+          data.forEach(item => {
+            let code = item.dictKey;
+            let value = item.dictValue;
+            let $item12 = {};
+            $item12.label = value;
+            let column12 = [];
+            getDictByCode(code).then(res2 => {
+              const data2 = res2.data.data;
+              data2.forEach(item2 => {
+                let $item2 = {}
+                let $item22 = {}
+                $item2.label = item2.dictValue;
+                $item22.label = item2.dictValue;
+                // $item2.prop = item2.dictKey;
+                $item2.type = 'text';
+                $item22.type = 'text';
+                $item2.span = 2;
+                $item22.span = 4;
+                column12.push($item22)
+                let holderItem = this.deepClone(holderObj);
+                let holderItem2 = this.deepClone(holderObj);
+                let backupItem = this.deepClone(backupObj);
+                let backupItem2 = this.deepClone(backupObj);
+                holderItem.prop = 'holder-' + item.dictKey + '-' + item2.dictKey;
+                holderItem2.prop = 'preholder-' + item.dictKey + '-' + item2.dictKey;
+                holderItem.span = 5;
+                holderItem2.span = 5;
+                // holderItem.label = '目前' + holderItem.label;
+                holderItem2.label = '上期' + holderItem2.label;
+                let h1 = this.deepClone(holderItem);
+                h1.span = 11;
+                column12.push(holderItem2)
+                column12.push(holderItem)
+                backupItem.prop = 'backupPerson-' + item.dictKey + '-' + item2.dictKey;
+                backupItem2.prop = 'prebackupPerson-' + item.dictKey + '-' + item2.dictKey;
+                backupItem.span = 5;
+                backupItem2.span = 5;
+                // backupItem.label = '目前' + backupItem.label;
+                backupItem2.label = '上期' + backupItem2.label;
+                let b1 = this.deepClone(backupItem);
+                b1.span = 11;
+                column12.push(backupItem2)
+                column12.push(backupItem)
+              })
+            });
+            $item12.column = column12;
+            $groupView.push($item12)
+            // this.optionForm.group = $groupView
+          })
+        });
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      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;
+        params.process = 3;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

src/components/confirmed/confirmed-returns.vue

@@ -0,0 +1,429 @@
+<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-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+      </template>
+      <template slot="menu" slot-scope="{row, index}">
+        <el-button size="small" class="el-button--text" v-if="permission.returns_view" @click="$refs.crud.rowView(row, index)"><i class="el-icon-view"></i> 查 看</el-button>
+        <el-button size="small" class="el-button--text" v-if="permission.returns_approve && row.process == 3" @click="approve(row, index)"><i class="el-icon-check"></i> 審 批</el-button>
+      </template>
+
+      <template slot="process" slot-scope="{row, index}">
+        <el-tag size="small " type="primary" plain v-if="row.process == 2">待發佈</el-tag>
+        <el-tag size="small " type="warning" plain v-if="row.process == 3">待確認</el-tag>
+        <el-tag size="small " type="success" plain v-if="row.process == 4">已確認</el-tag>
+      </template>
+    </avue-crud>
+
+    <el-dialog title="信息審核"
+               append-to-body
+               :visible.sync="approveVisible"
+               width="70%">
+      <returns-approve :form="approveForm" @close="approveVisible = false, onLoad(page)"></returns-approve>
+    </el-dialog>
+
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove, returnsSubmit, settingSave, getSetting} from "@/api/bank/returns";
+  import {mapGetters} from "vuex";
+  import {dateFormat} from "../../util/date";
+  import ReturnsComfire from "../../components/common/returns-comfire";
+  import ReturnsApprove from "../../components/common/returns-approve";
+  import FlowSettings from "../../components/common/flow-settings";
+  import ReturnsIssue from "../../components/common/returns-issue";
+
+  export default {
+    name: "confirmed-returns",
+    components: {ReturnsIssue, FlowSettings, ReturnsApprove, ReturnsComfire},
+    data() {
+      return {
+        approveForm: {},
+        approveVisible: false,
+
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: false,
+          editBtn: false,
+          addBtn: false,
+          delBtn: false,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "業務類型",
+              prop: "isPublic",
+              type: "select",
+              dataType: "string",
+              dicUrl: `/api/blade-system/dict/dictionary?code=business_type`,
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: true,
+                message: "请输入業務類型",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "銀行號",
+              prop: "bankNo",
+              rules: [{
+                required: true,
+                message: "请输入銀行號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "機構號",
+              prop: "orgNo",
+              rules: [{
+                required: true,
+                message: "请输入機構號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "序號",
+              prop: "serialNo",
+              rules: [{
+                required: true,
+                message: "请输入序號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支行",
+              prop: "subBank",
+              rules: [{
+                required: true,
+                message: "请输入支行",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "客戶名稱",
+              prop: "customerName",
+              rules: [{
+                required: true,
+                message: "请输入客戶名稱",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "狀態",
+              prop: "status",
+              type: "select",
+              dataType: "string",
+              dicUrl: `/api/blade-system/dict/dictionary?code=returns_status`,
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: true,
+                message: "请输入狀態",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "退件原因",
+              prop: "reason",
+              rules: [{
+                required: true,
+                message: "请输入退件原因",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "備註",
+              prop: "remark",
+              rules: [{
+                required: true,
+                message: "请输入備註",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "條碼",
+              prop: "barCode",
+              rules: [{
+                required: true,
+                message: "请输入條碼",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "接辦行經辦",
+              prop: "handlingBank",
+              rules: [{
+                required: true,
+                message: "请输入接辦行經辦",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "接辦行覆核",
+              prop: "handlingBankReview",
+              rules: [{
+                required: true,
+                message: "请输入接辦行覆核",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "處理日期",
+              prop: "handlingDate",
+              type: "datetime",
+              format: "yyyy/MM/dd",
+              valueFormat: "yyyy/MM/dd",
+              rules: [{
+                required: true,
+                message: "请输入處理日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "經辦",
+              prop: "handler",
+              rules: [{
+                required: true,
+                message: "请输入經辦",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "處理狀態",
+              prop: "handlingStatus",
+              type: "select",
+              dataType: "string",
+              dicUrl: `/api/blade-system/dict/dictionary?code=processing_status`,
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: true,
+                message: "请输入處理狀態",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支行備註",
+              prop: "bankRemark",
+              viewDisplay: false,
+              editDisplay: false,
+              hide: true,
+              rules: [{
+                required: false,
+                message: "请输入支行備註",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支行確認人員工號",
+              prop: "bankConfirmNo",
+              viewDisplay: false,
+              editDisplay: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入支行確認人員工號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支行確認人姓名",
+              prop: "bankConfirmName",
+              viewDisplay: false,
+              editDisplay: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入支行確認人姓名",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "確認日期",
+              prop: "bankConfirmTime",
+              type: "datetime",
+              format: "yyyy-MM-dd HH:mm:ss",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+              viewDisplay: false,
+              editDisplay: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入確認日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "進度",
+              prop: "process",
+              viewDisplay: false,
+              editDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入節點",
+                trigger: "blur"
+              }]
+            },
+          ]
+        },
+        data: [],
+        data2: [],
+
+        temForm: {},
+        attachForm: {},
+        attachBox: false,
+        attachOption: {
+          submitBtn: false,
+          emptyBtn: false,
+          column: [
+            {
+              label: '文件上传',
+              prop: 'attachFile',
+              type: 'upload',
+              drag: true,
+              loadText: '文件上传中，请稍等',
+              span: 24,
+              propsHttp: {
+                res: 'data'
+              },
+              action: "/api/bank/returns/readExcel"
+            }
+          ]
+        }
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.returns_add, false),
+          viewBtn: this.vaildData(this.permission.returns_view, false),
+          delBtn: this.vaildData(this.permission.returns_delete, false),
+          editBtn: this.vaildData(this.permission.returns_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      approve(row, index){
+        this.approveVisible = true;
+        this.approveForm = row;
+      },
+      infoFormat(row){
+        row.isPublic = row.isPublic == '對公' ? 1 : 0;
+        let arr = row.subBank.split(' ');
+        row.subOrgNo = arr[0];
+        row.subBank = arr[1];
+        if (row.status == '退件'){
+          row.status = '1';
+        }else if (row.status == 'HOLD'){
+          row.status = '2';
+        }else if (row.status == '完成'){
+          row.status = '3';
+        }
+        return row;
+      },
+
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+          if (type == "view"){
+            this.findObject(this.option.column, "bankRemark").viewDisplay = this.form.process == 3;
+            this.findObject(this.option.column, "bankConfirmNo").viewDisplay = this.form.process == 3;
+            this.findObject(this.option.column, "bankConfirmName").viewDisplay = this.form.process == 3;
+            this.findObject(this.option.column, "bankConfirmTime").viewDisplay = this.form.process == 3;
+          }
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      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;
+        params.process = 4; //待確認
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

src/components/initiated/init-message.vue

@@ -50,10 +50,10 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove, getDeptTree} from "@/api/bank/message";
+  import {getList, getDetail, add, update, remove} from "@/api/bank/message";
   import {mapGetters} from "vuex";
   import {downloadFileBase64} from "@/util/util";
-  import website from '@/config/website';
+  import {getDeptTree} from "@/api/system/dept";
 
   export default {
     name: "init-message",
@@ -191,7 +191,7 @@
       }
     },
     mounted() {
-      getDeptTree(website.tenantId).then(res => {
+      getDeptTree().then(res => {
         const column = this.findObject(this.option.column, "deptId");
         column.dicData = res.data.data;
       });

src/components/release/release-cardswallow.vue

@@ -0,0 +1,318 @@
+<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-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+
+      <template slot="process" slot-scope="{row, index}">
+        <el-tag size="small " type="primary" plain v-if="row.process == 2">待發佈</el-tag>
+        <el-tag size="small " type="warning" plain v-if="row.process == 3">待確認</el-tag>
+        <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="mini " type="primary" plain v-if="permission.cardswallow_issue && row.process == 2" @click="form = row,issueVisible = true">去發佈</el-button>
+      </template>
+    </avue-crud>
+
+    <el-dialog :append-to-body="true" :modal-append-to-body="false" :visible.sync="issueVisible">
+      <cardswallow-issue :form="form" @close="issueVisible = false, onLoad(page)"></cardswallow-issue>
+    </el-dialog>
+
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove, settingSave, getSetting} from "@/api/bank/cardswallow";
+  import {mapGetters} from "vuex";
+  import CardswallowIssue from "../../components/common/cardswallow-issue";
+
+  export default {
+    name: "release-cardswallow",
+    components: {CardswallowIssue},
+    data() {
+      return {
+        issueVisible: false,
+
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          addBtn: false,
+          editBtn: false,
+          delBtn: false,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "銀行號",
+              prop: "bankNo",
+              rules: [{
+                required: true,
+                message: "请输入銀行號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "機構號",
+              prop: "orgNo",
+              rules: [{
+                required: true,
+                message: "请输入機構號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "序號",
+              prop: "serialNo",
+              rules: [{
+                required: true,
+                message: "请输入序號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "發送時間",
+              prop: "sendDate",
+              rules: [{
+                required: true,
+                message: "请输入發送時間",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "發送支行",
+              prop: "sendBank",
+              rules: [{
+                required: true,
+                message: "请输入發送支行",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "卡號",
+              prop: "cardNo",
+              rules: [{
+                required: true,
+                message: "请输入卡號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "卡序號",
+              prop: "cardSerialNo",
+              rules: [{
+                required: true,
+                message: "请输入卡序號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "本行機/他行機",
+              prop: "machine",
+              rules: [{
+                required: true,
+                message: "请输入本行機/他行機",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "機號",
+              prop: "machineNo",
+              rules: [{
+                required: true,
+                message: "请输入機號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "沒收卡日期",
+              prop: "swallowDate",
+              rules: [{
+                required: true,
+                message: "请输入沒收卡日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "卡狀態",
+              prop: "cardStatus",
+              rules: [{
+                required: true,
+                message: "请输入卡狀態",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "發送狀態",
+              prop: "sendStatus",
+              type: "select",
+              dataType: "string",
+              dicUrl: `/api/blade-system/dict/dictionary?code=send_status`,
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: true,
+                message: "请输入發送狀態",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "備註",
+              prop: "remark",
+              rules: [{
+                required: false,
+                message: "请输入備註",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "進度",
+              prop: "process",
+              display: false,
+              rules: [{
+                required: false,
+                message: "请输入備註",
+                trigger: "blur"
+            }]
+          },
+
+            {
+              label: "支行確認人員工號",
+              prop: "bankConfirmNo",
+              editDisplay: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入支行確認人員工號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支行確認人姓名",
+              prop: "bankConfirmName",
+              editDisplay: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入支行確認人姓名",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "確認日期",
+              prop: "bankConfirmTime",
+              editDisplay: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入確認日期",
+                trigger: "blur"
+              }]
+            },
+          ]
+        },
+        data: [],
+        data2: [],
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.cardswallow_add, false),
+          viewBtn: this.vaildData(this.permission.cardswallow_view, false),
+          delBtn: this.vaildData(this.permission.cardswallow_delete, false),
+          editBtn: this.vaildData(this.permission.cardswallow_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      beforeOpen(done, type) {
+        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) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      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;
+        params.process = 2; // 待發佈
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

src/components/release/release-returns.vue

@@ -0,0 +1,421 @@
+<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-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+      </template>
+      <template slot="menu" slot-scope="{row, index}">
+        <el-button size="small" class="el-button--text" v-if="permission.returns_view" @click="$refs.crud.rowView(row, index)"><i class="el-icon-view"></i> 查 看</el-button>
+        <el-button size="small" class="el-button--text" v-if="permission.returns_issue && row.process == 2" @click="form = row,issueVisible = true">去發佈</el-button>
+      </template>
+
+      <template slot="process" slot-scope="{row, index}">
+        <el-tag size="small " type="primary" plain v-if="row.process == 2">待發佈</el-tag>
+        <el-tag size="small " type="warning" plain v-if="row.process == 3">待確認</el-tag>
+        <el-tag size="small " type="success" plain v-if="row.process == 4">已確認</el-tag>
+      </template>
+    </avue-crud>
+
+    <el-dialog :append-to-body="true" :modal-append-to-body="false" :visible.sync="issueVisible">
+      <returns-issue :form="form" @close="issueVisible = false, onLoad(page)"></returns-issue>
+    </el-dialog>
+
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove, returnsSubmit, settingSave, getSetting} from "@/api/bank/returns";
+  import {mapGetters} from "vuex";
+  import {dateFormat} from "../../util/date";
+  import ReturnsComfire from "../../components/common/returns-comfire";
+  import ReturnsApprove from "../../components/common/returns-approve";
+  import FlowSettings from "../../components/common/flow-settings";
+  import ReturnsIssue from "../../components/common/returns-issue";
+
+  export default {
+    name: "release-returns",
+    components: {ReturnsIssue, FlowSettings, ReturnsApprove, ReturnsComfire},
+    data() {
+      return {
+        issueVisible: false,
+
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: false,
+          editBtn: false,
+          addBtn: false,
+          delBtn: false,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "業務類型",
+              prop: "isPublic",
+              type: "select",
+              dataType: "string",
+              dicUrl: `/api/blade-system/dict/dictionary?code=business_type`,
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: true,
+                message: "请输入業務類型",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "銀行號",
+              prop: "bankNo",
+              rules: [{
+                required: true,
+                message: "请输入銀行號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "機構號",
+              prop: "orgNo",
+              rules: [{
+                required: true,
+                message: "请输入機構號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "序號",
+              prop: "serialNo",
+              rules: [{
+                required: true,
+                message: "请输入序號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支行",
+              prop: "subBank",
+              rules: [{
+                required: true,
+                message: "请输入支行",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "客戶名稱",
+              prop: "customerName",
+              rules: [{
+                required: true,
+                message: "请输入客戶名稱",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "狀態",
+              prop: "status",
+              type: "select",
+              dataType: "string",
+              dicUrl: `/api/blade-system/dict/dictionary?code=returns_status`,
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: true,
+                message: "请输入狀態",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "退件原因",
+              prop: "reason",
+              rules: [{
+                required: true,
+                message: "请输入退件原因",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "備註",
+              prop: "remark",
+              rules: [{
+                required: true,
+                message: "请输入備註",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "條碼",
+              prop: "barCode",
+              rules: [{
+                required: true,
+                message: "请输入條碼",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "接辦行經辦",
+              prop: "handlingBank",
+              rules: [{
+                required: true,
+                message: "请输入接辦行經辦",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "接辦行覆核",
+              prop: "handlingBankReview",
+              rules: [{
+                required: true,
+                message: "请输入接辦行覆核",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "處理日期",
+              prop: "handlingDate",
+              type: "datetime",
+              format: "yyyy/MM/dd",
+              valueFormat: "yyyy/MM/dd",
+              rules: [{
+                required: true,
+                message: "请输入處理日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "經辦",
+              prop: "handler",
+              rules: [{
+                required: true,
+                message: "请输入經辦",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "處理狀態",
+              prop: "handlingStatus",
+              type: "select",
+              dataType: "string",
+              dicUrl: `/api/blade-system/dict/dictionary?code=processing_status`,
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: true,
+                message: "请输入處理狀態",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支行備註",
+              prop: "bankRemark",
+              viewDisplay: false,
+              editDisplay: false,
+              hide: true,
+              rules: [{
+                required: false,
+                message: "请输入支行備註",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支行確認人員工號",
+              prop: "bankConfirmNo",
+              viewDisplay: false,
+              editDisplay: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入支行確認人員工號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支行確認人姓名",
+              prop: "bankConfirmName",
+              viewDisplay: false,
+              editDisplay: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入支行確認人姓名",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "確認日期",
+              prop: "bankConfirmTime",
+              type: "datetime",
+              format: "yyyy-MM-dd HH:mm:ss",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+              viewDisplay: false,
+              editDisplay: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入確認日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "進度",
+              prop: "process",
+              viewDisplay: false,
+              editDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入節點",
+                trigger: "blur"
+              }]
+            },
+          ]
+        },
+        data: [],
+        data2: [],
+
+        temForm: {},
+        attachForm: {},
+        attachBox: false,
+        attachOption: {
+          submitBtn: false,
+          emptyBtn: false,
+          column: [
+            {
+              label: '文件上传',
+              prop: 'attachFile',
+              type: 'upload',
+              drag: true,
+              loadText: '文件上传中，请稍等',
+              span: 24,
+              propsHttp: {
+                res: 'data'
+              },
+              action: "/api/bank/returns/readExcel"
+            }
+          ]
+        }
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.returns_add, false),
+          viewBtn: this.vaildData(this.permission.returns_view, false),
+          delBtn: this.vaildData(this.permission.returns_delete, false),
+          editBtn: this.vaildData(this.permission.returns_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      infoFormat(row){
+        row.isPublic = row.isPublic == '對公' ? 1 : 0;
+        let arr = row.subBank.split(' ');
+        row.subOrgNo = arr[0];
+        row.subBank = arr[1];
+        if (row.status == '退件'){
+          row.status = '1';
+        }else if (row.status == 'HOLD'){
+          row.status = '2';
+        }else if (row.status == '完成'){
+          row.status = '3';
+        }
+        return row;
+      },
+
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+          if (type == "view"){
+            this.findObject(this.option.column, "bankRemark").viewDisplay = this.form.process == 3;
+            this.findObject(this.option.column, "bankConfirmNo").viewDisplay = this.form.process == 3;
+            this.findObject(this.option.column, "bankConfirmName").viewDisplay = this.form.process == 3;
+            this.findObject(this.option.column, "bankConfirmTime").viewDisplay = this.form.process == 3;
+          }
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      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;
+        params.process = 2; //待發佈
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

src/components/tobeconfirm/tobeconfirm-goodsuse.vue

@@ -0,0 +1,414 @@
+<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-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+
+      <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="menu" slot-scope="{row, index}">
+        <el-button size="small" class="el-button--text" @click="$refs.crud.rowView(row, index)"><i class="el-icon-view"></i> 查 看</el-button>
+        <el-button size="mini " type="primary" plain v-if="permission.goodsuse_confirm && row.process == 2" @click="form = row, sureVisible = true">去確認</el-button>
+      </template>
+    </avue-crud>
+
+    <el-dialog :append-to-body="true" :modal-append-to-body="false" :visible.sync="sureVisible" title="確認">
+      <goodsuse-sure :form="form" @close="sureVisible = false, onLoad(page)"></goodsuse-sure>
+    </el-dialog>
+
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove, getSetting, settingSave} from "@/api/bank/goodsuse";
+  import {mapGetters} from "vuex";
+  import FlowSettings from "../../components/common/flow-settings";
+  import {dateFormat} from "../../util/date";
+  import { getCurrentDept } from "@/api/system/dept";
+  import SelectDialogUser from "../../components/select-dialog/select-dialog-user";
+  import GoodsuseSure from "../../components/common/goodsuse-sure";
+
+  export default {
+    components: {GoodsuseSure, SelectDialogUser, FlowSettings},
+    name: "tobeconfirm-goodsuse",
+    data() {
+      return {
+
+        sureVisible: false,
+
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          addBtn: false,
+          viewBtn: false,
+          editBtn: false,
+          delBtn: false,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "銀行號",
+              prop: "bankNo",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入銀行號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "機構號",
+              prop: "orgNo",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入機構號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "日期",
+              prop: "date",
+              type: "datetime",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              rules: [{
+                required: true,
+                message: "请输入日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "憑證/實物種類",
+              prop: "type",
+              type: "select",
+              dicUrl: "/api/blade-system/dict/dictionary?code=voucher_type",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: true,
+                message: "请输入憑證/實物種類",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "使用數量",
+              prop: "useNumber",
+              type: "number",
+              rules: [{
+                required: true,
+                message: "请输入使用數量",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "領入數量",
+              prop: "receiptNumber",
+              type: "number",
+              rules: [{
+                required: false,
+                message: "请输入領入數量",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "註銷數量",
+              prop: "writeOffNumber",
+              type: "number",
+              rules: [{
+                required: false,
+                message: "请输入註銷數量",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "開始編號",
+              prop: "beginNo",
+              rules: [{
+                required: false,
+                message: "请输入開始編號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "結束編號",
+              prop: "endNo",
+              rules: [{
+                required: false,
+                message: "请输入結束編號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "餘額",
+              prop: "balance",
+              rules: [{
+                required: true,
+                message: "请输入餘額",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "備註",
+              prop: "remark",
+              rules: [{
+                required: false,
+                message: "请输入備註",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "填報人員工號",
+              prop: "fillingNo",
+              addDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入填報人員工號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "填報人姓名",
+              prop: "fillingName",
+              addDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入填報人姓名",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "確認人員工號",
+              prop: "confirmNo",
+              hide: true,
+              addDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入確認人員工號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "確認人姓名",
+              prop: "confirmName",
+              hide: true,
+              addDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入確認人姓名",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "填報時間",
+              prop: "fillingDate",
+              addDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入填報日期及時間",
+                trigger: "blur"
+              }]
+            },
+
+            {
+              label: "確認人",
+              prop: "personName",
+              hide: true,
+              // addDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入審批人",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "確認人員工號",
+              prop: "personNo",
+              hide: true,
+              // addDisplay: false,
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "審批時間",
+              prop: "approveTime",
+              hide: true,
+              addDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入審批時間",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "節點",
+              prop: "process",
+              addDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入節點",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "是否已完成",
+              prop: "isCompleted",
+              hide: true,
+              addDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入是否已完成",
+                trigger: "blur"
+              }]
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.goodsuse_add, false),
+          viewBtn: this.vaildData(this.permission.goodsuse_view, false),
+          delBtn: this.vaildData(this.permission.goodsuse_delete, false),
+          editBtn: this.vaildData(this.permission.goodsuse_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      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) {
+        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) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      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;
+        params.process = 2;// 待确认
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

src/components/tobeconfirm/tobeconfirm-postchange.vue

@@ -0,0 +1,514 @@
+<template>
+  <basic-container>
+    <avue-crud :option="optionForm"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+
+      <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="menu" slot-scope="{row, index}">
+        <el-button size="small" class="el-button--text" @click="handleView(row, index)"><i class="el-icon-view"></i> 查 看</el-button>
+        <el-button size="small" class="el-button--text" v-if="permission.postchange_approve && row.process == 2" @click="approve(row, index)"><i class="el-icon-check"></i> 審 批</el-button>
+      </template>
+    </avue-crud>
+
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, getDictByCode} from "@/api/bank/postchange";
+  import {mapGetters} from "vuex";
+  import {getUserList} from "@/api/system/user";
+
+  export default {
+    name: "tobeconfirm-postchange",
+    data() {
+      return {
+        approveFlag: false,
+
+        form: {},
+        viewForm: {},
+        query: {},
+        loading: true,
+        settingVisible: false,
+        viewVisible: false,
+        personId: null,
+        personNo: null,
+        personName: null,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        userList: [],
+
+        optionForm: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: false,
+          addBtn: false,
+          editBtn: false,
+          delBtn: false,
+          selection: true,
+          dialogClickModal: false,
+          submitText: "確認",
+          column: [
+            {
+              label: "銀行號",
+              prop: "bankNo",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入銀行號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "機構號",
+              prop: "orgNo",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "请输入機構號",
+                trigger: "blur"
+              }]
+            },
+
+            {
+              label: "申請日期",
+              prop: "applyDate",
+              type: "datetime",
+              disabled: true,
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              rules: [{
+                required: true,
+                message: "请输入申請日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "生效日期",
+              prop: "effectiveDate",
+              type: "datetime",
+              disabled: true,
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              rules: [{
+                required: true,
+                message: "请输入生效日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "備註",
+              prop: "remark",
+              disabled: true,
+              rules: [{
+                required: false,
+                message: "请输入備註",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "进度",
+              prop: "process",
+              slot: true,
+              viewDisplay: false,
+              addDisplay: false,
+              editDisplay: false,
+            },
+          ],
+          group: [
+            {
+              label: "人員配置",
+              prop: "personSetting",
+              column: [
+                {
+                  label: "網點出納主管",
+                  prop: "director",
+                  type: "text",
+                  span: 4,
+                },
+                {
+                  label: "上期持有人",
+                  prop: "preholder1",
+                  span: 5,
+                  type: "select",
+                  multiple: true,
+                  props: {
+                    label: "text",
+                    value: "ehr"
+                  },
+                  rules: [{
+                    required: true,
+                    message: "请输入持有人",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "目前持有人",
+                  prop: "holder1",
+                  span: 5,
+                  type: "select",
+                  multiple: true,
+                  props: {
+                    label: "text",
+                    value: "ehr"
+                  },
+                  rules: [{
+                    required: true,
+                    message: "请输入持有人",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "上期後備人員",
+                  prop: "prebackupPerson1",
+                  span: 5,
+                  type: "select",
+                  multiple: true,
+                  props: {
+                    label: "text",
+                    value: "ehr"
+                  },
+
+                  rules: [{
+                    required: true,
+                    message: "请输入後備人員",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "目前後備人員",
+                  prop: "backupPerson1",
+                  span: 5,
+                  type: "select",
+                  multiple: true,
+                  props: {
+                    label: "text",
+                    value: "ehr"
+                  },
+
+                  rules: [{
+                    required: true,
+                    message: "请输入後備人員",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "網點出納專管員",
+                  prop: "manager",
+                  type: "text",
+                  span: 4,
+                },
+                {
+                  label: "上期持有人",
+                  prop: "preholder2",
+                  span: 5,
+                  type: "select",
+                  multiple: true,
+                  props: {
+                    label: "text",
+                    value: "ehr"
+                  },
+                  rules: [{
+                    required: true,
+                    message: "请输入持有人",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "目前持有人",
+                  prop: "holder2",
+                  span: 5,
+                  type: "select",
+                  multiple: true,
+                  props: {
+                    label: "text",
+                    value: "ehr"
+                  },
+                  rules: [{
+                    required: true,
+                    message: "请输入持有人",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "後備人員",
+                  prop: "prebackupPerson2",
+                  span: 5,
+                  type: "select",
+                  multiple: true,
+                  props: {
+                    label: "text",
+                    value: "ehr"
+                  },
+                  rules: [{
+                    required: true,
+                    message: "请输入後備人員",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "目前後備人員",
+                  prop: "backupPerson2",
+                  span: 5,
+                  type: "select",
+                  multiple: true,
+                  props: {
+                    label: "text",
+                    value: "ehr"
+                  },
+                  rules: [{
+                    required: true,
+                    message: "请输入後備人員",
+                    trigger: "blur"
+                  }]
+                },
+              ]
+            },
+          ],
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.postchange_add, false),
+          viewBtn: this.vaildData(this.permission.postchange_view, false),
+          delBtn: this.vaildData(this.permission.postchange_delete, false),
+          editBtn: this.vaildData(this.permission.postchange_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    created() {
+      const _this = this;
+      getUserList().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;
+        }
+        this.userList = data;
+        this.optionForm.group[0].column.forEach(item => {
+          if (item.prop.indexOf('holder') > -1 || item.prop.indexOf('backup') > -1){
+            item.dicData = data;
+          }
+          item.disabled = true;
+        })
+        this.initForm();
+      })
+    },
+    mounted() {
+    },
+    methods: {
+      approve(row, index){
+        this.approveFlag = true;
+        this.$refs.crud.rowEdit(row, index)
+      },
+      handleView(row, index){
+        this.viewForm = row;
+        this.$refs.crud.rowView(row, index)
+        getDetail(this.viewForm.id).then(res => {
+          let data = res.data.data;
+          let holder = JSON.parse(data.holder);
+          let backupPerson = JSON.parse(data.backupPerson);
+          Object.assign(data, holder, backupPerson)
+          this.viewForm = data;
+
+          this.viewForm.previousId && getDetail(this.viewForm.previousId).then(res => {
+            let preData = res.data.data;
+            let preholderStr = preData.holder.replaceAll('holder', 'preholder');
+            let prebackupPersonStr = preData.backupPerson.replaceAll('backupPerson', 'prebackupPerson');
+            let propreholder = JSON.parse(preholderStr);
+            let prebackupPerson = JSON.parse(prebackupPersonStr);
+            Object.assign(data, propreholder, prebackupPerson)
+            this.viewForm = data;
+          })
+        });
+        // this.viewForm = row;
+        // this.$refs.crud.rowView(row, index)
+      },
+
+      beforeOpen(done, type) {
+        getDetail(this.form.id).then(res => {
+          let data = res.data.data;
+          let holder = JSON.parse(data.holder);
+          let backupPerson = JSON.parse(data.backupPerson);
+          Object.assign(data, holder, backupPerson)
+          // this.option.group = this.groupView;
+          this.form = data;
+          if (this.form.previousId){
+            console.log(new Date().getTime())
+            getDetail(this.form.previousId).then(res => {
+              console.log(new Date().getTime())
+
+              let preData = res.data.data;
+              let preholderStr = preData.holder.replaceAll('holder', 'preholder');
+              let prebackupPersonStr = preData.backupPerson.replaceAll('backupPerson', 'prebackupPerson');
+              let propreholder = JSON.parse(preholderStr);
+              let prebackupPerson = JSON.parse(prebackupPersonStr);
+              Object.assign(data, propreholder, prebackupPerson)
+              console.log(new Date().getTime())
+
+              this.form = data;
+            })
+          }
+
+        });
+        done();
+      },
+      initForm(){
+        let holderObj = {
+          label: "持有人",
+          prop: "holder",
+          span: 11,
+          type: "select",
+          multiple: true,
+          dicData: this.userList,
+          props: {
+            label: "text",
+            value: "ehr"
+          },
+        }
+        let backupObj = {
+          label: "後備人員",
+          prop: "backupPerson",
+          span: 11,
+          type: "select",
+          multiple: true,
+          dicData: this.userList,
+          props: {
+            label: "text",
+            value: "ehr"
+          },
+        }
+
+        getDictByCode("cashier_key_type").then(res => {
+          const data = res.data.data;
+          let $groupView = this.optionForm.group;
+          data.forEach(item => {
+            let code = item.dictKey;
+            let value = item.dictValue;
+            let $item12 = {};
+            $item12.label = value;
+            let column12 = [];
+            getDictByCode(code).then(res2 => {
+              const data2 = res2.data.data;
+              data2.forEach(item2 => {
+                let $item2 = {}
+                let $item22 = {}
+                $item2.label = item2.dictValue;
+                $item22.label = item2.dictValue;
+                // $item2.prop = item2.dictKey;
+                $item2.type = 'text';
+                $item22.type = 'text';
+                $item2.span = 2;
+                $item22.span = 4;
+                column12.push($item22)
+                let holderItem = this.deepClone(holderObj);
+                let holderItem2 = this.deepClone(holderObj);
+                let backupItem = this.deepClone(backupObj);
+                let backupItem2 = this.deepClone(backupObj);
+                holderItem.prop = 'holder-' + item.dictKey + '-' + item2.dictKey;
+                holderItem2.prop = 'preholder-' + item.dictKey + '-' + item2.dictKey;
+                holderItem.span = 5;
+                holderItem2.span = 5;
+                // holderItem.label = '目前' + holderItem.label;
+                holderItem2.label = '上期' + holderItem2.label;
+                let h1 = this.deepClone(holderItem);
+                h1.span = 11;
+                column12.push(holderItem2)
+                column12.push(holderItem)
+                backupItem.prop = 'backupPerson-' + item.dictKey + '-' + item2.dictKey;
+                backupItem2.prop = 'prebackupPerson-' + item.dictKey + '-' + item2.dictKey;
+                backupItem.span = 5;
+                backupItem2.span = 5;
+                // backupItem.label = '目前' + backupItem.label;
+                backupItem2.label = '上期' + backupItem2.label;
+                let b1 = this.deepClone(backupItem);
+                b1.span = 11;
+                column12.push(backupItem2)
+                column12.push(backupItem)
+              })
+            });
+            $item12.column = column12;
+            $groupView.push($item12)
+            // this.optionForm.group = $groupView
+          })
+        });
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      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;
+        params.process = 2;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

src/components/tobeconfirm/tobeconfirm-returns.vue

@@ -0,0 +1,429 @@
+<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-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+      </template>
+      <template slot="menu" slot-scope="{row, index}">
+        <el-button size="small" class="el-button--text" v-if="permission.returns_view" @click="$refs.crud.rowView(row, index)"><i class="el-icon-view"></i> 查 看</el-button>
+        <el-button size="small" class="el-button--text" v-if="permission.returns_approve && row.process == 3" @click="approve(row, index)"><i class="el-icon-check"></i> 審 批</el-button>
+      </template>
+
+      <template slot="process" slot-scope="{row, index}">
+        <el-tag size="small " type="primary" plain v-if="row.process == 2">待發佈</el-tag>
+        <el-tag size="small " type="warning" plain v-if="row.process == 3">待確認</el-tag>
+        <el-tag size="small " type="success" plain v-if="row.process == 4">已確認</el-tag>
+      </template>
+    </avue-crud>
+
+    <el-dialog title="信息審核"
+               append-to-body
+               :visible.sync="approveVisible"
+               width="70%">
+      <returns-approve :form="approveForm" @close="approveVisible = false, onLoad(page)"></returns-approve>
+    </el-dialog>
+
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove, returnsSubmit, settingSave, getSetting} from "@/api/bank/returns";
+  import {mapGetters} from "vuex";
+  import {dateFormat} from "../../util/date";
+  import ReturnsComfire from "../../components/common/returns-comfire";
+  import ReturnsApprove from "../../components/common/returns-approve";
+  import FlowSettings from "../../components/common/flow-settings";
+  import ReturnsIssue from "../../components/common/returns-issue";
+
+  export default {
+    name: "tobeconfirm-returns",
+    components: {ReturnsIssue, FlowSettings, ReturnsApprove, ReturnsComfire},
+    data() {
+      return {
+        approveForm: {},
+        approveVisible: false,
+
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: false,
+          editBtn: false,
+          addBtn: false,
+          delBtn: false,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "業務類型",
+              prop: "isPublic",
+              type: "select",
+              dataType: "string",
+              dicUrl: `/api/blade-system/dict/dictionary?code=business_type`,
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: true,
+                message: "请输入業務類型",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "銀行號",
+              prop: "bankNo",
+              rules: [{
+                required: true,
+                message: "请输入銀行號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "機構號",
+              prop: "orgNo",
+              rules: [{
+                required: true,
+                message: "请输入機構號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "序號",
+              prop: "serialNo",
+              rules: [{
+                required: true,
+                message: "请输入序號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支行",
+              prop: "subBank",
+              rules: [{
+                required: true,
+                message: "请输入支行",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "客戶名稱",
+              prop: "customerName",
+              rules: [{
+                required: true,
+                message: "请输入客戶名稱",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "狀態",
+              prop: "status",
+              type: "select",
+              dataType: "string",
+              dicUrl: `/api/blade-system/dict/dictionary?code=returns_status`,
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: true,
+                message: "请输入狀態",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "退件原因",
+              prop: "reason",
+              rules: [{
+                required: true,
+                message: "请输入退件原因",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "備註",
+              prop: "remark",
+              rules: [{
+                required: true,
+                message: "请输入備註",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "條碼",
+              prop: "barCode",
+              rules: [{
+                required: true,
+                message: "请输入條碼",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "接辦行經辦",
+              prop: "handlingBank",
+              rules: [{
+                required: true,
+                message: "请输入接辦行經辦",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "接辦行覆核",
+              prop: "handlingBankReview",
+              rules: [{
+                required: true,
+                message: "请输入接辦行覆核",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "處理日期",
+              prop: "handlingDate",
+              type: "datetime",
+              format: "yyyy/MM/dd",
+              valueFormat: "yyyy/MM/dd",
+              rules: [{
+                required: true,
+                message: "请输入處理日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "經辦",
+              prop: "handler",
+              rules: [{
+                required: true,
+                message: "请输入經辦",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "處理狀態",
+              prop: "handlingStatus",
+              type: "select",
+              dataType: "string",
+              dicUrl: `/api/blade-system/dict/dictionary?code=processing_status`,
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              rules: [{
+                required: true,
+                message: "请输入處理狀態",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支行備註",
+              prop: "bankRemark",
+              viewDisplay: false,
+              editDisplay: false,
+              hide: true,
+              rules: [{
+                required: false,
+                message: "请输入支行備註",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支行確認人員工號",
+              prop: "bankConfirmNo",
+              viewDisplay: false,
+              editDisplay: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入支行確認人員工號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支行確認人姓名",
+              prop: "bankConfirmName",
+              viewDisplay: false,
+              editDisplay: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入支行確認人姓名",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "確認日期",
+              prop: "bankConfirmTime",
+              type: "datetime",
+              format: "yyyy-MM-dd HH:mm:ss",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+              viewDisplay: false,
+              editDisplay: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入確認日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "進度",
+              prop: "process",
+              viewDisplay: false,
+              editDisplay: false,
+              rules: [{
+                required: true,
+                message: "请输入節點",
+                trigger: "blur"
+              }]
+            },
+          ]
+        },
+        data: [],
+        data2: [],
+
+        temForm: {},
+        attachForm: {},
+        attachBox: false,
+        attachOption: {
+          submitBtn: false,
+          emptyBtn: false,
+          column: [
+            {
+              label: '文件上传',
+              prop: 'attachFile',
+              type: 'upload',
+              drag: true,
+              loadText: '文件上传中，请稍等',
+              span: 24,
+              propsHttp: {
+                res: 'data'
+              },
+              action: "/api/bank/returns/readExcel"
+            }
+          ]
+        }
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.returns_add, false),
+          viewBtn: this.vaildData(this.permission.returns_view, false),
+          delBtn: this.vaildData(this.permission.returns_delete, false),
+          editBtn: this.vaildData(this.permission.returns_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      approve(row, index){
+        this.approveVisible = true;
+        this.approveForm = row;
+      },
+      infoFormat(row){
+        row.isPublic = row.isPublic == '對公' ? 1 : 0;
+        let arr = row.subBank.split(' ');
+        row.subOrgNo = arr[0];
+        row.subBank = arr[1];
+        if (row.status == '退件'){
+          row.status = '1';
+        }else if (row.status == 'HOLD'){
+          row.status = '2';
+        }else if (row.status == '完成'){
+          row.status = '3';
+        }
+        return row;
+      },
+
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+          if (type == "view"){
+            this.findObject(this.option.column, "bankRemark").viewDisplay = this.form.process == 3;
+            this.findObject(this.option.column, "bankConfirmNo").viewDisplay = this.form.process == 3;
+            this.findObject(this.option.column, "bankConfirmName").viewDisplay = this.form.process == 3;
+            this.findObject(this.option.column, "bankConfirmTime").viewDisplay = this.form.process == 3;
+          }
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      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;
+        params.process = 3; //待確認
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

src/main.js

@@ -41,6 +41,8 @@ Vue.component('basicContainer', basicContainer);
 Vue.component('basicBlock', basicBlock);
 Vue.component('thirdRegister', thirdRegister);
 Vue.component('avueUeditor', avueUeditor);
+import * as echarts from 'echarts'
+Vue.prototype.$echarts = echarts;
 // 加载相关url地址
 Object.keys(urls).forEach(key => {
   Vue.prototype[key] = urls[key];
@@ -60,3 +62,4 @@ new Vue({
   i18n,
   render: h => h(App)
 }).$mount('#app');
+

src/views/bank/checkwarehouse.vue

@@ -40,6 +40,7 @@
   import { getCurrentDept } from "@/api/system/dept";
   import {dateFormat} from "@/util/date";
   import SelectDialogUser from "@/components/select-dialog/select-dialog-user";
+  import {getDeptTree} from "@/api/system/dept";
 
   export default {
     components: {SelectDialogUser},
@@ -73,6 +74,8 @@
               label: "銀行號",
               prop: "bankNo",
               disabled: true,
+              search: true,
+              searchSpan: 4,
               rules: [{
                 required: true,
                 message: "请输入銀行號",
@@ -89,6 +92,44 @@
                 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: "checkTimeRange",
+              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: "checkTimeBegin",
@@ -117,6 +158,9 @@
               label: "檢查單位",
               prop: "checkUnit",
               type: "select",
+              search: true,
+              searchSpan: 4,
+              searchMultiple: true,
               dicUrl: "/api/blade-system/dict/dictionary?code=unit_type",
               props:{
                 label: "dictValue",
@@ -156,6 +200,9 @@
               label: "檢查內容",
               prop: "checkContent",
               type: "select",
+              search: true,
+              searchSpan: 4,
+              searchMultiple: true,
               dicUrl: "/api/blade-system/dict/dictionary?code=check_content_warehouse",
               props:{
                 label: "dictValue",
@@ -268,6 +315,12 @@
         return ids.join(",");
       },
     },
+    mounted() {
+      getDeptTree().then(res => {
+        const column = this.findObject(this.option.column, "orgNos");
+        column.dicData = res.data.data;
+      });
+    },
     methods: {
       selectCallback(value){
         this.form.checkPersonNo = value.ehr;
@@ -363,6 +416,20 @@
         this.onLoad(this.page);
       },
       searchChange(params, done) {
+        if (params.checkUnit){
+          params.checkUnit = params.checkUnit.join();
+        }
+        if (params.checkContent){
+          params.checkContent = params.checkContent.join();
+        }
+        if (params.orgNos){
+          params.orgNos = params.orgNos.join();
+        }
+        if (params.checkTimeRange){
+          params.checkTime_begin = params.checkTimeRange[0], params.checkTime_end = params.checkTimeRange[1];
+          params.checkTimeRange = null;
+        }
+
         this.query = params;
         this.page.currentPage = 1;
         this.onLoad(this.page, params);

src/views/bank/keypwd.vue

@@ -180,7 +180,7 @@
               search: true,
               rules: [{
                 required: true,
-                message: "请输入通知时间",
+                message: "请输入交接日期",
                 trigger: "blur"
               }]
             },
@@ -247,11 +247,13 @@
                 trigger: "blur"
               }]
             },
-
-
             {
               label: "接收人",
               prop: "receiverName",
+              search: true,
+              searchPlaceholder: "保管人",
+              searchTip: "保管人",
+              searchSpan: 4,
               formslot:  true,
               rules: [{
                 required: true,

src/views/bank/postchange.vue

@@ -63,6 +63,7 @@
   import SelectDialogUser from "../../components/select-dialog/select-dialog-user";
   import FlowSettings from "../../components/common/flow-settings";
   import {getUserList} from "@/api/system/user";
+  import {getDeptTree} from "@/api/system/dept";
 
   export default {
     components: {FlowSettings},
@@ -105,6 +106,8 @@
               label: "銀行號",
               prop: "bankNo",
               disabled: true,
+              search: true,
+              searchSpan: 4,
               rules: [{
                 required: true,
                 message: "请输入銀行號",
@@ -115,6 +118,14 @@
               label: "機構號",
               prop: "orgNo",
               disabled: true,
+              search: true,
+              searchSpan: 4,
+              type: "tree",
+              dicData: [],
+              props: {
+                label: "key",
+                value: "key"
+              },
               rules: [{
                 required: true,
                 message: "请输入機構號",
@@ -135,6 +146,24 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "生效日期",
+              prop: "effectiveDateRange",
+              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: "effectiveDate",
@@ -160,7 +189,9 @@
               label: "进度",
               prop: "process",
               // slot: true,
-              display: true
+              viewDisplay: false,
+              addDisplay: false,
+              editDisplay: false,
             },
           ],
         },
@@ -509,6 +540,10 @@
       })
     },
     mounted() {
+      getDeptTree().then(res => {
+        const column = this.findObject(this.option.column, "orgNo");
+        column.dicData = res.data.data;
+      });
     },
     methods: {
       approveSubmit(row){
@@ -538,11 +573,8 @@
         // this.$refs.crudView.rowView(row, index)
       },
       approve(row, index){
-        // this.approveVisible = true;
-        // this.approveForm = row;
         this.approveFlag = true;
         this.$refs.crud.rowEdit(row, index)
-
       },
       settingCallback(row){
         this.form.personId = row.personId;
@@ -823,6 +855,12 @@
         this.onLoad(this.page);
       },
       searchChange(params, done) {
+
+        if (params.effectiveDateRange){
+          params.effectiveDate_begin = params.effectiveDateRange[0], params.effectiveDate_end = params.effectiveDateRange[1];
+          params.effectiveDateRange = null;
+        }
+
         this.query = params;
         this.page.currentPage = 1;
         this.onLoad(this.page, params);

src/views/bank/returns.vue

@@ -33,17 +33,26 @@
                    v-if="permission.returns_upload"
                    @click="handleUpload">上 傳
         </el-button>
+        <el-button type="success"
+                   size="small"
+                   icon="el-icon-setting"
+                   plain
+                   v-if="permission.returns_setting"
+                   @click="handleSetting">設置發佈人
+        </el-button>
       </template>
       <template slot="menu" slot-scope="{row, index}">
         <el-button size="small" class="el-button--text" v-if="permission.returns_delete && row.process <= 2" @click="$refs.crud.rowDel(row, index)"><i class="el-icon-delete"></i> 刪 除</el-button>
         <el-button size="small" class="el-button--text" v-if="permission.returns_view" @click="$refs.crud.rowView(row, index)"><i class="el-icon-view"></i> 查 看</el-button>
         <el-button size="small" class="el-button--text" v-if="permission.returns_edit && row.process <= 2" @click="$refs.crud.rowEdit(row, index)"><i class="el-icon-edit"></i> 编 辑</el-button>
-        <el-button size="small" class="el-button--text" v-if="permission.returns_approve && row.process == 2" @click="approve(row, index)"><i class="el-icon-check"></i> 審 批</el-button>
+        <el-button size="small" class="el-button--text" v-if="permission.returns_issue && row.process == 2" @click="form = row,issueVisible = true">去發佈</el-button>
+        <el-button size="small" class="el-button--text" v-if="permission.returns_approve && row.process == 3" @click="approve(row, index)"><i class="el-icon-check"></i> 審 批</el-button>
       </template>
 
       <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>
+        <el-tag size="small " type="primary" plain v-if="row.process == 2">待發佈</el-tag>
+        <el-tag size="small " type="warning" plain v-if="row.process == 3">待確認</el-tag>
+        <el-tag size="small " type="success" plain v-if="row.process == 4">已確認</el-tag>
       </template>
     </avue-crud>
 
@@ -72,20 +81,36 @@
       <returns-approve :form="approveForm" @close="approveVisible = false, onLoad(page)"></returns-approve>
     </el-dialog>
 
+    <el-dialog :append-to-body="true" :modal-append-to-body="false" :visible.sync="settingVisible" title="設置發佈人">
+      <flow-settings :id="personId" :ehr="personNo" :name="personName" :callback="settingCallback" @close="settingVisible = false"></flow-settings>
+    </el-dialog>
+
+    <el-dialog :append-to-body="true" :modal-append-to-body="false" :visible.sync="issueVisible">
+      <returns-issue :form="form" @close="issueVisible = false, onLoad(page)"></returns-issue>
+    </el-dialog>
+
   </basic-container>
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove, returnsSubmit} from "@/api/bank/returns";
+  import {getList, getDetail, add, update, remove, returnsSubmit, settingSave, getSetting} from "@/api/bank/returns";
   import {mapGetters} from "vuex";
   import {dateFormat} from "../../util/date";
   import ReturnsComfire from "../../components/common/returns-comfire";
   import ReturnsApprove from "../../components/common/returns-approve";
+  import FlowSettings from "../../components/common/flow-settings";
+  import ReturnsIssue from "../../components/common/returns-issue";
 
   export default {
-    components: {ReturnsApprove, ReturnsComfire},
+    components: {ReturnsIssue, FlowSettings, ReturnsApprove, ReturnsComfire},
     data() {
       return {
+        personId: null,
+        personNo: null,
+        personName: null,
+        settingVisible: false,
+        issueVisible: false,
+
         form: {},
         approveForm: {},
         query: {},
@@ -381,6 +406,31 @@
       }
     },
     methods: {
+      settingCallback(row){
+        this.form.personId = row.personId;
+        this.form.personNo = row.personNo;
+        this.form.personName = row.personName;
+        settingSave(this.form).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        }, error => {
+          window.console.log('error');
+        });
+      },
+      handleSetting(){
+        getSetting().then((res) => {
+          let data = res.data.data;
+          if (!!data){
+            this.personId = data.personId;
+            this.personNo = data.personNo;
+            this.personName = data.personName;
+          }
+        });
+        this.settingVisible = true;
+      },
       approve(row, index){
         this.approveVisible = true;
         this.approveForm = row;

src/views/bank/sealhandover.vue

@@ -8,6 +8,7 @@
                :before-open="beforeOpen"
                v-model="form"
                ref="crud"
+               :search.sync="search"
                @row-update="rowUpdate"
                @row-save="rowSave"
                @row-del="rowDel"
@@ -33,6 +34,11 @@
       <template slot="handoverPersonNameForm">
         <select-dialog-user :name="form.handoverPersonName" :ehr="form.handoverPersonNo" :disabled="true" :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>
     </avue-crud>
   </basic-container>
 </template>
@@ -43,11 +49,14 @@
   import { getCurrentDept } from "@/api/system/dept";
   import {dateFormat} from "../../util/date";
   import SelectDialogUser from "../../components/select-dialog/select-dialog-user";
+  import {getDeptTree} from "@/api/system/dept";
 
   export default {
     components: {SelectDialogUser},
     data() {
       return {
+        search: {},
+
         form: {},
         query: {},
         loading: true,
@@ -73,6 +82,8 @@
               label: "銀行號",
               prop: "bankNo",
               disabled: true,
+              search: true,
+              searchSpan: 4,
               rules: [{
                 required: true,
                 message: "请输入銀行號",
@@ -98,6 +109,8 @@
                 label: "dictValue",
                 value: "dictKey",
               },
+              search: true,
+              searchMultiple: true,
               rules: [{
                 required: true,
                 message: "请输入印章類型",
@@ -107,6 +120,9 @@
             {
               label: "印章編號",
               prop: "sealNo",
+              search: true,
+              searchSpan: 4,
+              searchslot: true,
               change: ({value, column}) => {
                 if (!value) return;
                 getByNoAndType(value, this.form.sealType, this.form.orgNo).then(res => {
@@ -129,6 +145,27 @@
                 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",
@@ -164,6 +201,10 @@
             {
               label: "接收人",
               prop: "receiverName",
+              search: true,
+              searchPlaceholder: "保管人",
+              searchTip: "保管人",
+              searchSpan: 4,
               formslot: true,
               rules: [{
                 required: true,
@@ -171,6 +212,24 @@
                 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",
@@ -234,6 +293,12 @@
         return ids.join(",");
       }
     },
+    created() {
+      getDeptTree().then(res => {
+        const column = this.findObject(this.option.column, "orgNos");
+        column.dicData = res.data.data;
+      });
+    },
     methods: {
       handoverSelectCallback(value){
         this.form.handoverPersonNo = value.ehr;
@@ -332,6 +397,17 @@
         this.onLoad(this.page);
       },
       searchChange(params, done) {
+        if (params.sealType){
+          params.sealType = params.sealType.join();
+        }
+        if (params.orgNos){
+          params.orgNos = params.orgNos.join();
+        }
+        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);

src/views/bank/tellertrunk.vue

@@ -40,7 +40,7 @@
   import { getCurrentDept } from "@/api/system/dept";
   import {dateFormat} from "../../util/date";
   import SelectDialogUser from "../../components/select-dialog/select-dialog-user";
-
+  import {getDeptTree} from "@/api/system/dept";
 
   export default {
     components: {SelectDialogUser},
@@ -71,6 +71,8 @@
               label: "銀行號",
               prop: "bankNo",
               disabled: true,
+              search: true,
+              searchSpan: 4,
               rules: [{
                 required: true,
                 message: "请输入銀行號",
@@ -87,10 +89,51 @@
                 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: "checkTimeRange",
+              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: "checkContent",
               type: "select",
+              search: true,
+              searchSpan: 4,
+              searchMultiple: true,
               dicUrl: "/api/blade-system/dict/dictionary?code=check_content_tellertrunk",
               props:{
                 label: "dictValue",
@@ -130,6 +173,9 @@
               label: "檢查單位",
               prop: "checkUnit",
               type: "select",
+              search: true,
+              searchSpan: 4,
+              searchMultiple: true,
               dicUrl: "/api/blade-system/dict/dictionary?code=unit_type",
               props:{
                 label: "dictValue",
@@ -294,6 +340,12 @@
         return ids.join(",");
       }
     },
+    mounted() {
+      getDeptTree().then(res => {
+        const column = this.findObject(this.option.column, "orgNos");
+        column.dicData = res.data.data;
+      });
+    },
     methods: {
       selectCallback(value){
         this.form.checkPersonNo = value.ehr;
@@ -388,6 +440,20 @@
         this.onLoad(this.page);
       },
       searchChange(params, done) {
+        if (params.checkUnit){
+          params.checkUnit = params.checkUnit.join();
+        }
+        if (params.checkContent){
+          params.checkContent = params.checkContent.join();
+        }
+        if (params.orgNos){
+          params.orgNos = params.orgNos.join();
+        }
+        if (params.checkTimeRange){
+          params.checkTime_begin = params.checkTimeRange[0], params.checkTime_end = params.checkTimeRange[1];
+          params.checkTimeRange = null;
+        }
+
         this.query = params;
         this.page.currentPage = 1;
         this.onLoad(this.page, params);

src/views/desk/confirmed.vue

@@ -0,0 +1,57 @@
+<template>
+  <basic-container>
+    <el-tabs type="border-card">
+      <el-tab-pane label="網點出納主管及專管員崗位表更">
+        <confirmed-postchange></confirmed-postchange>
+      </el-tab-pane>
+      <el-tab-pane label="網點各項憑證/實物使用及出入庫">
+        <tobeconfirm-goodsuse></tobeconfirm-goodsuse>
+        <confirmed-goodsuse></confirmed-goodsuse>
+      </el-tab-pane>
+      <el-tab-pane label="新開戶退件登記表">
+        <confirmed-returns></confirmed-returns>
+      </el-tab-pane>
+    </el-tabs>
+  </basic-container>
+</template>
+
+<script>
+  import {mapGetters} from "vuex";
+  import ConfirmedPostchange from "@/components/confirmed/confirmed-postchange";
+  import ConfirmedGoodsuse from "@/components/confirmed/confirmed-goodsuse";
+  import ConfirmedReturns from "../../components/confirmed/confirmed-returns";
+
+  export default {
+    components: {ConfirmedReturns, ConfirmedGoodsuse, ConfirmedPostchange},
+    data() {
+      return {
+
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.notice_add, false),
+          viewBtn: this.vaildData(this.permission.notice_view, false),
+          delBtn: this.vaildData(this.permission.notice_delete, false),
+          editBtn: this.vaildData(this.permission.notice_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+
+    }
+  };
+</script>
+
+<style>
+</style>

src/views/desk/initiated.vue

@@ -1,10 +1,10 @@
 <template>
   <basic-container>
     <el-tabs type="border-card">
-      <el-tab-pane label="網點出納主管及專管員崗位表更記錄表">
+      <el-tab-pane label="網點出納主管及專管員崗位表更">
         <init-postchange></init-postchange>
       </el-tab-pane>
-      <el-tab-pane label="使用及出入庫登記表">
+      <el-tab-pane label="網點各項憑證/實物使用及出入庫">
         <init-goodsuse></init-goodsuse>
       </el-tab-pane>
       <el-tab-pane label="新開戶退件登記表">
@@ -21,9 +21,8 @@
 </template>
 
 <script>
-  import {getList, remove, update, add, getNotice} from "@/api/desk/notice";
   import {mapGetters} from "vuex";
-  import InitPostchange from "@/components/initiated/init-postchange";
+  import InitPostchange from "../../components/initiated/init-postchange";
   import InitGoodsuse from "../../components/initiated/init-goodsuse";
   import InitReturns from "../../components/initiated/init-returns";
   import InitCardswallow from "../../components/initiated/init-cardswallow";
@@ -56,128 +55,7 @@
       }
     },
     methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          window.console.log(error);
-          loading();
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      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) {
-        if (["edit", "view"].includes(type)) {
-          getNotice(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      currentChange(currentPage) {
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize) {
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        const {releaseTimeRange} = this.query;
-        let values = {
-          ...params,
-        };
-        if (releaseTimeRange) {
-          values = {
-            ...params,
-            releaseTime_datege: releaseTimeRange[0],
-            releaseTime_datelt: releaseTimeRange[1],
-            ...this.query
-          };
-          values.releaseTimeRange = null;
-        }
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, values).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      }
+
     }
   };
 </script>

src/views/desk/tobeconfirm.vue

@@ -0,0 +1,56 @@
+<template>
+  <basic-container>
+    <el-tabs type="border-card">
+      <el-tab-pane label="網點出納主管及專管員崗位表更">
+        <tobeconfirm-postchange></tobeconfirm-postchange>
+      </el-tab-pane>
+      <el-tab-pane label="網點各項憑證/實物使用及出入庫">
+        <tobeconfirm-goodsuse></tobeconfirm-goodsuse>
+      </el-tab-pane>
+      <el-tab-pane label="新開戶退件登記表">
+        <tobeconfirm-returns></tobeconfirm-returns>
+      </el-tab-pane>
+    </el-tabs>
+  </basic-container>
+</template>
+
+<script>
+  import {mapGetters} from "vuex";
+  import TobeconfirmPostchange from "../../components/tobeconfirm/tobeconfirm-postchange";
+  import TobeconfirmGoodsuse from "../../components/tobeconfirm/tobeconfirm-goodsuse";
+  import TobeconfirmReturns from "../../components/tobeconfirm/tobeconfirm-returns";
+
+  export default {
+    components: {TobeconfirmReturns, TobeconfirmGoodsuse, TobeconfirmPostchange},
+    data() {
+      return {
+
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.notice_add, false),
+          viewBtn: this.vaildData(this.permission.notice_view, false),
+          delBtn: this.vaildData(this.permission.notice_delete, false),
+          editBtn: this.vaildData(this.permission.notice_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+
+    }
+  };
+</script>
+
+<style>
+</style>

src/views/desk/toberelease.vue

@@ -0,0 +1,53 @@
+<template>
+  <basic-container>
+    <el-tabs type="border-card">
+      <el-tab-pane label="新開戶退件登記表">
+        <release-returns></release-returns>
+      </el-tab-pane>
+      <el-tab-pane label="自助設備吞沒卡處理">
+        <init-cardswallow></init-cardswallow>
+        <release-cardswallow></release-cardswallow>
+      </el-tab-pane>
+    </el-tabs>
+  </basic-container>
+</template>
+
+<script>
+  import {mapGetters} from "vuex";
+  import ReleaseReturns from "../../components/release/release-returns";
+  import ReleaseCardswallow from "../../components/release/release-cardswallow";
+
+  export default {
+    components: {ReleaseCardswallow, ReleaseReturns},
+    data() {
+      return {
+
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.notice_add, false),
+          viewBtn: this.vaildData(this.permission.notice_view, false),
+          delBtn: this.vaildData(this.permission.notice_delete, false),
+          editBtn: this.vaildData(this.permission.notice_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+
+    }
+  };
+</script>
+
+<style>
+</style>

src/views/wel/index.vue

@@ -2,8 +2,24 @@
   <div>
     <el-row>
       <el-col :span="24">
-        <basic-container>
-          <avue-data-rotate :option="option"></avue-data-rotate>
+        <basic-container v-if="permission.home_front">
+          <avue-data-rotate :option="optionFront"></avue-data-rotate>
+        </basic-container>
+        <basic-container v-if="permission.home_manage">
+          <el-row>
+            <el-col :span="8">
+              <div id="chartDay" :style="{width: '400px', height: '400px'}"></div>
+            </el-col>
+            <el-col :span="8">
+              <div id="chartWeek" :style="{width: '400px', height: '400px'}"></div>
+            </el-col>
+            <el-col :span="8">
+              <div id="chartMonth" :style="{width: '400px', height: '400px'}"></div>
+            </el-col>
+          </el-row>
+        </basic-container>
+        <basic-container v-if="permission.home_backgr">
+          <avue-data-rotate :option="optionBackgr"></avue-data-rotate>
         </basic-container>
       </el-col>
     </el-row>
@@ -13,46 +29,240 @@
 
 <script>
   import {mapGetters} from "vuex";
-  import {getMyInitiated} from "@/api/bank/home";
+  import {getMyInitiated, getToBoReleased, getToBeConfirmed, getMyConfirmation} from "@/api/bank/home";
+
 
   export default {
     name: "wel",
     data() {
       return {
-        activeNames: ['1', '2', '3', '5'],
-        logActiveNames: ['23'],
-        option: {
+        initiatedCount: 0,
+        releaseCount: 0,
+        tobeconfirmCount: 0,
+        confirmedCount: 0,
+        optionFront: {
           span: 8,
           data: [
             {
+              click: (item) => {
+                this.$router.push({path: "/desk/initiated"})
+              },
+              count: 0,
+              title: '我的發起',
+              icon: 'el-icon-warning',
+              color: '#409eff'
+            }, {
               click: function (item) {
                 alert(JSON.stringify(item));
-                getMyInitiated().then(res => {
-                  debugger
-                })
-
-
               },
-              count: '150',
-              title: '新订单',
+              count: '53%',
+              title: '待確認',
+              display: false,
+              icon: 'el-icon-view',
+              color: '#f39c12'
+            }, {
+              click: function (item) {
+                alert(JSON.stringify(item));
+              },
+              count: '44',
+              title: '我的確認',
+              icon: 'el-icon-setting',
+              color: '#5daf34'
+            }
+          ]
+        },
+        optionManage: {
+          span: 8,
+          data: [
+            {
+              click: (item) => {
+                this.$router.push({path: "/desk/initiated"})
+              },
+              count: 0,
+              title: '每日',
               icon: 'el-icon-warning',
               color: 'rgb(49, 180, 141)'
             }, {
               click: function (item) {
                 alert(JSON.stringify(item));
               },
-              count: '53%',
-              title: '跳出率',
+              count: '0',
+              title: '每週',
               icon: 'el-icon-view',
               color: '#00a65a'
             }, {
               click: function (item) {
                 alert(JSON.stringify(item));
               },
-              count: '44',
-              title: '用户注册数',
+              count: '0',
+              title: '每月',
+              display: false,
+              icon: 'el-icon-view',
+              color: '#00a65a'
+            }
+          ]
+        },
+        optionBackgr: {
+          span: 8,
+          data: [
+            {
+              click: (item) => {
+                this.$router.push({path: "/desk/initiated"})
+              },
+              count: 0,
+              title: '每日',
+              icon: 'el-icon-warning',
+              color: 'rgb(49, 180, 141)'
+            }, {
+              click: function (item) {
+                alert(JSON.stringify(item));
+              },
+              count: '0',
+              title: '每週',
+              icon: 'el-icon-view',
+              color: '#00a65a'
+            }, {
+              click: function (item) {
+                alert(JSON.stringify(item));
+              },
+              count: '0',
+              title: '每月',
+              display: false,
+              icon: 'el-icon-view',
+              color: '#00a65a'
+            }, {
+              click: function (item) {
+                alert(JSON.stringify(item));
+              },
+              count: '0',
+              title: '異常報表',
               icon: 'el-icon-setting',
               color: '#f39c12'
+            },{
+              click: (item) => {
+                this.$router.push({path: "/desk/initiated"})
+              },
+              count: 0,
+              title: '我的發起',
+              icon: 'el-icon-warning',
+              color: 'rgb(49, 180, 141)'
+            }, {
+              click: function (item) {
+                alert(JSON.stringify(item));
+              },
+              count: '0',
+              title: '待發佈',
+              display: false,
+              icon: 'el-icon-view',
+              color: '#00a65a'
+            }
+          ]
+        },
+        option1: {
+          title: {
+            text: '每日监控图表',
+            subtext: '纯属虚构',
+            left: 'center'
+          },
+          tooltip: {
+            trigger: 'item'
+          },
+          legend: {
+            orient: 'vertical',
+            left: 'left',
+          },
+          series: [
+            {
+              name: '每日',
+              type: 'pie',
+              radius: '50%',
+              data: [
+                {value: 484, name: '未完成', color: 'red'},
+                {value: 316, name: '已完成'}
+              ],
+              itemStyle: {
+                normal:{
+                  color:function(params) {
+                    //自定义颜色
+                    var colorList = [
+                      'red', 'lightgreen'
+                    ];
+                    return colorList[params.dataIndex]
+                  }
+                }
+              },
+            }
+          ]
+        },
+        option2: {
+          title: {
+            text: '每周监控图表',
+            subtext: '纯属虚构',
+            left: 'center'
+          },
+          tooltip: {
+            trigger: 'item'
+          },
+          legend: {
+            orient: 'vertical',
+            left: 'left',
+          },
+          series: [
+            {
+              name: '每日',
+              type: 'pie',
+              radius: '50%',
+              data: [
+                {value: 484, name: '未完成', color: 'red'},
+                {value: 316, name: '已完成'}
+              ],
+              itemStyle: {
+                normal:{
+                  color:function(params) {
+                    //自定义颜色
+                    var colorList = [
+                      'red', 'lightgreen'
+                    ];
+                    return colorList[params.dataIndex]
+                  }
+                }
+              },
+            }
+          ]
+        },
+        option3: {
+          title: {
+            text: '每月监控图表',
+            subtext: '纯属虚构',
+            left: 'center'
+          },
+          tooltip: {
+            trigger: 'item'
+          },
+          legend: {
+            orient: 'vertical',
+            left: 'left',
+          },
+          series: [
+            {
+              name: '每日',
+              type: 'pie',
+              radius: '50%',
+              data: [
+                {value: 484, name: '未完成', color: 'red'},
+                {value: 316, name: '已完成'}
+              ],
+              itemStyle: {
+                normal:{
+                  color:function(params) {
+                    //自定义颜色
+                    var colorList = [
+                      'red', 'lightgreen'
+                    ];
+                    return colorList[params.dataIndex]
+                  }
+                }
+              },
             }
           ]
         },
@@ -60,10 +270,41 @@
     },
     computed: {
       ...mapGetters(["userInfo"]),
+      ...mapGetters(["permission"]),
+    },
+    created() {
+      getMyInitiated().then(res => {
+        const initiatedCount = res.data.data;
+        this.optionFront.data[0].count = initiatedCount;
+      })
+      getToBoReleased().then(res => {
+        const tobeReleaseCount = res.data.data;
+        // this.option.data[1].count = tobeReleaseCount;
+      });
+      getToBeConfirmed().then(res => {
+        const tobeConfirmedCount = res.data.data;
+        this.optionFront.data[1].count = tobeConfirmedCount;
+      });
+      getMyConfirmation().then(res => {
+        const confirmedCount = res.data.data;
+        this.optionFront.data[2].count = confirmedCount;
+      });
+    },
+    mounted() {
+      this.drawLine()
     },
     methods: {
       handleChange(val) {
         window.console.log(val);
+      },
+      drawLine(){
+        // 基于准备好的dom，初始化echarts实例
+        let chartDay = this.$echarts.init(document.getElementById('chartDay'))
+        chartDay.setOption(this.option1);
+        let chartWeek = this.$echarts.init(document.getElementById('chartWeek'))
+        chartWeek.setOption(this.option2);
+        let chartMonth = this.$echarts.init(document.getElementById('chartMonth'))
+        chartMonth.setOption(this.option3);
       }
     },
   };

vue.config.js

@@ -22,11 +22,11 @@ module.exports = {
   },
   //开发模式反向代理配置，生产模式请使用Nginx部署并配置反向代理
   devServer: {
-    port: 1888,
+    port: 8080,
     proxy: {
       '/api': {
         //本地服务接口地址
-        target: 'http://localhost:8527',
+        target: 'http://localhost:8090',
         //远程演示服务地址,可用于直接启动项目
         //target: 'https://saber.bladex.vip/api',
         ws: true,