sale-client 3.6.204 → 3.6.209

package/package.json

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

package/src/components/FilesManage/MeterinfoTest.vue

@@ -38,7 +38,7 @@
                v-show="(formconfig && formconfig.f_defendcard && formconfig.f_defendcard.required) || !onlyshowmust"
                v-if="getConfigShowItem('f_defendcard',false)">
             <label class="font_normal_body">防盗卡号1</label>
-            <input type="number" class="input_search" style="width:60%" v-model="row.f_defendcard"
+            <input type="text" class="input_search" style="width:60%" v-model="row.f_defendcard"
                    v-validate:f_defendcard=getConfigValidate("f_defendcard",false)
                    :value.sync="row.f_defendcard"
                    placeholder='防盗卡号1' >
@@ -47,7 +47,7 @@
                v-show="(formconfig && formconfig.f_defendcard_two && formconfig.f_defendcard_two.required) || !onlyshowmust"
                v-if="getConfigShowItem('f_defendcard_two',false)">
             <label class="font_normal_body">防盗卡号2</label>
-            <input type="number" class="input_search" style="width:60%" v-model="row.f_defendcard_two"
+            <input type="text" class="input_search" style="width:60%" v-model="row.f_defendcard_two"
                    v-validate:f_defendcard_two=getConfigValidate("f_defendcard_two",false)
                    :value.sync="row.f_defendcard_two"
                    placeholder='防盗卡号2' >

package/src/components/FilesManageNew/MeterinfoTest.vue

@@ -20,7 +20,7 @@
                v-show="(formconfig && formconfig.f_defendcard && formconfig.f_defendcard.required) || !onlyshowmust"
                v-if="getConfigShowItem('f_defendcard',false)">
             <label class="font_normal_body">防盗卡号1</label>
-            <input type="number" class="input_search" style="width:60%" v-model="row.f_defendcard"
+            <input type="text" class="input_search" style="width:60%" v-model="row.f_defendcard"
                    v-validate:f_defendcard=getConfigValidate("f_defendcard",false)
                    :value.sync="row.f_defendcard"
                    placeholder='防盗卡号1' >
@@ -29,7 +29,7 @@
                v-show="(formconfig && formconfig.f_defendcard_two && formconfig.f_defendcard_two.required) || !onlyshowmust"
                v-if="getConfigShowItem('f_defendcard_two',false)">
             <label class="font_normal_body">防盗卡号2</label>
-            <input type="number" class="input_search" style="width:60%" v-model="row.f_defendcard_two"
+            <input type="text" class="input_search" style="width:60%" v-model="row.f_defendcard_two"
                    v-validate:f_defendcard_two=getConfigValidate("f_defendcard_two",false)
                    :value.sync="row.f_defendcard_two"
                    placeholder='防盗卡号2' >

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

@@ -59,6 +59,8 @@
               <th><nobr>用户编号</nobr></th>
               <th><nobr>姓名</nobr></th>
               <th><nobr>住址</nobr></th>
+              <th><nobr>上期底数</nobr></th>
+              <th><nobr>本期底数</nobr></th>
               <th><nobr>气量</nobr></th>
               <th><nobr>应交</nobr></th>
               <th><nobr>缴费金额 </nobr></th>
@@ -77,6 +79,8 @@
               <td style="text-align:center">{{row.f_userinfo_code}}</td>
               <td style="text-align:center">{{row.f_user_name}}</td>
               <td style="text-align:center">{{row.f_address}}</td>
+              <td style="text-align:center">{{row.f_last_tablebase}}</td>
+              <td style="text-align:center">{{row.f_tablebase}}</td>
               <td style="text-align:center">{{row.gas}}</td>
               <td style="text-align:center;white-space:nowrap;">{{row.fee}}</td>
               <td style="text-align:center;white-space:nowrap;">{{row.f_collection}}</td>
@@ -134,7 +138,7 @@
         searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
         // row数据
         rowsdata: [],
-        fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_address': '地址',  'fee': '金额', 'gas': '气量', 'f_type': '类型', 'f_operator': '操作员', 'f_operate_date': '操作时间'},
+        fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_address': '地址','f_last_tablebase': '上期底数','f_tablebase': '本期底数',  'fee': '金额', 'gas': '气量', 'f_type': '类型', 'f_operator': '操作员', 'f_operate_date': '操作时间'},
         defaultfield: [
           'f_userinfo_code', 'f_user_name', 'fee', 'gas', 'f_type', 'f_operate_date'
         ],

package/src/components/revenue/HandManager/MeterBookUser.vue

@@ -153,6 +153,10 @@
             <th v-if="$parent.$parent.$parent.editsort"><nobr>操作</nobr></th>
             <th><nobr>客户编号</nobr></th>
             <th><nobr>客户名称</nobr></th>
+            <th>
+              <data-order field="f_address" name="客户地址"
+                          :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+            </th>
             <th>
               <data-order field="f_street" name="街道"
                           :order.sync="$parent.$parent.$parent.orderFields.f_street"></data-order>
