修復

src/components/confirmed/confirmed-postchange.vue

@@ -10,6 +10,7 @@
                ref="crud"
                @row-update="rowUpdate"
                @row-save="rowSave"
+               @row-del="rowDel"
                @search-change="searchChange"
                @search-reset="searchReset"
                @selection-change="selectionChange"
@@ -56,7 +57,7 @@
       <template slot="menu" slot-scope="{row, index}">
         <el-button size="small" class="el-button--text" v-if="permission.postchange_view"  @click="handleView(row, index)"><i class="el-icon-view"></i> 查 看</el-button>
         <el-button size="small" class="el-button--text" v-if="permission.postchange_edit && userInfo.user_id == row.createUser && row.process != 3" @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.postchange_delete && userInfo.user_id == row.createUser && row.process != 3" @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.postchange_delete && userInfo.user_id == row.createUser && row.process != 3" @click="$refs.crud.rowDel(row)"><i class="el-icon-delete"></i> 刪 除</el-button>
         <el-button size="small" class="el-button--text" v-if="permission.postchange_approve && row.process == 2 && row.personNo == userInfo.user_ehr" @click="approve(row, index)"><i class="el-icon-check"></i> 審 批</el-button>
       </template>
 
@@ -337,7 +338,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, approve, settingSave, getDictByCode, getSetting, getLastRecord, transfer} from "@/api/bank/postchange";
+  import {getList, getDetail, add, update, remove, approve, settingSave, getDictByCode, getSetting, getLastRecord, transfer} from "@/api/bank/postchange";
   import {mapGetters} from "vuex";
   import { getCurrentDept } from "@/api/system/dept";
   import {dateFormat} from "../../util/date";
@@ -1184,7 +1185,45 @@
             console.log(error);
           });
         }
-
+      },
+      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();
+          });
       },
       handleEdit(){
         // this.form = this.data[0];

src/components/initiated/init-checkwarehouse.vue

@@ -77,6 +77,15 @@
     name: "init-checkwarehouse",
     components: {SelectDialogUser},
     data() {
+      const validateCheckTime = (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('請選擇結束時間'));
+        } else if (value < this.form.checkTimeBegin) {
+          callback(new Error('結束時間不能早於開始時間!'));
+        } else {
+          callback();
+        }
+      };
       return {
         title: "",
         attachBox: false,
@@ -229,11 +238,10 @@
               type: "datetime",
               format: "yyyy-MM-dd HH:mm",
               valueFormat: "yyyy-MM-dd HH:mm",
-              rules: [{
-                required: true,
-                message: "請輸入檢查時間結束",
-                trigger: "blur"
-              }]
+              rules: [
+                {required: true, message: "請輸入檢查時間結束",trigger: "blur"},
+                {required: true, validator: validateCheckTime, trigger: 'blur'}
+              ]
             },
             {
               label: "檢查單位",
@@ -398,7 +406,7 @@
               type: 'textarea',
               rules: [{
                 required: false,
-                message: "請輸入備註(可間要補充檢查發現情況)",
+                message: "請輸入備註(可簡要補充檢查發現情況)",
                 trigger: "blur"
               }]
             },

src/components/initiated/init-postchange.vue

@@ -10,6 +10,7 @@
                ref="crud"
                @row-update="rowUpdate"
                @row-save="rowSave"
+               @row-del="rowDel"
                @search-change="searchChange"
                @search-reset="searchReset"
                @selection-change="selectionChange"
@@ -56,7 +57,7 @@
       <template slot="menu" slot-scope="{row, index}">
         <el-button size="small" class="el-button--text" v-if="permission.postchange_view"  @click="handleView(row, index)"><i class="el-icon-view"></i> 查 看</el-button>
         <el-button size="small" class="el-button--text" v-if="permission.postchange_edit && userInfo.user_id == row.createUser && row.process != 3" @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.postchange_delete && userInfo.user_id == row.createUser && row.process != 3" @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.postchange_delete && userInfo.user_id == row.createUser && row.process != 3" @click="$refs.crud.rowDel(row)"><i class="el-icon-delete"></i> 刪 除</el-button>
         <el-button size="small" class="el-button--text" v-if="permission.postchange_approve && row.process == 2 && row.personNo == userInfo.user_ehr" @click="approve(row, index)"><i class="el-icon-check"></i> 審 批</el-button>
       </template>
 
