manage-client 4.1.73 → 4.1.74-weinan

package/.eslintrc.js

@@ -15,6 +15,8 @@ module.exports = {
     // allow debugger during development
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
     // 必须使用全等
-    'eqeqeq': 0
+    'eqeqeq': 0,
+    "import/no-unresolved": ["error", { "caseSensitive": true }],
+    "camelcase": "off"
   }
 }

package/build/dev-server.js

@@ -6,7 +6,7 @@ const proxyMiddleware = require('http-proxy-middleware')
 const app = express()
 const compiler = webpack(config)
 
-const server = 'http://192.168.50.67:31567/'
+const server = 'http://172.168.1.11:8400/#'
 const local = 'http://127.0.0.1:9026/'
 const proxyTable = {
   '/rs/logic/exportfile': {
@@ -15,24 +15,24 @@ const proxyTable = {
   '/dataManage': {
     target: server
   },
-  '/api/af-revenue/sql/': {
-    pathRewrite: {
-      '^/api/af-revenue': '/'
-    },
-    target: local
-  },
-  '/api/af-revenue/report/': {
-    pathRewrite: {
-      '^/api/af-revenue': '/'
-    },
-    target: local
-  },
-  '/api/af-revenue/logic': {
-    pathRewrite: {
-      '^/api/af-revenue': '/'
-    },
-    target: local
-  },
+  // '/api/af-revenue/sql/': {
+  //   pathRewrite: {
+  //     '^/api/af-revenue': '/'
+  //   },
+  //   target: local
+  // },
+  // '/api/af-revenue/report/': {
+  //   pathRewrite: {
+  //     '^/api/af-revenue': '/'
+  //   },
+  //   target: local
+  // },
+  // '/api/af-revenue/logic': {
+  //   pathRewrite: {
+  //     '^/api/af-revenue': '/'
+  //   },
+  //   target: local
+  // },
   '/api': {
     target: server
   },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "4.1.73",
+    "version": "4.1.74-weinan",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {
@@ -67,7 +67,7 @@
         "style": "0.0.3",
         "style-loader": "^0.20.3",
         "swiper": "^5.4.5",
-        "system-clients": "4.0.12",
+        "system-clients": "3.2.87",
         "ldap-clients": "3.0.96",
         "url-loader": "^0.5.7",
         "vue-amap": "0.5.10",

package/src/components/SellReport/siyang/RHKFSummary.vue

@@ -0,0 +1,200 @@
+<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'"
+                          :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'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">用户类型</label>
+              <v-select :value.sync="model.f_user_type"
+                        v-model="model.f_user_type"
+                        multiple
+                        :options='$parent.$parent.user_type' placeholder='请选择'
+                        condition="f_user_type in {}"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">用气性质</label>
+              <v-select :value.sync="model.f_gasproperties"
+                        v-model="model.f_gasproperties"
+                        multiple
+                        :options='$parent.$parent.gasproperties' placeholder='请选择'
+                        condition="f_gasproperties in {}"
+                        close-on-select></v-select>
+            </div>
+            <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>
+          </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">
+          <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 }}&nbsp;&nbsp;<br/>
+              <!--收费员：{{// $parent.operatorname}}-->
+            </th>
+          </tr>
+          <tr >
+            <th v-if="false" :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              <div>
+                <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
+                <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.operatorname">人员：{{$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>
+          <tr style="text-align: left">
+            <th :colspan='Math.floor($parent.spans/3)'>报账人：</th>
+            <th :colspan='Math.floor($parent.spans/3)'>数据审核：</th>
+            <th :colspan='Math.floor($parent.spans/3)'>接收人：</th>
+          </tr>
+          </tfoot>
+        </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: [],
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      // f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: '',
+      criteriaShow: false,
+      operatorname: '',
+      orgCondtionStr: '1=1',
+      f_user_type: '',
+      f_gasproperties: '',
+      f_state: ['有效'],
+      model: new DataModel('api/af-revenue/report/rh_charge', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      resshow: ['company', 'department', 'operator'],
+      spans: 0,
+      initres: {
+        org: [this.$login.f.orgid],
+        dep: [],
+        user: []
+      }
+    }
+  },
+  ready () {
+    this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString()
+    this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString()
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      let orgcondition = args.condition
+      let orgstr = this.orgCondtionStr
+      orgcondition = orgcondition + orgstr
+      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+      this.$refs.paged.search(args)
+    },
+
+    hidden () {
+      this.criteriaShow = !this.criteriaShow
+    },
+    getRes (condition, obj) {
+      this.orgCondtionStr = condition
+      this.orgname = obj.orgnames[0]
+      this.depname = obj.depnames[0]
+      this.operatorname = obj.operatornames[0]
+    },
+    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: {
+    'model.data' (val) {
+      let len=0
+      let a=val.split('</tr>')
+      for(let i=0;i<a.length;i++){
+        if(a[i].split('</td>').length-1>len){
+          len=a[i].split('</td>').length-1
+        }
+      }
+      this.spans = len
+    }
+  },
+  computed: {
+    user_type () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    },
+    gasproperties () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

package/src/components/sale/config/exportConfig.js

@@ -676,7 +676,9 @@ export default {
     'f_network_valve': '自动阀控',
     'f_defendcard': '防盗卡号',
     'f_factory_date': '生产年月',
-    'f_meteread_date': '最后通讯时间'
+    'f_meteread_date': '最后通讯时间',
+    'f_xiaohushijian': '销户时间',
+    'f_xiaohuyuanyin': '销户原因'
     // 'latest_f_pregas' : '最后购气量',
     // 'latest_f_collection':'最后购气金额',
     // 'f_max_operate_date': '最后购气日期'

package/src/filiale/WEINAN/ChargeQuery.vue

@@ -315,6 +315,18 @@
                               close-on-select>
                     </v-select>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label for="f_user_usenature" class="font_normal_body" title="参数：票据类型查询">票据类型</label>
+                    <v-select id="print"
+                              v-model="model.f_bill_style"
+                              placeholder='请选择'
+                              :value.sync="model.f_bill_style"
+                              :options='$parent.$parent.billStyles'
+                              condition="f_bill_style = '{}'"
+                              close-on-select
+                              clear-button>
+                    </v-select>
+                  </div>
                 </div>
               </div>
             </div>
@@ -352,6 +364,9 @@
                   <data-order field="f_operate_date" name="收费日期"
                               :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
                 </th>
+                <th>
+                  <nobr>票据类型</nobr>
+                </th>
                 <th>
                   <nobr>状态</nobr>
                 </th>
@@ -400,6 +415,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_operate_date}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_bill_style}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_state}}</nobr>
               </td>
@@ -850,6 +868,9 @@
       },
       bank(){
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('银行名称')]
+      },
+      billStyles(){
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('票据类型查询')]
       }
     }
   }

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

@@ -72,7 +72,7 @@ export default{
     'f_delaypay': '违约金', 'f_comments': '备注', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司',
     'f_yucun': '预存金额', 'f_card_id': '卡号', 'f_stairamount1': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费',
     'f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',
-    'f_stair3amount': '三阶气量', 'f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'f_inputtor': '抄表员', 'f_residential_area': '小区', 'f_serial_number': '业务单号'
+    'f_stair3amount': '三阶气量', 'f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'f_inputtor': '抄表员', 'f_residential_area': '小区', 'f_serial_number': '业务单号', 'f_bill_style': '票据类型'
   },
   pricetypeGasConfig: {
     'f_price': '价格类型', 'f_gas': '当日售气量', 'f_money': '当日售气金额'