safecheck-client 3.0.27-gongyi → 3.0.30-gongyi

package/src/components/pc/CheckBook.vue

@@ -1,67 +1,67 @@
-<template>
-  <!--安检综合查询主界面-->
-  <div id="unit" class="flex-row" :class="{'binary':showItem}">
-    <div :class="{'basic-main':!showItem,'binary-left':showItem}">
-      <!--展示查询界面-->
-      <check-book-list :permission="permission" class="flex" :tempval="hidden" :style="style" :style2="style2" @select-changed="selected"
-                         @canel-main="close" v-ref:checkbook></check-book-list>
-    </div>
-    <div class="binary-right" v-show="showItem">
-      <div class="flex">
-        <check-book-user style="height: 100%" :row="rowData"></check-book-user>
-      </div>
-    </div>
-  </div>
-
-</template>
-
-<script>
-export default {
-  title: '安检册管理',
-  name: 'CheckPaperSearchUser',
-  data () {
-    return {
-      style: 'col-sm-2 form-group',
-      style2: 'col-sm-4 form-group',
-      hidden: true,
-      barwidth: '100%',
-      showItem: false,
-      rowData: {}
-    }
-  },
-  props: ['permission'],
-  methods: {
-    show () {
-      this.showItem = this.showItem ? false : true
-    },
-    selected (row) {
-      this.showItem = true
-      this.barwidth = '50%'
-      console.log('88888888888', row.val)
-      this.rowData = row.val
-      this.hidden = false
-      console.log('2.现在的状态是:' + this.hidden)
-    },
-
-    close () {
-      this.showItem = false
-      this.barwidth = '100%'
-      this.hidden = true
-    }
-  },
-  watch: {
-    'showItem' (val) {
-      console.log(val)
-      if (val) {
-        this.style = 'col-sm-3 form-group'
-        this.style2 = 'col-sm-6 form-group'
-      } else {
-        this.style = 'col-sm-2 form-group'
-        this.style2 = 'col-sm-4 form-group'
-      }
-    }
-  }
-}
-
-</script>
-
+<template>
+  <!--安检综合查询主界面-->
+  <div id="unit" class="flex-row" :class="{'binary':showItem}">
+    <div :class="{'basic-main':!showItem,'binary-left':showItem}">
+      <!--展示查询界面-->
+      <check-book-list :permission="permission" class="flex" :tempval="hidden" :style="style" :style2="style2" @select-changed="selected"
+                         @canel-main="close" v-ref:checkbook></check-book-list>
+    </div>
+    <div class="binary-right" v-show="showItem">
+      <div class="flex">
+        <check-book-user style="height: 100%" :row="rowData"></check-book-user>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+<script>
+export default {
+  title: '安检册管理',
+  name: 'CheckPaperSearchUser',
+  data () {
+    return {
+      style: 'col-sm-2 form-group',
+      style2: 'col-sm-4 form-group',
+      hidden: true,
+      barwidth: '100%',
+      showItem: false,
+      rowData: {}
+    }
+  },
+  props: ['permission'],
+  methods: {
+    show () {
+      this.showItem = this.showItem ? false : true
+    },
+    selected (row) {
+      this.showItem = true
+      this.barwidth = '50%'
+      console.log('88888888888', row.val)
+      this.rowData = row.val
+      this.hidden = false
+      console.log('2.现在的状态是:' + this.hidden)
+    },
+
+    close () {
+      this.showItem = false
+      this.barwidth = '100%'
+      this.hidden = true
+    }
+  },
+  watch: {
+    'showItem' (val) {
+      console.log(val)
+      if (val) {
+        this.style = 'col-sm-3 form-group'
+        this.style2 = 'col-sm-6 form-group'
+      } else {
+        this.style = 'col-sm-2 form-group'
+        this.style2 = 'col-sm-4 form-group'
+      }
+    }
+  }
+}
+
+</script>
+

package/src/components/pc/CheckBookList.vue

@@ -199,7 +199,7 @@
             <!--            <div class="col-xs-8 col-md-8">-->
             <!--              <input type="text" class="input_search" style="width: 70%;" v-model="checkBook.f_check_book_name"/>-->
             <!--            </div>-->
-            <div class="col-sm-6 form-group"  style="margin-top: 20px" v-if="permission === 'c1' ">
+            <div class="col-sm-6 form-group"  style="margin-top: 20px" v-if="permission === 'c1' && showModal ">
               <label class="font_normal_body">安检科室</label>
               <right-tree islist :userid="userid" :source="source"  v-on:re-res="reres" :textContent="选择科室" :selectData="" v-ref:f_reciever>
               </right-tree>
