apply-clients 7.1.36-1 → 7.1.36-yuchuan-1

package/src/components/product/Report/apply-stair-tongqi.vue

@@ -0,0 +1,137 @@
+<template>
+  <div class="basic-main"  style="height: 100%">
+    <criteria-paged :model="model" :pager='false' 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="col-sm-2" >
+              <label class="font_normal_body" for="startDate">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2" >
+              <label  class="font_normal_body" for="endDate">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+          </div>
+          <div class="span" style = "float:right;">
+            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+            <report-print id='gasprice2' top='1cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+            <report-excel id='gasprice2'></report-excel>
+          </div>
+        </div>
+      </criteria>
+      <div  partial='list' v-el:handcollect id='gasprice2' style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">用户管理部通气月报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              <div>
+                <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
+                <span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td :colspan='$parent.spans' class="noborder">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          </tfoot>
+        </table>
+      </div>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { DataModel } from 'vue-client'
+
+export default {
+  title: '用户管理部通气月报表',
+  props: ['data'],
+  data () {
+    return {
+      printTime: this.$login.toStandardTimeString(),
+      depresid: [],
+      userresid: [],
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: '',
+      operatorname: '',
+      f_inputtor: [],
+      f_user_type: '',
+      orgCondtionStr: '1=1',
+      model: new DataModel('rs/apply/report/apply-stair-tongqi', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      spans: 0
+    }
+  },
+  ready () {
+    this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
+      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+      this.$refs.paged.search(args)
+    },
+    getRes (obj) {
+      this.orgname = obj.res[0]
+      // this.depresid = obj.resids
+      this.f_orgid = obj.resids
+    }
+  },
+  watch: {
+    'model.data' (val) {
+      this.spans = val.split('</tr>').map(item => item.split('</td>').length - 1).reduce((x, y) => x > y ? x : y)
+    }
+  },
+  computed: {
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

package/src/components/product/Report/apply-stair-wtongqi.vue

@@ -0,0 +1,138 @@
+<template>
+  <div class="basic-main"  style="height: 100%">
+    <criteria-paged :model="model" :pager='false' 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="col-sm-2" >
+              <label class="font_normal_body" for="startDate">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2" >
+              <label  class="font_normal_body" for="endDate">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+
+          </div>
+          <div class="span" style = "float:right;">
+            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+            <report-print id='gasprice3' top='1cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+            <report-excel id='gasprice3'></report-excel>
+          </div>
+        </div>
+      </criteria>
+      <div  partial='list' v-el:handcollect id='gasprice3' style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">用户管理部未通气月报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              <div>
+                <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
+                <span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td :colspan='$parent.spans' class="noborder">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          </tfoot>
+        </table>
+      </div>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { DataModel } from 'vue-client'
+import co from 'co'
+export default {
+  title: '用户管理部未通气月报表',
+  props: ['data'],
+  data () {
+    return {
+      printTime: this.$login.toStandardTimeString(),
+      depresid: [],
+      userresid: [],
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: '',
+      operatorname: '',
+      f_inputtor: [],
+      f_user_type: '',
+      orgCondtionStr: '1=1',
+      model: new DataModel('rs/apply/report/apply-stair-wtongqi', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      spans: 0
+    }
+  },
+  ready () {
+    this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
+      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+      this.$refs.paged.search(args)
+    },
+    getRes (obj) {
+      this.orgname = obj.res[0]
+      // this.depresid = obj.resids
+      this.f_orgid = obj.resids
+    }
+  },
+  watch: {
+    'model.data' (val) {
+      this.spans = val.split('</tr>').map(item => item.split('</td>').length - 1).reduce((x, y) => x > y ? x : y)
+    }
+  },
+  computed: {
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue

@@ -156,12 +156,21 @@
             this.showLabels('营业执照', '小区', '小区名称')
             this.requiredLabels( '小区')
           }
+        if (this.selectdata.f_dispatching_type === '施工工队') {
+          this.showLabels('现场项目负责人', '安装单位', '建设单位', '监理单位', '土建单位', '检测单位')
+          this.requiredLabels( '小区')
+        }
         // 消除双向绑定，避免子组件（显示层）数据更改，父组件（控制层）也更改
         let temp = JSON.parse(JSON.stringify(this.data))
 
         this.show_data = temp
         this.$nextTick(() => {
-          this.showview = true
+          if ((this.show_data.defname==='报装缴费' || this.show_data.defname==='收费标准') && !(this.$login.f.rolesnames.includes('营业厅报装')||this.$login.f.rolesnames.includes('市场部报装'))){
+            this.showview = false
+            this.$showMessage("对不起，您没有查看此节点的权限！")
+          }else {
+            this.showview = true
+          }
         })
       },
       // json配置数据处理
@@ -253,7 +262,7 @@
         let http = new HttpResetClass()
         let res = await http.load(
           'POST',
-          `rs/sql/getMeterBrand`,
+          `rs/sql/getMeterBrand1`,
           {data: data},
           {resolveMsg: null, rejectMsg: '气表品牌查询失败！！！'}
         )
@@ -306,7 +315,7 @@
         }
 
         let res = await this.$resetpost(
-          `${this.$androidUtil.getProxyUrl()}/rs/search`,
+          `rs/search`,
           {data: data},
           {resolveMsg: null, rejectMsg: '现场负责人查询失败！！！'}
         )
@@ -433,7 +442,7 @@
             value: item.id
           }
         })
