sale-client 3.4.182 → 3.4.183

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.4.182",
+  "version": "3.4.183",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -87,7 +87,7 @@
     "style-loader": "^0.20.3",
     "system-clients": "3.2.0-2",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.49",
+    "vue-client": "1.24.51",
     "vue-clipboard2": "0.3.1",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",

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

@@ -1,23 +1,23 @@
-<template>
-  <div class="auto">
-    <card-change-fill v-if="row.f_meter_type.includes('卡表') || (row.f_meter_type.includes('物联网表') && row.f_open_type ==='发卡开户')" :row.sync="row"></card-change-fill>
-    <iot-change-fill v-if="row.f_meter_type.includes('物联网表')&& row.f_open_type !=='发卡开户'" :row.sync="row"></iot-change-fill>
-    <machine-change-fill v-if="row.f_meter_type.includes('机表')" :row.sync="row"></machine-change-fill>
-  </div>
-</template>
-<script>
-  import IotChangeFill from './IOT/IotChangeFill'
-  import CardChangeFill from './CardChangeFill'
-  import MachineChangeFill from './machine/MachineChangeFill'
-
-  export default {
-    components: {CardChangeFill, IotChangeFill, MachineChangeFill},
-    title: '换表补气',
-    data () {
-      return {
-
-      }
-    },
-    props: ['row']
-  }
-</script>
+<template>
+  <div class="auto">
+    <card-change-fill v-if="row.f_meter_type.includes('卡表')||(row.f_meter_type.includes('物联网表') && row.f_open_type ==='发卡开户')" :row.sync="row"></card-change-fill>
+    <iot-change-fill v-if="row.f_meter_type.includes('物联网表')&& row.f_open_type !=='发卡开户'" :row.sync="row"></iot-change-fill>
+    <machine-change-fill v-if="row.f_meter_type.includes('机表')" :row.sync="row"></machine-change-fill>
+  </div>
+</template>
+<script>
+  import IotChangeFill from './IOT/IotChangeFill'
+  import CardChangeFill from './CardChangeFill'
+  import MachineChangeFill from './machine/MachineChangeFill'
+
+  export default {
+    components: {CardChangeFill, IotChangeFill, MachineChangeFill},
+    title: '换表补气',
+    data () {
+      return {
+
+      }
+    },
+    props: ['row']
+  }
+</script>

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

@@ -3,35 +3,62 @@
     <div class="span" style="overflow-y: auto;min-height: 500px;">
       <validator name='v'>
         <form novalidate class="form-horizontal">
-          <div style="margin-top:10px;" v-for="row in model.otherdetail">
+          <!--          <div class="row" style="margin-top:10px;">-->
+          <!--            -->
+          <!--          </div>-->
+          <div style="margin-top:10px;" v-for="(index, row) in model.otherdetail">
             <div class="row">
-              <div class="col-sm-4" :class="{'has-success':row.f_device,'select-error':!row.f_device}">
-                <label for="f_device" class="font_normal_body " title="参数名称：品名及规格">&nbsp;收费类型</label>
-                <v-select id="f_device"
-                          width="70%"
+              <div class="col-sm-4" :class="{'has-success':row.f_brand_spec,'select-error':!row.f_brand_spec}">
+                <label for="f_brand_spec" class="font_normal_body " title="参数名称：品名及规格">收费类型</label>
+                <v-select id="f_brand_spec"
                           placeholder='请选择'
-                          v-model="row.f_device"
-                          :value.sync="row.f_device"
-                          :options='brandspec' value-single
+                          v-model="row.f_brand_spec"
+                          :value.sync="row.f_brand_spec"
+                          :options='brandspec'
+                          @change="setTypename"
                           close-on-select clear-button>
                 </v-select>
               </div>
