sale-client 3.6.168 → 3.6.170

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [ serverRul, localUrl ] = ['http://121.36.106.17:8400/', 'http://127.0.0.1:8080/']
+const [ serverRul, localUrl ] = ['http://61.240.138.248:8400', 'http://61.240.138.248:8400']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/components/charge/business/CardMeterCenter.vue

@@ -388,7 +388,7 @@
             self.row.id = res
             self.eticket_show = true
             // 应铜川需要卡表显示
-            await self.$refs.eticketbill.openETicket([res], self.row, '是', self.invoice_is_pax, '卡表收费')
+            await self.$refs.eticketbill.openETicket(res, self.row, '卡表收费')
             // await self.$CommonService.openEticket(res, '售气收费')
             // self.print = true
           }

package/src/filiale/gehua/MachineMeterCenter.vue

@@ -262,7 +262,7 @@ let asyncMachineMeterCenter = async function (self) {
           // TODO
         } else if (self.data.f_print[0] === '电子发票') {
           self.eticket_show = true
-          await self.$refs.eticketbill.openETicket([res.data], self.row, '是', self.invoice_is_pax, '机表收费')
+          await self.$refs.eticketbill.openETicket([res.data], self.row, '卡表收费')
           // await self.$CommonService.openEticket(res.data, '售气收费')
           // 如果不欠费就用下边的预存收据
           // if (self.$parent.$children[0].selecteds) {

package/src/filiale/wenxi/CardHand.vue

@@ -306,6 +306,7 @@
                             v-model="row.f_hand_date"
                             :value.sync="row.f_hand_date"
                             :format="'yyyy-MM-dd HH:mm:ss'"
+                            @change="$parent.$parent.$parent.valueChange(row.f_hand_date, row)"
                             :show-reset-button="true">
                 </datepicker>
               </div>
@@ -342,6 +343,7 @@
                           width="100%"
                           :value-single="true"
                           close-on-select
+                          @change="$parent.$parent.$parent.valueChange(row.f_result_state, row)"
                           condition="f_adjustable_name = '{}'"></v-select>
                 <!-- <span id="inputError2Status" class="sr-only">(error)</span> -->
               </div>
@@ -359,6 +361,7 @@
                 <input type="text" class="form-control" v-model="row.f_instantaneous_flow"
                        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>
@@ -372,6 +375,7 @@
                 <input type="text" class="form-control" v-model="row.f_pressure"
                        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>
@@ -385,6 +389,7 @@
                 <input type="text" class="form-control" v-model="row.f_temperature"
                        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>
@@ -392,7 +397,18 @@
               </div>
             </td>
             <td style="text-align: center;">
-              <nobr>{{row.f_flowmeter_capacity}}</nobr>
+              <!--              <nobr>{{row.f_temperature}}</nobr>-->
+              <div class="form-group" style="margin-bottom:0px;"
+                   v-if="row.f_meter_state === '未抄表' ">
+                <input type="text" class="form-control" v-model="row.f_flowmeter_capacity"
+                       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_flowmeter_capacity }}</span>
+              </div>
             </td>
             <td style="text-align: center;">
               <!--              <nobr>{{row.f_controller_power}}</nobr>-->
@@ -401,6 +417,7 @@
                 <input type="text" class="form-control" v-model="row.f_controller_power"
                        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>
@@ -415,6 +432,7 @@
                           :options='$parent.$parent.$parent.valve_switch' placeholder='阀门开关'
                           width="100%"
                           :value-single="true"
+                          @change="$parent.$parent.$parent.valueChange(row.f_valve_switch, row)"
                           close-on-select
                 ></v-select>
                 <!-- <span id="inputError2Status" class="sr-only">(error)</span> -->
@@ -569,6 +587,12 @@ import {HttpResetClass, PagedList} from 'vue-client'
       loadParamGem(this)
     },
     methods: {
+      valueChange (value, row) {
+        console.log('value=================>', value)
+        if (value) {
+          this.enter(row)
+        }
+      },
       hidden () {
         this.criteriaShow = !this.criteriaShow
       },
@@ -666,6 +690,11 @@ import {HttpResetClass, PagedList} from 'vue-client'
         this.$refs.paged.$refs.criteria.search()
       },
       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) {
+          return
+        }
         if (!row.f_tablebase || ((row.f_tablebase - 0) - (row.f_last_tablebase - 0)).toFixed(2) < 0) {
           return
         }

package/src/filiale/wuhai/CardMeterCenter.vue

