safecheck-client 4.0.0-6 → 4.0.0-60

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/AddToCheckBook.vue

@@ -1,26 +1,26 @@
 <template>
   <div id='AddTobook'>
     <div class="auto select-overspread">
+      <button class="button_new" style="margin-right: 10px"  @click="showUploadCodeCondition()">导入编号</button>
       <validator name='v'>
         <ul class="nav nav-tabs">
           <p class="bg-info text-center" style="padding: 8px;">{{tabstitles[$parent.$refs.tabs.active]}}</p>
         </ul>
-        <div class="form-horizontal select-overspread container-fluid auto" style="margin-top:20px;flex: 1;" v-show="!($parent.$refs.tabs.active == 2)">
+        <div class="form-horizontal select-overspread container-fluid auto" style="margin-top:20px;flex: 1;">
           <div class="row" style="text-align: center">
-
             <div class="col-sm-12 form-group" :class="[$v.f_check_book_num.required ? 'has-error' : '']">
-              <label class="font_normal_body" style="width: 26%;">目标片区</label>
+              <label class="font_normal_body" style="width: 26%;">目标安检册</label>
               <input type="text" v-model="model.f_check_book_num" v-show="false"
                      v-validate:f_check_book_num='{required: true }'>
               <v-select :value.sync="model.f_check_book_num" v-model="model.f_check_book_num"
-                        :options='checkbook' placeholder='片区'
+                        :options='checkbook' placeholder='安检册'
                         :value-single="true" :search="true"
                         style="width:60%"
                         close-on-select></v-select>
             </div>
           </div>
         </div>
-        <div class="row"  v-show="!($parent.$refs.tabs.active == 2)">
+        <div class="row"  >
           <div style="float:right;margin-top: 250px;margin-right: 20px;">
             <button @click="confirm()" class="btn button_search" style="width: 70px" :disabled='!$v.valid'>
               <span class="glyphicon glyphicon-floppy-disk"></span>保存
@@ -29,8 +29,23 @@
         </div>
       </validator>
     </div>
+    <modal :show.sync="excelUserCondtion" width="500px" v-ref:modal1 >
+      <div slot="modal-header" class="modal-header">
+        <h4 class="modal-title">
+          导入用户编号
+        </h4>
+      </div>
+      <div slot="modal-body" class="modal-body">
+        <div class="row">
+          <file-upload class="my-file-uploader " name="UploadFile" class="btn btn-success" style="border-radius: 2px;"
+                       action="api/af-safecheck/file/uploadFile" tagname="安检册导入" v-ref:file :headers="headers" multiple></file-upload>
+          <img src="../../assets/anjince.png" style="width: 100%"/>
+        </div>
+      </div>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
   </div>
-
 </template>
 
 <script>
@@ -45,16 +60,17 @@
         model:{
           f_check_book_num:''
         },
+        excelUserCondtion:false,
         checkbook: [],
         checkbooks:[],
-        tabstitles:['请选择小区添加到目标片区','请选择单位添加到目标片区','用户无法单独添加到片区内']
+        tabstitles:['请选择用户添加到安检册内']
       }
     },
     created () {
     },
     ready () {
       // this.close()
-      new HttpResetClass().load('POST','api/af-safecheck/sql/safe_singleTable_OrderBy',{data: {
+      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,f_user_type',
           tablename: 't_check_book',
           condition: `1=1`,
@@ -69,10 +85,17 @@
             value:item.id
           })
         })