-        if(this.selectdata.f_apply_nature === '散户'){
+        if(this.selectdata.f_apply_nature === '散户' || this.selectdata.f_apply_type === '改线业务'){
           result.push({label:'用户自理',value:'用户自理'})
         }
         result.push({label:'无',value:'无'})
@@ -486,10 +495,12 @@
           {data: data},
           {resolveMsg: null, rejectMsg: null}
         )
-        for (const item of this.data.fields) {
-          if (item.label === '缴费日期') {
-            item.value = res.data[0].finishtime
-            this.data[item.field] = item.value
+        if (res.data[0]){
+          for (const item of this.data.fields) {
+            if (item.label === '缴费日期') {
+              item.value = res.data[0].finishtime
+              this.data[item.field] = item.value
+            }
           }
         }
       },
@@ -534,6 +545,24 @@
 
         this.setLabelOptions('气表型号', res.data)
       },
+      async 'buildReadyEvent' () {
+        console.log("cscc")
+        if (isEmpty(this.show_data.f_meter_brand)) {
+          return
+        }
+        let data = {
+          f_gasbrand_id: this.show_data.f_meter_brand
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `rs/sql/getGasModel`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '气表型号查询失败！！！'}
+        )
+
+        this.setLabelOptions('气表型号', res.data)
+      }
     },
     watch: {
       deep: true

package/src/components/product/Supervisory/SupervisoryList.vue

@@ -70,20 +70,19 @@
               <v-select
                 v-model="model.f_apply_type"
                 placeholder='报建类型'
-                condition="f_apply_type = '{}'"
+                condition="u.f_apply_type in {}"
                 :value.sync="model.f_apply_type"
                 :options='$parent.$parent.applytype'
                 class="select select_list"
-                :value-single="true"
-                @change="$parent.$parent.applyTypeChange()"
-                close-on-select ></v-select>
+                multiple
+                @change="$parent.$parent.applyTypeChange()"></v-select>
             </div>
             <div class="form-group col-sm-2">
               <label class="font_normal_body">办理环节：</label>
               <v-select
                 v-model="model.defname"
                 placeholder='办理环节'
-                condition="defname = '{}'"
+                condition="act.defname = '{}'"
                 :value.sync="model.defname"
                 :options='$parent.$parent.defnames'
                 class="select select_list"
@@ -119,7 +118,7 @@
               <v-select
                 v-model="model.f_user_type"
                 placeholder='普通/煤改'
-                condition="(f_user_type = '{}' or f_user_type is null)"
+                condition="f_user_type = '{}'"
                 :value.sync="model.f_user_type"
                 :options='$parent.$parent.UserType'
                 class="select select_list"
@@ -188,6 +187,53 @@
                           condition="u.f_release_date <= '{}'">
               </datepicker>
             </div>
+            <div class="form-group col-sm-2">
+              <label  for="startDate" class="font_normal_body">回单日期：</label>
+              <datepicker id="startDate1" placeholder="回单开始日期"
+                          style="width: 60%!important;"
+                          v-model="model.startDate2"
+                          :value.sync="model.startDate2"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          :show-reset-button="true"
+                          condition="u.f_outdoors_receipt_time >= '{}'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-2">
+              <label for="endDate" class="font_normal_body">回单日期：</label>
+              <datepicker id="endDate1" placeholder="回单截止日期"
+                          style="width: 60%!important;"
+                          v-model="model.endDate2"
+                          :value.sync="model.endDate2"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="true"
+                          condition="u.f_outdoors_receipt_time <= '{}'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">派工类型：</label>
+              <v-select
+                v-model="model.f_dispatching_type"
+                placeholder='工队/维修'
+                condition="u.f_dispatching_type = '{}'"
+                :value.sync="model.f_dispatching_type"
+                :options='$parent.$parent.dispatching'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">新旧报建：</label>
+              <v-select
+                v-model="model.f_house_type"
+                placeholder='新旧报建'
+                condition="u.f_house_type {}"
+                :value.sync="model.f_house_type"
+                :options='$parent.$parent.houseType'
+                class="select select_list"
+                :value-single="true"
+                close-on-select >
+              </v-select>
+            </div>
             <div class="form-group col-sm-2">
               <label class="font_normal_body">来&emsp;&emsp;源：</label>
               <v-select
@@ -227,52 +273,52 @@
         </template>
         <template partial='body'>
           <tr>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{$index+1}}</nobr>
             </td>
