manage-client-xy 3.2.8 → 3.2.10

package/build/dev-server.js

@@ -11,7 +11,7 @@ var compiler = webpack(config)
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-var bendi = 'http://172.16.16.163:8300/'
+var bendi = 'http://127.0.0.1:8888/'
   , fuwu = 'http://172.16.16.163:8300/'
 // ,fuwu = 'http://172.16.16.163:8300/'
 var proxyTable = {
@@ -22,6 +22,12 @@ var proxyTable = {
   '/rs/logic/exportfile': {
     target: bendi
   },
+  '/rs/logic/saleExport': {
+    target: fuwu
+  },
+  '/rs/sql/qc_statistics_manage': {
+    target: fuwu
+  },
   '/files': {
     target: fuwu
   },
@@ -78,7 +84,7 @@ var proxyTable = {
     target: fuwu
   },
   '/rs/logic/SumSettleFileImport': {
-    target: 'http://127.0.0.1:8087'
+    target: fuwu
   },
   '/rs': {
     target: fuwu

package/package.json

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

package/src/components/SellReport/ManageOtherChargeReport.vue

@@ -0,0 +1,229 @@
+<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">&emsp;&emsp;公司:</label>
+              <right-tree @re-res="$parent.$parent.getRes"></right-tree>
+            </div>
+            <div class="col-sm-4">
+              <label class="font_normal_body">&emsp;&emsp;部门:</label>
+              <res-select restype='department'
+                          :is-mul="false"
+                          @res-select="$parent.$parent.getdep"
+                          :parentresid="$parent.$parent.depresid"
+                          :initresid='$parent.$parent.depid'>
+              </res-select>
+
+            </div>
+            <div class="col-sm-4">
+              <label class="font_normal_body">&emsp;&emsp;人员:</label>
+              <res-select restype='user'
+                          :is-mul="false"
+                          @res-select="$parent.$parent.getuser"
+                          :parentresid="$parent.$parent.userresid"
+                          :initresid='$parent.$parent.operatorid'>
+              </res-select>
+            </div>
+            <div class="col-sm-4" style="float:right;">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;&emsp;&emsp;&nbsp;&nbsp;&nbsp;</label>
+              <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'
+                            v-if="$parent.$parent.jurisdiction.includes('excel导出')"
+              ></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">
+          <thead>
+          <tr>
+            <th colspan='17' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">咸阳其他收费汇总</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='17' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}
+            </th>
+          </tr>
+          <tr>
+            <th colspan='17' style="font-weight: normal; text-align: center;">
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th colspan='17' 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='17'>
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left">
+            <th colspan='6'>财务审核：</th>
+            <th colspan='6'>收款审核：</th>
+            <th colspan='5'>收款员：</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,
+      jurisdiction: this.$login.r,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: '',
+      operatorname: '',
+      f_inputtor: [],
+      f_user_type: '',
+      orgCondtionStr: '1=1',
+      model: new DataModel('rs/report/otherCharge', {
+        startDate: 'this.model.startDate',
+        endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'
+      }),
+      reportStr: null
+    }
+  },
+  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) {
+      console.log(args.condition + 'yyyqqq')
+      this.printTime = this.$login.toStandardTimeString()
+      let orgCondition = '1=1'
+      if (this.f_orgid[0]) {
+        let id = this.f_orgid.toString()
+        let ids = id.split(',')
+        console.log('几个公司:' + ids.length)
+        let orgids = ''
+        let f_orgids = ''
+        if (ids.length === 1) {
+          f_orgids += "'" + ids[0] + "'"
+        } else {
+          for (let i = 0; i < ids.length; i++) {
+            console.log('id = ' + ids[i])
+            orgids += "'" + ids[i] + "',"
+          }
+          f_orgids = orgids.substring(0, orgids.length - 1)
+        }
+
+        orgCondition += " and f_orgid in ( " + f_orgids + " ) "
+        console.log('f_orgids:' + f_orgids)
+      }
+      if (this.f_depid[0]) {
+        orgCondition += " and f_depname like '%" + this.depname + "%'"
+      }
+      if (this.f_operatorid[0]) {
+        orgCondition += " and f_operator like '%" + this.operatorname + "%'"
+      }
+      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
+      this.userresid = obj.resids
+    },
+    getdep(obj, val) {
+      this.depname = val[0]
+      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 = '正确'
+      })
+    },
+    close() {
+      this.show = false
+    }
+  },
+  watch: {
+    'data'(val) {
+      if (val.f_files_path) {
+        this.getFileContent(val.f_files_path)
+      } else {
+        this.reportStr = null
+      }
+    }
+  },
+  computed: {}
+}
+</script>
+<style scoped>
+.noborder {
+  border: none;
+}
+</style>

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

@@ -16,9 +16,6 @@
       <tabs-manage header="过户查询">
         <transfer-query v-if="show[4]" @deal-msg="dealMsg"></transfer-query>
       </tabs-manage>
-<!--      <tabs-manage header="其他收费查询">-->
-<!--        <other-charge-query v-if="show[5]" @deal-msg="dealMsg"></other-charge-query>-->
-<!--      </tabs-manage>-->
       <tabs-manage header="冲正查询">
         <reverse-query v-if="show[5]" @deal-msg="dealMsg"></reverse-query>
       </tabs-manage>
@@ -67,6 +64,9 @@
       <tabs-manage header="非收费业务查询" v-if="permission('非收费业务查询')">
         <no-business-query v-if="show == '非收费业务查询'"  @deal-msg="dealMsg"></no-business-query>
       </tabs-manage>
