修复

public/index.html

@@ -103,13 +103,14 @@
 </div>
 <!-- built files will be auto injected -->
 <script src="<%= BASE_URL %>util/aes.js" charset="utf-8"></script>
+<script src="<%= BASE_URL %>util/aes.js" charset="utf-8"></script>
 <script src="<%= BASE_URL %>cdn/vue/2.6.10/vue.min.js" charset="utf-8"></script>
 <script src="<%= BASE_URL %>cdn/vuex/3.1.1/vuex.min.js" charset="utf-8"></script>
 <script src="<%= BASE_URL %>cdn/vue-router/3.0.1/vue-router.min.js" charset="utf-8"></script>
 <script src="<%= BASE_URL %>cdn/axios/1.0.0/axios.min.js" charset="utf-8"></script>
 <script src="<%= BASE_URL %>cdn/element-ui/2.15.1/index.js" charset="utf-8"></script>
 <script src="<%= BASE_URL %>cdn/avue/2.8.12/avue.min.js" charset="utf-8"></script>
-<script src="https://cdn.bootcss.com/crypto-js/3.1.9-1/crypto-js.min.js"></script>
+<script src="<%= BASE_URL %>util/crypto-js.min.js"></script>
 </body>
 
 </html>

src/api/bank/cardswallow.js

@@ -73,6 +73,14 @@ export const cardswallowSubmit = (row) => {
   })
 }
 
+export const cardswallowSubmitBatch = (list) => {
+  return request({
+    url: '/api/bank/cardswallow/cardswallowSubmitBatch',
+    method: 'post',
+    data: list
+  })
+}
+
 export const issue = (row) => {
   return request({
     url: '/api/bank/cardswallow/issue',

src/components/common/cardswallow-comfirm.vue

@@ -153,7 +153,7 @@
                 trigger: "blur"
               }]
             },
-            {
+           /* {
               label: "發送狀態",
               prop: "sendStatus",
               type: "select",
@@ -173,7 +173,7 @@
                 message: "请输入發送狀態",
                 trigger: "blur"
               }]
-            },
+            },*/
             {
               label: "備註",
               prop: "remark",

src/router/axios.js

@@ -10,7 +10,7 @@ import store from '@/store/';
 import router from '@/router/router';
 import {serialize} from '@/util/util';
 import {getToken} from '@/util/auth';
-import {Message} from 'element-ui';
+import {Message, Alert} from 'element-ui';
 import website from '@/config/website';
 import {Base64} from 'js-base64';
 import NProgress from 'nprogress';
@@ -65,7 +65,7 @@ axios.interceptors.response.use(res => {
   if (status === 401) store.dispatch('FedLogOut').then(() => router.push({path: '/login'}));
   // 如果请求为非200否者默认统一处理
   if (status !== 200) {
-    Message({
+    Alert({
       message: message,
       type: 'error'
     });

src/views/bank/cardswallow.vue

@@ -26,13 +26,13 @@
                    v-if="permission.cardswallow_delete"
                    @click="handleDelete">删 除
         </el-button>
-        <el-button type="success"
+        <!--<el-button type="success"
                    size="small"
                    icon="el-icon-setting"
                    plain
                    v-if="permission.cardswallow_setting"
                    @click="handleSetting">設置發佈人
-        </el-button>
+        </el-button>-->
         <el-button type="primary"
                    size="small"
                    icon="el-icon-upload"
@@ -56,7 +56,7 @@
       <template slot="menu" slot-scope="{row, index}">
         <el-button size="small" class="el-button--text" v-if="row.process <= 2 && userInfo.user_id == row.createUser" @click="$refs.crud.rowDel(row, index)"><i class="el-icon-delete"></i> 刪 除</el-button>
         <el-button size="small" class="el-button--text" v-if="row.process <= 2 && userInfo.user_id == row.createUser" @click="$refs.crud.rowEdit(row, index)"><i class="el-icon-edit"></i> 编 辑</el-button>
-        <el-button size="mini " type="primary" plain v-if="permission.cardswallow_issue && row.process == 2 && row.personNo == userInfo.user_ehr" @click="form = row,issueVisible = true">去發佈</el-button>
+<!--        <el-button size="mini " type="primary" plain v-if="permission.cardswallow_issue && row.process == 2 && row.personNo == userInfo.user_ehr" @click="form = row,issueVisible = true">去發佈</el-button>-->
         <el-button size="mini " type="warning" plain v-if="permission.cardswallow_confirm && row.process == 3" @click="form = row,issueVisible = true">去簽收</el-button>
       </template>
     </avue-crud>

src/views/system/login-test.vue

@@ -42,6 +42,7 @@
             console.log('testLogin')
             console.log(res)
             this.$Log.primary('testLogin' + res)
+            this.$alert("驗證成功！")
           });
         },
         test1(){

src/views/system/user.vue

@@ -404,7 +404,7 @@
                     trigger: "blur"
                   }]
                 },
-                {
+               /* {
                   label: '密码',
                   prop: 'password',
                   type: 'password',
@@ -421,7 +421,7 @@
                   editDisplay: false,
                   viewDisplay: false,
                   rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
-                },
+                },*/
               ]
             },
             {
@@ -452,7 +452,7 @@
                     message: '姓名长度在2到5个字符'
                   }]
                 },
-                {
+                /*{
                   label: "手机号码",
                   prop: "phone",
                   overHidden: true
@@ -496,7 +496,7 @@
                   prop: "statusName",
                   hide: true,
                   display: false
-                }
+                }*/
               ]
             },
             {
@@ -772,10 +772,10 @@
           let treeData = getTree(res.data.data, this.userInfo.dept_id);
           this.treeData = treeData;
         });
-        getPostList(tenantId).then(res => {
+        /*getPostList(tenantId).then(res => {
           const column = this.findObject(this.option.group, "postId");
           column.dicData = res.data.data;
-        });
+        });*/
       },
       submitRole() {
         const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
@@ -791,7 +791,9 @@
       rowSave(row, done, loading) {
         // row.deptId = row.deptId.join(",");
         row.roleId = row.roleId.join(",");
-        row.postId = row.postId.join(",");
+        if (row.postId){
+          row.postId = row.postId.join(",");
+        }
         add(row).then(() => {
           this.initFlag = false;
           this.onLoad(this.page);
@@ -808,7 +810,9 @@
       rowUpdate(row, index, done, loading) {
         // row.deptId = row.deptId.join(",");
         row.roleId = row.roleId.join(",");
-        row.postId = row.postId.join(",");
+        if (row.postId){
+          row.postId = row.postId.join(",");
+        }
         update(row).then(() => {
           this.initFlag = false;
           this.onLoad(this.page);