sale-client 3.6.174 → 3.6.176

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
+const [ serverRul, localUrl ] = ['http://192.168.3.82:8400/#', 'http://192.168.3.82:8400/#']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -73,13 +73,13 @@ var devConfig = {
         target: serverRul
       },
       '/rs/logic': {
-        target: 'http://127.0.0.1:8080'
+        target: serverRul
       },
       '/rs/sql': {
-        target: 'http://127.0.0.1:8080'
+        target: serverRul
       },
       '/rs/entity': {
-        target: 'http://127.0.0.1:8080'
+        target: serverRul
       },
       '/webmeter': {
         target: serverRul

package/package.json

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

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

@@ -622,7 +622,8 @@
         }
       },
       'model.f_payment' (val) {
-        if (val == '免交') {
+        let _payment = this.$appdata.getSingleValue('需要输入业务单号的付款方式') || ''
+        if (val == '免交' || _payment.includes(val)) {
           this.mjshow = true
         } else if (val == '赠气' && (this.model.f_preamount || this.model.f_preamount != '')) {
           if (this.row.f_collection_type == '按气量') {

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

@@ -587,7 +587,8 @@
         this.getPrivilegeList()
       },
       'model.f_payment' (val) {
-        if (val == '免交') {
+        let _payment = this.$appdata.getSingleValue('需要输入业务单号的付款方式') || ''
+        if (val == '免交' || _payment.includes(val)) {
           this.mjshow = true
         } else if (val == '赠气' && (this.model.f_preamount || this.model.f_preamount != '')) {
           if (this.row.f_collection_type == '按气量') {

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

@@ -139,6 +139,16 @@
                         close-on-select clear-button>
               </v-select>
             </div>
+            <div class="col-sm-4" v-if="!mjshow" >
+              <label for="f_serial_number" class=" font_normal_body">业务单号</label>
+              <input class="input_search" style="width:60%"  type="text"
+                     v-model="model.f_serial_number" placeholder="业务单号">
+            </div>
+            <div class="col-sm-4" v-if="mjshow" :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
+              <label for="f_serial_number" class=" font_normal_body">业务单号</label>
+              <input class="input_search" style="width:60%"  type="text" v-validate:f_serial_number='{required: true }'
+                     v-model="model.f_serial_number" placeholder="业务单号">
+            </div>
             <div class="col-sm-8">
               <label for="f_comments" class=" font_normal_body">&nbsp;备&emsp;&emsp;注</label>
               <input type="text" class="input_search" style="width:80%" v-model="model.f_comments" rows="1"
@@ -326,6 +336,7 @@ export default {
         otherdetail: [{f_brand_spec: [''], typeNameList: [], f_typenumber: '', typenumberList: [], f_unitprice: '', f_number: ''}]
       },
       eticket_msg: false,
+      mjshow: false,
       eticket_show: false,
       invoice_is_pax: '征税',
       is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
@@ -362,6 +373,10 @@ export default {
       if (val[0]) {
         this.userfees(this.row.f_userinfo_id, val[0])
       }
+    },
+    'model.f_payment' (val) {
+      let _payment = this.$appdata.getSingleValue('需要输入业务单号的付款方式') || ''
+      this.mjshow = (val === '免交' || _payment.includes(val))
     }
   },
   events: {

package/src/components/charge/business/machine/MachineMeterCenter.vue

@@ -652,7 +652,8 @@ let asyncMachineMeterCenter = async function (self) {
       'data.f_payment' (val) {
         this.getPrivilegeList()
         // 根据付款方式增加业务单号
-        if (val == '免交') {
+        let _payment = this.$appdata.getSingleValue('需要输入业务单号的付款方式') || ''
+        if (val == '免交' || _payment.includes(val)) {
           this.mjshow = true
         } else {
           this.mjshow = false

package/src/filiale/gehua/PriceChangeCompensation/GroupJbCompensation.vue

@@ -190,7 +190,7 @@ let asyncCardMeterCenter = async function (self) {
       data: {
         items: 'sum(f_real_amount) f_real_amount,sum(f_surplus_fee) f_surplus_fee',
         tablename: 't_surplus_detail',
-        condition: `f_userinfo_id = any(select f_userinfo_id from t_userfiles where f_civill_id = '${self.civill}') and f_state='有效' and f_whether_pay = '否' `,
+        condition: `f_userinfo_id = any(select f_userinfo_id from t_userfiles where f_civill_id = '${self.civill.id}') and f_state='有效' and f_whether_pay = '否' `,
         orderitem: 'f_surplus_fee'
       }
     },

package/src/filiale/gehua/PriceChangeCompensation/OweRecordQuery.vue

@@ -157,7 +157,7 @@ export default {
       // 处理按钮样式
       this.styleChange(btn.name)
       this.chargeShow = true
-      this.$refs.route.init(btn.value.routeName, {row: this.row, data: this.model, owe: this.owe, civill: this.f_civill_id})
+      this.$refs.route.init(btn.value.routeName, {row: this.row, data: this.model, owe: this.owe, civill: this.civill})
     },
     styleChange (name) {
       this.operBtns.forEach((res) => {

package/src/filiale/haile/unHandplanQuery.vue

@@ -129,6 +129,17 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
                          condition="f_meternumber = '{}' " placeholder="表号">
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">机表未抄期数</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_hand_month"
+                         condition="f_hand_month  >= '{}' " placeholder="机表未抄期数">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">物联未报天数</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_webhand_day"
+                         condition="f_webhand_day >= '{}' " placeholder="物联未报天数">
+                </div>
+
 
                 <!--表册片区-->
                 <!--<div class="col-sm-2 form-group">-->

package/src/filiale/tongchuan/CardMeterCenter.vue

@@ -612,7 +612,8 @@ export default {
       }
     },
     'model.f_payment' (val) {
-      if (val == '免交') {
+      let _payment = this.$appdata.getSingleValue('需要输入业务单号的付款方式') || ''
+      if (val == '免交' || _payment.includes(val)) {
         this.mjshow = true
       } else if (val == '赠气' && (this.model.f_preamount || this.model.f_preamount != '')) {
         if (this.row.f_collection_type == '按气量') {

package/src/filiale/tongchuan/IOTMeterCenter.vue

@@ -581,7 +581,8 @@
         this.getPrivilegeList()
       },
       'model.f_payment' (val) {
-        if (val == '免交') {
+        let _payment = this.$appdata.getSingleValue('需要输入业务单号的付款方式') || ''
+        if (val == '免交' || _payment.includes(val)) {
           this.mjshow = true
         } else if (val == '赠气' && (this.model.f_preamount || this.model.f_preamount != '')) {
           if (this.row.f_collection_type == '按气量') {

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/yuansheng/sale'
+import FilialeSale from './filiale/gehua/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'