@@ -495,20 +495,24 @@ export default {
       this.model.f_filialeids = this.$login.convertToIn(obj.resids)
     },
     async deleteCheckBook (val) {
-      try {
-        console.log('val', val.id)
-        let http = new HttpResetClass()
-        let upAddress = `update t_user_address set f_check_book_id = null where f_check_book_id = '${val.id}'`
-        let delCheckBook= `delete from t_check_book where id ='${val.id}'`
-        await http.load('POST', 'rs/logic/runSQL', {data: {sql: upAddress}},
-          {resolveMsg: null, rejectMsg: '删除安检册失败'})
-        await http.load('POST', 'rs/logic/runSQL', {data: {sql: delCheckBook}},
-          {resolveMsg: null, rejectMsg: '删除安检册失败'})
-        this.$showMessage('删除成功')
-        this.$refs.paged.$refs.criteria.search()
-      }catch (e) {
-        this.$showMessage('删除失败',e)
-      }
+      this.$showMessage('是否确认删除安检册，此操作无法撤销！', ['confirm', 'cancel']).then(async (res) => {
+        if(res == 'confirm'){
+          try {
+            console.log('val', val.id)
+            let http = new HttpResetClass()
+            let upAddress = `update t_user_address set f_check_book_id = null where f_check_book_id = '${val.id}'`
+            let delCheckBook= `delete from t_check_book where id ='${val.id}'`
+            await http.load('POST', 'rs/logic/runSQL', {data: {sql: upAddress}},
+              {resolveMsg: null, rejectMsg: '删除安检册失败'})
+            await http.load('POST', 'rs/logic/runSQL', {data: {sql: delCheckBook}},
+              {resolveMsg: null, rejectMsg: '删除安检册失败'})
+            this.$showMessage('删除成功')
+            this.$refs.paged.$refs.criteria.search()
+          }catch (e) {
+            this.$showMessage('删除失败',e)
+          }
+        }
+      })
     }
   },
 

package/src/components/pc/CheckBookManage.vue

@@ -52,7 +52,171 @@
                 <label class="font_normal_body">公&emsp;&emsp;司</label>
                 <right-tree-safe  @re-res="$parent.$parent.getResm" v-model="model.f_orgid" condition="tua.f_orgid in {}"></right-tree-safe>
               </div>