+              <div class="col-sm-4" :class="{'has-success':row.f_typename,'has-error':!row.f_typename}">
+                <label for="f_typename" class=" font_normal_body">&nbsp;品名规格</label>
+                <v-select
+                  style="width: 100px"
+                  v-model="row.f_typename"
+                  placeholder='请选择'
+                  :value.sync="row.f_typename"
+                  :options='gettypename'
+                  @change="setTypenumber"
+                  close-on-select clear-button>
+                </v-select>
+              </div>
+              <div class="col-sm-4" :class="{'has-success':row.f_typenumber,'has-error':!row.f_typenumber}">
+                <label for="f_typenumber" class=" font_normal_body">&nbsp;型&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
+                <v-select
+                  style="width: 100px"
+                  v-model="row.f_typenumber"
+                  placeholder='请选择'
+                  :value.sync="row.f_typenumber"
+                  :options='gettypenumber'
+                  @change="setTypeprice(index)"
+                  close-on-select clear-button>
+                </v-select>
+              </div>
             </div>
-            <div class="row" style="margin-top:15px;">
-              <div class="col-sm-4" :class="{'has-success':row.f_device.f_unitprice,'has-error':!row.f_device.f_unitprice}">
+            <div class="row">
+              <div class="col-sm-4" :class="{'has-success':row.f_unitprice,'has-error':!row.f_unitprice}">
                 <label style="" for="f_unitprice" class=" font_normal_body">*单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;价</label>
                 <input class="input_search" style="width:60%" type="number" min="1" @blur.prevent="getcollection()"
                        v-validate:f_unitprice='{required: true, dctest: [0, ">" ] }'
-                       v-model="row.f_device.f_unitprice"
-                       :value.sync="row.f_device.f_unitprice"
-                       placeholder="单价" v-next-el='sl' disabled>
+                       v-model="row.f_unitprice"
+                       :value.sync="row.f_unitprice"
+                       placeholder="单价" v-next-el='sl'>
               </div>
-              <div class="col-sm-4" :class="{'has-success':row.f_device.f_number,'has-error':!row.f_device.f_number}">
+              <div class="col-sm-4" :class="{'has-success':row.f_number,'has-error':!row.f_number}">
                 <label style="" for="f_number" class="font_normal_body">*数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;量</label>
                 <input class="input_search" style="width:60%" type="number" min='1' @blur.prevent="getcollection()"
                        v-validate:f_number='{required: true, dctest: [0, ">" ] }'
-                       v-model="row.f_device.f_number"
-                       :value.sync="row.f_device.f_number"
+                       v-model="row.f_number"
+                       :value.sync="row.f_number"
                        placeholder="数量" v-next-el='sk' v-el:sl>
               </div>
               <div style="padding-top:10px">
@@ -40,6 +67,31 @@
                 <button type="button" class="glyphicon glyphicon-plus btn-success" @click.stop="addadetail()"></button>
               </div>
             </div>
+            <!--            <div class="row" style="margin-top:10px;" v-if="row.f_brand_spec[0]=='其他费用'">-->
+            <!--              <div class="col-sm-4" :class="[$v.f_fee_type.required ? 'has-error' : 'has-success']">-->
+            <!--                <input v-validate:f_fee_type='{required: true}' v-model="row.f_fee_type" v-show="false"/>-->
+            <!--                <label for="f_fee_type" class="font_normal_body ">其他收费类型</label>-->
+            <!--                <v-select id="f_fee_type"-->
+            <!--                          v-model="row.f_fee_type"-->
+            <!--                          placeholder='请选择'-->
+            <!--                          :value.sync="row.f_fee_type"-->
+            <!--                          :options='feetype'-->
+            <!--                          close-on-select clear-button>-->
+            <!--                </v-select>-->
+            <!--              </div>-->
+
+            <!--              <div class="col-sm-4">-->
+            <!--                <label for="f_fee_time" class="font_normal_body">本次购买时间</label>-->
+            <!--                <v-select id="f_fee_time"-->
+            <!--                          v-model="row.f_fee_time"-->
+            <!--                          placeholder='请选择'-->
+            <!--                          :value.sync="row.f_fee_time"-->
+            <!--                          :options='feetime'-->
+            <!--                          close-on-select clear-button>-->
+            <!--                </v-select>-->
+            <!--              </div>-->
+            <!--            </div>-->
+
           </div>
 
 