@@ -337,7 +338,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, approve, settingSave, getDictByCode, getSetting, getLastRecord, transfer} from "@/api/bank/postchange";
+  import {getList, getDetail, add, update, remove, approve, settingSave, getDictByCode, getSetting, getLastRecord, transfer} from "@/api/bank/postchange";
   import {mapGetters} from "vuex";
   import { getCurrentDept } from "@/api/system/dept";
   import {dateFormat} from "../../util/date";
@@ -1184,7 +1185,45 @@
             console.log(error);
           });
         }
-
+      },
+      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();
+          });
       },
       handleEdit(){
         // this.form = this.data[0];

src/components/initiated/init-tellertrunk.vue

@@ -72,6 +72,15 @@
     name: "init-tellertrunk",
     components: {SelectDialogUser},
     data() {
+      const validateCheckTime = (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('請選擇結束時間'));
+        } else if (value < this.form.checkTimeBegin) {
+          callback(new Error('結束時間不能早於開始時間!'));
+        } else {
+          callback();
+        }
+      };
       return {
         title: "",
         attachBox: false,
@@ -310,11 +319,10 @@
               type: "datetime",
               format: "yyyy-MM-dd HH:mm",
               valueFormat: "yyyy-MM-dd HH:mm",
-              rules: [{
-                required: true,
-                message: "請輸入檢查時間結束",
-                trigger: "blur"
-              }]
+              rules: [
+                {required: true, message: "請輸入檢查時間結束",trigger: "blur"},
+                {required: true, validator: validateCheckTime, trigger: 'blur'}
+              ]
             },
 
             {
@@ -410,12 +418,12 @@
               }]
             },
             {
-              label: "備註(可間要補充檢查發現情況)",
+              label: "備註(可簡要補充檢查發現情況)",
               prop: "remark",
               type: "textarea",
               rules: [{
                 required: false,
-                message: "請輸入備註(可間要補充檢查發現情況)",
+                message: "請輸入備註(可簡要補充檢查發現情況)",
                 trigger: "blur"
               }]
             },

src/components/tobeconfirm/tobeconfirm-postchange.vue

@@ -10,6 +10,7 @@
                ref="crud"
                @row-update="rowUpdate"
                @row-save="rowSave"
+               @row-del="rowDel"
                @search-change="searchChange"
                @search-reset="searchReset"
                @selection-change="selectionChange"
@@ -56,7 +57,7 @@
       <template slot="menu" slot-scope="{row, index}">
         <el-button size="small" class="el-button--text" v-if="permission.postchange_view"  @click="handleView(row, index)"><i class="el-icon-view"></i> 查 看</el-button>
         <el-button size="small" class="el-button--text" v-if="permission.postchange_edit && userInfo.user_id == row.createUser && row.process != 3" @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.postchange_delete && userInfo.user_id == row.createUser && row.process != 3" @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.postchange_delete && userInfo.user_id == row.createUser && row.process != 3" @click="$refs.crud.rowDel(row)"><i class="el-icon-delete"></i> 刪 除</el-button>
         <el-button size="small" class="el-button--text" v-if="permission.postchange_approve && row.process == 2 && row.personNo == userInfo.user_ehr" @click="approve(row, index)"><i class="el-icon-check"></i> 審 批</el-button>
       </template>
 
@@ -337,7 +338,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, approve, settingSave, getDictByCode, getSetting, getLastRecord, transfer} from "@/api/bank/postchange";
+  import {getList, getDetail, add, update, remove, approve, settingSave, getDictByCode, getSetting, getLastRecord, transfer} from "@/api/bank/postchange";
   import {mapGetters} from "vuex";
   import { getCurrentDept } from "@/api/system/dept";
   import {dateFormat} from "../../util/date";
@@ -1184,7 +1185,45 @@
             console.log(error);
           });
         }