+      <tabs-manage header="其他收费查询">
+        <other-charge-query v-if="show[20]" @deal-msg="dealMsg"></other-charge-query>
+      </tabs-manage>
     </tab-button-manage>
 <!--  </div>-->
 <!--  <div v-if="!listpage">-->

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

@@ -12,6 +12,8 @@
             <tr>
               <th><nobr>序号</nobr></th>
               <th><nobr>收费类型</nobr></th>
+              <th><nobr>具体项目</nobr></th>
+              <th><nobr>型号</nobr></th>
               <th><nobr>数量</nobr></th>
               <th><nobr>单价</nobr></th>
               <th><nobr>价格</nobr></th>
@@ -21,9 +23,11 @@
             <tr >
               <td style="text-align:center;">{{$index+1}}</td>
               <th style="text-align:center">{{row.f_brand_spec}}</th>
+              <th style="text-align:center">{{row.f_typename}}</th>
+              <th style="text-align:center">{{row.f_typenumber}}</th>
               <th style="text-align:center">{{row.f_number}}</th>
               <th style="text-align:center">{{row.f_unitprice}}</th>
-              <th style="text-align:center">{{(row.f_number-0)*(row.f_unitprice-0)}}</th>
+              <th style="text-align:center">{{(row.f_number - 0)*(row.f_unitprice - 0)}}</th>
             </tr>
           </template>
           <template partial='foot'></template>

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

@@ -54,21 +54,9 @@
                 <res-select-group style="col-sm-2 form-group" :initres="$parent.$parent.initres"  @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_address"
+                  <input type="text" style="width: 60%;" class="input_search" v-model="model.f_address"
                          condition="f_address like '%{}%'" placeholder='客户地址'>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">收费类型</label>
-                  <v-select id="f_type"
-                            v-model="model.f_brand_spec"
-                            placeholder='请选择'
-                            condition="f_type ='{}'"
-                            :value.sync="model.f_type"
-                            :options='$parent.$parent.chargetype'
-                            close-on-select clear-button></v-select>
-                </div>
-              </div>
-              <div class="row" v-show="$parent.$parent.criteriaShow">
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">收费状态</label>
                   <v-select id="f_state"
@@ -80,6 +68,9 @@
                             close-on-select clear-button>
                   </v-select>
                 </div>
+              </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+
 
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">付款方式</label>
@@ -93,15 +84,13 @@
                   </v-select>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">服务人员</label>
-                  <v-select id="f_service_person"
-                            v-model="model.f_service_person"
+                  <label class="font_normal_body">是否<br/>手持设备</label>
+                  <v-select :value.sync="$parent.$parent.f_outlets"
+                            :options="$parent.$parent.isPos"
+                            :search="false"
                             placeholder='请选择'
-                            condition="f_service_person ='{}'"
-                            :value.sync="model.f_service_person"
-                            :options='$parent.$parent.service_person'
-                            close-on-select clear-button>
-                  </v-select>
+                            condition="{}"
+                            close-on-select></v-select>
                 </div>
               </div>
             </div>
@@ -266,6 +255,8 @@
         },
         show:false,
         showdetail:false,
+        isPos: [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}],
+        f_outlets: [],
         otherchargeid:'',
         rowdata:{},
         //合计数据
@@ -286,6 +277,12 @@
         this.$refs.paged.$refs.cri.search()
       },
       selfSearch(args) {
+        // 手持设备查询条件
+        if(this.f_outlets[0] === '是'){
+          args.condition += ` and f_outlets = '手持设备'`
+        } else if (this.f_outlets[0] === '否'){
+          args.condition += ` and f_outlets is null`
+        }
         args.condition = `${args.condition}` + this.orgCondtionStr
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums

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

@@ -124,9 +124,8 @@ export default {
 
   otherchargeConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_address': '客户地址',
-    'f_brand_spec': '收费类型', 'f_unitprice': '单价', 'f_number': '数量', 'f_collection': '收款',
-    'f_payment': '付款方式', 'f_state': '状态', 'f_operate_date': '收费日期',
-    'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司'
+    'f_collection': '收款', 'f_payment': '付款方式', 'f_state': '状态',
+    'f_operate_date': '收费日期', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司'
   },
 
   handplanConfig: {

package/src/main.js

@@ -4,10 +4,10 @@ import { all } from 'vue-client'
 import { system } from 'system-clients'
 import { sale } from 'sale-client'
 import saleManage from './saleManage'
-import webmeterManage from './webmeterManage'
-import reportManage from './reportManage'
-import newmanage from './newmanage'
-import ManageHome from './ManageHome'
+// import webmeterManage from './webmeterManage'
+// import reportManage from './reportManage'
+// import newmanage from './newmanage'
+// import ManageHome from './ManageHome'
 import echarts from 'echarts'
 import AMap from 'vue-amap';
 
@@ -41,10 +41,10 @@ all()
 sale()
 system(false)
 saleManage()
-webmeterManage()
-ManageHome()
-newmanage()
-reportManage()
+// webmeterManage()
+// ManageHome()
+// newmanage()
+// reportManage()
 require('./bootstrap/less/bootstrap.less')
 require('./bootstrap/less/manageStyle/manageStyle.less')
 require('./bootstrap/less/manageStyle/manageChile.less')

package/src/reportManage.js

@@ -271,4 +271,8 @@ export default function () {
   Vue.component('manage-user-counta', (resolve) => {
     require(['./components/SellReport/ManageUserCounta'], resolve)
   })
+  // 报表展示组件（其他收费汇总）
+  Vue.component('manage-other-charge', (resolve) => {
+    require(['./components/SellReport/ManageOtherChargeReport'], resolve)
+  })
 }