manage-client 3.3.225 → 3.3.226

package/package.json

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

package/src/components/webmeter/DrillData/LostContactAnalysisList.vue

@@ -59,6 +59,16 @@
               <right-tree @re-res="$parent.$parent.getorg" width="60%"
                           :initresid='$parent.$parent.org'></right-tree>
             </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%"
+                          is-mul="false"
+                          @res-select="$parent.$parent.getdep"
+                          :parentresid="$parent.$parent.depresid"
+                          :initresid='$parent.$parent.depid' >
+              </res-select>
+
+            </div>
             <div class="col-sm-2 form-group">
               <label class="font_normal_body">客户类型</label>
               <v-select style="width:60%" id="f_user_type"
@@ -419,6 +429,13 @@
         endDate: '',
         criteriaShow:false,
         outlets: [],
+        depresid: [],
+        queryData: {
+          f_orgid: [],
+          f_depid: [],
+          f_operatorid: [],
+          f_payment: []
+        },
         gasproperties:[{label: '全部', value: ''}],
         operator: [],
         WarningType: [
@@ -564,12 +581,36 @@
       },
       getorg(obj) {
         if (obj.resids.length>0) {
+          this.depresid = obj.resids
           this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(obj.resids)
         }else
         {
+          this.depresid = obj.resids
           this.orgCondtionStr = " and f_orgid = " + this.$login.f.orgid
         }
       },
+      getdep(obj, val) {
+        this.orgCondtionStr = ""
+
+        this.depname = val[0]
+        this.userresid = obj
+        this.queryData.f_depid = obj
+        console.log(this.queryData.f_depid)
+
+        if (obj.length > 0) {
+          this.orgCondtionStr += " and f_depid in " + plugin.convertToIn(obj)
+        } else {
+          this.orgCondtionStr += " and f_depid = " + this.$login.f.depid
+        }
+
+        if (this.depresid && this.depresid.length > 0) {
+          this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(this.depresid) + this.orgCondtionStr
+        } else {
+          this.orgCondtionStr = " and f_orgid = " + this.$login.f.orgid + this.orgCondtionStr
+        }
+
+        console.log(this.orgCondtionStr);
+      },
       // SaveAsFile(str) {
       //   this.$showMessage('您是否需要导出本页数据？', ['confirm', 'cancel']).then((res) => {
       //     if (res === 'confirm') {

package/src/components/webmeter/DrillData/UserLostContactAnalysis.vue

@@ -60,6 +60,16 @@
               <right-tree @re-res="$parent.$parent.getorg"
                           :initresid='$parent.$parent.org'></right-tree>
             </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%"
+                            is-mul="false"
+                            @res-select="$parent.$parent.getdep"
+                            :parentresid="$parent.$parent.depresid"
+                            :initresid='$parent.$parent.depid' >
+                </res-select>
+
+              </div>
             <div class="col-sm-2 form-group">
               <label class="font_normal_body">客户类型</label>
               <v-select style="width:60%" id="f_user_type"
@@ -375,6 +385,14 @@
         rowdata:{},
         criteriaShow:false,
         outlets: [],
+        depresid: [],
+        queryData: {
+          f_orgid: [],
+          f_depid: [],
+          f_operatorid: [],
+          f_payment: []
+        },
+        depid: [],
         operator: [],
         other: [],
         sumsmodel: {},
@@ -387,7 +405,7 @@
         ],
         styles:false,
         org:[this.$login.f.orgid],
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid} `,
         echarts: false,
         searchshow: false,
         isActiveTotalForm: false,
@@ -496,13 +514,38 @@
         this.model.search(args.condition, args.model)
       },
       getorg(obj) {
-        if (obj.resids.length>0) {
+        if (obj.resids.length > 0) {
+          this.depresid = obj.resids
           this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(obj.resids)
-        }else
-        {
+        } else {
+          this.depresid = obj.resids
           this.orgCondtionStr = " and f_orgid = " + this.$login.f.orgid
         }
+        console.log(this.orgCondtionStr);
       },
+      getdep(obj, val) {
+        this.orgCondtionStr = ""
+
+        this.depname = val[0]
+        this.userresid = obj
+        this.queryData.f_depid = obj
+        console.log(this.queryData.f_depid)
+
+        if (obj.length > 0) {
+          this.orgCondtionStr += " and f_depid in " + plugin.convertToIn(obj)
+        } else {
+          this.orgCondtionStr += " and f_depid = " + this.$login.f.depid
+        }
+
+        if (this.depresid && this.depresid.length > 0) {
+          this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(this.depresid) + this.orgCondtionStr
+        } else {
+          this.orgCondtionStr = " and f_orgid = " + this.$login.f.orgid + this.orgCondtionStr
+        }
+
+        console.log(this.orgCondtionStr);
+      },
+
       // SaveAsFile(str) {
       //   this.$showMessage('您是否需要导出本页数据？', ['confirm', 'cancel']).then((res) => {
       //     if (res === 'confirm') {

package/src/filiale/kelai/NewGasStatistics.vue

@@ -36,6 +36,7 @@
                   <button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
                   <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
                                 :field="$parent.$parent.getfield"
+                                :header="$parent.$parent.other"
                                 sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="queryGasRecord" template-name='用气量统计表'
                                 :choose-col="true"></export-excel>
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
@@ -312,6 +313,7 @@ export default {
   title: '新用气分析',
   data () {
     return {
+      other: [],
       show:false,
       org:[this.$login.f.orgid],
       orgcondition: ' and f_orgid = ' + this.$login.f.orgid,
@@ -364,6 +366,13 @@ export default {
     this.$refs.paged.$refs.criteria.model.inputEndDate = Util.addDate(new Date(),-1).substring(0,10) + ' 23:59:59'
   },
   methods: {
+    getheader() {
+      this.other=[];
+      let date = []
+      date.push(`起始时间:${this.$refs.paged.$refs.cri.model.startDate}`)
+      date.push(`终止时间:${this.$refs.paged.$refs.cri.model.endDate}`)
+      this.other.push(date)
+    },
     initParams() {
       // 初始化气表品牌
       let brandArr = []
@@ -450,6 +459,12 @@ export default {
         this.f_filialeid = res[1]
         // this.updateParams()
       }
+    },
+    sumsmodel:{
+      handler: function (val){
+        this.getheader()
+      },
+      deep: true
     }
   },
   computed: {