manage-client 4.0.11 → 4.0.13

package/package.json

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

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

@@ -648,6 +648,8 @@ export default {
     'f_total_usegas_amount': '累计用气金额',
     'f_total_gas': '表累购气量',
     'f_total_fee': '表累购金额',
+    'f_user_total_gas': '用户总购气量',
+    'f_user_total_fee': '用户总购金额',
     'f_inputtor': '档案抄表员',
     'f_book_inputtor': '表册抄表员',
     'f_userfiles_address': '安装地址',

package/src/components/sale/filesquery/RecordInfoQuery.vue

@@ -663,6 +663,9 @@
                   <th><nobr>表累购气量</nobr></th>
                   <th><nobr>表累购金额</nobr></th>
 
+                  <th><nobr>用户总购气量</nobr></th>
+                  <th><nobr>用户总购金额</nobr></th>
+
                   <th><nobr>抄表员(表册)</nobr></th>
                   <th><nobr>抄表员(档案)</nobr></th>
                   <th><nobr>用气点</nobr></th>
@@ -802,6 +805,8 @@
                 <td style="text-align: center;"><nobr>{{row.f_total_usegas_amount}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_total_gas}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_total_fee}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_user_total_gas}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_user_total_fee}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_book_inputtor}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_inputtor}}</nobr></td>
 
@@ -894,29 +899,6 @@
   import {HttpResetClass, PagedList} from 'vue-client'
   import defaultPrint from '../config/DefaultPrint'
   import exportConfig from '../config/exportConfig'
-  // let cardBtnGen = async function (self, val) {
-  //   self.cardInfo = val.data
-  //
-  //   // 判断读卡是否需要卡密码
-  //   console.log('读卡上的信息', self.cardInfo)
-  //
-  //   if (self.cardInfo.NewParam) {
-  //     if (self.cardInfo.NewParam.error) {
-  //       if (self.cardInfo.NewParam.error === '0001') {
-  //         // 需要重新读卡并传卡密码
-  //         if (self.model.rows.length == 1 && self.model.rows[0].f_alias === self.cardInfo.Factory) {
-  //           self.readCardParam = self.model.rows[0].f_card_password
-  //           self.cardInfo = await self.$refs.paged.$refs.cri.$refs.readcard.readCard2(self.model.rows[0].f_card_password)
-  //         } else {
-  //           self.$showAlert('此卡需要先获取客户信息。请通过条件查询该客户信息之后进行读卡！！', 'warning', 2000)
-  //           return
-  //         }
-  //       }
-  //     }
-  //   }
-  //   self.card=self.cardInfo.CardID
-  //   self.search()
-  // }
   let readySomething = async function (self) {
     await self.$MagLoadParams.loadParam()
     // await self.$LoadParams.loadParam(self.f_filialeid)
@@ -1072,13 +1054,6 @@
         let exportdata = this.getCondition;
         let otherInData = [];
         otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
-        // let footerData = [], exportfield = this.getExportField;
-        // footerData.push("合计");
-        // let self = this;
-        // for (var field in self.sumsmodel) {
-        //   footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
-        // }
-        // this.footer.push(footerData);
         this.other.push(otherInData);
       },
       initParams() {

package/src/filiale/WEINAN/UserGasAll.vue

@@ -107,7 +107,7 @@
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">时间区间</label>
-                    <datepicker  :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'"
+                    <datepicker  :disabled-days-of-Week="[]" :format="'yyyy-MM-dd HH:mm:ss'"
                                 :show-reset-button="reset"
                                 :value.sync="$parent.$parent.startDate"
                                 id="startDate"
@@ -118,7 +118,7 @@
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body" style="word-break:keep-all;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;</label>
-                    <datepicker  :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'"
+                    <datepicker  :disabled-days-of-Week="[]" :format="'yyyy-MM-dd HH:mm:ss'"
                                 :show-reset-button="reset"
                                 :value.sync="$parent.$parent.endDate"
                                 style="width:60%"

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

@@ -302,11 +302,14 @@ export default {
   }, chargeexportConfig: {
     'f_userinfo_code': '客户编号',
     'f_user_name': '客户名称',
+    'f_address': '客户地址',
     'f_pregas': '气量',
     'f_collection': '收款',
-    'f_stairamount1': '一阶气量',
-    'f_stair2amount': '二阶气量',
-    'f_stair3amount': '三阶气量'
+    'f_payment': '付款方式',
+    'f_operate_date': '收费日期',
+    'f_operator': '操作员',
+    'f_depname': '部门',
+    'f_stair1price': '一阶单价'
   }, loginQueryexportConfig: {
     'f_userinfo_id': '登录人编号',
     'f_user_name': '登录人名称',

package/src/filiale/shanxian/UserQuery.vue

@@ -112,8 +112,8 @@
                   <div class="col-sm-2 form-group">
                     <label for="startDate" class="font_normal_body">建档日期</label>
                     <datepicker placeholder="建档日期小于等于" style="width:60%"
-                                v-model="model.f_createfile_date"
-                                :value.sync="model.f_createfile_date"
+                                v-model="model.f_createfile_date_end"
+                                :value.sync="model.f_createfile_date_end"
                                 :format="'yyyy-MM-dd'"
                                 :show-reset-button="true"
                                 condition="f_createfile_date <= '{} 23:59:59'">

package/src/saleManage.js

@@ -142,7 +142,7 @@ export default function () {
   Vue.component('handplan-query', (resolve) => {
     require(['./components/sale/businessquery/HandplanQuery'], resolve)
   })
-  // 机表抄表查询
+  // 物联网抄表查询
   Vue.component('web-handplan-query', (resolve) => {
     require(['./components/sale/businessquery/WebHandplanQuery'], resolve)
   })