safecheck-client 4.0.0-3 → 4.0.0-30

package/src/components/paper/PaperList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="flex-row">
+  <div class="flex-row" v-show="showinfo1">
     <div class="basic-main">
       <criteria-paged :model="model" v-ref:paged @sort="sort">
         <criteria partial='criteria' class="search_area" @condition-changed='$parent.selfSearch' v-ref:criteria>
@@ -405,6 +405,8 @@
       <check-msg v-if="showcheckmsg" :show="showcheckmsg" :data="checkInfo"></check-msg>
     </div>
   </div>
+  <new-check-paper v-if="showinfo2" :f_plan_id="shouinfodata.f_check_plan_id" :item="shouinfodata" :role="'view'" v-on:showback="showback1"></new-check-paper>
+  <new-check-paper-temp  v-if="showinfo3" :f_plan_id="shouinfodata.f_check_plan_id" :item="shouinfodata" :role="'view'" v-on:showback="showback2"></new-check-paper-temp>
 </template>
 
 <script>
@@ -461,6 +463,10 @@ export default {
     // }
     // model.f_subcompany = this.$login.f.f_fengongsi
     return {
+      showinfo1:true,
+      showinfo2:false,
+      showinfo3:false,
+      shouinfodata:{},
       tableBrands: [{label: '全部', value: ''}],
       audioshow: false,
       safeAudit: this.$appdata.getSingleValue('安检审核') == '是' ? true : false,
@@ -516,7 +522,26 @@ export default {
         cbc:[]
       }
     },
+  created() {
+    // 使用 $on 监听事件
+    this.$root.$on('audit-status-changed', () => {
+      console.log('收到审核状态变更事件')
+      this.refresh()
+    })
+  },
+  beforeDestroy() {
+    // 记得在组件销毁前移除事件监听
+    this.$root.$off('audit-status-changed')
+  },
     methods: {
+      showback1(){
+        this.showinfo1 = true
+        this.showinfo2 = false
+      },
+      showback2(){
+        this.showinfo1 = true
+        this.showinfo3 = false
+      },
             //气表品牌查询
       getTableBrands() {
         new HttpResetClass().load("POST", `/api/af-safecheck/sql/safe_singleTable_OrderBy`,
@@ -635,13 +660,16 @@ export default {
       },
 
       change(row) {
+        row.f_upload_state = '已传'
+        this.shouinfodata = JSON.parse(JSON.stringify(row))
+        this.showinfo1 = false
         if (row.f_safe_type == '已挂表未办卡安检'){
-            row.f_upload_state = '已传'
-            this.$goto('new-check-paper-temp', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
+            this.showinfo2 = false
+            this.showinfo3 = true
             return
          }
-           row.f_upload_state = '已传'
-           this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
+           this.showinfo2 = true
+           this.showinfo3 = false
       },
       showChooser() {
         this.showModal = true
@@ -761,7 +789,7 @@ export default {
         if (val) {
           this.searchData.f_approved = val
         }
-      },
+      }
     }
 
   }

package/src/components/pc/CheckBookList.vue

@@ -318,7 +318,9 @@ export default {
       // //tag
       this.$parent.showItem = false
       this.$parent.showItemUser = false
-      args.condition += ` and f_orgid in ${this.model.f_filialeids}`
+      if(this.model.f_filialeids){
+        args.condition += ` and f_orgid in ${this.model.f_filialeids}`
+      }
       args.condition += ` and tcb.f_user_type ='${this.showtype}' `
       return this.model.search(args.condition, args.model)
     },