manage-client 3.2.91-1 → 3.2.92-2

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

@@ -256,7 +256,7 @@
         footer:[],
         show:false,
         rowdata:{},
-        model: new PagedList('rs/sql/transferQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}, {f_transfer_fees: 0,hushu:0}),
+        model: new PagedList('rs/sql/transferQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_transfer_fees: 0,hushu:0}),
         criteriaShow: false,
         initres: {
           org:[this.$login.f.orgid],
@@ -336,7 +336,7 @@
           this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
         }
         args.condition = `${args.condition}` + this.orgCondtionStr
-        console.log('我的阐述', JSON.stringify(args.condition))
+        // console.log('我的阐述', JSON.stringify(args.condition))
         await this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
         this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
@@ -451,7 +451,7 @@
       getCondition() {
         return {
           condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
-          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
+          orderitem: this.orderitem?`${this.orderitem}`: `'f_operate_date desc'` }
       },
       getfield() {
         return exportConfig.transferConfig

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

@@ -346,7 +346,7 @@
         orderFields: {
           f_operate_date: 'no'
         },
-        model: new PagedList('rs/sql/surplusQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}, {
+        model: new PagedList('rs/sql/surplusQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {
           f_real_amount: 0,
           f_surplus_fee: 0
         }),

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

@@ -42,16 +42,6 @@
 
                 </div>
 
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">收费类型</label>
-                  <v-select :value.sync="model.typesss" v-model="model.typesss"
-                            @change="$parent.$parent.typechangesss"
-                            condition="s.f_type = '{}'"
-                            placeholder='收费类型' :options="$parent.$parent.typesss"
-                            close-on-select v-ref:type>
-
-                  </v-select>
-                </div>
 
 
 
@@ -146,7 +136,16 @@
                 </div>
 
 
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">收费类型</label>
+                  <v-select :value.sync="model.typesss" v-model="model.typesss"
+                            @change="$parent.$parent.typechangesss"
+                            condition="s.f_type = '{}'"
+                            placeholder='收费类型' :options="$parent.$parent.typesss"
+                            close-on-select v-ref:type>
 
+                  </v-select>
+                </div>
 
               </div>
             </div>

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

@@ -78,7 +78,7 @@ export default{
     '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_stair3amount': '三阶气量', 'f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'f_inputtor': '抄表员','f_residential_area':'小区','f_serial_number':'业务单号'
   },
   pricetypeGasConfig: {
     'f_price': '价格类型', 'f_gas': '当日售气量', 'f_money': '当日售气金额'