@@ -387,7 +387,9 @@
             self.row.id = res
             self.eticket_show = true
             // 应铜川需要卡表显示
-            await self.$refs.eticketbill.openETicket([res], self.row, '是', self.invoice_is_pax, '卡表收费')
+            await self.$refs.eticketbill.openETicket(res, self.row, '卡表收费')
+
+            // await self.$refs.eticketbill.openETicket([res], self.row, '是', self.invoice_is_pax, '卡表收费')
             // await self.$CommonService.openEticket(res, '售气收费')
             // self.print = true
           }

package/src/filiale/wuhai/IOTMeterCenter.vue

@@ -350,7 +350,7 @@
           // TODO
         } else if (self.model.f_print[0] === '电子发票') {
           self.eticket_show = true
-          await self.$refs.eticketbill.openETicket([res.data.id], self.row, self.invoice_show_gas, self.invoice_is_pax, '物联网收费')
+          await self.$refs.eticketbill.openETicket(res.data.id, self.row, '物联网收费')
 
           // self.$CommonService.openEticket(res.data.id, '其他收费')
           // self.$dispatch('success')

package/src/filiale/wuhai/NoCardMeterCenter.vue

@@ -253,7 +253,7 @@
           }
         } else {
           if (self.model.f_print[0] === '电子发票') {
-            await self.$CommonService.openEticket(res, '售气收费')
+            await self.$refs.eticketbill.openETicket(res, self.row, '卡表收费')
             self.row.id = res
             self.print = true
           }

package/src/filiale/wuhai/OtherChargeNew.vue

@@ -298,7 +298,7 @@
           self.$dispatch('success')
         } else if (self.model.f_print[0] === '电子发票') {
           self.eticket_show = true
-          await self.$refs.eticketbill.openETicket([resid.data], self.row, '是', self.invoice_is_pax, '其他收费')
+          await self.$refs.eticketbill.openETicket(resid.data, self.row, '其他收费')
           // self.$CommonService.openEticket(resid.data, '其他收费')
           // self.$dispatch('success')
         }

package/src/filiale/wuhai/ShowCardSellGas.vue

@@ -398,7 +398,7 @@ let initCardGen = async function (self) {
           self.row.id = res.data.id
           self.eticket_show = true
           // 应铜川需要卡表显示
-          await self.$refs.eticketbill.openETicket([res.data.id], self.row, '是', self.invoice_is_pax, '发卡售气')
+          await self.$refs.eticketbill.openETicket(res.data.id, self.row, '卡表收费')
 
           // await self.$CommonService.openEticket(res.data.id, '售气收费')
           // self.row.id = res.data.id

package/src/filiale/yuansheng/icTable.vue

@@ -138,6 +138,8 @@ let preamountGen = async function (self) {
       f_times: self.row.cardInfo.Times + 1,
       f_total_gas: data.f_add_gas === '计入' ? (self.row.f_total_gas - 0) + (self.model.f_pregas - 0) : (self.row.f_total_gas - 0),
       f_total_fee: data.f_add_gas === '计入' ? (self.row.f_total_fee - 0) + (self.model.f_preamount - 0) : (self.row.f_total_fee - 0),
+      f_write_totalgas: (self.row.f_write_totalgas - 0) + (self.model.f_pregas - 0),
+      f_write_totalfee: (self.row.f_write_totalfee - 0) + (self.model.f_preamount - 0),
       f_balance_gas: 0,
       f_balance_amount: 0
     }
@@ -303,6 +305,8 @@ let preamountGen = async function (self) {
           meterid: row.f_meternumber ? row.f_meternumber : 0                  // 表号
           // meternumber: row.f_meternumber ? row.f_meternumber : 0
         }
+        params.ljgql = parseFloat(((row.f_write_totalgas - 0) + (this.model.f_pregas - 0)).toFixed(2))
+        params.ljgqje = parseFloat(((row.f_write_totalfee - 0) + (this.model.f_preamount - 0)).toFixed(2))
         return Object.assign({}, this.$CommonService.writeCardParams(cardParams), params)
       },
       close () {

package/src/main.js

@@ -4,7 +4,7 @@ import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
 // import wenxi from './filiale/rizhao/sale'
-import FilialeSale from './filiale/lixianV3/sale'
+import FilialeSale from './filiale/yuansheng/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'
@@ -24,7 +24,7 @@ all()
 system(false)
 sale()
 // wenxi()
-// FilialeSale()
+FilialeSale()
 address()
 ldap()
 require('system-clients/src/styles/less/bootstrap.less')