修復

src/api/desk/notice.js

@@ -78,3 +78,13 @@ export const getNotice = (id) => {
     }
   })
 }
+
+export const testNotice = (mocode) => {
+  return request({
+    url: '/api/blade-desk/notice/testNotice',
+    method: 'post',
+    params: {
+      mocode,
+    }
+  })
+}

src/api/system/user.js

@@ -151,3 +151,5 @@ export const getUserList = () => {
     }
   })
 }
+
+

src/components/initiated/init-checkwarehouse.vue

@@ -371,7 +371,7 @@
               }]
             },
             {
-              label: "查庫人員",
+              label: "檢查人員",
               prop: "checkPersonName",
               // formslot: true,
               type: "array",
@@ -379,19 +379,19 @@
               dataType: 'string',
               rules: [{
                 required: true,
-                message: "請輸入查庫人員姓名",
+                message: "請輸入檢查人員姓名",
                 trigger: "change"
               }]
             },
             {
-              label: "查庫人員工號或身份證後四位",
+              label: "檢查人員工號或身份證後四位",
               prop: "checkPersonNo",
               type: "array",
               span: 12,
               dataType: 'string',
               rules: [{
                 required: true,
-                message: "請輸入查庫人員工號或身份證後四位",
+                message: "請輸入檢查人員工號或身份證後四位",
                 trigger: "blur"
               }]
             },

src/components/initiated/init-tellertrunk.vue

@@ -363,24 +363,24 @@
             },
 
             {
-              label: "查庫人員",
+              label: "檢查人員",
               prop: "checkPersonName",
               type: "array",
               dataType: 'string',
               rules: [{
                 required: true,
-                message: "請輸入查庫人員姓名",
+                message: "請輸入檢查人員姓名",
                 trigger: "change"
               }]
             },
             {
-              label: "查庫人員工號",
+              label: "檢查人員工號",
               prop: "checkPersonNo",
               type: "array",
               dataType: 'string',
               rules: [{
                 required: true,
-                message: "請輸入查庫人員(員工號/身份證號後四位)",
+                message: "請輸入檢查人員(員工號/身份證號後四位)",
                 trigger: "blur"
               }]
             },

src/views/bank/checkwarehouse.vue

@@ -365,7 +365,7 @@
               }]
             },
             {
-              label: "查庫人員",
+              label: "檢查人員",
               prop: "checkPersonName",
               // formslot: true,
               type: "array",
@@ -373,19 +373,19 @@
               dataType: 'string',
               rules: [{
                 required: true,
-                message: "請輸入查庫人員姓名",
+                message: "請輸入檢查人員姓名",
                 trigger: "change"
               }]
             },
             {
-              label: "查庫人員工號或身份證後四位",
+              label: "檢查人員工號或身份證後四位",
               prop: "checkPersonNo",
               type: "array",
               span: 12,
               dataType: 'string',
               rules: [{
                 required: true,
-                message: "請輸入查庫人員工號或身份證後四位",
+                message: "請輸入檢查人員工號或身份證後四位",
                 trigger: "blur"
               }]
             },

src/views/bank/keypwd-keep.vue

@@ -35,7 +35,6 @@
         <avue-input-tree :check-strictly="false" v-model="search.category" placeholder="請選擇內容" type="tree" :dic="typeList" :props="props"></avue-input-tree>
       </template>
 
-
     </avue-crud>
   </basic-container>
 </template>
@@ -486,9 +485,9 @@
         this.onLoad(this.page);
       },
       searchChange(params, done) {
-        if (params.category){
+        /*if (params.category){
           params.category = params.category.join();
-        }
+        }*/
         if (params.orgNos){
           params.orgNostr = params.orgNos.join();
           params.orgNos = '';

src/views/bank/keypwd.vue

@@ -45,7 +45,7 @@
       </template>
 
       <template slot="menu" slot-scope="{row, index}">
-<!--        <el-button size="small" class="el-button&#45;&#45;text" v-if="permission.keypwd_edit && userInfo.user_id == row.createUser" @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.keypwd_edit && userInfo.user_id == row.createUser && row.process == 2" @click="$refs.crud.rowEdit(row, index)"><i class="el-icon-edit"></i> 編 輯</el-button>
         <el-button size="small" class="el-button--text" v-if="permission.keypwd_delete && userInfo.user_id == row.createUser && row.process == 2" @click="$refs.crud.rowDel(row, index)"><i class="el-icon-delete"></i> 刪 除</el-button>
         <el-button size="small" class="el-button--text" v-if="permission.keypwd_sure && row.process == 2 && row.receiverId == userInfo.user_id" @click="approveForm=row,approveVisible=true"><i class="el-icon-check"></i> 確 認</el-button>
       </template>
@@ -72,6 +72,11 @@
         <el-tag size="small " type="danger" plain v-if="!row.isTurnIn">非上繳</el-tag>
       </template>
 
+      <template slot="process" slot-scope="{row, index}">
+        <el-tag size="small " type="warning" plain v-if="row.process == 2">待確認</el-tag>
+        <el-tag size="small " type="success" plain v-if="row.process == 3">已確認</el-tag>
+      </template>
+
       <template slot="titleForm" slot-scope="{row, index}">
         <div v-html="title" style="white-space: pre-line;color: red;font-weight: bold;"></div>
       </template>
@@ -79,6 +84,7 @@
         <span style="color: red;font-weight: bold;">注意事項：</span>
       </template>
 
+
     </avue-crud>
 
     <el-dialog :append-to-body="true" :modal-append-to-body="false" :destroy-on-close="true" :fullscreen="true" :visible.sync="keepVisible" title="保管人查詢">
@@ -427,6 +433,11 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "進度",
+              prop: "process",
+              display: false,
+            },
           ]
         },
         data: []