@@ -217,6 +269,26 @@ let otherChargeGen = async function (self, parameter) {
       localeSustainMoney = (localeSustainMoney - 0) + (self.model.f_collection - 0)
       window.localStorage.setItem('sustainMoney', localeSustainMoney)
     }
+    // // 转燃气改装工程单
+    // if (self.config.modificationList && parameter) {
+    //   let printSheet = {
+    //     f_userinfo_id: self.row.f_userinfo_id,
+    //     f_charge_id: resid.data,
+    //     f_state: '有效',
+    //     f_print_state: '未打印',
+    //     f_type: '改装单',
+    //     f_orgid: self.$login.f.orgid ? self.$login.f.orgid : '',
+    //     f_orgname: self.$login.f.orgs ? self.$login.f.orgs : '',
+    //     f_depid: self.$login.f.depids ? self.$login.f.depids : '',
+    //     f_depname: self.$login.f.deps ? self.$login.f.deps : '',
+    //     f_operator: self.$login.f.name,
+    //     f_operatorid: self.$login.f.id
+    //   }
+    //   await self.$resetpost('rs/logic/savePrintSheet', {data: {printData: printSheet}}, {
+    //     resolveMsg: '',
+    //     rejectMsg: '转单失败, 请重试'
+    //   })
+    // }
     if (self.config.hasPrint && !self.$login.r.includes('不打印发票')) {
       if (self.model.f_print[0] != '电子发票') {
         if (self.config.hasBillManage) {
@@ -251,12 +323,13 @@ let asyncOtherCharge = async function (self) {
   await self.$getConfig(self, 'OtherCharge')
   self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
   self.model.f_payment = [self.config.payment]
-  self.model.otherdetail[0].f_device = [self.config.brandspec]
+  self.model.otherdetail[0].f_brand_spec = [self.config.brandspec]
   self.model.f_service_person = [self.config.services]
 
   self.model.f_use_type = self.config.billType
   self.model.f_bill_type = self.model.f_print
   self.hasValidateBill = self.config.hasBillManage
+  self.setTypename(self.model.f_brand_spec[0])
 }
 export default {
   title: '其他收费',
@@ -286,7 +359,7 @@ export default {
         t_userfees: '',
         f_fee_type: [],
         f_fee_time: ['12'],
-        otherdetail: [{}]
+        otherdetail: [{f_brand_spec: ['材料费'], f_unitprice: '', f_number: ''}]
       },
       eticket_msg: false,
       eticket_show: false,
@@ -302,7 +375,10 @@ export default {
       // 启用发票管理需要对票号进行验证
       hasValidateBill: false,
       validateOk: false,
-      brandspec: [],
+      f_typenumber: '',
+      typeNameList: [],
+      typenumberList: [],
+      brandspec: this.$appdata.getParam('品名及规格'),
       printstyle: this.$appdata.getParam('打印格式'),
       paytype: this.$appdata.getParam('付款方式'),
       feetype: this.$appdata.getParam('其他费用'),
@@ -313,7 +389,6 @@ export default {
   props: ['row'],
   ready () {
     // this.model.f_unitprice = this.$appdata.getSingleValue('置换气费')
-    this.setbrandspec()
     asyncOtherCharge(this)
   },
   watch: {
@@ -324,10 +399,13 @@ export default {
     }
   },
   methods: {
-    async setbrandspec () {
-      let data = {f_orgname: this.$login.f.orgs}
-      let res = await this.$resetpost('rs/logic/getdevice', data, {resolveMsg: null, rejectMsg: null})
-      this.brandspec = res.data
+    setTypeprice (val) {
+      if (val && this.model.otherdetail[val] && this.model.otherdetail[val].f_typenumber) {
+        let unitprice = this.$appdata.getSingleValue(this.model.otherdetail[val].f_typenumber)
+        if (unitprice !== undefined) {
+          this.model.otherdetail[val].f_unitprice = unitprice
+        }
+      }
     },
     async createQianfei () {
       let data = {
@@ -340,11 +418,14 @@ export default {
         f_address: this.row.f_address,
         f_user_type: this.row.f_user_type,
         f_gasproperties: this.row.f_gasproperties,
+        // f_number: model.f_number,
+        // f_unitprice: model.f_unitprice,
         f_collection: this.model.f_collection,
         f_comments: this.model.f_comments,
         f_payment: this.model.f_payment[0],
         f_voucher_number: this.model.f_voucher_number,
         f_bill_style: this.model.f_print[0],
+        // f_brand_spec: model.f_brand_spec[0],
         f_userinfo_id: this.row.f_userinfo_id,
         f_service_person: this.model.f_service_person[0],
         f_operat_type: '其他收费欠费登记',
@@ -395,6 +476,29 @@ export default {
       this.eticket_show = false
       this.$dispatch('success')
     },
+    async setTypename (val) {
+      this.f_typenumber = ''
+      this.f_unitprice = ''
+      this.typeNameList = this.$appdata.getParam(val)
+      let self = this
+      if (val == '开卡费') {
+        if (this.$appdata.getSingleValue('开卡费')) {
+          let money = this.$appdata.getSingleValue('开卡费')
+          await this.model.otherdetail.forEach(function (item) {
+            self.isflag = false
+            if (item.f_brand_spec[0] == '开卡费') {
+              item.f_unitprice = money
+              item.f_number = 1
+              self.isflag = true
+            }
+          })
+          this.getcollection()
+        }
+      }
+    },
+    setTypenumber (val) {
+      this.typenumberList = this.$appdata.getParam(val)
+    },
     async confirm (parameter) {
       let res = await this.$showMessage(`确定对客户${this.row.f_user_name}进行其他收费吗？`, ['confirm', 'cancel'])
       if (res != 'confirm') return
@@ -425,9 +529,9 @@ export default {
       let money = 0
       let flag = true
       this.model.otherdetail.forEach((item) => {
-        if (!item.f_device.f_number || item.f_device.f_number == '0') flag = false
-        if (item.f_device.f_unitprice && item.f_device.f_number) {
-          money += ((item.f_device.f_unitprice - 0) * (item.f_device.f_number - 0)) - 0
+        if (!item.f_number || item.f_number == '0') flag = false
+        if (item.f_unitprice && item.f_number) {
+          money += ((item.f_unitprice - 0) * (item.f_number - 0)) - 0
         }
       })
       if (money != 0) {
@@ -436,7 +540,8 @@ export default {
       if (!flag) this.model.f_collection = ''
     },
     addadetail () {
-      this.model.otherdetail.push({f_device: ['材料费']})
+      this.$set(`model.otherdetail[${this.model.otherdetail.length}]`, {f_brand_spec: ['材料费'], f_unitprice: '', f_number: ''})
+      console.log(JSON.stringify(this.model.otherdetail))
     },
     delthisdetail (index) {
       if (this.model.otherdetail.length > 1) {
@@ -460,11 +565,8 @@ export default {
       if (this.isflag) {
         if (this.model.f_collection && this.model.f_collection != '') {
           let collection = (parseFloat(this.model.f_collection - 0)).toFixed(2)
-          if (collection > 0) {
-            return !this.isflag
-          } else {
-            return !this.$v.valid
-          }
+          if (collection > 0) return !this.isflag
+          else return !this.$v.valid
         } else {
           return !this.$v.valid
         }
@@ -483,6 +585,12 @@ export default {
       console.log('this.$login.r:', this.$login.r)
       console.log('this.$login.r.includes:', this.$login.r.includes('收费综合导出权限'))
       return this.$login.r ? this.$login.r : []
+    },
+    gettypename () {
+      return this.typeNameList
+    },
+    gettypenumber () {
+      return this.typenumberList
     }
   }
 }

package/src/components/common/userinfo_detail/ic_detail/FillGasQueryUser.vue

@@ -59,7 +59,7 @@
               <td style="text-align: center;"><nobr>{{row.f_pregas}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_preamount}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_type }}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_reason}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_comments}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_operator}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
             </tr>