manage-client 3.3.46 → 3.3.48

package/package.json

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

package/src/components/SellReport/AmountGas.vue

@@ -172,7 +172,7 @@ export default {
     },
     selfSearch (args) {
       this.printTime = this.$login.toStandardTimeString()
-      let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
+      let orgcondition = ` f_orgid  in ('${this.f_orgid}')`
       if (this.f_depid[0]) {
         orgcondition += ` and f_depid in ('${this.f_depid}')`
       }

package/src/components/SellReport/ChSellReport.vue

@@ -172,7 +172,7 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
+        let orgcondition = ` f_orgid  in ('${this.f_orgid}')`
         if (this.f_depid[0]) {
           orgcondition += ` and f_depid in ('${this.f_depid}')`
         }

package/src/components/SellReport/ChargeDayTable.vue

@@ -173,7 +173,7 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
+        let orgcondition = ` f_orgid  in ('${this.f_orgid}')`
         if (this.f_depid[0]) {
           orgcondition += ` and f_depid in ('${this.f_depid}')`
         }

package/src/components/SellReport/ChargeMonthTable.vue

@@ -172,7 +172,7 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
+        let orgcondition = ` f_orgid  in ('${this.f_orgid}')`
         if (this.f_depid[0]) {
           orgcondition += ` and f_depid in ('${this.f_depid}')`
         }

package/src/components/SellReport/ChargeYearTable.vue

@@ -173,7 +173,7 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
+        let orgcondition = ` f_orgid  in ('${this.f_orgid}')`
         if (this.f_depid[0]) {
           orgcondition += ` and f_depid in ('${this.f_depid}')`
         }

package/src/components/SellReport/GasSummary.vue

@@ -172,7 +172,7 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
+        let orgcondition = ` f_orgid  in ('${this.f_orgid}')`
         if (this.f_depid[0]) {
           orgcondition += ` and f_depid in ('${this.f_depid}')`
         }

package/src/components/SellReport/Gasc.vue

@@ -172,7 +172,7 @@ export default {
     },
     selfSearch (args) {
       this.printTime = this.$login.toStandardTimeString()
-      let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
+      let orgcondition = ` f_orgid  in ('${this.f_orgid}')`
       if (this.f_depid[0]) {
         orgcondition += ` and f_depid in ('${this.f_depid}')`
       }

package/src/components/SellReport/GetUserNum.vue

@@ -172,12 +172,12 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = 'f.f_orgid in (' + this.f_orgid + ')'
+        let orgcondition = `f.f_orgid in (${this.f_orgid})`
         if (this.f_depid[0]) {
-          orgcondition += ' and f.f_depid in (' + this.f_depid + ')'
+          orgcondition += ` and f.f_depid in (${this.f_depid})`
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f.f_operatorid in (' + this.f_operatorid + ')'
+          orgcondition += ` and f.f_operatorid in (${this.f_operatorid})`
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/ManageSellType.vue

@@ -201,13 +201,13 @@
         this.printTime = this.$login.toStandardTimeString()
         this.orgCondtionStr='1=1'
         if (this.f_orgid[0]) {
-          this.orgCondtionStr += ' and f_orgid in (' + this.f_orgid + ")"
+          this.orgCondtionStr += " and f_orgid in ('" + this.f_orgid + "')"
         }
         if (this.f_depid[0]) {
-          this.orgCondtionStr += " and f_depid in (" + this.f_depid.toString() + ")"
+          this.orgCondtionStr += " and f_depid in ('" + this.f_depid.toString() + "')"
         }
         if(this.f_operatorid[0]) {
-          this.orgCondtionStr += ' and f_operatorid in (' + this.f_operatorid + ")"
+          this.orgCondtionStr += " and f_operatorid in ('" + this.f_operatorid + "')"
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = this.orgCondtionStr.replace('1=1','') + (this.f_state && this.f_state != '' ? " and f_state='" + this.f_state + "' " : '')
         this.$refs.paged.search(args)

package/src/components/SellReport/ManageUserCount.vue

@@ -223,7 +223,7 @@
         this.printTime = this.$login.toStandardTimeString()
         this.orgCondtionStr='1=1'
         if (this.f_orgid[0]) {
-          this.orgCondtionStr += ' and f_orgid in ( ' + this.f_orgid + ')'
+          this.orgCondtionStr += ` and f_orgid   in ('${this.f_orgid}')`
         }
         if (this.f_depid[0]) {
           this.orgCondtionStr += ` and  f_depid = '${this.f_depid}'`

package/src/components/SellReport/OperatorCheckoutReport.vue

@@ -166,13 +166,13 @@
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition = '1 = 1'
         if (this.f_orgid[0]){
-          orgcondition += ' and f_orgid in ( ' + this.f_orgid + ')'
+          orgcondition += ` and f_orgid in ('${this.f_orgid}')`
         }
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid in ( ' + this.f_depid + ')'
+          orgcondition += ` and f_depid in ('${this.f_depid}')`
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid in ( ' + this.f_operatorid + ')'
+          orgcondition += ` and f_operatorid in ('${this.f_operatorid}')`
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/OperatorCheckoutTwo.vue

@@ -181,13 +181,13 @@
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition = '1 = 1'
         if (this.f_orgid[0]){
-          orgcondition += ' and f_orgid in ( ' + this.f_orgid + ')'
+          orgcondition += ` and f_orgid   in ('${this.f_orgid}')`
         }
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid in ( ' + this.f_depid + ')'
+          orgcondition += ` and f_depid   in ('${this.f_depid}')`
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid in ( ' + this.f_operatorid + ')'
+          orgcondition += ` and f_operatorid   in ('${this.f_operatorid}')`
         }
         if(this.depname){
           this.$refs.paged.$refs.criteria.model.depname = this.depname

package/src/components/SellReport/SellBySelfHelp.vue

@@ -181,13 +181,13 @@
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition = '1 = 1'
         if (this.f_orgid[0]){
-          orgcondition += ' and f_orgid in ( ' + this.f_orgid + ')'
+          orgcondition += ` and f_orgid   in ('${this.f_orgid}')`
         }
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid in ( ' + this.f_depid + ')'
+          orgcondition += ` and f_depid   in ('${this.f_depid}')`
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid in ( ' + this.f_operatorid + ')'
+          orgcondition += ` and f_operatorid   in ('${this.f_operatorid}')`
         }
         if(this.depname){
           this.$refs.paged.$refs.criteria.model.depname = this.depname

package/src/components/SellReport/WeiNanYuShou.vue

@@ -172,7 +172,7 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
+        let orgcondition = ` f_orgid  in ('${this.f_orgid}')`
         if (this.f_depid[0]) {
           orgcondition += ` and f_depid in ('${this.f_depid}')`
         }

package/src/components/SellReport/XiaoShouReport.vue

@@ -174,10 +174,10 @@
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition = ' f_orgid in ( ' + this.f_orgid + ')'
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid in ( ' + this.f_depid + ')'
+          orgcondition += ` and f_depid   in ('${this.f_depid}')`
         }
         if(this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid in ( ' + this.f_operatorid + ')'
+          orgcondition += ` and f_operatorid   in ('${this.f_operatorid}')`
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)

package/src/components/SellReport/chaostyle.vue

@@ -362,7 +362,7 @@ export default {
       this.$refs.paged.$refs.cri.search()
     },
     selfSearch(args) {
-      let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
+      let orgcondition = ` f_orgid  in ('${this.f_orgid}')`
       if (this.f_depid[0]) {
         orgcondition += " and f_depid in("+this.f_depid.toString()+')'
       }

package/src/components/SellReport/feimin_style.vue

@@ -282,7 +282,7 @@ export default {
       this.$refs.paged.$refs.cri.search()
     },
     selfSearch(args) {
-      let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
+      let orgcondition = ` f_orgid  in ('${this.f_orgid}')`
       if (this.f_depid[0]) {
         orgcondition += " and f_depid in("+this.f_depid.toString()+')'
       }

package/src/components/SellReport/shoufeistyle.vue

@@ -318,7 +318,7 @@ export default {
       this.$refs.paged.$refs.cri.search()
     },
     selfSearch(args) {
-      let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
+      let orgcondition = ` f_orgid  in ('${this.f_orgid}')`
       if (this.f_depid[0]) {
         orgcondition += " and f_depid in("+this.f_depid.toString()+')'
       }

package/src/components/handReport/GeneraHandReport.vue

@@ -167,13 +167,13 @@
         this.$refs.paged.$refs.criteria.model.group1Name = this.$refs.paged.$refs.criteria.$refs.groupone.selectedItems
         let orgcondition = '1 = 1'
         if (this.f_orgid[0]) {
-          orgcondition += ' and f_orgid in ( ' + this.f_orgid + ')'
+          orgcondition += ` and f_orgid   in ('${this.f_orgid}')`
         }
         if (this.f_depid[0]) {
-          orgcondition += ' and f_depid in ( ' + this.f_depid + ')'
+          orgcondition += ` and f_depid   in ('${this.f_depid}')`
         }
         if (this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid in ( ' + this.f_operatorid + ')'
+          orgcondition += ` and f_operatorid   in ('${this.f_operatorid}')`
         }
         let name1 = args.model.f_public_group1
         if (name1 == null || name1 == '') {

package/src/components/webmeter/instruction/NewQueryInstruct.vue

@@ -198,6 +198,9 @@
               <th style="text-align:center">
                 <nobr>操作内容</nobr>
               </th>
+              <th style="text-align:center">
+                <nobr>操作原因</nobr>
+              </th>
               <th style="text-align:center">
                 <nobr>操作人(记录)</nobr>
               </th>
@@ -260,6 +263,9 @@
               <td style="text-align:center">
                 <nobr>{{row.note}}</nobr>
               </td>
+              <td style="text-align:center">
+                <nobr>{{row.f_info}}</nobr>
+              </td>
               <td style="text-align:center">
                 <nobr>{{row.f_operator}}</nobr>
               </td>
@@ -332,7 +338,7 @@
             'f_userinfo_code': '客户编号','f_address': '客户地址','f_user_name': '客户姓名',
             'f_meternumber': '表号','f_meter_brand': '气表品牌','f_instruct_type': '指令类型',
             'f_instruct_state': '执行状态','f_receive_state': '执行结果','f_inputtor': '指令生成人','f_instruct_date': '指令时间',
-            'note':'操作内容','f_operator':'操作人(记录)','f_operate_date':'操作时间(记录)','f_operate_type':'操作类型','f_state':'操作状态',
+            'note':'操作内容','f_info':'操作原因','f_operator':'操作人(记录)','f_operate_date':'操作时间(记录)','f_operate_type':'操作类型','f_state':'操作状态',
             'f_orgname': '组织机构'
           }
         },

package/src/filiale/ceshi/ChManageBusSummary.vue

@@ -207,13 +207,13 @@ import * as Util from '../../Util'
         this.printTime = this.$login.toStandardTimeString()
         this.orgCondtionStr='1=1'
         if (this.f_orgid[0]) {
-          this.orgCondtionStr += ' and f_orgid in ( ' + this.f_orgid + ')'
+          this.orgCondtionStr += ` and f_orgid   in ('${this.f_orgid}')`
         }
         if (this.f_depid[0]) {
-          this.orgCondtionStr += ' and f_depid in ( ' + this.f_depid + ')'
+          this.orgCondtionStr += ` and f_depid   in ('${this.f_depid}')`
         }
         if(this.f_operatorid[0]) {
-          this.orgCondtionStr += ' and f_operatorid in ( ' + this.f_operatorid + ')'
+          this.orgCondtionStr += ` and f_operatorid   in ('${this.f_operatorid}')`
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = this.orgCondtionStr
         this.$refs.paged.search(args)

package/src/filiale/kelai/feimin_style.vue

@@ -294,7 +294,7 @@ export default {
       this.$refs.paged.$refs.cri.search()
     },
     selfSearch(args) {
-      let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
+      let orgcondition = ` f_orgid  in ('${this.f_orgid}')`
       if (this.f_depid[0]) {
         orgcondition += " and f_depid in("+this.f_depid.toString()+')'
       }

package/src/filiale/macheng/ManageSellType.vue

@@ -205,13 +205,13 @@
         let orgstr = this.orgCondtionStr
         orgcondition = orgcondition + orgstr
 /*        if (this.f_orgid[0]) {
-          this.orgCondtionStr += ' and f_orgid in (' + this.f_orgid + ")"
+          this.orgCondtionStr += ` and f_orgid   in ('${this.f_orgid}')`
         }
         if (this.f_depid[0]) {
-          this.orgCondtionStr += " and f_depid in (" + this.f_depid.toString() + ")"
+          this.orgCondtionStr += ` and f_depid   in ('${this.f_depid.toString}')`
         }
         if(this.f_operatorid[0]) {
-          this.orgCondtionStr += ' and f_operatorid in (' + this.f_operatorid + ")"
+          this.orgCondtionStr += ` and f_operatorid   in ('${this.f_operatorid}')`
         }*/
         this.$refs.paged.$refs.criteria.model.f_orgid = this.orgCondtionStr.replace('1=1','') + (this.f_state && this.f_state != '' ? " and f_state='" + this.f_state + "' " : '')
         this.$refs.paged.search(args)

package/src/filiale/ningjin/ManageSellType.vue

@@ -201,13 +201,13 @@
         this.printTime = this.$login.toStandardTimeString()
         this.orgCondtionStr='1=1'
         if (this.f_orgid[0]) {
-          this.orgCondtionStr += ' and f_orgid in (' + this.f_orgid + ")"
+          this.orgCondtionStr += ` and f_orgid   in ('${this.f_orgid}')`
         }
         if (this.f_depid[0]) {
-          this.orgCondtionStr += " and f_depid in (" + this.f_depid.toString() + ")"
+          this.orgCondtionStr += ` and f_depid   in ('${this.f_depid.toString}')`
         }
         if(this.f_operatorid[0]) {
-          this.orgCondtionStr += ' and f_operatorid in (' + this.f_operatorid + ")"
+          this.orgCondtionStr += ` and f_operatorid   in ('${this.f_operatorid}')`
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = this.orgCondtionStr.replace('1=1','') + (this.f_state && this.f_state != '' ? " and f_state='" + this.f_state + "' " : '')
         this.$refs.paged.search(args)

package/src/filiale/rizhao/ChargeQuery.vue

@@ -343,6 +343,9 @@
                 <th>
                   <nobr>客户名称</nobr>
                 </th>
+                <th>
+                  <nobr>身份证号</nobr>
+                </th>
                 <th>
                   <nobr>小区</nobr>
                 </th>
@@ -536,6 +539,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_idnumber}}</nobr>
+              </td>
               <td style="text-align: center;"><nobr>
                 <nobr>{{row.f_residential_area}}</nobr>
               </nobr> </td>
@@ -784,7 +790,7 @@
 
 <script>
   import {HttpResetClass, PagedList} from 'vue-client'
-  import exportConfig from '../../components/sale/config/exportConfig'
+  import exportConfig from './config/exportConfig'
   let cardBtnGen = async function (self, val) {
     self.cardInfo = val.data
 

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

@@ -84,14 +84,16 @@ export default{
     'f_price_name': '气价名称','f_type': '收费类型', 'f_price': '单价', 'f_gas': '气量','f_money': '气费'
   },
   chargeConfig: {
-    'id': '收费编号', 'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_user_phone': '客户电话', 'f_address': '客户地址', 'f_zones': '片区', 'f_user_type': '客户类型',
+    'id': '收费编号', 'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称',
+    'f_idnumber': '身份证号', 'f_user_phone': '客户电话', 'f_address': '客户地址', 'f_zones': '片区', 'f_user_type': '客户类型',
     'f_gasproperties': '用气性质', 'f_meternumber': '表号', 'f_meter_brand': '气表品牌', 'f_times': '购气次数', 'f_price_name': '气价名称',
     'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_pregas': '气量', 'fee': '金额', 'f_preamount': '燃气费', 'f_collection': '收款', 'f_privilege_money': '优惠金额', 'f_balance': '上期结余',
     'f_curbalance': '本期结余', 'f_type': '收费类型', 'f_payment': '付款方式', 'f_bank_type': '支付渠道', 'f_state': '状态', 'f_operate_date': '收费日期', 'f_serial_id': '流水号',
     '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': '业务单号'
   },
   loginQueryConfig:{
     'userid': '登录人编号','username': '登录人名称', 'logindate': '登录时间', 'type': '类型'

package/src/filiale/shiquan/ManageSellType.vue

@@ -205,13 +205,13 @@
           return
         }
         if (this.f_orgid[0]) {
-          this.orgCondtionStr += ' and f_orgid in (' + this.f_orgid + ")"
+          this.orgCondtionStr += ` and f_orgid   in ('${this.f_orgid}')`
         }
         if (this.f_depid[0]) {
-          this.orgCondtionStr += " and f_depid in (" + this.f_depid.toString() + ")"
+          this.orgCondtionStr += ` and f_depid   in ('${this.f_depid.toString}')`
         }
         if(this.f_operatorid[0]) {
-          this.orgCondtionStr += ' and f_operatorid in (' + this.f_operatorid + ")"
+          this.orgCondtionStr += ` and f_operatorid   in ('${this.f_operatorid}')`
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = this.orgCondtionStr.replace('1=1','') + (this.f_state && this.f_state != '' ? " and f_state='" + this.f_state + "' " : '')
         this.$refs.paged.search(args)

package/src/filiale/zhongyi/ManageSellType.vue

@@ -201,13 +201,13 @@
         this.printTime = this.$login.toStandardTimeString()
         this.orgCondtionStr='1=1'
         if (this.f_orgid[0]) {
-          this.orgCondtionStr += ' and f_orgid in (' + this.f_orgid + ")"
+          this.orgCondtionStr += ` and f_orgid   in ('${this.f_orgid}')`
         }
         if (this.f_depid[0]) {
-          this.orgCondtionStr += " and f_depid in (" + this.f_depid.toString() + ")"
+          this.orgCondtionStr += ` and f_depid   in ('${this.f_depid.toString}')`
         }
         if(this.f_operatorid[0]) {
-          this.orgCondtionStr += ' and f_operatorid in (' + this.f_operatorid + ")"
+          this.orgCondtionStr += ` and f_operatorid   in ('${this.f_operatorid}')`
         }
         this.$refs.paged.$refs.criteria.model.f_orgid = this.orgCondtionStr.replace('1=1','') + (this.f_state && this.f_state != '' ? " and f_state='" + this.f_state + "' " : '')
         this.$refs.paged.search(args)