-            <td style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_apply_num}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_user_name}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_contact}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_contract_number}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_phone}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr><font>{{row.f_designer_people}}</font></nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_apply_type}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_apply_nature}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_user_type}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.defname}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_user_classification}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_address}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_apply_source}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_sub_state}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_apply_date}}</nobr>
             </td>
           </tr>
@@ -303,6 +349,8 @@
         UserList:[{label: '全部', value: ''}, ...this.$appdata.getParam('用户分类')],
         UserType:[{label: '全部', value: ''}, {label: '普通用户', value: '普通用户'}, {label: '煤改用户', value: '煤改用户'}],
         designerPeoples:  this.getDesigner(),
+        dispatching:  [{label: '全部', value: ''}, {label: '施工工队', value: '施工工队'}, {label: '安检维修中心', value: '安检维修中心'}],
+        houseType:[{label: '全部', value: ''}, {label: '旧报建', value: ` = '旧报导入'`}, {label: '新报建', value: ' is null' }],
         getfield: {
           'f_apply_num': ' 工 程 编 号 ',
           'f_charge_date': ' 收 费 日 期 ',
@@ -344,7 +392,8 @@
           'f_apply_source': ' 来源 ',
           'f_apply_type': ' 报 建 类 型 ',
           'f_sub_state': ' 流 程 状 态 ',
-          'f_apply_date': ' 报 建 日 期 '
+          'f_apply_date': ' 报 建 日 期 ',
+          'f_house_type': ' 新 旧 报 建 '
         },
         civil: {
           'f_apply_num': '工程编号',
@@ -359,7 +408,8 @@
           'f_construct_operator': '现场项目负责人',
           'f_contact': '联系人',
           'f_phone': '电话',
-          'f_construction_unit':'施工单位'
+          'f_construction_unit':'施工单位',
+          'f_house_type': ' 新 旧 报 建 '
         },
         uncivil: {
           'f_apply_num': '工程编号',
@@ -391,13 +441,14 @@
           'f_outdoors_receipt_time': ' 户内回单日期 ',
           'f_courtyard_time': ' 庭院出单日期 ',
           'f_courtyard_receipt_time': ' 庭院回单日期 ',
-          'f_construction_unit':'施工单位'
+          'f_construction_unit':'施工单位',
+          'f_house_type': ' 新 旧 报 建 '
         }
       }
     },
     ready () {
       // 调用查询
-      this.search()
+      // this.search()
     },
     events: {
     },