manage-client 3.2.136 → 3.2.140

package/src/components/SellReport/applysFillmoney.vue

@@ -0,0 +1,228 @@
+<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>
+        <p class="bg-info text-center" style="padding: 8px;">人员报建表</p>
+        <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+          <div class="row">
+            <div class="col-sm-4" >
+              <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-4" >
+              <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-4">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
+              <right-tree @re-res="$parent.$parent.getRes"></right-tree>
+            </div>
+
+          </div>
+          <div class="span" 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>
+      </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='7' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">人员报建表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='7' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}
+            </th>
+          </tr>
+          <tr>
+            <th colspan='7' style="font-weight: normal; text-align: center;">
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th colspan='7' 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='7'>
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left">
+            <th colspan='3'>财务审核：</th>
+            <th colspan='3'>收款审核：</th>
+            <th colspan='1'>收款员：</th>
+          </tr>
+          </tfoot>
+        </table>
+        {{{ $parent.reportStr}}}
+      </div>
+    </criteria-paged>
+    <modal :show.sync="show" v-ref:modal small backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h4 class="modal-title">输入文件名称</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="form-group">
+          <input  type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
+        <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+import { DataModel } from 'vue-client'
+import co from 'co'
+let saveFile = function * (self) {
+  // 线验证文件是否重名
+  let count = yield self.$resetpost('rs/sql/manageSingleTable',
+    {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
+    {resolveMsg: null, rejectMsg: null})
+  if (count.data.length > 0) {
+    self.$showAlert('无法保存，文件名重名', 'warning', 3000)
+    return
+  }
+  let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
+    f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
+    f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
+    f_outlets: this.$login.f.depname})
+  if (saveBack.data.status === 'succeed') {
+    self.show = false
+    self.filename = ''
+    // 后台保存完成，通知刷新
+    self.$dispatch('save-success', self.filename)
+  }
+}
+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/report/applygasfillmoney', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      show: false
+    }
+  },
+  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()
+    console.log(this.$login.f)
+  },
+  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
+    },
+    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
+    },
+    // 根据文件路径获取储存的报表内容
+    getFileContent (path) {
+      this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        this.reportStr = res.data.filecontent
+        this.model.state = '正确'
+      })
+    },
+    confirm () {
+      if (!this.filename || this.filename === '') {
+        this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
+      }
+      let saveGen = saveFile(this)
+      co(saveGen)
+    },
+    close () {
+      this.show = false
+    },
+    // 将报表保存成文件
+    confirmReport () {
+      this.show = true
+      this.filename = this.data.f_report_name + this.$login.toStandardDateString()
+    },
+  },
+  watch: {
+    'data' (val) {
+      if (val.f_files_path) {
+        this.getFileContent(val.f_files_path)
+      } else {
+        this.reportStr = null
+      }
+    }
+  },
+  computed: {
+    usertypes() {
+      return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+    },
+    inputtor() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表员')]
+    },
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

package/src/components/WebReport/EchartsBox.vue

@@ -32,10 +32,11 @@
                       @res-select="getRes"
                       :initresid="model.id">
           </res-select>
+          <button class="button_search button_spacing" @click="changePage()">下一页</button>
         </div>
       </div>
     </div>
-    <div style="height: 97%;">
+    <div style="height: 97%;" v-if="showPage === 1">
       <div class="flex-row" style="flex: 1;border-bottom: 1px dashed #888;height: 48%">
         <div style="flex: 1;border-right: 1px dashed #888;width: 50%">
           <site-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
@@ -49,8 +50,9 @@
       <div class="flex-row" style="flex: 1;height: 48%">
 
         <div class="flex-row" style="flex: 1;width: 50%;border-right: 1px dashed #888;">
-          <div  style="flex: 1;">
-            <paymentpie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></paymentpie>
+          <div style="flex: 1;">
+            <paymentpie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
+                        v-ref:pay></paymentpie>
           </div>
           <!--          <div style="flex: 1;">-->
           <!--            <usertype-pie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></usertype-pie>-->
@@ -58,7 +60,15 @@
         </div>
 
         <div style="flex: 1;width: 50%">
-          <bussiness-type :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></bussiness-type>
+          <bussiness-type :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
+                          v-ref:pay></bussiness-type>
+        </div>
+      </div>
+    </div>
+    <div style="height: 97%;" v-if="showPage === 2">
+      <div class="flex-row" style="flex: 1;height: 96%">
+        <div style="flex: 1">
+          <gas-properties-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'></gas-properties-manager>
         </div>
       </div>
     </div>
@@ -67,43 +77,53 @@
 </template>
 
 <script>
-  import * as Util from '../../Util'
+import * as Util from '../../Util'
 
