manage-client 3.3.91 → 3.3.93

package/src/components/handReport/WebGastypeReport.vue

@@ -1,190 +1,190 @@
-<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 form-group" >
-              <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 form-group" >
-              <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 class="col-sm-2 form-group">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
-              <right-tree @re-res="$parent.$parent.getRes"></right-tree>
-            </div>
-            <div class="col-sm-2 form-group">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
-              <res-select restype='department'
-                          @res-select="$parent.$parent.getdep"
-                          :parentresid  ="$parent.$parent.depresid"
-                          :initresid='$parent.$parent.depid'>
-              </res-select>
-
-            </div>
-
-
-            <div  style = "float:right;">
-              <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
-              <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
-              <report-excel id='gasprice'></report-excel>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
-        <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
-          <thead>
-          <tr>
-            <th colspan='5' style="font-weight: bold; text-align: left;">
-              <h3 style="text-align: center">抄表性质统计报表</h3>
-            </th>
-          </tr>
-          <tr>
-            <th colspan='5' style="font-weight: normal; text-align: center;">
-              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
-              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;
-            </th>
-          </tr>
-          <tr>
-            <th colspan='5' style="font-weight: normal; text-align: center;">
-              打印时间：{{{$parent.printTime}}}
-            </th>
-          </tr>
-          <tr>
-            <th colspan='5' 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>
-              </div>
-            </th>
-          </tr>
-          </thead>
-          <tr>
-            <td colspan='5' style="font-weight: normal;" id="test">
-              {{{ model.data.substring(26,model.data.length-8) }}}
-            </td>
-          </tr>
-        </table>
-        {{{ $parent.reportStr}}}
-      </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: [],
-      initres: {
-        org:[this.$login.f.orgid],
-        dep:[],
-        user:[]
-      },
-      f_public_group1: '',
-      f_orgid: this.$login.f.orgid,
-      f_depid: this.$login.f.depids,
-      f_operatorid: this.$login.f.id,
-      operatorid: [],
-      depid: [],
-      orgname: '',
-      depname: '',
-      operatorname: '',
-      orgCondtionStr: '1=1',
-      model: new DataModel('rs/report/WebGasType_hd',
-        {startDate: 'this.model.startDate',
-          endDate: 'this.model.endDate',
-          f_orgid: 'this.model.f_orgid'
-        }
-      ),
-      reportStr: null,
-      show: false,
-      spans: ''
-    }
-  },
-  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'
-    // this.$refs.paged.$refs.criteria.search()
-  },
-  methods: {
-    searchData () {
-      this.$refs.paged.$refs.criteria.search()
-    },
-    selfSearch (args) {
-      this.printTime = this.$login.toStandardTimeString()
-      let orgcondition = '1 = 1'
-      if (this.f_orgid[0]) {
-        orgcondition += ` and f_orgid   in ('${this.f_orgid}')`
-      }
-      if (this.f_depid[0]) {
-        orgcondition += ` and f_depid   in ('${this.f_depid}')`
-      }
-      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
-    },
-    getdep (obj, val) {
-      this.depname = val[0]
-      this.userresid = obj
-      this.f_depid = obj
-    },
-    getuser ( obj, val) {
-      this.operatorname = val[0]
-      this.f_operatorid = obj
-    }
-  },
-  watch: {
-    'data' (val) {
-      if (val.f_files_path) {
-        this.getFileContent(val.f_files_path)
-      } else {
-        this.reportStr = null
-      }
-    },
-    'model.data' (val) {
-      let tab = document.getElementById('test').children[0]
-      var tds = tab.getElementsByTagName('td')
-      var num = 0
-      for (let td of tds) {
-        let span = td.getAttribute('colspan')
-        num = num + ((span ? span : 1) - 0)
-      }
-      this.spans = num
-    }
-  },
-  computed: {
-  }
-}
-</script>
-<style scoped>
-.noborder{
-  border: none;
-}
-</style>
+<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 form-group" >
+              <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 form-group" >
+              <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 class="col-sm-2 form-group">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
+              <right-tree @re-res="$parent.$parent.getRes"></right-tree>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
+              <res-select restype='department'
+                          @res-select="$parent.$parent.getdep"
+                          :parentresid  ="$parent.$parent.depresid"
+                          :initresid='$parent.$parent.depid'>
+              </res-select>
+
+            </div>
+
+
+            <div  style = "float:right;">
+              <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+              <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+              <report-excel id='gasprice'></report-excel>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
+          <thead>
+          <tr>
+            <th colspan='5' style="font-weight: bold; text-align: left;">
+              <h3 style="text-align: center">抄表性质统计报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='5' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;
+            </th>
+          </tr>
+          <tr>
+            <th colspan='5' style="font-weight: normal; text-align: center;">
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th colspan='5' 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>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td colspan='5' style="font-weight: normal;" id="test">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+        </table>
+        {{{ $parent.reportStr}}}
+      </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: [],
+      initres: {
+        org:[this.$login.f.orgid],
+        dep:[],
+        user:[]
+      },
+      f_public_group1: '',
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: '',
+      operatorname: '',
+      orgCondtionStr: '1=1',
+      model: new DataModel('rs/report/WebGasType_hd',
+        {startDate: 'this.model.startDate',
+          endDate: 'this.model.endDate',
+          f_orgid: 'this.model.f_orgid'
+        }
+      ),
+      reportStr: null,
+      show: false,
+      spans: ''
+    }
+  },
+  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'
+    // this.$refs.paged.$refs.criteria.search()
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      let orgcondition = '1 = 1'
+      if (this.f_orgid[0]) {
+        orgcondition += ` and f_orgid   in ('${this.f_orgid}')`
+      }
+      if (this.f_depid[0]) {
+        orgcondition += ` and f_depid   in ('${this.f_depid}')`
+      }
+      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
+    },
+    getdep (obj, val) {
+      this.depname = val[0]
+      this.userresid = obj
+      this.f_depid = obj
+    },
+    getuser ( obj, val) {
+      this.operatorname = val[0]
+      this.f_operatorid = obj
+    }
+  },
+  watch: {
+    'data' (val) {
+      if (val.f_files_path) {
+        this.getFileContent(val.f_files_path)
+      } else {
+        this.reportStr = null
+      }
+    },
+    'model.data' (val) {
+      let tab = document.getElementById('test').children[0]
+      var tds = tab.getElementsByTagName('td')
+      var num = 0
+      for (let td of tds) {
+        let span = td.getAttribute('colspan')
+        num = num + ((span ? span : 1) - 0)
+      }
+      this.spans = num
+    }
+  },
+  computed: {
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

package/src/filiale/WEINAN/ManageCompanyGasDetail.vue

@@ -127,10 +127,8 @@
       <!--            </td>-->
       <!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
       <!--              用气量:&emsp;{{ sumsmodel.f_oughtamount }}m³-->
-      <!--            </td>-->
-      <!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
-      <!--              售气量:&emsp;{{ sumsmodel.f_pregas }}m³-->
-      <!--            </td>-->
+      <!--            <' and f_user_usetype in (\'居民用气\')'d style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
+      <!--            ' and f_user_usetype in (\'公福用气\',\'商业用户\',\'工业用户\')'  <!--            </td>-->
       <!--          </tr>-->
       <!--        </table>-->
     </div>
@@ -226,6 +224,20 @@ export default {
       args.condition = `${args.condition} and f_corporate_name_id = '${this.data.id}'`
       this.$refs.paged.$refs.cri.model.startDate = this.data.startDate
       this.$refs.paged.$refs.cri.model.endDate = this.data.endDate
+      if (this.data.f_user_type == '民用' && !this.data.f_user_usetype) {
+        args.condition = args.condition + " and f_user_usetype in ('居民用气')"
+      } else if (this.data.f_user_type == '非民用' && !this.data.f_user_usetype) {
+        args.condition = args.condition + " and f_user_usetype in ('公福用气','商业用户','工业用户')"
+      }
+      if (this.data.f_user_usetype) {
+        args.condition = args.condition + ` and f_user_usetype in (${this.data.f_user_usetype})`
+      }
+      if (this.data.f_user_usenature) {
+        args.condition = args.condition + ` and f_user_usenature in ('${this.data.f_user_usetype}')`
+      }
+      if (this.data.f_use_institution) {
+        args.condition = args.condition + ` and f_use_institution in ('${this.data.f_user_usetype}')`
+      }
       this.condition = args.condition
       console.log('查看条件', this.condition)
       this.model.search(args.condition, args.model)

package/src/filiale/WEINAN/ManageCompanyGasManage.vue

@@ -6,7 +6,7 @@
                                   :style="style">
       </manage-company-gas-summary>
     </div>
-    <div v-show="showDetail" class="binary-right">
+    <div v-if="showDetail" class="binary-right">
       <div class="flex">
         <manage-company-gas-detail v-if="showDetail" :data="row">
         </manage-company-gas-detail>
@@ -36,6 +36,10 @@ export default {
         this.row = obj.val
         this.row.startDate = this.$refs.gas.$refs.paged.$refs.cri.model.startDate
         this.row.endDate = this.$refs.gas.$refs.paged.$refs.cri.model.endDate
+        this.row.f_user_type = this.$refs.gas.$refs.paged.$refs.cri.model.f_user_type
+        this.row.f_user_usetype = this.$refs.gas.$refs.paged.$refs.cri.model.f_user_usetype
+        this.row.f_user_usenature = this.$refs.gas.$refs.paged.$refs.cri.model.f_user_usenature
+        this.row.f_use_institution = this.$refs.gas.$refs.paged.$refs.cri.model.f_use_institution
       }
     },
     refresh () {
@@ -45,6 +49,7 @@ export default {
     'cancel' () {
       this.style = 'col-sm-2 form-group'
       this.row = null
+      this.$refs.gas.$refs.paged.$refs.grid.cleanSelected()
       this.showDetail = false
     }
   }

package/src/filiale/WEINAN/ManageCompanyGasSummary.vue

@@ -100,13 +100,12 @@
                 </div>
                 <div class="col-sm-2 form-group">
                   <label for="f_user_usetype" class="font_normal_body ">用气类型</label>
-                  <v-select :value.sync="model.f_user_usetype" :search="false"
+                  <v-select :value.sync="model.f_userusetype" :search="false"
                             @change="$parent.$parent.userUseTypeChange()"
-                            v-model="model.f_user_usetype"
-                            :value-single="true"
+                            v-model="model.f_userusetype"
+                            :multiple="true"
                             :options='$parent.$parent.userusetypes'
-                            placeholder='用气类型'
-                            close-on-select>
+                            placeholder='用气类型'>
                   </v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -369,11 +368,11 @@ export default {
       this.userusetypes = []
       this.userusenatures = []
       this.useinstitutions = []
-      this.$refs.paged.$refs.cri.model.f_user_usetype = ''
+      this.$refs.paged.$refs.cri.model.f_userusetype = []
       this.$refs.paged.$refs.cri.model.f_use_institution = ''
       this.$refs.paged.$refs.cri.model.f_user_usenature = ''
       if (this.$refs.paged.$refs.cri.model.f_user_type) {
-          let str = this.$refs.paged.$refs.cri.model.f_user_type + '用气类型'
+        let str = this.$refs.paged.$refs.cri.model.f_user_type + '用气类型'
         this.userusetypes = this.$appdata.getParam(str)
       }
     },
@@ -382,10 +381,18 @@ export default {
       this.userusenatures = []
       this.$refs.paged.$refs.cri.model.f_use_institution = ''
       this.$refs.paged.$refs.cri.model.f_user_usenature = ''
-      if (this.$refs.paged.$refs.cri.model.f_user_usetype) {
-        let str = this.$refs.paged.$refs.cri.model.f_user_usetype + '机构'
-        this.useinstitutions = this.$appdata.getParam(str)
+      if (this.$refs.paged.$refs.cri.model.f_userusetype.length > 0) {
+        for (var i = 0; i < this.$refs.paged.$refs.cri.model.f_userusetype.length; i++) {
+          let str = this.$refs.paged.$refs.cri.model.f_userusetype[i] + '机构'
+          let getParam = this.$appdata.getParam(str)
+          Array.prototype.push.apply(this.useinstitutions, getParam);
+        }
       }
+      let temp = {}
+      this.useinstitutions = this.useinstitutions.filter(function(item) {
+        var key = JSON.stringify(item);
+        return temp.hasOwnProperty(key) ? false : (temp[key] = true);
+      });
     },
     userUseInstitutionChange () {
       this.userusenatures = []
@@ -432,6 +439,11 @@ export default {
     },
     async selfSearch (args) {
       let companyCondition2 = '1=1'
+      if (this.$refs.paged.$refs.cri.model.f_userusetype.length > 0) {
+        this.$refs.paged.$refs.cri.model.f_user_usetype = this.appendCondition(this.$refs.paged.$refs.cri.model.f_userusetype)
+      } else {
+        this.$refs.paged.$refs.cri.model.f_user_usetype = ''
+      }
       if (!this.orgConditionStr) {
         args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
       } else {

package/src/filiale/WEINAN/ManageSummaryReport.vue

@@ -79,7 +79,6 @@
                   <v-select :value.sync="model.f_user_type"
                             :options='$parent.$parent.usertypes'
                             placeholder='请选择' v-model="model.f_user_type"
-                            condition="f_user_type = '{}'"
                             :value-single="true"
                             @change="$parent.$parent.userTypeChange()"
                             close-on-select></v-select>
@@ -89,11 +88,10 @@
                   <v-select :value.sync="model.f_user_usetype" :search="false"
                             @change="$parent.$parent.userUseTypeChange()"
                             v-model="model.f_user_usetype"
-                            :value-single="true"
+                            :multiple="true"
                             :options='$parent.$parent.userusetypes'
-                            condition="f_user_usetype = '{}'"
-                            placeholder='用气类型'
-                            close-on-select>
+                            condition="f_user_usetype in {}"
+                            placeholder='用气类型'>
                   </v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -441,7 +439,7 @@ export default {
       this.userusetypes = []
       this.userusenatures = []
       this.useinstitutions = []
-      this.$refs.paged.$refs.cri.model.f_user_usetype = ''
+      this.$refs.paged.$refs.cri.model.f_user_usetype = []
       this.$refs.paged.$refs.cri.model.f_use_institution = ''
       this.$refs.paged.$refs.cri.model.f_user_usenature = ''
       if (this.$refs.paged.$refs.cri.model.f_user_type) {
@@ -454,10 +452,18 @@ export default {
       this.userusenatures = []
       this.$refs.paged.$refs.cri.model.f_use_institution = ''
       this.$refs.paged.$refs.cri.model.f_user_usenature = ''
-      if (this.$refs.paged.$refs.cri.model.f_user_usetype) {
-        let str = this.$refs.paged.$refs.cri.model.f_user_usetype + '机构'
-        this.useinstitutions = this.$appdata.getParam(str)
+      if (this.$refs.paged.$refs.cri.model.f_user_usetype.length > 0) {
+        for (var i = 0; i < this.$refs.paged.$refs.cri.model.f_user_usetype.length; i++) {
+          let str = this.$refs.paged.$refs.cri.model.f_user_usetype[i] + '机构'
+          let getParam = this.$appdata.getParam(str)
+          Array.prototype.push.apply(this.useinstitutions, getParam);
+        }
       }
+      let temp = {}
+      this.useinstitutions = this.useinstitutions.filter(function(item) {
+        var key = JSON.stringify(item);
+        return temp.hasOwnProperty(key) ? false : (temp[key] = true);
+      });
     },
     userUseInstitutionChange () {
       this.userusenatures = []
@@ -519,6 +525,11 @@ export default {
           companyCondition2 = companyCondition2 + ' and id in (' + await this.appendCondition(args.model.f_residential_area_id) + ')'
         }
       }
+      if (this.$refs.paged.$refs.cri.model.f_user_type == '民用' && !this.$refs.paged.$refs.cri.model.f_user_usetype[0]) {
+        args.condition = args.condition + " and f_user_usetype in ('居民用气')"
+      } else if (this.$refs.paged.$refs.cri.model.f_user_type == '非民用' && !this.$refs.paged.$refs.cri.model.f_user_usetype[0]) {
+        args.condition = args.condition + " and f_user_usetype in ('公福用气','商业用户','工业用户')"
+      }
       args.model.condition2 = companyCondition2
       this.condition = args.condition
       console.log("查看条件",this.condition)