manage-client 3.2.207 → 3.2.209-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.207",
+  "version": "3.2.209-1",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/SellReport/AnLiReport.vue

@@ -55,7 +55,7 @@ export default {
       },
       isShow: false,
       url: '',
-      urlPrefix: 'http://192.168.50.77:31039/report/jmreport/shareView/761723305776898048',
+      urlPrefix: '/report/jmreport/shareView/761723305776898048',
       queryData: {
         f_user_state: []
       }

package/src/components/SellReport/ManageBusSummaryNew.vue

@@ -0,0 +1,181 @@
+<template>
+  <div class="basic-main" style="height: 100%">
+    <div class="form-group" >
+      <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+        <div class="row">
+          <div class="col-sm-3 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-3 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-3 form-group" >
+            <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
+            <right-tree id="org" @re-res="getRes"></right-tree>
+          </div>
+          <div class="col-sm-3 form-group">
+            <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
+            <res-select id="dep" restype='department'
+                        @res-select="getdep"
+                        :parentresid="depresid"
+                        :initresid='queryData.depid' >
+            </res-select>
+
+          </div>
+          <div class="col-sm-3 form-group">
+            <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
+            <res-select id="oper" restype='user'
+                        is-mul="false"
+                        @res-select="getuser"
+                        :parentresid="userresid"
+                        :initresid='queryData.operatorid'>
+            </res-select>
+          </div>
+          <div class="col-sm-3 form-group">
+              <label class="font_normal_body">用户类型</label>
+              <v-select :value.sync="queryData.f_user_type"
+                        v-model="queryData.f_user_type"
+                        :options='user_type' placeholder='请选择'
+                        close-on-select :value-single="true"></v-select>
+          </div>
+          <div class="col-sm-2 form-group" style="float:right;">
+            <button class="button_search" @click="searchData()">查询</button>
+            <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':criteriaShow,
+                  'button_shrink_bottom':!criteriaShow}"  @click="hidden()"></div>
+          </div>
+        </div>
+      </div>
+      <div style="width:100%;height: 100%;margin-top: 2%" class="div-iframe">
+        <iframe class="iframe_style" style="width:100%;height:100%" :src="url" v-if="isShow"></iframe>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '新收费汇总报表',
+  data () {
+    return {
+      orgCondtionStr: '1=1',
+      model: {
+        startDate: '',
+        endDate: '',
+        f_orgid: []
+      },
+      isShow: false,
+      url: '',
+      urlPrefix: '/report/jmreport/shareView/783966412390916096',
+      queryData: {
+        f_user_type: '',
+        f_depid: [],
+        f_operatorid: []
+      },
+      orgname: '',
+      depresid: [],
+      userresid: [],
+      depname: '',
+      operatorname: '',
+      operatorid: [],
+      depid: [],
+      criteriaShow: false
+    }
+  },
+  ready () {
+    this.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+    this.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+    this.searchData()
+  },
+  methods: {
+    searchData () {
+      let queryData = ''
+      queryData = this.orgCondtionStr
+      let f_orgid = ''
+      f_orgid = this.orgCondtionStr
+      if (this.model.f_orgid.length > 0) {
+        f_orgid = f_orgid + ' and f_orgid in (' + "'" + this.model.f_orgid + "'" + ')'
+      }
+      console.log(f_orgid)
+      for (let key in this.queryData) {
+        if (this.queryData[key] !== null && this.queryData[key] !== '' && this.queryData[key] !== undefined && this.queryData[key].length > 0) {
+          if (Array.isArray(this.queryData[key])) {
+            let stringValue = ''
+            for (var i = 0; i < this.queryData[key].length; i++) {
+              if (i === this.queryData[key].length - 1) {
+                stringValue = stringValue + "'" + this.queryData[key][i] + "'"
+              } else {
+                stringValue = stringValue + "'" + this.queryData[key][i] + "',"
+              }
+            }
+            queryData = queryData + ' and ' + key + ' in (' + stringValue + ')'
+          } else {
+            queryData = queryData + ' and ' + key + ' = ' + "'" + this.queryData[key] + "'"
+          }
+        }
+      }
+      console.log(queryData)
+      // 重置url
+      this.url = ''
+      // encodeURIComponent是将该参数中的特殊符号进行编码，后端会进行解码
+      this.url = this.urlPrefix + '?condition=' + encodeURIComponent(queryData) +
+        '&startDate=' + encodeURIComponent(this.model.startDate) +
+        '&f_orgid=' + encodeURIComponent(f_orgid) +
+        '&endDate=' + encodeURIComponent(this.model.endDate)
+      console.log('报表===' + queryData)
+      console.log('报表===>' + this.url)
+      this.isShow = true
+    },
+    load () {
+      this.isShow = true
+    },
+    getRes (obj) {
+      this.orgname = obj.res[0]
+      this.depresid = obj.resids
+      this.userresid = obj.resids
+      this.model.f_orgid = obj.resids
+    },
+    getdep (obj, val) {
+      this.depname = val[0]
+      this.userresid = obj
+      this.queryData.f_depid = obj
+    },
+    getuser (obj, val) {
+      this.operatorname = val[0]
+      this.queryData.f_operatorid = obj
+    },
+    hidden () {
+      this.criteriaShow = !this.criteriaShow
+    }
+  },
+  computed: {
+    user_type () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+.span{
+  height: 0;
+}
+.iframe_style{
+  border: medium none;
+}
+</style>

package/src/components/SellReport/ManageSellTypeNew.vue

@@ -59,8 +59,10 @@
           </div>
         </div>
       </div>
-      <div style="width:100%;height: 100%;margin-top: 2%" class="div-iframe">
-        <iframe class="ifarme_style" style="width:100%;height:100%" :src="url" v-if="isShow"></iframe>
+      <div style="width:100%;height: 100%;margin-top: 2%;text-align: center" class="div-iframe">
+        <div style="width: 100%;height: 100%;display: inline-block" >
+          <iframe id="iframe" class="iframe_style" style="width:100%;height:100%" :src="url" v-show="isShow"></iframe>
+        </div>
       </div>
     </div>
   </div>
@@ -68,23 +70,22 @@
 
 <script>
 export default {
-  title: '营业厅分项汇总表',
+  title: '新营业厅分项汇总表',
   data () {
     return {
-      f_state: [ {label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '销户', value: '销户'}, {label: '预备', value: '预备'} ],
-      orgCondtionStr: '1=1',
+      orgCondtionStr: 'and 1=1',
       model: {
         startDate: '',
         endDate: ''
       },
       isShow: false,
       url: '',
-      urlPrefix: 'http://192.168.50.77:31039/report/jmreport/shareView/779255398271029248',
+      urlPrefix: '/report/jmreport/shareView/779255398271029248',
       queryData: {
         f_state: ['有效'],
-        f_orgid: this.$login.f.orgid,
-        f_depid: this.$login.f.depids,
-        f_operatorid: this.$login.f.id
+        f_orgid: [],
+        f_depid: [],
+        f_operatorid: []
       },
       orgname: '',
       depresid: [],
@@ -101,12 +102,31 @@ export default {
     this.searchData()
   },
   methods: {
+    // iframe () {
+    //   let iframe = document.getElementById('iframe')
+    //   if (iframe.attachEvent) {
+    //     iframe.attachEvent('onload', function () {
+    //       console.log('加载完成-----------')
+    //     })
+    //   } else {
+    //     iframe.onload = function () {
+    //       console.log('加载完成===========')
+    //       // let iframeDoc = iframe.contentDocument
+    //       // iframeDoc.body.style.backgroundColor = 'blue'
+    //       // console.log(iframeDoc.body.style.backgroundColor + '------------------------------')
+    //       var y = (iframe.contentWindow || iframe.contentDocument)
+    //       if (y.document)y = y.document
+    //       console.log(y.body.style.backgroundColor)
+    //     }
+    //   }
+    // },
     searchData () {
-      let queryData = this.orgCondtionStr
+      let queryData = ''
+      queryData = this.orgCondtionStr
       for (let key in this.queryData) {
         if (this.queryData[key] !== null && this.queryData[key] !== '' && this.queryData[key] !== undefined && this.queryData[key].length > 0) {
           if (Array.isArray(this.queryData[key])) {
-            var stringValue = ''
+            let stringValue = ''
             for (var i = 0; i < this.queryData[key].length; i++) {
               if (i === this.queryData[key].length - 1) {
                 stringValue = stringValue + "'" + this.queryData[key][i] + "'"
@@ -116,7 +136,7 @@ export default {
             }
             queryData = queryData + ' and ' + key + ' in (' + stringValue + ')'
           } else {
-            queryData = queryData + ' and ' + key + ' = ' + this.queryData[key]
+            queryData = queryData + ' and ' + key + ' = ' + "'" + this.queryData[key] + "'"
           }
         }
       }
@@ -129,6 +149,7 @@ export default {
       console.log('报表===' + queryData)
       console.log('报表===>' + this.url)
       this.isShow = true
+      // this.iframe()
     },
     load () {
       this.isShow = true
@@ -157,13 +178,7 @@ export default {
 }
 </script>
 <style scoped>
-.noborder{
-  border: none;
-}
-.span{
-  height: 0;
-}
-.ifarme_style{
+.iframe_style{
   border: medium none;
 }
 </style>

package/src/components/SellReport/jingwei/ManageHandSellMoneyNew.vue

@@ -0,0 +1,166 @@
+<template>
+  <div class="basic-main" style="height: 100%">
+    <div class="form-group" >
+      <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+        <div class="row">
+          <div class="col-sm-3 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-3 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-3 form-group" >
+            <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
+            <right-tree id="org" @re-res="getRes"></right-tree>
+          </div>
+          <div class="col-sm-3 form-group">
+            <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
+            <res-select id="dep" restype='department'
+                        @res-select="getdep"
+                        :parentresid="depresid"
+                        :initresid='queryData.depid' >
+            </res-select>
+
+          </div>
+          <div class="col-sm-3 form-group">
+            <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
+            <res-select id="oper" restype='user'
+                        is-mul="false"
+                        @res-select="getuser"
+                        :parentresid="userresid"
+                        :initresid='queryData.operatorid'>
+            </res-select>
+          </div>
+          <div class="col-sm-2 form-group" style="float:right;">
+            <button class="button_search" @click="searchData()">查询</button>
+            <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':criteriaShow,
+                  'button_shrink_bottom':!criteriaShow}"  @click="hidden()"></div>
+          </div>
+        </div>
+      </div>
+      <div style="width:100%;height: 100%;margin-top: 2%" class="div-iframe">
+        <iframe class="iframe_style" style="width:100%;height:100% ;border: medium none;" :src="url" v-if="isShow"></iframe>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '新营业厅售气情况统计表',
+  data () {
+    return {
+      orgCondtionStr: 'and 1=1',
+      model: {
+        startDate: '',
+        endDate: ''
+      },
+      isShow: false,
+      url: '',
+      urlPrefix: '/report/jmreport/shareView/786012859030429696',
+      queryData: {
+        f_orgid: [],
+        f_depid: [],
+        f_operatorid: []
+      },
+      orgname: '',
+      depresid: [],
+      userresid: [],
+      depname: '',
+      operatorname: '',
+      operatorid: [],
+      depid: [],
+      criteriaShow: false
+    }
+  },
+  ready () {
+    this.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+    this.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+    this.searchData()
+  },
+  methods: {
+    searchData () {
+      let queryData = ''
+      queryData = this.orgCondtionStr
+      for (let key in this.queryData) {
+        if (this.queryData[key] !== null && this.queryData[key] !== '' && this.queryData[key] !== undefined && this.queryData[key].length > 0) {
+          if (Array.isArray(this.queryData[key])) {
+            let stringValue = ''
+            for (var i = 0; i < this.queryData[key].length; i++) {
+              if (i === this.queryData[key].length - 1) {
+                stringValue = stringValue + "'" + this.queryData[key][i] + "'"
+              } else {
+                stringValue = stringValue + "'" + this.queryData[key][i] + "',"
+              }
+            }
+            queryData = queryData + ' and ' + key + ' in (' + stringValue + ')'
+          } else {
+            queryData = queryData + ' and ' + key + ' = ' + "'" + this.queryData[key] + "'"
+          }
+        }
+      }
+      console.log(queryData)
+      // 重置url
+      this.url = ''
+      // encodeURIComponent是将该参数中的特殊符号进行编码，后端会进行解码
+      this.url = this.urlPrefix + '?f_orgid=' + encodeURIComponent(queryData) +
+        '&startDate=' + encodeURIComponent(this.model.startDate) +
+        '&endDate=' + encodeURIComponent(this.model.endDate)
+      console.log('报表===' + queryData)
+      console.log('报表===>' + this.url)
+      this.isShow = true
+    },
+    load () {
+      this.isShow = true
+    },
+    getRes (obj) {
+      this.orgname = obj.res[0]
+      this.depresid = obj.resids
+      this.userresid = obj.resids
+      this.model.f_orgid = obj.resids
+    },
+    getdep (obj, val) {
+      this.depname = val[0]
+      this.userresid = obj
+      this.queryData.f_depid = obj
+    },
+    getuser (obj, val) {
+      this.operatorname = val[0]
+      this.queryData.f_operatorid = obj
+    },
+    hidden () {
+      this.criteriaShow = !this.criteriaShow
+    }
+  },
+  computed: {
+    user_type () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+.span{
+  height: 0;
+}
+.iframe_style{
+  border: medium none;
+}
+</style>

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

@@ -83,7 +83,7 @@
               </datepicker>
             </div>
             <div class="col-sm-2 ">
-              <label for="f_meter_classify"class="font_normal_body">气表类型</label>
+              <label for="f_meter_classify"class="font_normal_body" title="参数名称：气表类型">气表类型</label>
               <v-select id="f_meter_classify"
                         v-model="$parent.$parent.meter_classify"
                         placeholder='气表类型'
@@ -420,7 +420,8 @@
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
       },
       f_meter_classify(){
-        return [{label: '机表', value: '机表'},{label: '卡表', value: '卡表'},{label: '物联网表', value: '物联网表'}]
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
+        // return [{label: '机表', value: '机表'},{label: '卡表', value: '卡表'},{label: '物联网表', value: '物联网表'}]
         // return [{label: '卡表', value: '卡表'}]
       },
 

package/src/filiale/WEINAN/ChargeQuery.vue

@@ -326,9 +326,6 @@
                 <th>
                   <nobr>操作员</nobr>
                 </th>
-                <th>
-                  <nobr>发票订单</nobr>
-                </th>
                 <th>
                     <nobr>阶一气量</nobr>
                 </th>
@@ -377,9 +374,6 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_operator}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_bill_code}}</nobr>
-              </td>
               <td style="text-align: center;">
                   <nobr>{{row.f_stairamount1}}</nobr>
               </td>

package/src/filiale/WEINAN/config/exportConfig.js

@@ -68,7 +68,7 @@ export default{
     'f_userinfo_code': '用户编号','f_user_name':'用户名称',
     'f_meternumber': '用户表号','f_card_id': '用户卡号','f_address': '用户地址',
     'f_pregas': '购气量','f_collection': '缴费金额','f_payment': '付款方式','f_operate_date': '收费日期','f_state': '状态',
-    'f_depname': '网点','f_operator': '操作员','f_bill_code':'发票订单','f_stairamount1':'一阶气量',
+    'f_depname': '网点','f_operator': '操作员','f_stairamount1':'一阶气量',
     'f_stair2amount': '二阶气量','f_stair3amount':'三阶气量'
   },
   pricetypeGasConfig: {

package/src/filiale/qianneng/OtherChargeQuery.vue

@@ -227,6 +227,9 @@
                 <th>
                   <nobr>数量</nobr>
                 </th>
+                <th>
+                  <nobr>应收</nobr>
+                </th>
                 <th>
                   <nobr>收款</nobr>
                 </th>
@@ -312,6 +315,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_money}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_collection}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_newbalance}}</nobr>
               </td>
@@ -361,7 +367,16 @@
               汇总信息
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              收款合计:&emsp;{{sumsmodel.f_money}}
+              应收合计:&emsp;{{sumsmodel.f_money}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              收款合计:&emsp;{{sumsmodel.f_collection}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              支出合计:&emsp;{{sumsmodel.f_newbalance}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              存入合计:&emsp;{{sumsmodel.f_newcurbalance}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               户数合计:&emsp;{{sumsmodel.hushu}}
@@ -422,7 +437,8 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/otherChargeQuery', 20, {}, {f_money: 0,hushu:0}),
+        model: new PagedList('rs/sql/otherChargeQuery', 20, {}, {f_money: 0, f_collection: 0,
+          f_newbalance: 0, f_newcurbalance: 0, hushu:0}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],

package/src/filiale/qianneng/exportConfig.js

@@ -75,8 +75,8 @@ export default{
   otherchargeConfig: {
     'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_user_phone': '客户电话', 'f_meter_classify': '气表类型',
     'f_meter_brand': '气表品牌', 'f_bill_number': '收据票号', 'f_brand_spec': '收费类型', 'f_typename': '品名规格',
-    'f_typenumber': '型号', 'f_unitprice': '单价', 'f_number': '数量',
-    'f_money': '收款', 'f_newbalance': '支出', 'f_newcurbalance': '收入', 'f_payment': '付款方式', 'f_state': '状态',
+    'f_typenumber': '型号', 'f_unitprice': '单价', 'f_number': '数量', 'f_money': '应收',
+    'f_collection': '收款', 'f_newbalance': '支出', 'f_newcurbalance': '收入', 'f_payment': '付款方式', 'f_state': '状态',
     'f_operate_date': '收费日期', 'f_service_person': '服务人员', 'f_comments': '备注',
     'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司'
   },