manage-client 4.1.132 → 4.1.133

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': {
@@ -16,22 +16,22 @@ const proxyTable = {
     target: server
   },
   '/api/af-revenue/sql/': {
-    pathRewrite: {
-      '^/api/af-revenue': '/'
-    },
-    target: local
+    // pathRewrite: {
+    //   '^/api/af-revenue': '/'
+    // },
+    target: server
   },
   '/api/af-revenue/report/': {
-    pathRewrite: {
-      '^/api/af-revenue': '/'
-    },
-    target: local
+    // pathRewrite: {
+    //   '^/api/af-revenue': '/'
+    // },
+    target: server
   },
   '/api/af-revenue/logic': {
-    pathRewrite: {
-      '^/api/af-revenue': '/'
-    },
-    target: local
+    // pathRewrite: {
+    //   '^/api/af-revenue': '/'
+    // },
+    target: server
   },
   '/api': {
     target: server

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "4.1.132",
+    "version": "4.1.133",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {
@@ -67,11 +67,11 @@
         "style": "0.0.3",
         "style-loader": "^0.20.3",
         "swiper": "^5.4.5",
-        "system-clients": "4.0.12",
+        "system-clients": "3.2.97-weinan",
         "ldap-clients": "3.0.96",
         "url-loader": "^0.5.7",
         "vue-amap": "0.5.10",
-        "vue-client": "1.26.6",
+        "vue-client": "1.24.117",
         "vue-hot-reload-api": "^1.2.0",
         "vue-html-loader": "^1.0.0",
         "vue-loader": "8.2.1",

package/src/filiale/WEINAN/DeptHomePage.vue

@@ -0,0 +1,329 @@
+<template>
+  <div class="basic-main" style="height: 98%">
+    <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="$parent.$parent.startdate"
+                          :value.sync="$parent.$parent.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="$parent.$parent.enddate"
+                          :value.sync="$parent.$parent.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 class="col-sm-4">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
+              <res-select-filter restype='department'
+                                 @res-select="$parent.$parent.getdep"
+                                 :parentresid="$parent.$parent.depresid"
+                                 :initresid='$parent.$parent.depid'
+                                 :filter-ids="$parent.$parent.getAllowedDepIds()">
+              </res-select-filter>
+
+            </div>
+            <div class="col-sm-4">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
+              <res-select-filter restype='user'
+                                 @res-select="$parent.$parent.getuser"
+                                 :parentresid="$parent.$parent.userresid"
+                                 :initresid='$parent.$parent.operatorid'
+                                 :filter-ids="$parent.$parent.getAllowedUserIds()">
+              </res-select-filter>
+            </div>
+          </div>
+          <div class="span" style = "float:right;">
+            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+            <report-print id='gasprice' top='2cm' left='2' 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;border-spacing: 0px 0px;font-size:13px;"  v-if="!$parent.data.f_files_path">
+          <thead>
+          <tr>
+            <th colspan='12' style="font-weight: normal; text-align: left; font-size: 2em
+            ;">
+              <h3 style="text-align: center">营业厅明细首页</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='12' style="font-weight: normal; text-align: left; font-size: 1em;">
+              <b style="text-align: left; font-size:15px;margin-left: 20px;" v-if="$parent.startDate==$parent.endDate">
+                {{$parent.startDate}}
+              </b>
+              <b style="text-align: left;font-size:15px;margin-left: 20px;" v-else>
+                {{$parent.startDate+" 至 "+$parent.endDate}}
+              </b>
+            </th>
+          </tr>
+          <tr >
+            <th colspan='12' class="noborder" style="font-weight: normal; text-align: center; font-size: 1em;">
+              <div style="text-align: left;font-size:15px;margin-left: 20px;">
+                <span v-show="$parent.orgFlag">{{$parent.orgname}}</span>
+                <span v-show="$parent.depFlag">{{$parent.depname}}</span>
+                <span v-show="$parent.operFlag">{{$parent.operatorname}}</span><br>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr class="noborder">
+            <td colspan='12' class="noborder">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left; font-size: 1em;">
+            <th colspan='4'>部门主管：</th>
+            <th colspan='2'>出纳：</th>
+            <th colspan='2'>审核：</th>
+            <th colspan='4'>制表：</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 ResSelectFilter from './ResSelectFilter.vue'
+  import co from 'co'
+  let saveFile = function * (self) {
+    // 线验证文件是否重名
+    let count = yield self.$resetpost('api/af-revenue/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('api/af-revenue/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: '营业厅明细首页',
+    components: {
+      ResSelectFilter
+    },
+    props: ['data'],
+    data () {
+      return {
+        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: '',
+        orgCondtionStr: '1=1',
+        model: new DataModel('api/af-revenue/report/deptHomePage', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+          f_orgid: 'this.model.f_orgid'}),
+        reportStr: null,
+        show: false,
+        startDate:"",
+        endDate:"",
+        startdate:'',
+        enddate:'',
+        orgFlag:false,
+        depFlag:false,
+        operFlag:false,
+        selectedOrgId: null,
+        selectedDepId: null,
+        allowedDepsByOrg: {
+          '3689': ['234624497607639042', '234624639551275010', '234625001985277954', '234624858028376066', '234625159867269122']
+        },
+        allowedUsersByDep: {
+        }
+      }
+    },
+    ready () {
+      this.startdate = this.$login.toStandardDateString() + ' 00:00:00'
+      this.enddate = this.$login.toStandardDateString() + ' 23:59:59'
+      this.startDate=this.startdate.substring(0,10)
+      this.endDate=this.startDate.substring(0,10)
+      console.log(this.$login.f)
+    },
+    methods: {
+      searchData () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      selfSearch (args) {
+        let f_dep=this.f_depid
+        let orgcondition = ` ts.f_orgid in ('${this.f_orgid}')`
+        if (f_dep[0]) {
+          orgcondition += " and ts.f_depid in('"+f_dep[0]+"'"
+            for( let i=1;i<f_dep.length;i++){
+              orgcondition += ",'"+f_dep[i]+"'"
+            }
+          orgcondition +=')'
+        }
+        if(this.f_operatorid[0]) {
+          orgcondition += `  and ts.f_operatorid in ('${this.f_operatorid}')`
+        }
+        // console.log(this.orgname,this.depname.toString(),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.selectedOrgId = obj.resids[0]
+        this.depid = []
+        this.f_depid = []
+        this.userresid = []
+        this.f_operatorid = []
+        this.operatorname = ''
+        this.depname = []
+      },
+      getdep (obj, val) {
+        this.depname = val
+        this.userresid = obj
+        this.f_depid = obj
+        this.selectedDepId = obj[0]
+        this.f_operatorid = []
+        this.operatorname = []
+      },
+      getAllowedDepIds() {
+        if (!this.selectedOrgId) return null
+        return this.allowedDepsByOrg[this.selectedOrgId] || null
+      },
+      getAllowedUserIds() {
+        if (!this.selectedDepId) return null
+        return this.allowedUsersByDep[this.selectedDepId] || null
+      },
+      getuser ( obj, val) {
+        this.operatorname = val[0]
+        this.f_operatorid = obj
+      },
+
+      // 根据文件路径获取储存的报表内容
+      getFileContent (path) {
+        this.$resetpost('api/af-revenue/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()
+      },
+      flag(){
+        if(this.orgname&&!this.depname.toString()&&!this.operatorname){
+          this.orgFlag=true
+        }else{
+          this.orgFlag=false
+        }
+        if(this.orgname&&this.depname.toString()&&!this.operatorname){
+          this.depFlag=true
+        }else{
+          this.depFlag=false
+        }
+        if(this.orgname&&this.depname.toString()&&this.operatorname){
+          this.operFlag=true
+        }else{
+          this.operFlag=false
+        }
+      }
+    },
+    watch: {
+      'data' (val) {
+        if (val.f_files_path) {
+          this.getFileContent(val.f_files_path)
+        } else {
+          this.reportStr = null
+        }
+      },
+      'orgname'(){
+        this.flag()
+      },
+      'depname'(){
+        this.flag()
+      },
+      'operatorname'(){
+        this.flag()
+      },
+      'startdate'(val){
+        this.$refs.paged.$refs.criteria.model.startDate=this.startdate
+        this.startDate=this.startdate.substring(0,10)
+        console.log('startdate',val)
+      },
+      'enddate'(val){
+        this.$refs.paged.$refs.criteria.model.endDate=this.enddate
+        this.endDate=this.enddate.substring(0,10)
+        console.log('enddate',val)
+      }
+    },
+    computed: {
+      operator () {
+        return this.$getParams('操作员查询用', [{label: '全部', value: ''}])
+      },
+      network () {
+        return this.$getParams('网点查询用', [{label: '全部', value: ''}])
+      }
+    }
+  }
+</script>
+<style scoped>
+  .noborder{
+    border: none;
+  }
+</style>

package/src/filiale/WEINAN/ManageUserCount.vue

@@ -32,12 +32,13 @@
             </div>
             <div class="col-sm-2 form-group">
               <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
-              <res-select id="dep" restype='department' style="width: 60%"
+              <res-select-filter id="dep" restype='department' style="width: 60%"
                           is-mul="false"
                           @res-select="$parent.$parent.getdep"
                           :parentresid="$parent.$parent.depresid"
-                          :initresid='$parent.$parent.depid' >
-              </res-select>
+                          :initresid='$parent.$parent.depid'
+                          :filter-ids="$parent.$parent.getAllowedDepIds()">
+              </res-select-filter>
 
             </div>
             <div class="col-sm-2 form-group">
@@ -147,6 +148,7 @@
 
 <script>
   import {DataModel, HttpResetClass} from 'vue-client'
+  import ResSelectFilter from './ResSelectFilter.vue'
   import co from 'co'
 
   let saveFile = function * (self) {
@@ -173,6 +175,9 @@
   export default {
     title: '用户新增销户统计报表',
     props: ['data'],
+    components: {
+      ResSelectFilter
+    },
     data () {
       return {
         printTime: this.$login.toStandardTimeString(),
@@ -196,7 +201,14 @@
           f_orgid: 'this.model.f_orgid',f_gasproperties: 'this.model.f_gasproperties'}),
         reportStr: null,
         show: false,
-        spans: ''
+        spans: '',
+        selectedOrgId: null,
+        selectedDepId: null,
+        allowedDepsByOrg: {
+          '3689': ['234624497607639042', '234624639551275010', '234625001985277954', '234624858028376066', '234625159867269122']
+        },
+        allowedUsersByDep: {
+        }
       }
     },
     ready () {
@@ -225,14 +237,30 @@
         this.orgname = obj.res[0]
         this.depresid = obj.resids
         this.f_orgid = obj.resids
-        console.log('this.f_orgid',this.f_orgid)
         this.initParams()
-        this.qijia()
+        this.selectedOrgId = obj.resids[0]
+        this.depid = []
+        this.f_depid = []
+        this.userresid = []
+        this.f_operatorid = []
+        this.operatorname = ''
+        this.depname = ''
       },
       getdep (obj, val) {
         this.depname = val[0]
         this.userresid = obj
         this.f_depid = obj
+        this.selectedDepId = obj[0]
+        this.f_operatorid = []
+        this.operatorname = ''
+      },
+      getAllowedDepIds() {
+        if (!this.selectedOrgId) return null
+        return this.allowedDepsByOrg[this.selectedOrgId] || null
+      },
+      getAllowedUserIds() {
+        if (!this.selectedDepId) return null
+        return this.allowedUsersByDep[this.selectedDepId] || null
       },
       getuser ( obj, val) {
         this.operatorname = val[0]