```快速構建調整-修復

src/components/common/cardswallow-issue.vue

@@ -21,12 +21,14 @@
               prop: "bankNo",
               span: 24,
               hide: true,
+              display: false,
               disabled: true,
             },
             {
               label: "機構號",
               prop: "orgNo",
               hide: true,
+              display: false,
               disabled: true,
             },
             {

src/components/common/returns-approve.vue

@@ -52,6 +52,7 @@
               span: 24,
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入銀行號",
@@ -63,6 +64,7 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",

src/components/common/returns-comfire.vue

@@ -123,6 +123,8 @@
             {
               label: "支行機構號",
               prop: "subOrgNo",
+              display: false,
+              hide: true,
               rules: [{
                 required: true,
                 message: "請輸入支行機構號",

src/components/common/sealhandover-sure.vue

@@ -35,6 +35,7 @@
               prop: "bankNo",
               span: 24,
               hide: true,
+              display: false,
               disabled: true,
               rules: [{
                 required: true,
@@ -46,6 +47,7 @@
               label: "機構號",
               prop: "orgNo",
               hide: true,
+              display: false,
               disabled: true,
               rules: [{
                 required: true,

src/components/confirmed/confirmed-cardswallow.vue

@@ -185,6 +185,7 @@
               label: "機構號",
               prop: "orgNo",
               hide: true,
+              display: false,
               disabled: true,
               rules: [{
                 required: true,

src/components/confirmed/confirmed-postchange.vue

@@ -414,6 +414,7 @@
               span: 24,
               hide: true,
               disabled: true,
+              display: false,
               search: false,
               searchSpan: 4,
               rules: [{
@@ -427,6 +428,7 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -437,6 +439,7 @@
               label: "機構名稱",
               prop: "orgName",
               disabled: true,
+              span: 24,
               rules: [{
                 required: true,
                 message: "請輸入機構號",

src/components/confirmed/confirmed-returns.vue

@@ -292,6 +292,9 @@
             {
               label: "支行機構號",
               prop: "subOrgNo",
+              display: false,
+              hide: true,
+              
               rules: [{
                 required: true,
                 message: "請輸入支行機構號",

src/components/initiated/init-cardswallow.vue

@@ -185,6 +185,7 @@
               label: "機構號",
               prop: "orgNo",
               hide: true,
+              display: false,
               disabled: true,
               rules: [{
                 required: true,

src/components/initiated/init-postchange.vue

@@ -414,6 +414,7 @@
               span: 24,
               hide: true,
               disabled: true,
+              display: false,
               search: false,
               searchSpan: 4,
               rules: [{
@@ -427,6 +428,7 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -437,6 +439,7 @@
               label: "機構名稱",
               prop: "orgName",
               disabled: true,
+              span: 24,
               rules: [{
                 required: true,
                 message: "請輸入機構號",

src/components/initiated/init-returns.vue

@@ -292,6 +292,8 @@
             {
               label: "支行機構號",
               prop: "subOrgNo",
+              display: false,
+              hide: true,
               rules: [{
                 required: true,
                 message: "請輸入支行機構號",

src/components/release/release-returns.vue

@@ -292,6 +292,8 @@
             {
               label: "支行機構號",
               prop: "subOrgNo",
+              display: false,
+              hide: true,
               rules: [{
                 required: true,
                 message: "請輸入支行機構號",

src/components/tobeconfirm/tobeconfirm-cardswallow.vue

@@ -185,6 +185,7 @@
               label: "機構號",
               prop: "orgNo",
               hide: true,
+              display: false,
               disabled: true,
               rules: [{
                 required: true,

src/components/tobeconfirm/tobeconfirm-postchange.vue

@@ -414,6 +414,7 @@
               span: 24,
               hide: true,
               disabled: true,
+              display: false,
               search: false,
               searchSpan: 4,
               rules: [{
@@ -427,6 +428,7 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -437,6 +439,7 @@
               label: "機構名稱",
               prop: "orgName",
               disabled: true,
+              span: 24,
               rules: [{
                 required: true,
                 message: "請輸入機構號",

src/components/tobeconfirm/tobeconfirm-returns.vue

@@ -292,6 +292,8 @@
             {
               label: "支行機構號",
               prop: "subOrgNo",
+              display: false,
+              hide: true,
               rules: [{
                 required: true,
                 message: "請輸入支行機構號",

src/page/login/index.vue

@@ -4,7 +4,7 @@
        @keyup.enter.native="handleLogin">
     <top-color v-show="false"></top-color>
     <div class="login-weaper animated bounceInDown">
-      <img class="img" src="/img/bg/orm_bg.png" width="500" style="float: left">
+      <img class="img" src="/img/bg/orm_bg_new.png" width="500" style="float: left">
       <!--<div class="login-left">
         <div class="login-time">
           {{time}}

src/views/bank/autodata.vue

@@ -160,7 +160,8 @@
         approveOption: {
           submitText: "同意",
           emptyBtn: false,
-          column: []
+          column: [],
+          group: [],
         },
 
         show: false,
@@ -383,18 +384,25 @@
         this.$refs.crud.rowEdit(row, index);
       },
       approveYesEnd(){
-        let row = this.deepClone(this.approveForm);
-        delete row.createTime,delete row.createUser,delete row.createUserName;
-        let form = this.beforeSave(row);
-        // form.id = row.id, form.remark = row.remark;
-        approveYes(form, true).then(res => {
-          this.approveVisible = false;
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "審批成功!"
-          });
+        this.$confirm("請確認您是否為最後的審批人?", {
+          confirmButtonText: "確定",
+          cancelButtonText: "取消",
+          type: "warning"
         })
+          .then(() => {
+            let row = this.deepClone(this.approveForm);
+            delete row.createTime,delete row.createUser,delete row.createUserName;
+            let form = this.beforeSave(row);
+            // form.id = row.id, form.remark = row.remark;
+            approveYes(form, true).then(res => {
+              this.approveVisible = false;
+              this.onLoad(this.page);
+              this.$message({
+                type: "success",
+                message: "審批成功!"
+              });
+            })
+          })
       },
       approveYes(data, done){
         let row = this.deepClone(this.approveForm);
@@ -567,6 +575,10 @@
         }
         this.option = option;
         this.approveOption.column = this.deepClone(option.column);
+        if (option.group){
+          this.approveOption.group = this.deepClone(option.group);
+          this.approveOption.group[0].column.forEach(item=>{item.disabled = true})
+        }
         this.approveOption.column.forEach(item => {
           item.disabled = true;
           if (item.prop == 'receiverName'){

src/views/bank/cardswallow.vue

@@ -185,6 +185,7 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",

src/views/bank/returns.vue

@@ -291,6 +291,9 @@
             {
               label: "支行機構號",
               prop: "subOrgNo",
+              display: false,
+              hide: true,
+              
               rules: [{
                 required: true,
                 message: "請輸入支行機構號",