-              <div class="col-sm-2 form-group" style="margin: 0">
+              <div class="form-group col-sm-2" style="margin-top: 0px">
+                <label class="font_normal_body">小&emsp;&emsp;区</label>
+                <input type="text" class="input_search" v-model="model.f_residential_area"
+                       style="width: 60%" placeholder="小区" condition="tua.f_residential_area like '%{}%'">
+              </div>
+              <div class="col-sm-2 form-group" style="margin-top: 0px">
+
+                <label class="font_normal_body" title="用户类型">用户类型</label>
+                <v-select :value.sync="model.f_user_type" v-model='model.f_user_type'
+                          :value-single="true" style="width: 60%"
+                          class="select_list select"
+                          :options='$parent.$parent.usertypes' placeholder='用户类型'
+                          close-on-select
+                          condition="tuf.f_user_type ='{}'"></v-select>
+
+              </div>
+              <!-- <div class="col-sm-2 form-group" style="margin: 0">
+
+                <label class="font_normal_body" title="安检用户状态">用户状态</label>
+                <v-select :value.sync="model.f_user_state" v-model='model.f_user_state'
+                          :value-single="true" style="width: 60%"
+                          class="select_list select"
+                          :options='$parent.$parent.userstates' placeholder='用户状态'
+                          close-on-select
+                          condition="tui.f_user_state ='{}'"></v-select>
+
+              </div> -->
+              <div class="col-sm-2 form-group" style="margin-top: 0px">
+
+                <label class="font_normal_body" title="用气性质">用气性质</label>
+                <v-select :value.sync="model.f_gasproperties" v-model='model.f_gasproperties'
+                          :value-single="true" style="width: 60%"
+                          class="select_list select"
+                          :options='$parent.$parent.gasproperties' placeholder='用气性质'
+                          close-on-select
+                          condition="tuf.f_gasproperties ='{}'"></v-select>
+
+              </div>
+              <div class="col-sm-2 form-group" style="margin-top: 0px">
+
+                <label class="font_normal_body" title="气表类型">气表类型</label>
+                <v-select
+                  class="select select_list"
+                  :value.sync="model.f_meter_classify"
+                  v-model="model.f_meter_classify"
+                  :options='$parent.$parent.meter_classifys'
+                  placeholder='请选择'
+                  condition="tuf.f_meter_classify='{}'"
+                  :search="false"
+                  style="width: 60%"
+                  close-on-select
+                  value-single
+                ></v-select>
+              </div>
+              <div class="col-sm-2 form-group" style="margin-top: 0px">
+
+                <label class="font_normal_body">气表品牌</label>
+                <v-select :value.sync="model.gasbrand" v-model='model.gasbrand'
+                          :value-single="true" style="width: 60%"
+                          class="select_list select"
+                          :options='$parent.$parent.getgasbrand' placeholder='气表品牌'
+                          close-on-select
+                          ></v-select>
+              </div>
+              <div class="col-sm-2 form-group" style="margin-top: 0px">
+
+                <label class="font_normal_body">气表型号</label>
+                <v-select :value.sync="model.gasmodel" v-model='model.gasmodel'
+                          :value-single="true" style="width: 60%"
+                          class="select_list select"
+                          :options='$parent.$parent.getgasmodel' placeholder='气表型号'
+                          close-on-select
+                          condition="tuf.f_gasmodel_id = {}"></v-select>
+
+              </div>
+              <div class="col-sm-2 form-group" style="margin-top: 0px">
+
+                <label class="font_normal_body" title="房屋类型">房屋类型</label>
+                <v-select :value.sync="model.f_house_type" v-model='model.f_house_type'
+                          :value-single="true" style="width: 60%"
+                          class="select_list select"
+                          :options='$parent.$parent.housetypes' placeholder='房屋类型'
+                          close-on-select
+                          condition="tui.f_house_type = {}"></v-select>
+
+              </div>
+              <div class="col-sm-2 form-group" style="margin-top: 0px">
+
+                <label class="font_normal_body" title="安装位置">安装位置</label>
+                <v-select :value.sync="model.f_position" v-model='model.f_position'
+                          :value-single="true" style="width: 60%"
+                          class="select_list select"
+                          :options='$parent.$parent.positions' placeholder='安装位置'
+                          close-on-select
+                          condition="tuf.f_position = {}"></v-select>
+
+              </div>
+              <div class="col-sm-2 form-group" style="margin-top: 0px">
+
+                <label class="font_normal_body" title="使用类型">使用类型</label>
+                <v-select :value.sync="model.f_usetype" v-model='model.f_usetype'
+                          :value-single="true" style="width: 60%"
+                          class="select_list select"
+                          :options='$parent.$parent.usetypes' placeholder='使用类型'
+                          close-on-select
+                          condition="tuf.f_usetype = {}"></v-select>
+
+              </div>
+              <div class="form-group col-sm-2" style="margin-top: 0px">
+                <label class="font_normal_body">开户起始</label>
+                <datepicker
+                  placeholder='开户起始'
+                  style="width:60%"
+                  :disabled-days-of-week="[]"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  :value.sync="model.f_startfile_time"
+                  v-model="model.f_startfile_time"
+                  condition="tui.f_createfile_date >= '{} 00:00:00'">
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-2"style="margin-top: 0px" >
+                <label class="font_normal_body">开户截止</label>
+                <datepicker
+                  placeholder='开户截止'
+                  :disabled-days-of-week="[]"
+                  style="width:60%"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  :value.sync="model.f_endfile_time"
+                  v-model="model.f_endfile_time"
+                  condition="tui.f_createfile_date <= '{} 00:00:00'">
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-2" style="margin-top: 0px">
+                <label class="font_normal_body">片&ensp;&ensp;&ensp;&ensp;区</label>
+                <v-select
+                  class="select select_list"
+                  style="width:60%"
+                  :value.sync="model.f_book_slice_area"
+                  v-model="model.f_book_slice_area"
+                  :options='$parent.$parent.sliceArea'
+                  placeholder='片区'
+                  condition="tua.f_slice_area  ='{}'"
+                  close-on-select
+                  value-single
+                >
+                </v-select>
+              </div>
+              <div class="form-group col-sm-2" style="margin-top: 0px">
+                <label class="font_normal_body" title="安检状态">安检状态</label>
+                <v-select
+                  class="select select_list"
+                  style="width:60%"
+                  :value.sync="model.f_last_check_state"
+                  v-model="model.f_last_check_state"
+                  :options='$parent.$parent.check_states'
+                  placeholder='安检状态'
+                  condition="tua.f_last_check_state  ='{}'"
+                  close-on-select
+                  value-single
+                >
+                </v-select>
+              </div>
+              <div class="col-sm-2 form-group" style="margin-top: 0px">
 
                 <label class="font_normal_body">安&ensp;检&ensp;册</label>
                 <v-select :value.sync="model.f_check_book_id" v-model='model.f_check_book_id'
@@ -63,7 +227,7 @@
                           condition="f_check_book_id ='{}'"></v-select>
 
               </div>
-              <div class="col-sm-2 form-group"  style="margin: 0">
+              <div class="col-sm-2 form-group"  style="margin-top: 0px">
 
                 <label class="font_normal_body">是否划分</label>
                 <v-select :value.sync="model.f_is_checkbook" v-model='model.f_is_checkbook'