@@ -177,10 +181,7 @@
               <data-order field="f_room" name="房间号"
                           :order.sync="$parent.$parent.$parent.orderFields.f_room"></data-order>
             </th>
-            <th>
-              <data-order field="f_address" name="客户地址"
-                          :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
-            </th>
+
             <th><nobr>客户电话</nobr></th>
             <th><nobr>表号</nobr></th>
             <th>
@@ -207,13 +208,13 @@
             </td>
             <td style="text-align:center"><nobr><span @click="$parent.$parent.$parent.dealmsg(row)"><a><b>{{row.f_userinfo_code}}</b></a></span></nobr></td>
             <td style="text-align:center"><nobr>{{row.f_user_name}}</nobr></td>
+            <td style="text-align:center;white-space: nowrap;"><nobr>{{row.f_address}}</nobr></td>
             <td style="text-align:center;white-space: nowrap;"><nobr>{{row.f_street}}</nobr></td>
             <td style="text-align:center;white-space: nowrap;"><nobr>{{row.f_residential_area}}</nobr></td>
             <td style="text-align:center;white-space: nowrap;"><nobr>{{row.f_building}}</nobr></td>
             <td style="text-align:center;white-space: nowrap;"><nobr>{{row.f_unit}}</nobr></td>
             <td style="text-align:center;white-space: nowrap;"><nobr>{{row.f_floor}}</nobr></td>
             <td style="text-align:center;white-space: nowrap;"><nobr>{{row.f_room}}</nobr></td>
-            <td style="text-align:center;white-space: nowrap;"><nobr>{{row.f_address}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_user_phone}}</nobr></td>
             <td style="text-align:center;white-space: nowrap;"><nobr>{{row.f_meternumber}}</nobr></td>
             <td style="text-align:center;"><nobr>{{row.f_meter_book_sort}}</nobr></td>

package/src/components/revenue/cardHandManage/cardsHand.vue

@@ -353,7 +353,7 @@
             </td>
 
             <td style="text-align: center;">{{ row.f_actualtablebase }}</td>
-            <td style="text-align: center;">{{ row.total_gas - (row.f_tablebase - row.f_initial_base) }}</td>
+            <td style="text-align: center;">{{ row.f_shengyu_gas }}</td>
             <td style="text-align: center;">{{ row.f_meter_state }}</td>
             <td style="text-align: center;">
 

package/src/components/revenue/changeInsurance/InsuranceChargesDetails.vue

@@ -180,6 +180,9 @@
                 <th>
                   <nobr>购买年限</nobr>
                 </th>
+                <th>
+                  <nobr>操作人</nobr>
+                </th>
                 <th>
                   <nobr>备注信息</nobr>
                 </th>
@@ -247,6 +250,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_salecount}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operator}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_comments}}</nobr>
               </td>
@@ -338,6 +344,7 @@
           'f_ins_number': '保险单号',
           'f_insurance_type': '险种',
           'f_salecount': '购买年限',
+          'f_operator': '操作人',
           'f_comments': '备注信息'
         },
         f_filialeid: this.$login.f.orgid,

package/src/components/revenue/comprehen/ComprehenOperation/ChangeAccount/TransferManage.vue

@@ -46,10 +46,10 @@
                         :options='printstyle'
                         close-on-select clear-button></v-select>
             </div>
-            <div class="col-sm-8">
+            <div class="col-sm-8"  :class="[$v.f_contract_id.required ? 'has-error' : '']" >
               <label for="f_contract" class="font_normal_body">*合同编号</label>
               <input type="text" v-model="model.f_contract_id" class="input_search" style="width:80%"
-                     placeholder="合同编号">
+                     v-validate:f_contract_id=config.f_contract_id  placeholder="合同编号">
             </div>
           </div>
           <div class="row" style="margin-top:10px;">
@@ -203,6 +203,7 @@
           hasBillManage: false,  // 默认不启用发票管理
           billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
           payment: '现金缴费',
+          f_contract_id: '',
           printType: '普通收据' // 收据/电子票/专用发票/国税发票
         },
         bankinfo: false,

package/src/components/revenue/comprehen/ComprehenOperation/OtherGas/OtherGas.vue

@@ -119,8 +119,8 @@
       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: data.f_add_gas === '计入' ? (self.row.f_write_totalgas - 0) + (self.model.f_pregas - 0) : (self.row.f_write_totalgas - 0),
-      f_write_totalfee: data.f_add_gas === '计入' ? (self.row.f_write_totalfee - 0) + (self.model.f_preamount - 0) : (self.row.f_write_totalfee - 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
     }
@@ -152,15 +152,15 @@
 
     // 保存表类型
     data.f_meter_type = self.row.f_meter_type