-
+      },
+      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();
+          });
       },
       handleEdit(){
         // this.form = this.data[0];

src/views/bank/checkwarehouse.vue

@@ -76,6 +76,15 @@
   export default {
     components: {SelectDialogUser},
     data() {
+      const validateCheckTime = (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('請選擇結束時間'));
+        } else if (value < this.form.checkTimeBegin) {
+          callback(new Error('結束時間不能早於開始時間!'));
+        } else {
+          callback();
+        }
+      };
       return {
         title: "",
         attachBox: false,
@@ -228,11 +237,10 @@
               type: "datetime",
               format: "yyyy-MM-dd HH:mm",
               valueFormat: "yyyy-MM-dd HH:mm",
-              rules: [{
-                required: true,
-                message: "請輸入檢查時間結束",
-                trigger: "blur"
-              }]
+              rules: [
+                {required: true, message: "請輸入檢查時間結束",trigger: "blur"},
+                {required: true, validator: validateCheckTime, trigger: 'blur'}
+              ]
             },
             {
               label: "檢查單位",
@@ -397,7 +405,7 @@
               type: 'textarea',
               rules: [{
                 required: false,
-                message: "請輸入備註(可間要補充檢查發現情況)",
+                message: "請輸入備註(可簡要補充檢查發現情況)",
                 trigger: "blur"
               }]
             },

src/views/bank/postchange.vue

@@ -10,6 +10,7 @@
                ref="crud"
                @row-update="rowUpdate"
                @row-save="rowSave"
+               @row-del="rowDel"
                @search-change="searchChange"
                @search-reset="searchReset"
                @selection-change="selectionChange"
@@ -56,7 +57,7 @@
       <template slot="menu" slot-scope="{row, index}">
         <el-button size="small" class="el-button--text" v-if="permission.postchange_view"  @click="handleView(row, index)"><i class="el-icon-view"></i> 查 看</el-button>
         <el-button size="small" class="el-button--text" v-if="permission.postchange_edit && userInfo.user_id == row.createUser && row.process != 3" @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.postchange_delete && userInfo.user_id == row.createUser && row.process != 3" @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.postchange_delete && userInfo.user_id == row.createUser && row.process != 3" @click="$refs.crud.rowDel(row)"><i class="el-icon-delete"></i> 刪 除</el-button>
         <el-button size="small" class="el-button--text" v-if="permission.postchange_approve && row.process == 2 && row.personNo == userInfo.user_ehr" @click="approve(row, index)"><i class="el-icon-check"></i> 審 批</el-button>
       </template>
 
@@ -337,7 +338,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, approve, settingSave, getDictByCode, getSetting, getLastRecord, transfer} from "@/api/bank/postchange";
+  import {getList, getDetail, add, update, remove, approve, settingSave, getDictByCode, getSetting, getLastRecord, transfer} from "@/api/bank/postchange";
   import {mapGetters} from "vuex";
   import { getCurrentDept } from "@/api/system/dept";
   import {dateFormat} from "../../util/date";
@@ -1183,7 +1184,45 @@
             console.log(error);
           });
         }
-
+      },
+      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();
+          });
       },
       handleEdit(){
         // this.form = this.data[0];

src/views/bank/tellertrunk.vue

@@ -71,6 +71,15 @@
   export default {
     components: {SelectDialogUser},
     data() {
+      const validateCheckTime = (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('請選擇結束時間'));
+        } else if (value < this.form.checkTimeBegin) {
+          callback(new Error('結束時間不能早於開始時間!'));
+        } else {
+          callback();
+        }
+      };
       return {
         title: "",
         attachBox: false,
@@ -309,11 +318,10 @@
               type: "datetime",
               format: "yyyy-MM-dd HH:mm",
               valueFormat: "yyyy-MM-dd HH:mm",
-              rules: [{
-                required: true,
-                message: "請輸入檢查時間結束",
-                trigger: "blur"
-              }]
+              rules: [
+                {required: true, message: "請輸入檢查時間結束",trigger: "blur"},
+                {required: true, validator: validateCheckTime, trigger: 'blur'}
+              ]
             },
 
             {
@@ -409,12 +417,12 @@
               }]
             },
             {
-              label: "備註(可間要補充檢查發現情況)",
+              label: "備註(可簡要補充檢查發現情況)",
               prop: "remark",
               type: "textarea",
               rules: [{
                 required: false,
-                message: "請輸入備註(可間要補充檢查發現情況)",
+                message: "請輸入備註(可簡要補充檢查發現情況)",
                 trigger: "blur"
               }]
             },

src/views/bank/user-log-view.vue

@@ -426,7 +426,7 @@
               disabled: true,
             },
             {
-              label: "備註(可間要補充檢查發現情況)",
+              label: "備註(可簡要補充檢查發現情況)",
               prop: "remark",
               span: 24,
               labelWidth: 150,
@@ -546,7 +546,7 @@
               prop: "checkPersonNoOut",
             },
             {
-              label: "備註(可間要補充檢查發現情況)",
+              label: "備註(可簡要補充檢查發現情況)",
               prop: "remark",
             },
             {