safecheck-client 3.0.35-gongyi → 3.0.35-gongyi-1

package/src/components/report/CheckPlanUserList.vue

@@ -1,217 +1,217 @@
-<template>
-  <div class="flex">
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-          <div class="row">
-            <div class="form-group col-sm-4" >
-              <label class="font_normal_body">客户编号</label>
-              <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" placeholder='客户编号'
-                     condition="f_userinfo_code = '{}'" @keyup.enter="search()">
-            </div>
-            <div class="form-group col-sm-4" >
-              <label class="font_normal_body">用户类型</label>
-              <v-select style="width:60% "
-                        class="select select_list"
-                        :value.sync="model.f_user_type"
-                        v-model="model.f_user_type"
-                        :options='$parent.$parent.userType'
-                        placeholder='用户类型'
-                        condition="f_user_type = '{}'"
-                        close-on-select>
-              </v-select>
-            </div>
-            <div class="form-group col-sm-4" >
-              <label class="font_normal_body">是否已检</label>
-              <v-select style="width:60% "
-                        class="select select_list"
-                        :value.sync="model.f_state"
-                        v-model="model.f_state"
-                        :options='$parent.$parent.checkState'
-                        placeholder='是否已检'
-                        condition="f_state = '{}'"
-                        close-on-select>
-              </v-select>
-            </div>
-            <div class="form-group col-sm-4" >
-              <label class="font_normal_body">安检状态</label>
-              <v-select style="width:60% "
-                        class="select select_list"
-                        :value.sync="model.f_entry_status"
-                        v-model="model.f_entry_status"
-                        :options='$parent.$parent.entry_status'
-                        placeholder='安检状态'
-                        condition="f_entry_status = '{}'"
-                        close-on-select>
-              </v-select>
-            </div>
-          </div>
-          <div class="row" v-show="$parent.$parent.criteriaShow">
-            <div class="form-group col-sm-4" >
-              <label class="font_normal_body">气表编号</label>
-              <input type="text" class="input_search" style="width:60%" v-model="model.f_meternumber" placeholder='气表编号'
-                     condition="f_meternumber = '{}'" @keyup.enter="search()">
-            </div>
-            <div class="form-group col-sm-4" >
-              <label class="font_normal_body">气表品牌</label>
-              <input type="text" class="input_search" style="width:60%" v-model="model.f_meter_brand" placeholder='气表品牌'
-                     condition="f_meter_brand like '%{}%'" @keyup.enter="search()">
-            </div>
-          </div>
-          <div class="row">
-            <div class="form-group col-sm-2 button-range" >
-              <button class="button_search" style="margin-right: 10px"  @click="search()" v-el:cba>查询</button>
-              <export-excel-safe   :data="$parent.$parent.exportParameter"
-                                   :field="$parent.$parent.excelHeaders"
-                                   sqlurl="rs/logic/SafeExportExcel" sql-name="getCheckPlanUserList"
-                                   template-name='安检情况明细' :choose-col="true">
-              </export-excel-safe>
-              <!--展示下方条件或隐藏-->
-              <div class="span" style="float:right;">
-                <div class="button_spacing" style="float: right;margin-left:10px"
-                     :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
-                     @click="$parent.$parent.hidden()">
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <data-grid :model="model" class="table_sy"  partial='list' v-ref:grid >
-        <template partial='head' >
-          <tr>
-            <th><nobr>序号</nobr></th>
-            <th><nobr>用户编号</nobr></th>
-            <th><nobr>用户姓名</nobr></th>
-            <th><nobr>用户电话</nobr></th>
-            <th><nobr>气表编号</nobr></th>
-            <th><nobr>气表品牌</nobr></th>
-            <th><nobr>用户类型</nobr></th>
-            <th><nobr>用户地址</nobr></th>
-            <th><nobr>是否已检</nobr></th>
-            <th><nobr>安检状态</nobr></th>
-            <th><nobr>安检时间</nobr></th>
-            <th><nobr>隐患状态</nobr></th>
-            <th><nobr>上报条数</nobr></th>
-          </tr>
-        </template>
-        <template partial='body' >
-          <tr >
-            <td style="text-align:center;">{{$index+1}}</td>
-            <td style="text-align:center"><span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_userinfo_code}}</a></span></td>
-            <td style="text-align:center">{{row.f_user_name}}</td>
-            <td style="text-align:center">{{row.f_user_phone}}</td>
-            <td style="text-align:center">{{row.f_meternumber}}</td>
-            <td style="text-align:center">{{row.f_meter_brand}}</td>
-            <td style="text-align:center">{{row.f_user_type}}</td>
-            <td style="text-align:center;white-space: nowrap;">{{row.f_address}}</td>
-            <td style="text-align:center">{{row.f_state}}</td>
-            <td style="text-align:center">{{row.f_entry_status}}</td>
-            <td style="text-align:center">{{row.f_offsite_time}}</td>
-            <td style="text-align:center">{{row.f_defect_content}}</td>
-            <td style="text-align:center">{{row.f_check_number}}</td>
-          </tr>
-        </template>
-        <template partial='foot'></template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-  export default {
-    title: '安检情况明细',
-    data () {
-      return {
-        model: new PagedList('rs/sql/getCheckPlanUserList', 50, {}),
-        condition: '',
-        getfield: {},
-        userType:[{label:'全部',value:''}, ...this.$appdata.getParam('用户类型')],
-        entry_status:[{label:'全部',value:''}, ...this.$appdata.getParam('安检状态')],
-        checkState:[{label:'全部',value:''},{label:'已检',value:'已检'},{label:'未检',value:'未检'}],
-        config: {
-          excelHeaders: {
-            'f_price_name': '气价名称', 'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_address': '客户地址',
-            'f_orgname': '组织机构'
-          }
-        },
-        criteriaShow:false,
-        excelHeaders: {
-          'f_userinfo_code':'用户编号',
-          'f_user_name':'用户姓名',
-          'f_user_phone':'用户电话',
-          'f_meternumber':'气表编号',
-          'f_meter_brand':'气表品牌',
-          'f_user_type':'用户类型',
-          'f_address':'用户地址',
-          'f_state':'是否已检',
-          'f_entry_status':'安检状态',
-          'f_offsite_time':'安检时间',
-          'f_defect_content':'隐患状态',
-          'f_check_number':'上报条数'
-        }
-      }
-    },
-    props: ['checkrow'],
-    ready () {
-
-        this.search()
-        this.getfield = this.config.excelHeaders
-    },
-    methods: {
-      search () {
-        this.$refs.paged.$refs.criteria.search()
-      },
-      selfSearch (args) {
-        if(!this.checkrow){
-          return
-        }
-        // args.condition = `${args.condition} and f_price_id = '${this.priceid}'`
-        console.log(this.checkrow,this.$parent.$refs.list,'cew')
-        var cc= this.$parent.$refs.list.model.condition
-        console.log(cc)
-        this.condition = args.condition
-        args.condition=args.condition+' and '+ cc
-        console.log( this.condition,args.condition)
-        var self=this
-        this.$parent.$refs.list.nameForSql.forEach(function (s) {
-
-          if(s!='f_user_number'&&self.checkrow[s]!='undefined'&&self.checkrow[s]){
-            var rowsname=self.checkrow[s].replace('*&','')
-            args.condition=args.condition+" and  s."+s+"=\'"+rowsname+"\'"
-          }
-        })
-
-        console.log( this.condition,args.condition)
-        this.model.search(args.condition, args.model)
-      },
-      dealmsg (val) {
-        console.log(val)
-        this.$parent.f_userinfo_id=val.f_userinfoid
-        this.$parent.listpage=false
-      },
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-      },
-    },
-    watch: {
-      'checkrow' () {
-        this.search()
-      }
-    },
-    computed: {
-      // 导出到Excel的条件构造
-      exportParameter() {
-        return {
-          condition: this.$refs.paged.model.condition,
-          startyear: this.$parent.$refs.list.model.params.startyear,
-          startmon: this.$parent.$refs.list.model.params.startmon,
-          endyear :this.$parent.$refs.list.model.params.endyear,
-          endmon: this.$parent.$refs.list.model.params.endmon,
-          f_user_type: this.$parent.$refs.list.model.params.f_user_type
-        }
-      }
-    }
-  }
-</script>
+<template>
+  <div class="flex">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="form-group col-sm-4" >
+              <label class="font_normal_body">客户编号</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" placeholder='客户编号'
+                     condition="f_userinfo_code = '{}'" @keyup.enter="search()">
+            </div>
+            <div class="form-group col-sm-4" >
+              <label class="font_normal_body">用户类型</label>
+              <v-select style="width:60% "
+                        class="select select_list"
+                        :value.sync="model.f_user_type"
+                        v-model="model.f_user_type"
+                        :options='$parent.$parent.userType'
+                        placeholder='用户类型'
+                        condition="f_user_type = '{}'"
+                        close-on-select>
+              </v-select>
+            </div>
+            <div class="form-group col-sm-4" >
+              <label class="font_normal_body">是否已检</label>
+              <v-select style="width:60% "
+                        class="select select_list"
+                        :value.sync="model.f_state"
+                        v-model="model.f_state"
+                        :options='$parent.$parent.checkState'
+                        placeholder='是否已检'
+                        condition="f_state = '{}'"
+                        close-on-select>
+              </v-select>
+            </div>
+            <div class="form-group col-sm-4" >
+              <label class="font_normal_body">安检状态</label>
+              <v-select style="width:60% "
+                        class="select select_list"
+                        :value.sync="model.f_entry_status"
+                        v-model="model.f_entry_status"
+                        :options='$parent.$parent.entry_status'
+                        placeholder='安检状态'
+                        condition="f_entry_status = '{}'"
+                        close-on-select>
+              </v-select>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="form-group col-sm-4" >
+              <label class="font_normal_body">气表编号</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_meternumber" placeholder='气表编号'
+                     condition="f_meternumber = '{}'" @keyup.enter="search()">
+            </div>
+            <div class="form-group col-sm-4" >
+              <label class="font_normal_body">气表品牌</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_meter_brand" placeholder='气表品牌'
+                     condition="f_meter_brand like '%{}%'" @keyup.enter="search()">
+            </div>
+          </div>
+          <div class="row">
+            <div class="form-group col-sm-2 button-range" >
+              <button class="button_search" style="margin-right: 10px"  @click="search()" v-el:cba>查询</button>
+              <export-excel-safe   :data="$parent.$parent.exportParameter"
+                                   :field="$parent.$parent.excelHeaders"
+                                   sqlurl="rs/logic/SafeExportExcel" sql-name="getCheckPlanUserList"
+                                   template-name='安检情况明细' :choose-col="true">
+              </export-excel-safe>
+              <!--展示下方条件或隐藏-->
+              <div class="span" style="float:right;">
+                <div class="button_spacing" style="float: right;margin-left:10px"
+                     :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                     @click="$parent.$parent.hidden()">
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" class="table_sy"  partial='list' v-ref:grid >
+        <template partial='head' >
+          <tr>
+            <th><nobr>序号</nobr></th>
+            <th><nobr>用户编号</nobr></th>
+            <th><nobr>用户姓名</nobr></th>
+            <th><nobr>用户电话</nobr></th>
+            <th><nobr>气表编号</nobr></th>
+            <th><nobr>气表品牌</nobr></th>
+            <th><nobr>用户类型</nobr></th>
+            <th><nobr>用户地址</nobr></th>
+            <th><nobr>是否已检</nobr></th>
+            <th><nobr>安检状态</nobr></th>
+            <th><nobr>安检时间</nobr></th>
+            <th><nobr>隐患状态</nobr></th>
+            <th><nobr>上报条数</nobr></th>
+          </tr>
+        </template>
+        <template partial='body' >
+          <tr >
+            <td style="text-align:center;">{{$index+1}}</td>
+            <td style="text-align:center"><span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_userinfo_code}}</a></span></td>
+            <td style="text-align:center">{{row.f_user_name}}</td>
+            <td style="text-align:center">{{row.f_user_phone}}</td>
+            <td style="text-align:center">{{row.f_meternumber}}</td>
+            <td style="text-align:center">{{row.f_meter_brand}}</td>
+            <td style="text-align:center">{{row.f_user_type}}</td>
+            <td style="text-align:center;white-space: nowrap;">{{row.f_address}}</td>
+            <td style="text-align:center">{{row.f_state}}</td>
+            <td style="text-align:center">{{row.f_entry_status}}</td>
+            <td style="text-align:center">{{row.f_upload_date}}</td>
+            <td style="text-align:center">{{row.f_defect_content}}</td>
+            <td style="text-align:center">{{row.f_check_number}}</td>
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  export default {
+    title: '安检情况明细',
+    data () {
+      return {
+        model: new PagedList('rs/sql/getCheckPlanUserList', 50, {}),
+        condition: '',
+        getfield: {},
+        userType:[{label:'全部',value:''}, ...this.$appdata.getParam('用户类型')],
+        entry_status:[{label:'全部',value:''}, ...this.$appdata.getParam('安检状态')],
+        checkState:[{label:'全部',value:''},{label:'已检',value:'已检'},{label:'未检',value:'未检'}],
+        config: {
+          excelHeaders: {
+            'f_price_name': '气价名称', 'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_address': '客户地址',
+            'f_orgname': '组织机构'
+          }
+        },
+        criteriaShow:false,
+        excelHeaders: {
+          'f_userinfo_code':'用户编号',
+          'f_user_name':'用户姓名',
+          'f_user_phone':'用户电话',
+          'f_meternumber':'气表编号',
+          'f_meter_brand':'气表品牌',
+          'f_user_type':'用户类型',
+          'f_address':'用户地址',
+          'f_state':'是否已检',
+          'f_entry_status':'安检状态',
+          'f_offsite_time':'安检时间',
+          'f_defect_content':'隐患状态',
+          'f_check_number':'上报条数'
+        }
+      }
+    },
+    props: ['checkrow'],
+    ready () {
+
+        this.search()
+        this.getfield = this.config.excelHeaders
+    },
+    methods: {
+      search () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      selfSearch (args) {
+        if(!this.checkrow){
+          return
+        }
+        // args.condition = `${args.condition} and f_price_id = '${this.priceid}'`
+        console.log(this.checkrow,this.$parent.$refs.list,'cew')
+        var cc= this.$parent.$refs.list.model.condition
+        console.log(cc)
+        this.condition = args.condition
+        args.condition=args.condition+' and '+ cc
+        console.log( this.condition,args.condition)
+        var self=this
+        this.$parent.$refs.list.nameForSql.forEach(function (s) {
+
+          if(s!='f_user_number'&&self.checkrow[s]!='undefined'&&self.checkrow[s]){
+            var rowsname=self.checkrow[s].replace('*&','')
+            args.condition=args.condition+" and  s."+s+"=\'"+rowsname+"\'"
+          }
+        })
+
+        console.log( this.condition,args.condition)
+        this.model.search(args.condition, args.model)
+      },
+      dealmsg (val) {
+        console.log(val)
+        this.$parent.f_userinfo_id=val.f_userinfoid
+        this.$parent.listpage=false
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+    },
+    watch: {
+      'checkrow' () {
+        this.search()
+      }
+    },
+    computed: {
+      // 导出到Excel的条件构造
+      exportParameter() {
+        return {
+          condition: this.$refs.paged.model.condition,
+          startyear: this.$parent.$refs.list.model.params.startyear,
+          startmon: this.$parent.$refs.list.model.params.startmon,
+          endyear :this.$parent.$refs.list.model.params.endyear,
+          endmon: this.$parent.$refs.list.model.params.endmon,
+          f_user_type: this.$parent.$refs.list.model.params.f_user_type
+        }
+      }
+    }
+  }
+</script>

package/src/components/report/HiddenSituation.vue

@@ -37,6 +37,64 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
+
+
+
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">气表类型</label>
+              <v-select class="select_list select"
+                        placeholder='请选择' style="width: 60%"
+                        :value.sync="model.meter_classify" v-model="model.meter_classify"
+                        :options='$parent.$parent.meter_classifys'
+                        filer-key="name"
+                        close-on-select clear-button
+                        condition="F_METER_CLASSIFY='{}'"
+                        :value-single="true">
+              </v-select>
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">安装位置</label>
+              <v-select class="select_list select"
+                        placeholder='请选择' style="width: 60%"
+                        :value.sync="model.f_position" v-model="model.f_position"
+                        :options='$parent.$parent.positions'
+                        filer-key="name"
+                        close-on-select clear-button
+                        condition="f_position='{}'"
+                        :value-single="true">
+              </v-select>
+            </div>
+            <div class="form-group col-sm-2" >
+              <label class="font_normal_body">房屋类型</label>
+              <v-select class="select_list select"
+                        placeholder='请选择' style="width: 60%"
+                        :value.sync="model.f_house_type" v-model="model.f_house_type"
+                        :options='$parent.$parent.housetype'
+                        filer-key="name"
+                        close-on-select clear-button
+                        condition="f_house_type='{}'"
+                        :value-single="true">
+              </v-select>
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">安检科室</label>
+              <right-tree-safe islist  :source="$parent.$parent.source"  v-on:re-res="$parent.$parent.reres2" :textContent="'选择科室'" >
+              </right-tree-safe>
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">用户类型</label>
+              <v-select
+                        placeholder='用户类型'
+                        class="select select_list"
+                        :value.sync="model.f_usertype"
+                        :value-single="true"
+                        :options='$parent.$parent.userTypes'
+                        v-model="model.f_usertype"
+                        condition="f_check_type='{}'"
+                        close-on-select clear-button></v-select>
+            </div>
+
+
             <div class="col-sm-3 form-group" style="margin-top: 8px">
               <button class="button_search button_spacing" @click="search()">查询</button>
               <report-print class="button_export button_spacing" style="width:28%" id='shexian'></report-print>
@@ -82,20 +140,60 @@
       let model = new DataModel('rs/report/hiddensituation', {startDate: 'this.model.startDate', endDate: 'this.model.endDate', f_filialeid: 'this.f_filialeid'})
       model.f_filialeid = '(' + this.$login.f.orgid + ')'
       return {
+        userTypes: [],
         filialeNameStr: '',
         filialeCodeStr: '',
         userid: this.$login.f.id,
-        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
-        model: model
+        // source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
+        model: model,
+        positions: [],
+        housetype: [],
+        source:
+          'dep=this.getParentByType($organization$).getSpecialResByType($department$),' +
+          'tool.getFullTree(dep.where(row.hasSpecialRole($安检册二次分配$)))',
+        meter_classifys:[]//气表类型
       }
     },
     methods: {
+      reres2(val){
+        if (!val.resids || val.resids.length === 0 || val.resids[0] ==='undefined' || !val.resids[0] || val.resids.length>1){
+          console.log('未选择',val)
+          this.f_dep = ''
+          return
+        }
+        console.log('val2',val)
+        const resids = val.orgobj.filter(res=>res.resourcetype==='department')
+        if (resids.length>0){
+          this.f_dep = resids[0].name
+        }
+      },
       getRes(obj) {
         this.model.f_filialeid = this.$login.convertToIn(obj.resids);
         console.log(this.model.f_filialeid)
       },
+      setConList(){
+        this.userTypes=this.$appdata.getParam('用户类型') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('用户类型')] : [{label: '全部', value: ''}]
+
+        this.meter_classifys=this.$appdata.getParam('气表类型') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('气表类型')] : [{label: '全部', value: ''}]
+
+        this.positions=this.$appdata.getParam('安装位置') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('安装位置')] : [{label: '全部', value: ''}]
+        this.housetype=this.$appdata.getParam('房屋类型') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('房屋类型')] : [{label: '全部', value: ''}]
+      },
     },
     ready() {
+      this.setConList()
     },
     computed: {
       selected() {

package/src/safecheck.js

@@ -589,7 +589,7 @@ export default function (filiale) {
     require(['./components/defect/DefectListWeixiu'], resolve)
   })
   // 隐患查看
-  Vue.component('defect-main-weixiu', (resolve) => {
+  Vue.component('defect-main-new', (resolve) => {
     require(['./components/defect/DefectMainWeixiu'], resolve)
   })
   // 隐患详情