safecheck-client 4.0.0-80 → 4.0.0-82

package/src/filiale/jinhong/android/CurrentCreate.vue

@@ -958,7 +958,7 @@ export default {
       if (this.$refs.paged.$refs.cri.model.f_check_version)
         condition += " and ti.f_check_version <= " + this.$refs.paged.$refs.cri.model.f_check_version
       //tag
-      this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检') or (f_last_check_state = '到访不遇' or f_last_check_state = '拒检')) and f_no_checkplan = '有计划安检'" + condition)
+      this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检') or (f_last_check_state = '到访不遇' or f_last_check_state = '拒检')) and ti.f_no_checkplan = '有计划安检'" + condition)
 
     },
     getNewOrder() {

package/src/filiale/jinhong/pc/PaperList.vue

@@ -146,7 +146,7 @@
                         :options='$parent.$parent.checkBooks'
                         filer-key="name"
                         close-on-select clear-button
-                        condition="f_check_book_name like '%{}%'"
+                        condition="f_check_book_name = '{}'"
                         :value-single="true">
               </v-select>
             </div>
@@ -530,7 +530,6 @@ export default {
       this.refresh()
     })
     document.addEventListener('keydown', this.handleEnter, true);
-    this.getCheckBook()
   },
   beforeDestroy() {
     // 记得在组件销毁前移除事件监听
@@ -544,9 +543,9 @@ export default {
       },
       getCheckBook(){
         this.checkBooks=[]
-        new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
+        new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy?pageNo=1&pageSize=9999999`, {
           data: {
-            items: 'id,f_check_book_name,f_check_book_type',
+            items: 'id,f_check_book_name',
             tablename: 't_check_book',
             condition: `f_orgid = '${this.$login.f.orgid}'`,
             orderitem: 'id desc'
@@ -766,6 +765,7 @@ export default {
       }
     },
     ready() {
+      this.getCheckBook()
     if(this.safeAudit){
       let oa = {
         'f_approved_by':'审核人',

package/src/filiale/jinhong/pc/checkUserList.vue

@@ -453,7 +453,7 @@
       },
       getCheckBook(){
         this.checkBooks=[]
-        new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
+        new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy?pageNo=1&pageSize=9999999`, {
           data: {
             items: 'id,f_check_book_name,f_check_book_type',
             tablename: 't_check_book',