@@ -151,7 +315,7 @@
 <!--            <div class="col-xs-8 col-md-8">-->
 <!--              <input type="text" class="input_search" style="width: 70%;" v-model="checkBook.f_check_book_name"/>-->
 <!--            </div>-->
-            <div class="col-sm-6 form-group"  style="margin-top: 20px" v-if="permission === 'c1' ">
+            <div class="col-sm-6 form-group"  style="margin-top: 20px" v-if="permission === 'c1' && showModal ">
               <label class="font_normal_body">安检科室</label>
               <right-tree islist :userid="userid" :source="source"  v-on:re-res="reres" :textContent="选择科室" :selectData="" v-ref:f_reciever>
               </right-tree>
@@ -294,11 +458,39 @@ export default {
       },
       showModal: false,
       showModal2: false,
-      showModal3: false
+      showModal3: false,
+      userstates:this.$appdata.getParam('安检用户状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检用户状态')]:[{label: '全部', value: ''}],
+      usertypes:this.$appdata.getParam('用户类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]:[{label: '全部', value: ''}],
+      gasproperties:this.$appdata.getParam('用气性质')?[{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]:[{label: '全部', value: ''}],
+      meter_classifys:this.$appdata.getParam('气表类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]:[{label: '全部', value: ''}],
+      housetypes:this.$appdata.getParam('房屋类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('房屋类型')]:[{label: '全部', value: ''}],
+      positions:this.$appdata.getParam('安装位置')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安装位置')]:[{label: '全部', value: ''}],
+      usetypes:this.$appdata.getParam('使用类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('使用类型')]:[{label: '全部', value: ''}],
+      check_states:this.$appdata.getParam('安检状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')]:[{label: '全部', value: ''}],
+      meterbrands:[],
+      sliceArea:[]
+
     }
   },
   props:['permission'],
   computed: {
+    getgasbrand(){
+      let ops=[{label:'全部',value:''}]
+      this.meterbrands.forEach(b =>{
+        ops.push({label:b.f_meter_brand,value:b})
+      })
+      return ops
+    },
+    getgasmodel(){
+      let ops=[{label:'全部',value:''}]
+      this.$refs.paged.$refs.criteria.model.gasmodel=''
+      if(this.$refs.paged.$refs.criteria.model && this.$refs.paged.$refs.criteria.model.gasbrand){
+        this.$refs.paged.$refs.criteria.model.gasbrand.gasmodel.forEach(b =>{
+          ops.push({label:b.f_meter_style,value:b.id})
+        })
+      }
+      return ops
+    },
     searchData () {
       return {condition: this.model.condition}
     },
@@ -313,6 +505,44 @@ export default {
     }
   },
   methods: {
+    //片区获取
+    async getSliceArea()  {
+      let http = new HttpResetClass()
+      let getAllArea = await http.load('POST', '/rs/search', {
+        source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+        userid: this.userlogin.id
+      }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
+      this.sliceArea = [{label: '全部', value: ''}]
+      getAllArea.data.forEach((res) => {
+        if(res.parentid==this.userlogin.orgid){
+          this.sliceArea.push({label:res.name,value:res.name})
+        }
+      })
+      console.log('片区' + this.sliceArea)
+    },
+    //片区改变-对应抄表册下拉重新赋值
+    slice_areaChange(value) {
+      console.log("下拉改变--"+value)
+      if(!value){
+        this.cbc=[]
+        this.meterbooks.forEach((res) => {
+          this.cbc.push({label: res.f_book_name, value: res.id})
+        })
+      }else{
+        this.cbc=[]
+        this.meterbooks.forEach((res) => {
+          if(res.f_book_slice_area==value){
+            this.cbc.push({label: res.f_book_name, value: res.id})
+          }
+        })
+      }
+    },
+    // 获取气表品牌
+    setConList(){
+      new HttpResetClass().load("POST", `/rs/logic/getSaleInitData`, {data:{f_orgid:`${this.$login.f.orgid}`}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+        this.meterbrands=res.data.gasbrands
+      })
+    },
     reres(val){
       if (!val.resids){
         return
@@ -609,6 +839,9 @@ export default {
       if (this.permission === 'c2'){
         args.condition +=` and tcb.f_depid = '${this.$login.f.depids}'`
       }
+      if(args.model.gasbrand){
+        args.condition +=` and tuf.f_gasbrand_id=${args.model.gasbrand.id}`
+      }
       this.model.search(args.condition, args.model)
     },
     getChecker(){
@@ -643,6 +876,10 @@ export default {
   },
 
   ready () {
+    // 获取片区
+    this.getSliceArea()
+    // 获取营收气表参数
+    this.setConList()
     if (this.permission === 'c1'){
       this.$refs.paged.$refs.criteria.model.f_is_checkbook = 'f_check_book_name is null'
     }else if(this.permission === 'c2'){