manage-client 3.3.220 → 3.3.222

package/package.json

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

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

@@ -1890,7 +1890,7 @@ export default {
     'f_meter_classify': '表具类型',
     'f_meter_title': '表描述',
     'f_price_name': '气价名称',
-    'f_user_nature': '用气类型',
+    'f_user_type': '用户类型',
     'f_gasproperties': '用气性质',
     'f_balance': '期初余额',
     'f_last_tablebase': '起方',

package/src/components/webmeter/newwebmeter/NewException/MeterExceptionList.vue

@@ -312,6 +312,11 @@
                 startDate: '',
                 endDate: '',
                 meterbrands: [],
+                initres: {
+                  org:[this.$login.f.orgid],
+                  dep:[],
+                  user:[],
+                },
                 other: [],
                 sumsmodel: {},
                 f_error_type:'',
@@ -427,14 +432,14 @@
                 this.startDate = this.$refs.paged.$refs.cri.model.startDate
                 this.endDate = this.$refs.paged.$refs.cri.model.endDate
                 this.f_error_type=this.$refs.paged.$refs.cri.model.f_error_type
-                console.log('1231321312312321')
                 /* if (this.endDate == '' || this.startDate == '') {
                    return this.$showMessage("时间区间的开始和结束时间不能为空！")
                  }*/
-                this.condition = this.$refs.paged.$refs.cri.condition +  this.orgCondtionStr
-
-                args.condition = this.condition
-                this.model.search(args.condition, args.model)
+              if (this.orgCondtionStr){
+                args.condition = `${args.condition}` + this.orgCondtionStr
+              }
+              this.condition = args.condition
+              this.model.search(args.condition, args.model)
             },
             SaveAsFile(str) {
                 this.$showMessage('您是否需要导出本页数据？', ['confirm', 'cancel']).then((res) => {

package/src/filiale/WEINAN/ManageSummaryReport.vue

@@ -52,7 +52,7 @@
                                 :header="$parent.$parent.other"
                                 :footer="$parent.$parent.footer"
                                 sqlurl="api/af-revenue/logic/openapi/exportfile"
-                                sql-name="manage_chargeSummary"
+                                :sql-name="$parent.$parent.sqlName"
                                 template-name='营收汇总报表'
                                 :choose-col="true"></export-excel>
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model"
@@ -357,6 +357,7 @@ export default {
       }),
       gasproperties: [],
       show: false,
+      sqlName: 'manage_chargeSummary',
       rowdata: {},
       areaList: [],
       modelval: [],
@@ -470,12 +471,14 @@ export default {
       if(this.f_is_area){
         if (this.f_is_area == '是') {
           this.isCompanyShow = true
+          this.sqlName = 'manage_chargeSummaryByArea'
           this.model = new PagedList('api/af-revenue/sql/manage_chargeSummaryByArea', 20, {
             startDate: 'this.model.startDate',
             endDate: 'this.model.endDate',
             condition2: 'this.model.condition2'
           }, {f_collection: 0, f_gas: 0, f_money: 0,f_card_money:0,f_sell_num:0,f_table_num:0})
         } else {
+          this.sqlName = 'manage_chargeSummary'
           this.isCompanyShow = false
           this.model = new PagedList('api/af-revenue/sql/manage_chargeSummary', 20, {
             startDate: 'this.model.startDate',
@@ -487,6 +490,7 @@ export default {
     isCompanyChange () {
       if (this.f_is_company) {
         if (this.f_is_company == '是') {
+          this.sqlName = 'manage_chargeSummaryByCompany'
           this.isAreaShow = true
           this.model = new PagedList('api/af-revenue/sql/manage_chargeSummaryByCompany', 20, {
             startDate: 'this.model.startDate',
@@ -494,6 +498,7 @@ export default {
             condition2: 'this.model.condition2'
           }, {f_collection: 0, f_gas: 0, f_money: 0,f_card_money:0,f_sell_num:0,f_table_num:0})
         } else {
+          this.sqlName = 'manage_chargeSummary'
           this.isAreaShow = false
           this.model = new PagedList('api/af-revenue/sql/manage_chargeSummary', 20, {
             startDate: 'this.model.startDate',

package/src/filiale/kelai/NewGasStatistics.vue

@@ -73,7 +73,6 @@
                   <label class="font_normal_body">气价类型</label>
                   <v-select :value.sync="model.pricetype" v-model="model.pricetype"
                             placeholder='气价类型' :options="$parent.$parent.pricetypes"
-                            condition="ss.f_price_type = '{}'"
                             close-on-select>
                   </v-select>
                 </div>
@@ -310,7 +309,7 @@ let readySomething = async function (self) {
   self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
 }
 export default {
-  title: '用气量统计表',
+  title: '新用气分析',
   data () {
     return {
       show:false,

package/src/main.js

@@ -46,11 +46,11 @@ ldap()
 system(false)
 
 saleManage()
-ShanXianSaleManage()
 webmeterManage()
 ManageHome()
 newmanage()
 reportManage()
+ShanXianSaleManage()
 require('system-clients/src/styles/less/bootstrap.less')
 require('./components/qinhua/Style/qinhuaStyle.less')
 // require('./bootstrap/less/manageStyle/manageChile.less')