sale-client 3.6.76 → 3.6.77

package/build/dev-server.js

@@ -70,10 +70,10 @@ var devConfig = {
         target: serverRul
       },
       '/rs/logic': {
-        target: 'http://127.0.0.1:8080/'
+        target: localUrl
       },
       '/rs/sql': {
-        target: 'http://127.0.0.1:8080/'
+        target: localUrl
       },
       '/webmeter': {
         target: serverRul

package/package.json

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

package/src/components/revenue/comprehen/Bill/EticketV4/EticketRecordList.vue

@@ -19,7 +19,7 @@
             <div class="form-group col-sm-2">
               <label class="font_normal_body">客户地址</label>
               <input type="text" class="form-control" v-model="model.f_buy_address_phone" style="width:60%"
-                     condition="f_buy_address_phone like '%{}%'" placeholder="用户姓名"
+                     condition="f_buy_address_phone like '%{}%'" placeholder="客户地址"
               >
             </div>
             <div class="form-group col-sm-2">
@@ -114,6 +114,10 @@
             </th>
             <th>
               <data-order field="f_total_money" name="实收金额"
+                          :order.sync="$parent.$parent.$parent.orderFields.f_collection"></data-order>
+            </th>
+            <th>
+              <data-order field="f_total_money" name="开票金额"
                           :order.sync="$parent.$parent.$parent.orderFields.f_total_money"></data-order>
             </th>
             <th>
@@ -159,6 +163,7 @@
             <th style="text-align:center">{{ row.f_userinfo_code }}</th>
             <th style="text-align:center">{{ row.f_user_name }}</th>
             <th style="text-align:center">{{ row.f_buy_address_phone }}</th>
+            <th style="text-align:center">{{ row.f_collection }}</th>
             <th style="text-align:center">{{ row.f_total_money }}</th>
             <th style="text-align:center">{{ row.f_tax_money }}</th>
             <th style="text-align:center">{{ row.f_invoice_type }}</th>
@@ -246,15 +251,18 @@ export default {
       bz: '',
       row: {},
       orderFields: {
-        f_operate_date: 'desc'
+        f_operate_date: 'desc',
+        f_collection: 'no',
+        f_total_money: 'no'
       },
       // 排序
-      orderitem: '',
+      orderitem: ' f_operate_date desc ',
       fields: {
         'f_userinfo_code': '客户编号',
         'f_user_name': '客户姓名',
         'f_buy_address_phone': '用户地址',
-        'f_total_money': '实收金额',
+        'f_collection': '实收金额',
+        'f_total_money': '开票金额',
         'f_tax_money': '不含税金额',
         'f_invoice_type': '发票类型',
         'f_bill_code': '发票代码',

package/src/filiale/gehua/MeterinfoTest.vue

@@ -45,7 +45,7 @@
 <!--            <v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
                       search @change='brandChange' v-model='row.gasbrand' :disabled="!((row.f_meter_classify.indexOf('卡表') !== -1&&row.f_user_state === '预备') || (row.f_meter_classify.indexOf('卡表') !== -1&&row.f_whether_hairpin === '未发'))" v-ref:brand></v-select>-->
             <v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
-                      search @change='brandChange' v-model='row.gasbrand' :disabled="!((row.f_user_state === '预备' ||user_State === '预备') || (user_State === undefined || user_State === ''))"  v-ref:brand></v-select>
+                      search @change='brandChange' v-model='row.gasbrand' :disabled="user_State === '正常'"  v-ref:brand></v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.model.required ? 'has-error' : '']">
             <label for="gasmodel" class="font_normal_body">气表型号</label>
@@ -56,7 +56,7 @@
 <!--                      v-model='row.gasmodel' :disabled="!(row.gasbrand.length !== 0 && ((row.f_meter_classify.indexOf('卡表') !== -1&&row.f_user_state === '预备') || (row.f_meter_classify.indexOf('卡表') !== -1&&row.f_whether_hairpin === '未发')))" v-ref:model></v-select>-->
             <v-select :value.sync="row.gasmodel" :options='row.gasbrand[0].gasmodel' placeholder='气表型号'
                       close-on-select
-                      v-model='row.gasmodel'  :disabled="!(row.gasbrand.length !== 0 && ((row.f_user_state === '预备' || user_State === '预备') ||  (user_State === undefined || user_State === '')))"   v-ref:model></v-select>
+                      v-model='row.gasmodel'  :disabled="!(row.gasbrand.length !== 0 && (user_State !== '正常'))"   v-ref:model></v-select>
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_meter_base" class="font_normal_body">&ensp;累购气量</label>
@@ -576,6 +576,7 @@
     props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id', 'overdueset', 'curuser'],
     async ready () {
       this.user_State = this.curuser.f_user_state
+      console.log(this.user_State)
       this.row = Object.assign(this.row, this.meter, {f_use_limit : this.$appdata.getSingleValue('报废年限')})
       if (this.row.f_meter_classify) {
         if (this.row.f_meter_classify === '物联网表') {
@@ -671,6 +672,11 @@
           co(brandChangeGen(this))
         }
         this.meternumberValidate()
+        console.log('---------------------------------')
+        console.log(this.curuser)
+        console.log(this.meter)
+        console.log(this.user_State)
+        console.log('---------------------------------')
       },
       userTypeChange () {
         this.gasproperties = []

package/src/filiale/rizhao/ChargeList.vue

@@ -307,7 +307,7 @@
             <p class="form-control-static">{{userAddress}}</p>
           </div>
           <label class="col-sm-2 control-label" v-if="showOrgname">所属公司</label>
-          <div class="col-sm-2" v-if="showOrgname">
+          <div class="col-sm-10" v-if="showOrgname">
             <p class="form-control-static" style="color: red">{{orgName}}</p>
           </div>
         </div>
@@ -575,6 +575,12 @@
           if (getUser.data[0].f_filialeid != self.$login.f.orgid) {
             self.showCardError = true
             self.showCardError2 = true
+            self.orgName = ''
+            let arr = []
+            for(let i=0;i < getUser.data.length;i++){
+              arr.push(getUser.data[i].f_orgname)
+            }
+            self.orgName = arr.join(", ")
             self.showOrgname = true
             return
           }

package/src/filiale/yuansheng/icTable.vue

@@ -8,11 +8,13 @@
               <label class="font_normal_body">&nbsp;操作&nbsp;</label>
               <v-select v-if="this.row.f_collection_type==='按金额'" :value.sync="model.f_operat_type"
                         :options='operator_type' placeholder='请选择'
+                        :value-single="true"
                         selected="赠费"
                         style="width:60%"
                         close-on-select></v-select>
               <v-select v-if="this.row.f_collection_type==='按气量'" :value.sync="model.f_operat_type"
                         :options='operator_type2' placeholder='请选择'
+                        :value-single="true"
                         selected="赠气"
                         style="width:60%"
                         close-on-select></v-select>
@@ -118,11 +120,8 @@ let preamountGen = async function (self) {
     let data = self.getSell()
     data.f_total_gas = data.f_add_gas === '计入' ? (self.row.f_total_gas - 0) + (self.model.f_pregas - 0) : (self.row.f_total_gas - 0)
     data.f_total_fee = data.f_add_gas === '计入' ? (self.row.f_total_fee - 0) + (self.model.f_preamount - 0) : (self.row.f_total_fee - 0)
-    if (self.isGas) {
-      data.f_pregas = self.model.f_pregas
-    } else {
-      data.f_preamount = self.model.f_preamount
-    }
+    data.f_pregas = self.model.f_pregas
+    data.f_preamount = self.model.f_preamount
     data.f_userfiles_id = {
       f_userfiles_id: self.row.f_userfiles_id,
       f_user_id: self.row.f_user_id,

package/src/filiale/yuansheng/sale.js

@@ -26,4 +26,6 @@ export default function () {
   Vue.component('iot-refund', (resolve) => { require(['./IOTRefund'], resolve) })
   // 物联网赠气
   Vue.component('iotTable', (resolve) => { require(['./iotTable'], resolve) })
+  // 物联网赠气
+  Vue.component('icTable', (resolve) => { require(['./icTable'], resolve) })
 }

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import wenxi from './filiale/rizhao/sale'
+import wenxi from './filiale/yuansheng/sale'
 // import FilialeSale from './filiale/yuansheng/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
@@ -11,7 +11,6 @@ import VueClipboard from 'vue-clipboard2'
 
 Vue.use(VueClipboard)
 Vue.config.silent = true
-
 all()
 system(false)
 sale()