-        this.checkbook = this.checkbooks.filter(item=>item.f_user_type==='民用')
+        this.checkbook = this.checkbooks
       })
     },
     methods: {
+      cancel(){
+        this.showCondtion=false
+        this.excelUserCondtion=false
+      },
+      showUploadCodeCondition(){
+        this.excelUserCondtion=true
+      },
        selectbook(val){
 
       },
@@ -82,7 +105,7 @@
 
       confirm () {
          if (!this.model.f_check_book_num){
-           this.$showMessage('请选择片区')
+           this.$showMessage('请选择目标安检册')
            return
          }
         console.log(this.$parent.$refs.tabs.active)
@@ -90,6 +113,7 @@
         console.log(this.$parent.bookAll)
         console.log(this.$parent.bookCondition)
         let userCondition = ''
+        let f_userinfo_ids = "'"
         if(this.$parent.bookAll){
           if(!this.$parent.bookCondition){
             this.$showMessage("请先查询")
@@ -98,13 +122,27 @@
             userCondition = this.$parent.bookCondition
           }
         }else if(this.$parent.bookList.length > 0){
-          userCondition = this.$parent.$refs.tabs.active ===0? 'ta.id in (' + this.$parent.bookList.toString() + ')':
-            'tc.id in (' + this.$parent.bookList.toString() + ')'
+          if(this.$parent.$refs.tabs.active ===0){
+            for(let i = 0;i<this.$parent.bookList.length;i++){
+              if(i === this.$parent.bookList.length-1){
+                f_userinfo_ids += this.$parent.bookList[i].f_userinfo_id + "'"
+              }else{
+                f_userinfo_ids += this.$parent.bookList[i].f_userinfo_id + "','"
+              }
+            }
+            userCondition ='tui.f_userinfo_id in (' + f_userinfo_ids+ ')'
+          }
+          if(this.$parent.$refs.tabs.active ===1){
+
+          }
+          if(this.$parent.$refs.tabs.active ===2){
+
+          }
         }else{
-          this.$showMessage(this.$parent.$refs.tabs.active===0?'请选择小区':'请选择单位')
+          this.$showMessage(this.$parent.$refs.tabs.active===3?'请选择用户':'请选择')
           return;
         }
-        if(this.$parent.$refs.tabs.active ===0){
+        if(this.$parent.$refs.tabs.active ===1){
           new HttpResetClass().load('POST', 'api/af-safecheck/logic/updateCheckBook', {data: {f_check_book_id: this.model.f_check_book_num,
                 f_check_book_type:'小区',condition:userCondition}},
             {resolveMsg: null, rejectMsg: '添加失败'}).then(res=>{
@@ -120,7 +158,27 @@
               this.$showMessage("添加失败")
             }
           })
-        }else{
+        }else if(this.$parent.$refs.tabs.active ===0){
+          new HttpResetClass().load('POST', 'api/af-safecheck/logic/updateCheckBook', {data: {
+                f_check_book_id: this.model.f_check_book_num,
+                f_check_book_type:'用户',
+                booklist:this.$parent.bookList,
+                condition:userCondition
+                }},
+            {resolveMsg: null, rejectMsg: '添加失败'}).then(res=>{
+            if(res && res.data){
+              this.model.f_check_book_num = ""
+              this.$showMessage("本次成功添加"+this.$parent.bookList.length+"个用户",['confirm']).then(res=>{
+                if(res==='confirm'){
+                  console.log("刷新了")
+                  bus.$emit('fresh-area')
+                }
+              })
+            }else{
+              this.$showMessage("添加失败")
+            }
+          })
+        }  else{
           new HttpResetClass().load('POST', 'api/af-safecheck/logic/updateCheckBook', {data: {f_check_book_id: this.model.f_check_book_num,
                 f_check_book_type:'单位',condition:userCondition}},
             {resolveMsg: null, rejectMsg: '添加失败'}).then(res=>{
@@ -140,17 +198,36 @@
       }
     },
     watch:{
-      '$parent.$refs.tabs.active'(val){
-        if(val =='0'){
-          this.checkbook = this.checkbooks.filter(item=>item.f_user_type==='民用')
-        }else{
-          this.checkbook = this.checkbooks.filter(item=>item.f_user_type==='非民用')
-        }
-        this.model.f_check_book_num = ''
-      }
+      // '$parent.$refs.tabs.active'(val){
+      //   if(val =='0'){
+      //     this.checkbook = this.checkbooks.filter(item=>item.f_user_type==='民用')
+      //   }else{
+      //     this.checkbook = this.checkbooks.filter(item=>item.f_user_type==='非民用')
+      //   }
+      //   this.model.f_check_book_num = ''
+      // }
     },
     computed: {
 
+    },
+    events: {
+      onFileUpload: function (file, res) {
+         if ( this.model.f_check_book_num==''){
+           this.$showMessage("请先选择目标安检册")
+           return
+         }
+        let data = {
+          f_check_book_id: this.model.f_check_book_num,
+          filepath: res.f_downloadpath
+        }
+        new HttpResetClass().load('POST','/api/af-safecheck/logic/checkbookImport', {data: data}, {
+          resolveMsg: '导入成功！',
+          rejectMsg: '导入失败'
+        }).then((res) => {
+          this.excelUserCondtion = false
+        })
+      },
+
     }
   }
 </script>