简单流程基本功能

src/api/bank/cardswallow.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/bank/cardswallow/list',
+    url: '/api/bank/cardswallow/page',
     method: 'get',
     params: {
       ...params,
@@ -48,3 +48,44 @@ export const update = (row) => {
   })
 }
 
+export const settingSave = (row) => {
+  return request({
+    url: '/api/bank/cardswallow/settingSave',
+    method: 'post',
+    data: row
+  })
+}
+
+export const getSetting = () => {
+  return request({
+    url: '/api/bank/cardswallow/getSetting',
+    method: 'get',
+    params: {
+    }
+  })
+}
+
+
+export const cardswallowSubmit = (row) => {
+  return request({
+    url: '/api/bank/cardswallow/cardswallowSubmit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const issue = (row) => {
+  return request({
+    url: '/api/bank/cardswallow/issue',
+    method: 'post',
+    data: row
+  })
+}
+
+export const signin = (row) => {
+  return request({
+    url: '/api/bank/cardswallow/signin',
+    method: 'post',
+    data: row
+  })
+}

src/api/bank/checklist.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/bank/checklist/list',
+    url: '/api/bank/checklist/page',
     method: 'get',
     params: {
       ...params,

src/api/bank/checkwarehouse.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/bank/checkwarehouse/list',
+    url: '/api/bank/checkwarehouse/page',
     method: 'get',
     params: {
       ...params,

src/api/bank/goodsuse.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/bank/goodsuse/list',
+    url: '/api/bank/goodsuse/page',
     method: 'get',
     params: {
       ...params,

src/api/bank/message.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/bank/message/list',
+    url: '/api/bank/message/page',
     method: 'get',
     params: {
       ...params,

src/api/bank/postchange.js

@@ -32,15 +32,15 @@ export const remove = (ids) => {
   })
 }
 
-export const settingSave = (row) => {
+export const add = (row) => {
   return request({
-    url: '/api/bank/postchange/settingSave',
+    url: '/api/bank/postchange/submit',
     method: 'post',
     data: row
   })
 }
 
-export const add = (row) => {
+export const update = (row) => {
   return request({
     url: '/api/bank/postchange/submit',
     method: 'post',
@@ -48,9 +48,10 @@ export const add = (row) => {
   })
 }
 
-export const update = (row) => {
+
+export const settingSave = (row) => {
   return request({
-    url: '/api/bank/postchange/submit',
+    url: '/api/bank/postchange/settingSave',
     method: 'post',
     data: row
   })
@@ -64,3 +65,10 @@ export const getSetting = () => {
     }
   })
 }
+
+export const getDictByCode = (code) => {
+  return request({
+    url: '/api/blade-system/dict/dictionary?code=' + code,
+    method: 'get',
+  })
+}

src/api/bank/returns.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/bank/returns/list',
+    url: '/api/bank/returns/page',
     method: 'get',
     params: {
       ...params,
@@ -48,3 +48,21 @@ export const update = (row) => {
   })
 }
 
+export const returnsSubmit = (row) => {
+  return request({
+    url: '/api/bank/returns/returnsSubmit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const returnsApprove = (row) => {
+  return request({
+    url: '/api/bank/returns/returnsApprove',
+    method: 'post',
+    data: row
+  })
+}
+
+
+

src/api/bank/sealhandover.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/bank/sealhandover/list',
+    url: '/api/bank/sealhandover/page',
     method: 'get',
     params: {
       ...params,

src/api/bank/tellertrunk.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/bank/tellertrunk/list',
+    url: '/api/bank/tellertrunk/page',
     method: 'get',
     params: {
       ...params,

src/components/common/cardswallow-comfirm.vue

@@ -0,0 +1,205 @@
+<template>
+  <div>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               @row-update="infoSubmit"
+               @row-del="removeItem"
+               v-model="form"
+               ref="crud2">
+    </avue-crud>
+  </div>
+</template>
+
+<script>
+  import {cardswallowSubmit} from "@/api/bank/cardswallow";
+
+  export default {
+    name: "cardswallow-comfirm",
+    data(){
+      return {
+        loading: false,
+        data: [],
+        form: {},
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: false,
+          searchShowBtn: false,
+          columnBtn: false,
+          refreshBtn: false,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: false,
+          editBtn: true,
+          addBtn: 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",
+              type: "datetime",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              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",
+              type: "datetime",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              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"
+              }]
+            },
+
+          ]
+        }
+      }
+    },
+    props: {
+      data: {
+        type: Array
+      },
+
+    },
+    mounted() {
+    },
+    methods: {
+      infoSubmit(row, index, done, loading){
+        cardswallowSubmit(row).then(() => {
+          this.data.splice(index, 1);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          loading = false;
+          done();
+        });
+      },
+      removeItem(row, index){
+        this.data.splice(index, 1)
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/components/common/cardswallow-issue.vue

@@ -0,0 +1,138 @@
+<template>
+  <div>
+    <avue-form :option="option" @submit="submit" v-model="form" ref="form"></avue-form>
+  </div>
+</template>
+
+<script>
+  import {issue, signin} from "@/api/bank/cardswallow";
+
+  export default {
+    name: "cardswallow-issue",
+    data(){
+      return {
+        form: {},
+        option: {
+          submitText: "發佈",
+          emptyBtn: false,
+          column: [
+            {
+              label: "銀行號",
+              prop: "bankNo",
+              disabled: true,
+            },
+            {
+              label: "機構號",
+              prop: "orgNo",
+              disabled: true,
+            },
+            {
+              label: "序號",
+              prop: "serialNo",
+              disabled: true,
+            },
+            {
+              label: "發送時間",
+              prop: "sendDate",
+              type: "datetime",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              disabled: true,
+            },
+            {
+              label: "發送支行",
+              prop: "sendBank",
+              disabled: true,
+            },
+            {
+              label: "卡號",
+              prop: "cardNo",
+              disabled: true,
+            },
+            {
+              label: "卡序號",
+              prop: "cardSerialNo",
+              disabled: true,
+            },
+            {
+              label: "本行機/他行機",
+              prop: "machine",
+              disabled: true,
+            },
+            {
+              label: "機號",
+              prop: "machineNo",
+              disabled: true,
+            },
+            {
+              label: "沒收卡日期",
+              prop: "swallowDate",
+              type: "datetime",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              disabled: true,
+            },
+            {
+              label: "卡狀態",
+              prop: "cardStatus",
+              disabled: true,
+            },
+            {
+              label: "發送狀態",
+              prop: "sendStatus",
+              type: "select",
+              dataType: "string",
+              dicUrl: `/api/blade-system/dict/dictionary?code=send_status`,
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              disabled: true,
+            },
+            {
+              label: "備註",
+              prop: "remark",
+              disabled: true,
+            },
+
+          ]
+        }
+      }
+    },
+    props: {
+      form: {
+        type: Array
+      },
+
+    },
+    mounted() {
+      if (this.form.process == 2){
+        this.option.submitText = '發佈';
+      }else{
+        this.option.submitText = '簽收';
+      }
+    },
+    methods: {
+      submit(row, done){
+        if (row.process == 2){
+          issue(row).then(() => {
+            this.$message.success("發佈成功！");
+            this.$emit("close")
+            // done();
+          })
+        }else{
+          signin(row).then(() => {
+            this.$message.success("簽收成功！");
+            this.$emit("close")
+            // done();
+          });
+        }
+        done();
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/components/common/flow-settings.vue

@@ -70,7 +70,6 @@
       this.form.id = this.id;
       this.form.personNo = this.ehr;
       this.form.personName = this.name;
-      debugger
     },
     methods: {
       selectCallback(row){

src/components/common/returns-approve.vue

@@ -0,0 +1,303 @@
+<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 {returnsApprove} from "@/api/bank/returns";;
+
+  export default {
+    name: "returns-approve",
+    data(){
+      return {
+        loading: false,
+        option: {
+          mockBtn: false,
+          submitText: '確認並發佈',
+          printBtn: false,
+          emptyBtn: 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",
+              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",
+              rules: [{
+                required: false,
+                message: "请输入支行備註",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支行確認人員工號",
+              prop: "bankConfirmNo",
+              rules: [{
+                required: true,
+                message: "请输入支行確認人員工號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支行確認人姓名",
+              prop: "bankConfirmName",
+              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",
+              rules: [{
+                required: true,
+                message: "请输入確認日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "",
+              prop: "personId",
+              display: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "審批人",
+              prop: "personName",
+              display: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入審批人",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "審批時間",
+              prop: "approveTime",
+              display: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入審批時間",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "節點",
+              prop: "process",
+              display: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入節點",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "是否已完成",
+              prop: "isCompleted",
+              display: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入是否已完成",
+                trigger: "blur"
+              }]
+            },
+          ]
+        }
+      }
+    },
+    props: {
+      form: {
+        type: Object
+      },
+
+    },
+    mounted() {
+
+    },
+    methods: {
+      submit(row, index, done, loading){
+        returnsApprove(row).then(() => {
+          this.$emit("close")
+        });
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/components/common/returns-comfire.vue

@@ -0,0 +1,325 @@
+<template>
+  <div v-if="data.length > 0">
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               @row-update="infoSubmit"
+               @row-del="removeItem"
+               v-model="form"
+               ref="crud2">
+    </avue-crud>
+  </div>
+</template>
+
+<script>
+  import {returnsSubmit} from "@/api/bank/returns";
+
+  export default {
+    name: "returns-comfire",
+    data(){
+      return {
+        loading: false,
+        data: [],
+        form: {},
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: false,
+          searchShowBtn: false,
+          columnBtn: false,
+          refreshBtn: false,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: false,
+          editBtn: true,
+          addBtn: 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",
+              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",
+              rules: [{
+                required: false,
+                message: "请输入支行備註",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支行確認人員工號",
+              prop: "bankConfirmNo",
+              rules: [{
+                required: true,
+                message: "请输入支行確認人員工號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "支行確認人姓名",
+              prop: "bankConfirmName",
+              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",
+              rules: [{
+                required: true,
+                message: "请输入確認日期",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "",
+              prop: "personId",
+              display: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "審批人",
+              prop: "personName",
+              display: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入審批人",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "審批時間",
+              prop: "approveTime",
+              display: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入審批時間",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "節點",
+              prop: "process",
+              display: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入節點",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "是否已完成",
+              prop: "isCompleted",
+              display: false,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入是否已完成",
+                trigger: "blur"
+              }]
+            },
+          ]
+        }
+      }
+    },
+    props: {
+      data: {
+        type: Array
+      },
+
+    },
+    mounted() {
+
+    },
+    methods: {
+      infoSubmit(row, index, done, loading){
+        returnsSubmit(row).then(() => {
+          this.data.splice(index, 1);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          loading = false;
+          done();
+        });
+      },
+      removeItem(row, index){
+        this.data.splice(index, 1)
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/views/bank/cardswallow.vue

@@ -26,18 +26,104 @@
                    v-if="permission.cardswallow_delete"
                    @click="handleDelete">删 除
         </el-button>
+        <el-button type="success"
+                   size="small"
+                   icon="el-icon-setting"
+                   plain
+                   v-if="permission.cardswallow_delete"
+                   @click="handleSetting">設 置
+        </el-button>
+        <el-button type="primary"
+                   size="small"
+                   icon="el-icon-upload"
+                   plain
+                   v-if="permission.cardswallow_delete"
+                   @click="attachBox = 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>
+      <template slot="menu" slot-scope="{row, index}">
+        <el-button size="small" class="el-button--text" v-if="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="row.process <= 2" @click="$refs.crud.rowEdit(row, index)"><i class="el-icon-edit"></i> 编 辑</el-button>
+        <el-button size="mini " type="primary" plain v-if="row.process == 2" @click="form = row,issueVisible = true">去發佈</el-button>
+        <el-button size="mini " type="warning" plain v-if="row.process == 3" @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>
+
+    <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 title="文件上传"
+               append-to-body
+               :visible.sync="attachBox"
+               width="555px">
+      <avue-form ref="form" :option="attachOption" v-model="attachForm" :upload-after="uploadAfter">
+      </avue-form>
+    </el-dialog>
+
+    <el-dialog title="信息確認"
+               append-to-body
+               :visible.sync="temVisible"
+               :fullscreen="true"
+               :close-on-press-escape="false"
+               @close="attachBox = false,onLoad(page)"
+    >
+      <cardswallow-comfirm :data="data2"></cardswallow-comfirm>
+    </el-dialog>
+
   </basic-container>
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/bank/cardswallow";
+  import {getList, getDetail, add, update, remove, settingSave, getSetting} from "@/api/bank/cardswallow";
   import {mapGetters} from "vuex";
+  import FlowSettings from "../../components/common/flow-settings";
+  import {dateFormat} from "../../util/date";
+  import CardswallowIssue from "../../components/common/cardswallow-issue";
+  import CardswallowComfirm from "../../components/common/cardswallow-comfirm";
 
   export default {
+    components: {CardswallowComfirm, CardswallowIssue, FlowSettings},
     data() {
       return {
+        issueVisible: false,
+
+        personId: null,
+        personNo: null,
+        personName: null,
+        settingVisible: false,
+
+        temVisible: false,
+        attachBox: false,
+        attachForm: {},
+        attachOption: {
+          submitBtn: false,
+          emptyBtn: false,
+          column: [
+            {
+              label: '文件上传',
+              prop: 'attachFile',
+              type: 'upload',
+              drag: true,
+              loadText: '文件上传中，请稍等',
+              span: 24,
+              propsHttp: {
+                res: 'data'
+              },
+              action: "/api/bank/cardswallow/readExcel"
+            }
+          ]
+        },
+
         form: {},
         query: {},
         loading: true,
@@ -56,6 +142,8 @@
           border: true,
           index: true,
           viewBtn: true,
+          editBtn: false,
+          delBtn: false,
           selection: true,
           dialogClickModal: false,
           column: [
@@ -161,6 +249,13 @@
             {
               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: "请输入發送狀態",
@@ -171,14 +266,26 @@
               label: "備註",
               prop: "remark",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入備註",
                 trigger: "blur"
               }]
             },
+            {
+              label: "進度",
+              prop: "process",
+              display: false,
+              rules: [{
+                required: false,
+                message: "请输入備註",
+                trigger: "blur"
+            }]
+          },
+
             {
               label: "支行確認人員工號",
               prop: "bankConfirmNo",
+              editDisplay: false,
               rules: [{
                 required: true,
                 message: "请输入支行確認人員工號",
@@ -188,6 +295,7 @@
             {
               label: "支行確認人姓名",
               prop: "bankConfirmName",
+              editDisplay: false,
               rules: [{
                 required: true,
                 message: "请输入支行確認人姓名",
@@ -197,6 +305,7 @@
             {
               label: "確認日期",
               prop: "bankConfirmTime",
+              editDisplay: false,
               rules: [{
                 required: true,
                 message: "请输入確認日期",
@@ -205,7 +314,8 @@
             },
           ]
         },
-        data: []
+        data: [],
+        data2: [],
       };
     },
     computed: {
@@ -227,6 +337,49 @@
       }
     },
     methods: {
+      uploadAfter(res, done, loading, column){
+        if (res && res.length > 0){
+          for (let i = 0; i < res.length; i++) {
+            let row = res[i];
+            row = this.infoFormat(row);
+          }
+          this.data2 = res;
+        }
+        this.temVisible = true;
+        loading = false;
+        done();
+      },
+      infoFormat(row){
+        let arr = row.sendBank.split(' ');
+        row.sendOrgNo = arr[0];
+        row.sendBank = arr[1];
+        return row;
+      },
+      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;
+      },
       rowSave(row, done, loading) {
         add(row).then(() => {
           this.onLoad(this.page);

src/views/bank/postchange.vue

@@ -28,7 +28,7 @@
         </el-button>
         <el-button type="success"
                    size="small"
-                   icon="el-icon-delete"
+                   icon="el-icon-setting"
                    plain
                    v-if="permission.checklist_delete"
                    @click="handleSetting">設 置
@@ -44,7 +44,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove, settingSave, getSetting} from "@/api/bank/postchange";
+  import {getList, getDetail, add, update, remove, settingSave, getSetting, getDictByCode} from "@/api/bank/postchange";
   import {mapGetters} from "vuex";
   import { getCurrentDept } from "@/api/system/dept";
   import {dateFormat} from "../../util/date";
@@ -100,60 +100,7 @@
                 trigger: "blur"
               }]
             },
-            {
-              label: "網點出納主管",
-              prop: "director",
-              rules: [{
-                required: true,
-                message: "请输入網點出納主管",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "網點出納專管員",
-              prop: "manager",
-              rules: [{
-                required: true,
-                message: "请输入網點出納專管員",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "種類",
-              prop: "type",
-              rules: [{
-                required: true,
-                message: "请输入種類",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "鎖匙/密碼",
-              prop: "keyPwd",
-              rules: [{
-                required: true,
-                message: "请输入鎖匙/密碼",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "持有人",
-              prop: "holder",
-              rules: [{
-                required: true,
-                message: "请输入持有人",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "後備人員",
-              prop: "backupPerson",
-              rules: [{
-                required: true,
-                message: "请输入後備人員",
-                trigger: "blur"
-              }]
-            },
+
             {
               label: "申請日期",
               prop: "applyDate",
@@ -181,50 +128,73 @@
                 trigger: "blur"
               }]
             },
+          ],
+          group: [
             {
-              label: "",
-              prop: "personId",
-              rules: [{
-                required: true,
-                message: "请输入",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "審批人",
-              prop: "personName",
-              rules: [{
-                required: true,
-                message: "请输入審批人",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "審批時間",
-              prop: "approveTime",
-              rules: [{
-                required: true,
-                message: "请输入審批時間",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "節點",
-              prop: "process",
-              rules: [{
-                required: true,
-                message: "请输入節點",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "是否已完成",
-              prop: "isCompleted",
-              rules: [{
-                required: true,
-                message: "请输入是否已完成",
-                trigger: "blur"
-              }]
+              label: "人員配置",
+              prop: "personSetting",
+              column: [
+                {
+                  label: "網點出納主管",
+                  prop: "director",
+                  span: 8,
+                  rules: [{
+                    required: true,
+                    message: "请输入網點出納主管",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "持有人",
+                  prop: "holder",
+                  span: 8,
+                  rules: [{
+                    required: true,
+                    message: "请输入持有人",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "後備人員",
+                  prop: "backupPerson",
+                  span: 8,
+                  rules: [{
+                    required: true,
+                    message: "请输入後備人員",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "網點出納專管員",
+                  prop: "manager",
+                  span: 8,
+                  rules: [{
+                    required: true,
+                    message: "请输入網點出納專管員",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "持有人",
+                  prop: "holder",
+                  span: 8,
+                  rules: [{
+                    required: true,
+                    message: "请输入持有人",
+                    trigger: "blur"
+                  }]
+                },
+                {
+                  label: "後備人員",
+                  prop: "backupPerson",
+                  span: 8,
+                  rules: [{
+                    required: true,
+                    message: "请输入後備人員",
+                    trigger: "blur"
+                  }]
+                },
+              ]
             },
           ]
         },
@@ -249,6 +219,9 @@
         return ids.join(",");
       }
     },
+    mounted() {
+      this.initForm();
+    },
     methods: {
       settingCallback(row){
         this.form.personId = row.personId;
@@ -276,7 +249,8 @@
         this.settingVisible = true;
       },
       rowSave(row, done, loading) {
-        add(row).then(() => {
+        debugger
+        /*add(row).then(() => {
           this.onLoad(this.page);
           this.$message({
             type: "success",
@@ -286,7 +260,7 @@
         }, error => {
           loading();
           window.console.log(error);
-        });
+        });*/
       },
       rowUpdate(row, index, done, loading) {
         update(row).then(() => {
@@ -357,8 +331,60 @@
             this.form = res.data.data;
           });
         }
+
         done();
       },
+      initForm(){
+        let holderObj = {
+            label: "持有人",
+            prop: "holder",
+            span: 8,
+            rules: [{
+              required: true,
+              message: "请输入持有人",
+              trigger: "blur"
+            }]
+          }
+        let backupObj = {
+            label: "後備人員",
+            prop: "backupPerson",
+            span: 8,
+            rules: [{
+              required: true,
+              message: "请输入後備人員",
+              trigger: "blur"
+            }]
+          }
+
+        getDictByCode("cashier_key_type").then(res => {
+          const data = res.data.data;
+          let $group = this.option.group;
+          data.forEach(item => {
+            let code = item.dictKey;
+            let value = item.dictValue;
+            let $item = {};
+            $item.label = value;
+            let column = [];
+            getDictByCode(code).then(res2 => {
+              const data2 = res2.data.data;
+              data2.forEach(item2 => {
+                let $item2 = {}
+                $item2.label = item2.dictValue;
+                $item2.prop = item2.dictKey;
+                $item2.span = 8;
+                column.push($item2)
+                column.push(holderObj)
+                column.push(backupObj)
+              })
+            });
+
+            $item.column = column;
+            $group.push($item)
+          })
+
+
+        });
+      },
       searchReset() {
         this.query = {};
         this.onLoad(this.page);

src/views/bank/returns.vue

@@ -26,21 +26,71 @@
                    v-if="permission.returns_delete"
                    @click="handleDelete">删 除
         </el-button>
+        <el-button type="primary"
+                   size="small"
+                   icon="el-icon-upload"
+                   plain
+                   v-if="permission.returns_delete"
+                   @click="handleUpload">上 傳
+        </el-button>
+      </template>
+      <template slot="menu" slot-scope="{row, index}">
+        <el-button size="small" class="el-button--text" v-if="row.process <= 2 && row.isCompleted != 1" @click="$refs.crud.rowDel(row, index)"><i class="el-icon-delete"></i> 刪 除</el-button>
+        <el-button size="small" class="el-button--text" v-if="row.process <= 2 && row.isCompleted != 1" @click="$refs.crud.rowEdit(row, index)"><i class="el-icon-edit"></i> 编 辑</el-button>
+        <el-button size="small" class="el-button--text" v-if="row.process == 2 && row.isCompleted != 1" @click="approve(row, index)"><i class="el-icon-check"></i> 審 批</el-button>
+      </template>
+      <template slot="process" slot-scope="{row, index}">
+        <el-button type="success" circle>{{row.process}}</el-button>
       </template>
+
     </avue-crud>
+
+    <el-dialog title="文件上传"
+               append-to-body
+               :visible.sync="attachBox"
+               width="555px">
+      <avue-form ref="form" :option="attachOption" v-model="attachForm" :upload-after="uploadAfter">
+      </avue-form>
+    </el-dialog>
+
+    <el-dialog title="信息確認"
+               append-to-body
+               :visible.sync="temVisible"
+               :fullscreen="true"
+               :close-on-press-escape="false"
+               @close="attachBox = false,onLoad(page)"
+    >
+<!--      <div v-if="data2.length > 0"></div>-->
+      <returns-comfire :data="data2"></returns-comfire>
+    </el-dialog>
+
+    <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} from "@/api/bank/returns";
+  import {getList, getDetail, add, update, remove, returnsSubmit} 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";
 
   export default {
+    components: {ReturnsApprove, ReturnsComfire},
     data() {
       return {
         form: {},
+        approveForm: {},
         query: {},
         loading: true,
+        temVisible: false,
+        approveVisible: false,
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -55,10 +105,34 @@
           searchMenuSpan: 6,
           border: true,
           index: true,
-          viewBtn: true,
+          viewBtn: false,
+          editBtn: false,
+          addBtn: false,
+          delBtn: false,
           selection: true,
           dialogClickModal: false,
           column: [
+            {
+              label: "流程業務號",
+              prop: "businessId",
+              display: false,
+            },
+            {
+              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",
@@ -88,7 +162,7 @@
             },
             {
               label: "支行",
-              prop: "bank",
+              prop: "subBank",
               rules: [{
                 required: true,
                 message: "请输入支行",
@@ -104,6 +178,22 @@
                 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",
@@ -170,6 +260,13 @@
             {
               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: "请输入處理狀態",
@@ -180,7 +277,7 @@
               label: "支行備註",
               prop: "bankRemark",
               rules: [{
-                required: true,
+                required: false,
                 message: "请输入支行備註",
                 trigger: "blur"
               }]
@@ -206,6 +303,9 @@
             {
               label: "確認日期",
               prop: "bankConfirmTime",
+              type: "datetime",
+              format: "yyyy-MM-dd HH:mm:ss",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
               rules: [{
                 required: true,
                 message: "请输入確認日期",
@@ -215,6 +315,7 @@
             {
               label: "",
               prop: "personId",
+              display: false,
               rules: [{
                 required: true,
                 message: "请输入",
@@ -224,6 +325,7 @@
             {
               label: "審批人",
               prop: "personName",
+              display: false,
               rules: [{
                 required: true,
                 message: "请输入審批人",
@@ -233,6 +335,7 @@
             {
               label: "審批時間",
               prop: "approveTime",
+              display: false,
               rules: [{
                 required: true,
                 message: "请输入審批時間",
@@ -242,6 +345,7 @@
             {
               label: "節點",
               prop: "process",
+              display: false,
               rules: [{
                 required: true,
                 message: "请输入節點",
@@ -251,6 +355,7 @@
             {
               label: "是否已完成",
               prop: "isCompleted",
+              display: false,
               rules: [{
                 required: true,
                 message: "请输入是否已完成",
@@ -259,7 +364,30 @@
             },
           ]
         },
-        data: []
+        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: {
@@ -281,6 +409,47 @@
       }
     },
     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';
+        }
+
+        let userInfoStr = localStorage.getItem("saber-userInfo");
+        let userInfo = JSON.parse(userInfoStr);
+        row.bankConfirmNo = userInfo.content.user_ehr;
+        row.bankConfirmName = userInfo.content.user_name;
+        row.bankConfirmTime = dateFormat(new Date(), "yyyy-MM-dd hh:mm:ss");
+
+        return row;
+      },
+      uploadAfter(res, done, loading, column){
+
+        if (res && res.length > 0){
+          for (let i = 0; i < res.length; i++) {
+            let row = res[i];
+            row = this.infoFormat(row);
+          }
+          this.data2 = res;
+        }
+        this.temVisible = true;
+        loading = false;
+        done();
+      },
+      handleUpload(){
+        this.attachBox = true;
+      },
       rowSave(row, done, loading) {
         add(row).then(() => {
           this.onLoad(this.page);

src/views/resource/attach.vue

@@ -189,6 +189,7 @@
         this.attachBox = true;
       },
       uploadAfter(res, done, loading, column) {
+        debugger
         window.console.log(column);
         this.attachBox = false;
         this.refreshChange();

src/views/system/user.vue

@@ -299,6 +299,7 @@
               label: "用户平台",
               prop: "userTypeName",
               slot: true,
+              hide: true,
               display: false
             },
             {
@@ -367,6 +368,9 @@
                   dataType: "number",
                   slot: true,
                   prop: "userType",
+                  disabled: true,
+                  display: false,
+                  hide: true,
                   rules: [{
                     required: true,
                     message: "请选择用户平台",
@@ -411,7 +415,7 @@
                   prop: "realName",
                   rules: [{
                     required: true,
-                    message: "请输入用户姓名",
+                    message: "请輸入输入用户姓名",
                     trigger: "blur"
                   }, {
                     min: 2,
@@ -472,12 +476,22 @@
               icon: 'el-icon-s-custom',
               column: [
                 {
-                  label: "用户编号",
+                  label: "用户Mo碼",
                   prop: "code",
+                  rules: [{
+                    required: true,
+                    message: "请輸入Mo碼",
+                    trigger: "click"
+                  }]
                 },
                 {
                   label: "EHR号",
                   prop: "ehr",
+                  rules: [{
+                    required: true,
+                    message: "请輸入EHR号",
+                    trigger: "click"
+                  }]
                 },
                 {
                   label: "所属角色",
@@ -572,7 +586,8 @@
               label: "用户平台",
               prop: "userTypeName",
               slot: true,
-              display: false
+              display: false,
+              hide: true
             },
             {
               label: "用户平台",
@@ -586,6 +601,7 @@
               search: true,
               hide: true,
               display: false,
+              disabled: true,
               prop: "userType",
               rules: [{
                 required: true,
@@ -886,6 +902,9 @@
         window.open(`/api/blade-user/export-template?${this.website.tokenHeader}=${getToken()}`);
       },
       beforeOpen(done, type) {
+        if (type == 'add'){
+          this.form.userType = '1';
+        }
         if (["edit", "view"].includes(type)) {
           getUser(this.form.id).then(res => {
             this.form = res.data.data;