@@ -469,6 +480,7 @@
     },
     methods: {
       turnInChange(value){
+        debugger
         this.findObject(this.option.column, "receiverNo").rules[0].required = !value;
         this.findObject(this.option.column, "receiverName").rules[0].required = !value;
         this.form.receiverNo = null,this.form.receiverName = null;

src/views/bank/returns.vue

@@ -196,6 +196,7 @@
               label: "業務類型",
               prop: "isPublicSearch",
               type: "select",
+              hide: true,
               search: true,
               searchSpan: 4,
               dataType: "string",
@@ -230,6 +231,7 @@
             {
               label: "機構名稱",
               prop: "orgName",
+              hide: true,
               disabled: true,
               rules: [{
                 required: true,

src/views/bank/sealhandover.vue

@@ -45,7 +45,7 @@
       </template>
 
       <template slot="menu" slot-scope="{row, index}">
-<!--        <el-button size="small" class="el-button&#45;&#45;text" v-if="permission.sealhandover_edit && userInfo.user_id == row.createUser" @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.sealhandover_edit && userInfo.user_id == row.createUser" @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.sealhandover_delete && 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="permission.sealhandover_sure && row.process == 2 && row.receiverId == userInfo.user_id" @click="approveForm=row,approveVisible=true"><i class="el-icon-check"></i> 確 認</el-button>
       </template>
@@ -435,6 +435,8 @@
               label: "確認時間",
               prop: "sureTime",
               hide: true,
+              addDisplay: false,
+              editDisplay: false,
               type: "datetime",
               format: "yyyy-MM-dd HH:mm:ss",
               valueFormat: "yyyy-MM-dd HH:mm:ss",
@@ -482,7 +484,7 @@
       turnInChange(value){
         // this.findObject(this.option.column, "receiverNo").rules[0].required = !value;
         // this.findObject(this.option.column, "receiverName").rules[0].required = !value;
-        this.hasOrgNo = value == true ? "51614" : null;
+        this.hasOrgNo = value == true ? "51007" : null;
         this.form.receiverNo = null,this.form.receiverName = null;
       },
       handleDownload(){
@@ -610,7 +612,7 @@
           getCurrentDept().then(res => {
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;
-            if (data.orgNo == '51614'){
+            if (data.orgNo == '51007'){
               this.findObject(this.option.column, 'orgNo').disabled = false;
               this.findObject(this.option.column, 'orgName').disabled = false;
             }else{

src/views/bank/tellertrunk.vue

@@ -262,18 +262,6 @@
                 trigger: "blur"
               }]
             },
-            {
-              label: "檢查時間開始",
-              prop: "checkTimeBegin",
-              type: "datetime",
-              format: "yyyy-MM-dd HH:mm",
-              valueFormat: "yyyy-MM-dd HH:mm",
-              rules: [{
-                required: true,
-                message: "請輸入檢查時間開始",
-                trigger: "blur"
-              }]
-            },
             {
               label: "檢查單位",
               prop: "checkUnitSearch",
@@ -398,24 +386,24 @@
             },
 
             {
-              label: "查庫人員",
+              label: "檢查人員",
               prop: "checkPersonName",
               type: "array",
               dataType: 'string',
               rules: [{
                 required: true,
-                message: "請輸入查庫人員姓名",
+                message: "請輸入檢查人員姓名",
                 trigger: "change"
               }]
             },
             {
-              label: "查庫人員工號",
+              label: "檢查人員工號",
               prop: "checkPersonNo",
               type: "array",
               dataType: 'string',
               rules: [{
                 required: true,
-                message: "請輸入查庫人員(員工號/身份證號後四位)",
+                message: "請輸入檢查人員(員工號/身份證號後四位)",
                 trigger: "blur"
               }]
             },

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

@@ -412,11 +412,11 @@
               },
             },
             {
-              label: "查庫人員",
+              label: "檢查人員",
               prop: "checkPersonName",
             },
             {
-              label: "查庫人員工號",
+              label: "檢查人員工號",
               prop: "checkPersonNo",
               disabled: true,
             },
@@ -525,19 +525,19 @@
             },
 
             {
-              label: "查庫人員",
+              label: "檢查人員",
               prop: "checkPersonName",
             },
             {
-              label: "查庫人員工號",
+              label: "檢查人員工號",
               prop: "checkPersonNo",
             },
             {
-              label: "查庫人員姓名",
+              label: "檢查人員姓名",
               prop: "checkPersonNameOut",
             },
             {
-              label: "查庫人員工號或身份證後四位",
+              label: "檢查人員工號或身份證後四位",
               prop: "checkPersonNoOut",
             },
             {

src/views/system/login-test.vue

@@ -13,6 +13,7 @@
 <script>
 
   import {testLogin, findAllUser, findByCn} from "../../api/user";
+  import {testNotice} from "../../api/desk/notice";
 
   export default {
       name: "login-test",
@@ -62,7 +63,10 @@
           });
         },
         test3(){
-
+          testNotice("123").then(res => {
+            console.log('testNotice');
+            console.log(res)
+          });
         },
         encryptByDES(message, key){
           var keyHex = CryptoJS.enc.Utf8.parse(key);