sale-client 3.6.228 → 3.6.230

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.228",
+  "version": "3.6.230",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/webMeter/meterinfo/NewMeterList.vue

@@ -371,7 +371,7 @@
   let readyGen = async function (self) {
     await self.$MagLoadParams.loadParam()
     self.initQueryParam()
-    await self.$getConfig(self, 'HandManager')
+    await self.$getConfig(self, 'manageGetNewMeterBrandAndModel')
     console.log('表具管理config', self.config)
     self.getfield = self.config.excelHeaders
     // self.reflash()

package/src/filiale/ancheng/NewMeterList.vue

@@ -378,7 +378,7 @@
   let readyGen = async function (self) {
     await self.$MagLoadParams.loadParam()
     self.initQueryParam()
-    await self.$getConfig(self, 'HandManager')
+    await self.$getConfig(self, 'manageGetNewMeterBrandAndModel')
     console.log('表具管理config', self.config)
     self.getfield = self.config.excelHeaders
     // self.reflash()

package/src/filiale/ningjin/CardMeterCenter.vue

@@ -310,7 +310,7 @@
       self.model.f_totalcost = self.model.f_preamount
       self.model.f_collection = 0
     } else {
-      self.model.f_collection = self.config.autoCollection ? self.model.f_totalcost : 0
+      self.model.f_collection = self.config.autoCollection ? self.model.f_preamount : 0
       self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0)).toFixed(4)
     }
     self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(4)
@@ -335,7 +335,7 @@
         self.model.f_totalcost = getAmount.data.chargenum
         self.model.f_collection = 0
       } else {
-        self.model.f_collection = self.config.autoCollection ? self.model.f_totalcost : 0
+        self.model.f_collection = self.config.autoCollection ? getAmount.data.chargenum : 0
         if(self.config.floor){
           self.model.f_collection=Math.ceil(self.model.f_collection)
         }

package/src/filiale/ningjin/IOTMeterCenter.vue

@@ -102,7 +102,7 @@
             <div class="col-sm-3 form-group" v-if="row.f_collection_type === '按金额'">
               <label for="f_collection" class=" font_normal_body">&nbsp;&nbsp;&nbsp;收款&nbsp;&nbsp;&nbsp;</label>
               <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
-                     v-el:sk v-scale="[model.f_collection, 2]" disabled>
+                     v-el:sk v-scale="[model.f_collection, 4]" disabled>
             </div>
             <div class="col-sm-1 form-group">
               <give-change :curbalance="curbalance" :collection.sync="model.f_collection" v-ref:givechange></give-change>
@@ -303,12 +303,13 @@
       self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
     }
     // self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
-    self.model.f_collection = self.model.f_totalcost
+    self.model.f_collection = (self.model.f_totalcost - 0).toFixed(2)
     self.model.f_preamount = ((getGas.data.chargenum - 0) - (self.dymoney - 0))
     if (self.model.f_payment == '赠气') {
       self.model.f_totalcost = self.model.f_preamount
-      self.model.f_collection = 0
-  }
+      self.model.f_collection = 0.00
+    }
+    console.log('self.model.f_collection', self.model.f_collection)
     self.calText(getGas.data.chargeprice)
   }
   // 输入气量，换算金额
@@ -328,11 +329,12 @@
       if(self.config.floor){
         self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
       }
-      self.model.f_collection = self.model.f_totalcost
+      self.model.f_collection = (self.model.f_totalcost - 0).toFixed(2)
       if (self.model.f_payment == '赠气') {
         self.model.f_totalcost = getAmount.data.chargenum
-        self.model.f_collection = 0
+        self.model.f_collection = 0.00
       }
+      console.log('self.model.f_collection', self.model.f_collection)
       self.calText(getAmount.data.chargeprice)
     }
   }

package/src/filiale/ningjin/NoCardMeterCenter.vue

@@ -212,7 +212,7 @@
       self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(4))
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice
-      self.model.f_collection = self.model.f_totalcost
+      self.model.f_collection = getAmount.data.chargenum - 0
       if(self.config.floor){
         self.model.f_collection=Math.ceil(self.model.f_collection)
       }

package/src/filiale/qianneng/charge/ChargeList.vue

@@ -17,7 +17,7 @@
           <div class="form-group col-sm-3">
             <label class="font_normal_body">客户名称</label>
             <input type="text" class="input_search" style="width:60%"  v-model="model.f_user_name" placeholder='客户名称'
-                   @keyup.enter="$parent.$parent.clean()" condition="f_user_name like '%{}%'">
+                   @keyup.enter="$parent.$parent.clean()" >
           </div>
           <!--<div class="row" >-->
           <div  v-show="$parent.$parent.criteriaShow">
@@ -597,7 +597,7 @@
         curorgid: [this.$login.f.orgid],
         f_orgid: '',
         showCardError2: false,
-        model: new PagedList('rs/sql/sale_getUser', 30, {orderitem: '"' + this.orderitem + ' DESC"'}),
+        model: new PagedList('rs/sql/sale_getUser', 30, {f_user_name: 'this.model.f_user_name', orderitem: '"' + this.orderitem + ' DESC"'}),
         isPager: true,
         rows: null,
         cardInfo: '',

package/src/filiale/qianneng/revenue/machineHandManage/machineHand.vue

@@ -348,6 +348,9 @@
               <th>
                 <nobr>调压箱名称</nobr>
               </th>