-  export default {
-    props: {
-      classname: {
-        type: String,
-        default: 'basic-main'
-      },
-      width: {
-        type: String,
-        default: '98.5%'
-      },
-      height: {
-        type: String,
-        default: '98%'
+export default {
+  props: {
+    classname: {
+      type: String,
+      default: 'basic-main'
+    },
+    width: {
+      type: String,
+      default: '98.5%'
+    },
+    height: {
+      type: String,
+      default: '98%'
+    }
+  },
+  data () {
+    return {
+      showPage: 1,
+      page: [1, 2],
+      jurisdiction: this.$login.r,
+      model: {
+        id: [this.$login.f.orgid],
+        orgid: [this.$login.f.orgid],
+        startDate: Util.toStandardDateString(),
+        endDate: Util.toStandardDateString()
       }
+    }
+  },
+  methods: {
+    searchdata () {
+      this.$refs.pay.searchdata()
     },
-    data() {
-      return {
-        jurisdiction: this.$login.r,
-        model: {
-          id: [this.$login.f.orgid],
-          orgid: [this.$login.f.orgid],
-          startDate: Util.toStandardDateString(),
-          endDate: Util.toStandardDateString()
-        }
+    changePage () {
+      let curPage = this.page.indexOf(this.showPage)
+      if (curPage + 1 === this.page.length) {
+        this.showPage = this.page[0]
+      } else {
+        this.showPage = this.page[curPage + 1]
       }
     },
-    methods: {
-      searchdata() {
-        this.$refs.pay.searchdata()
-      },
-      getRes(obj) {
-        this.model.orgid = obj
-      },
+    getRes (obj) {
+      this.model.orgid = obj
     }
   }
+}
 </script>
 
 <style lang="css">

package/src/components/daping/DataManagement.vue

@@ -6,7 +6,7 @@
         <div class="flex">
           <div class="flex" >
             <div class="flex-row" style="height: 40%;margin-top: 2%;">
-              <div  class="auto col-sm-12" style="width: 40%;height: 100%;padding: 1em" >
+              <div  class="auto col-sm-12" style="width: 60%;height: 100%;padding: 1em" >
                 <div class=" col-sm-12 auto" style="padding-left: 1em">
                   <span class="font-title">安检</span>
                 </div>
@@ -24,9 +24,9 @@
                   <span class="normal-font" >计划安检量</span>
                 </div>
               </div>
-              <div style="width: 60%">
-                <ring-safecheck-wh></ring-safecheck-wh>
-              </div>
+              <!--<div style="width: 60%">-->
+                <!--<ring-safecheck-wh></ring-safecheck-wh>-->
+              <!--</div>-->
             </div>
             <div  style="height: 58%">
               <safe-check-wh></safe-check-wh>

package/src/components/daping/json/dataManage.json

@@ -1,14 +1,18 @@
 {
 "checkData":{
-  "wrhsum":2458,
+  "wrhsum":1021,
   "jhsum":81300
 },
-  "checkByMonth":[{"sucnum":8359,"time":"2021-11","allnum":8359},
-    {"sucnum":2114,"time":"2021-12","allnum":2114},
-    {"sucnum":5528,"time":"2022-01","allnum":5528},
-    {"sucnum":6921,"time":"2022-02","allnum":6921},
-    {"sucnum":3820,"time":"2022-03","allnum":3820}
- ],
+  "checkByMonth":[
+    {"sucnum":8359,"time":"2021-10","allnum":8500},
+    {"sucnum":8359,"time":"2021-11","allnum":8400},
+    {"sucnum":2114,"time":"2021-12","allnum":2200},
+    {"sucnum":5500,"time":"2022-01","allnum":5528},
+    {"sucnum":6921,"time":"2022-02","allnum":7000},
+    {"sucnum":3820,"time":"2022-03","allnum":4000},
+    {"sucnum":8617,"time":"2022-04","allnum":9000},
+    {"sucnum":9388,"time":"2022-05","allnum":9500}
+  ],
   "callData":{
     "yearamount":12101,
     "sumsend":2453,

package/src/components/qinhua/Pie.vue

@@ -24,9 +24,10 @@
           // color: color,
           backgroundColor: '#ffffff00',
           legend: {
+            // show: false,
             orient: 'horizontal',
             x: 'center',
-            y: 'top',
+            y: 'bottom',
             icon: 'circle',
             data: title,
             itemWidth: 10,
@@ -48,23 +49,32 @@
             // }],
             labelLine: {
               normal: {
-                length: '5%'
+                length: 10
               }
             },
             label: {
               show: true,
-              formatter: '{b|{b}}\n{per|{d}%}',
+              formatter: '{b|{b}}{per|{d}%}',
               rich: {
+                a: {
+                  color: '#999',
+                  lineHeight: 16,
+                  align: 'center'
+                },
+                hr: {
+                  borderColor: '#aaa',
+                  width: '100%',
+                  borderWidth: 1,
+                  height: 0
+                },
                 b: {
                   fontSize: 10,
                   padding: [5, 0],
                   color: '#fff'
                 },
-                hr: {
-                  height: 0,
-                  borderWidth: 1,
-                  width: '100%',
-                  borderColor: '#fff'
+                c: {
+                  fontSize: 10,
+                  color: '#eee'
                 },
                 per: {
                   color: '#FDF44E',

package/src/components/sale/businessquery/ArrearsQuery.vue

@@ -8,20 +8,20 @@
               <div class="row">
                 <div class="col-sm-2 form-group">
 
-                  <label for="startDate" class="font_normal_body" title="归属日期">开始日期</label>
-                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
-                              v-model="model.startDate"
-                              :value.sync="model.startDate"
+                  <label for="startDate1" class="font_normal_body" title="归属日期">开始日期</label>
+                  <datepicker id="startDate1" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate1"
+                              :value.sync="model.startDate1"
                               :format="'yyyy-MM-dd HH:mm:ss'"
                               :show-reset-button="true"
                   >
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body" title="归属日期">结束日期</label>
-                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
-                              v-model="model.endDate"
-                              :value.sync="model.endDate"
+                  <label for="endDate1" class="font_normal_body" title="归属日期">结束日期</label>
+                  <datepicker id="endDate1" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate1"
+                              :value.sync="model.endDate1"
                               :format="'yyyy-MM-dd HH:mm:ss'"
                               :show-reset-button="true"
                   >
@@ -563,7 +563,7 @@
           dep:[],
           user:[]
         },
-        model: new PagedList('rs/sql/arrearsQuery', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {
+        model: new PagedList('rs/sql/arrearsQuery', 20, {startDate: 'this.model.inputstartDate', endDate: 'this.model.inputendDate',startDate1: 'this.model.startDate1', endDate1: 'this.model.endDate1'}, {
           f_oughtamount: 0,
           f_oughtfee: 0,
           f_debt_money: 0,
@@ -911,8 +911,10 @@
       },
       getCondition() {
         return {
-          startDate: this.$refs.paged.$refs.cri.model.startDate,
-          endDate: this.$refs.paged.$refs.cri.model.endDate,
+          startDate: this.$refs.paged.$refs.cri.model.inputstartDate,
+          endDate: this.$refs.paged.$refs.cri.model.inputendDate,
+          startDate1: this.$refs.paged.$refs.cri.model.startDate1,
+          endDate1: this.$refs.paged.$refs.cri.model.endDate1,
           condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
           condValue: `${this.model.condValue}`
         }

package/src/components/sale/businessquery/ChargeQuery.vue

@@ -59,7 +59,7 @@
                 </div>
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
-                <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <res-select-group :show-component="$parent.$parent.resshow"  :initres="$parent.$parent.initres"  :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户名称</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
@@ -697,7 +697,7 @@
                     <nobr>{{row.f_stairamount1}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                    <nobr>{{row.f_stair1price}}</nobr>
+                    <nobr>{{row.conutnum>1?'--':row.f_stair1price}}</nobr>
                 </td>
                 <td style="text-align: center;">
                     <nobr>{{(row.f_stair1fee - 0).toFixed(2)}}</nobr>
@@ -706,7 +706,7 @@
                     <nobr>{{row.f_stair2amount}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                    <nobr>{{row.f_stair2price}}</nobr>
+                    <nobr>{{row.conutnum>1?'--':row.f_stair2price}}</nobr>
                 </td>
                 <td style="text-align: center;">
                     <nobr>{{(row.f_stair2fee - 0).toFixed(2)}}</nobr>
@@ -715,7 +715,7 @@
                     <nobr>{{row.f_stair3amount}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                    <nobr>{{row.f_stair3price}}</nobr>
+                    <nobr>{{row.conutnum>1?'--':row.f_stair3price}}</nobr>
                 </td>
                 <td style="text-align: center;">
                     <nobr>{{(row.f_stair3fee - 0).toFixed(2)}}</nobr>

package/src/components/sale/businessquery/CommunityPaymen.vue

@@ -35,7 +35,7 @@
                             style="width: 60%"
                             v-model="model.f_residential_area"
                             :options='$parent.$parent.residentialArea' placeholder='选择小区'
-                            condition="ud.f_residential_area = '{}'"
+                            condition="f_residential_area = '{}'"
                             close-on-select search="true">
                   </v-select>
                 </div>

package/src/components/sale/businessquery/HandGasPropertiesQuery.vue

@@ -274,6 +274,7 @@
     self.$MagGetSaleParam.initinputtor();
     self.getinputtores();
     self.initmeterbook();
+    self.initSlice()
     self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
     self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
     // self.$refs.paged.$refs.cri.search()
@@ -339,8 +340,7 @@
       }
     },
     ready() {
-      // this.getaddress()
-      //
+      this.getaddress()
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
@@ -350,6 +350,9 @@
     methods: {
       //初始化片区
       async initSlice (val) {
+        if(val == null ){
+          val = this.f_filialeid;
+        }
         if (val) {
           let getAllArea = await this.$resetpost('/rs/search', {
             source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',