-    if(!(self.row.f_hascard==null)  &&  !(self.row.f_share_times==null)  && self.row.f_meter_type =='物联网表' && self.row.f_hascard == '是' &&  self.row.f_share_times == '是'){
-      data.f_times = self.row.f_times+1
-    }else{
+    if (!(self.row.f_hascard == null) && !(self.row.f_share_times == null) && self.row.f_meter_type == '物联网表' && self.row.f_hascard == '是' && self.row.f_share_times == '是') {
+      data.f_times = self.row.f_times + 1
+    } else {
       data.f_times = self.row.cardInfo.Times + 1
     }
 
     let result = await self.$resetpost('rs/logic/sale_fillGas', data, {resolveMsg: null, rejectMsg: '补气报错！！！'})
 
-    if (self.row.f_meter_type == '机表' || self.model.f_write_card ==='不写卡') {
+    if (self.row.f_meter_type == '机表' || self.model.f_write_card === '不写卡') {
       self.$showAlert('补气成功', 'success', 2000)
       return result.data.id
     } else {
@@ -172,8 +172,8 @@
         let params = self.getWriteCard(cardParams, self.row, data)
         params.kh = cardId
         params.kzt = getLastOper.data.ispick === '未过表' && getLastOper.data.lastsell_oper === '发卡售气' ? '0' : '1'
-        if(!(self.row.f_hascard==null)  &&  !(self.row.f_share_times==null)  && self.row.f_meter_type =='物联网表' && self.row.f_hascard == '是' &&  self.row.f_share_times == '是'){
-          params.cs = self.row.f_times+1
+        if (!(self.row.f_hascard == null) && !(self.row.f_share_times == null) && self.row.f_meter_type == '物联网表' && self.row.f_hascard == '是' && self.row.f_share_times == '是') {
+          params.cs = self.row.f_times + 1
         }
         console.log('获取其他补气写卡参数，，', params)
 
@@ -210,7 +210,7 @@
     await self.$getConfig(self, 'OtherGas')
     console.log('其他补气config', self.config)
     self.model.f_add_gas = [self.config.addGas]
-    self.model.f_write_card=self.config.writeCard
+    self.model.f_write_card = self.config.writeCard
   }
 
   export default {
@@ -250,7 +250,7 @@
           url: 'rs/report/acceptOtherGas_bill',
           billnumber: ''
         },
-        writecard: [{label: '写卡',value:'写卡'},{label: '不写卡',value:'不写卡'}],
+        writecard: [{label: '写卡', value: '写卡'}, {label: '不写卡', value: '不写卡'}],
         blodid: '',
         addTaskModel: {
           f_task_name: '',
@@ -454,6 +454,8 @@
           klx: row.f_coding,
           kzt: '1',
           dqdm: row.f_area_code,
+          ljgql: (row.f_write_totalgas - 0) + (data.f_pregas - 0),                              // 当前累计购气量
+          ljgqje: (row.f_write_totalfee - 0) + (data.f_preamount - 0),                           // 累计购气金额
           meterid: row.f_meternumber ? row.f_meternumber : 0                  // 表号
           // meternumber: row.f_meternumber ? row.f_meternumber : 0
         }

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue

@@ -243,6 +243,13 @@
                       :options='opentype'
                       close-on-select clear-button></v-select>
           </div>
+          <div v-if="config.aroundmeter" class="col-sm-4 form-group" :class="[$v.f_newaroundmeter.required ? 'has-error' : '']">
+            <label  class="font_normal_body">新表表向</label>
+            <v-select :value.sync="model.f_newaroundmeter" :options='aroundmeters' placeholder='新表表向'
+                      :value-single="true"
+                      close-on-select
+                      v-model='model.f_newaroundmeter'></v-select>
+          </div>
         </div>
         <div class="row auto">
           <div class="col-sm-12"
@@ -261,6 +268,11 @@
             ></textarea>
           </div>
         </div>
+
+        <div class="col-sm-12" v-if="config.changeReason">
+          <label class="font_normal_body ">换表原因</label>
+          <textarea class="input_textarea" rows="3" style="width:87%;" v-model="model.f_changetables_reason"></textarea>
+        </div>
         <div style="text-align:right;height:auto;">
           <button class="button_search" v-show="config.approve == true ? applyButtonShow : false" type="button" @click="apply()"
                   :disabled="(!meterinfo && !(model.f_type.includes('清零') || model.f_type.includes('换卡控流量计'))) || !$v.valid"
@@ -423,6 +435,8 @@ export default {
         hasArrearsChange: false, // 是否可以有欠费换表
         f_change_operator: false, // 换表人是否必填
         castInt: true,
+        aroundmeter: false, // 表向
+        changeReason: false, // 换表原因
         dispatch: false, // 是否派工
         showupload: true, //
         approve: false  // 是否开启审核
@@ -503,6 +517,9 @@ export default {
     }
   },
   computed: {
+    aroundmeters () {
+      return this.$appdata.getParam('左右表')
+    },
     flowmeterbrands () {
       let gasbrand = this.$GetSaleParam.getGasbrand()
       let flowmeterbrands = []