+              <th>
+                <nobr>是否单户抄表</nobr>
+              </th>
               <th>
                 <nobr>抄表员</nobr>
               </th>
@@ -448,6 +451,7 @@
             </td>
             <td>{{ row.f_book_name }}</td>
             <td>{{ row.f_adjustable_name }}</td>
+            <td>{{ row.f_isone == '是' ? '是': '否' }}</td>
             <td>{{ row.f_inputtor }}</td>
             <td style="text-align: center;">
               <nobr>
@@ -1049,6 +1053,7 @@ export default {
               f_meter_brand: this.danhu.info.f_meter_brand,
               f_hand_id: res2.data[0].id,
               f_tablebase: this.danhu.f_tablebase,
+              f_isone: '是',
               f_userinfo_id: this.danhu.info.f_userinfo_id
             }
             this.$resetpost('rs/logic/sale_commonEnter', {data: handParam}, {

package/src/filiale/shanxian/components/webMeter/meterinfo/NewMeterList.vue

@@ -372,7 +372,7 @@
   let readyGen = async function (self) {
     await self.$MagLoadParams.loadParam()
     self.initQueryParam()
-    await self.$getConfig(self, 'HandManager')
+    await self.$getConfig(self, 'manageGetNewMeterBrandAndModel')
     console.log('表具管理config', self.config)
     self.getfield = self.config.excelHeaders
     // self.reflash()

package/src/filiale/wenxi/CardHand.vue

@@ -207,11 +207,16 @@
               </th>
               <th>
                 <nobr>
-                  <data-order field="f_address" name="基本信息"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+                  用户姓名
                 </nobr>
               </th>
 <!--              <th>-->
+<!--                <nobr>-->
+<!--                  <data-order field="f_address" name="基本信息"-->
+<!--                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>-->
+<!--                </nobr>-->
+<!--              </th>-->
+<!--              <th>-->
 <!--                <nobr>用户等级</nobr>-->
 <!--              </th>-->
               <th>
@@ -290,7 +295,8 @@
           <template partial='body'>
             <td style="text-align: center;">{{$index+1}}</td>
             <td style="text-align: center;">{{row.f_userinfo_code}}</td>
-            <td style="text-align: center;">{{row.f_user_name}}&nbsp;&nbsp;{{row.f_gasproperties}}&nbsp;&nbsp;{{row.f_user_phone}}&nbsp;&nbsp;{{row.f_address}}</td>
+            <td style="text-align: center;">{{row.f_user_name}}</td>
+<!--            <td style="text-align: center;">{{row.f_gasproperties}}&nbsp;&nbsp;{{row.f_user_phone}}&nbsp;&nbsp;{{row.f_address}}</td>-->
 <!--            <td>{{row.f_user_level}}</td>-->
             <td style="text-align: center;">{{row.f_residential_area}}</td>
             <td style="text-align: center;">{{row.f_meternumber}}</td>
@@ -354,7 +360,19 @@
 
 
             <td style="text-align: center;">{{row.f_actualtablebase}}</td>
-            <td style="text-align: center;">{{row.f_total_gas-(row.f_tablebase-row.f_initial_base)}}</td>
+            <td style="text-align: center;">
+              <div class="form-group" style="margin-bottom:0px;"
+                   v-if="row.f_meter_state === '未抄表' ">
+                <input type="text" class="form-control" v-model="row.f_shengyu_gas"
+                       v-next-el="{id: $index+1}" :id="$index" style="width: 100px;padding: 6px;"
+                       :disabled="row.state === '开始'"
+                       @blur="$parent.$parent.$parent.enter(row)"
+                >
+              </div>
+              <div v-else>
+                <span >{{ row.f_shengyu_gas }}</span>
+              </div>
+            </td>
             <td style="text-align: center;">
               <div class="form-group" style="margin-bottom:0px;"
                    v-if="row.f_meter_state === '未抄表' ">
@@ -553,7 +571,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
         cardCentalData: '',
         getfield: {
           'f_userinfo_code': '户编号',
-          'f_user_name': '基本信息',
+          'f_user_name': '用户姓名',
           'f_meternumber': '表号',
           'f_inputtor': '抄表员',
           'f_total_fee': '总购金额',
@@ -692,7 +710,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
       enter (row) {
         if (!row.f_result_state || !row.f_valve_switch || !row.f_controller_power ||
           !row.f_flowmeter_capacity || !row.f_temperature || !row.f_pressure ||
-          !row.f_instantaneous_flow || !row.f_hand_date || !row.f_tablebase) {
+          !row.f_instantaneous_flow || !row.f_hand_date || !row.f_tablebase | !row.f_shengyu_gas) {
           return
         }
         if (!row.f_tablebase || ((row.f_tablebase - 0) - (row.f_last_tablebase - 0)).toFixed(2) < 0) {
@@ -738,7 +756,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
           console.log('================================判断前:', row.f_hand_date)
           row.f_user_id = row.f_user_id + ''
           // 余气量=累购-(本期指数-表初始指数)
-          row.f_shengyu_gas = (row.f_total_gas - (row.f_tablebase - row.f_initial_base)).toFixed(2)
+          // row.f_shengyu_gas = (row.f_total_gas - (row.f_tablebase - row.f_initial_base)).toFixed(2)
           console.log('录入完毕。。', row)
           this.$resetpost('rs/logic/cardhands', row, {resolveMsg: null, rejectMsg: '录入数据出错!!!'}).then((res) => {
             console.log('返回数据', res)