sale-client 3.6.255-mx → 3.6.256

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Tue Jan 23 18:15:26 CST 2024
+gradle.version=5.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.255-mx",
+  "version": "3.6.256",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -24,7 +24,7 @@
     "qrcodejs2": "0.0.2",
     "vue": "^1.0.17",
     "webpack-dev-server": "^2.11.5",
-    "vue-client": "1.24.116",
+    "vue-client": "1.24.137",
     "yarn": "^1.22.10"
   },
   "devDependencies": {

package/src/components/FilesManage/UserEssentialInfoTest.vue

@@ -38,6 +38,15 @@
                       :options='userstates' :placeholder="getConfigPlaceholder('f_user_state','客户状态')"
                       close-on-select></v-select>
           </div>
+          <div class="col-sm-4 form-group" style="" >
+            <label for="f_uservent_date" class="font_normal_body">&ensp;{{getConfigLabelName('f_uservent_date','通气日期')}}</label>
+            <datepicker style="width:60%" placeholder="用户通气日期"
+                        v-model="baseinfo.base.f_uservent_date"
+                        v-ref:f_uservent_date
+                        :value.sync="baseinfo.base.f_uservent_date"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+            ></datepicker>
+          </div>
         </div>
         <div class="row">
           <div style="" class="col-sm-4 form-group" v-if="getConfigShowItem('f_credentials')">
@@ -223,6 +232,20 @@
                    :placeholder="getConfigPlaceholder('f_olduserinfo_code','档案编号')">
           </div>
         </div>
+        <div >
+          <div class="col-sm-4 form-group"
+               v-show="(formconfig && formconfig.f_gas_pointsnumber && formconfig.f_gas_pointsnumber.required) || !onlyshowmust"
+               :class="[$v.f_gas_pointsnumber.dctest ? 'has-error' : '']" v-if="getConfigShowItem('f_people_num')">
+            <label for="f_people_num" style="letter-spacing: 0.5em;margin-right: -0.5em" class="font_normal_body w3">{{getConfigLabelName('f_gas_pointsnumber','用气点数量')}}</label>
+            <v-select id="f_people_num" :value.sync="baseinfo.base.f_gas_pointsnumber"
+                      v-model="baseinfo.base.f_gas_pointsnumber"
+                      :value-single="true"
+                      :options='pointsnums'
+                      :placeholder="getConfigPlaceholder('f_gas_pointsnumber','用气点数量')"
+                      style="width: 65%"
+                      close-on-select></v-select>
+          </div>
+        </div>
         <div class="row">
           <div style="" class="col-sm-12 form-group" v-if="getConfigShowItem('f_comments')"
                v-show="(formconfig && formconfig.f_comments && formconfig.f_comments.required) || !onlyshowmust"
@@ -339,6 +362,7 @@
         userstates: this.$appdata.getParam('用户状态'),
         mgq: this.$appdata.getParam('是否煤改气'),
         peopleMax: this.$appdata.getSingleValue('最大人口数'),
+        pointsMax: this.$appdata.getSingleValue('最大用气点数量'),
         costtype: this.$appdata.getParam('付款类型'),
         usernature: this.$appdata.getParam('用户性质'),
         userlevel: this.$appdata.getParam('用户等级'),
@@ -466,6 +490,17 @@
           nums.push(temp)
         }
         return nums
+      },
+      pointsnums () {
+        let pointsMax = this.$appdata.getSingleValue('最大用气点数量') ? this.$appdata.getSingleValue('最大用气点数量') : 10
+        let nums = []
+        for (let i = 1; i <= pointsMax; i++) {
+          let temp = {}
+          temp.label = i
+          temp.value = i
+          nums.push(temp)
+        }
+        return nums
       }
     },
     events: {

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -273,6 +273,8 @@ export default {
       limitShow: false,
       limit_gas: null,
       peopleNum: this.$appdata.getSingleValue('默认人口'),
+      pointsNum: this.$appdata.getSingleValue('默认用气点'),
+      kitchenType: this.$appdata.getSingleValue('默认厨房类型'),
       blodid: '', // 附件的临时id
       defaultMeterInfo: '',  // 默认的表具信息
       fileSaveData: {
@@ -384,6 +386,12 @@ export default {
       this.data.oldaddressinfo = this.oldAddress
       this.data.hasnumber = this.config.hasnumber
       this.data.limit_gas = this.limit_gas
+      let fileLength = this.$refs.upload.fileInfoData.length
+      debugger
+      if (this.data.baseinfo.base.f_kitchen_type === '暗厨房' && fileLength === 0) {
+        this.$showAlert('暗厨房需上传附件！', 'danger', 0)
+        return
+      };
       if (this.f_filialeid && this.f_filialeid != '') {
         this.data.f_filialeid = this.f_filialeid
       } else {
@@ -514,6 +522,8 @@ export default {
       this.data.baseinfo.base.f_paper_type = this.data.baseinfo.base.f_paper_type ? [this.data.baseinfo.base.f_paper_type] : '电子发票'
       this.data.baseinfo.bank.f_bank_name = this.data.baseinfo.bank.f_bank_name ? [this.data.baseinfo.bank.f_bank_name] : '中国银行'
       this.data.baseinfo.base.f_people_num = this.data.baseinfo.base.f_people_num ? this.data.baseinfo.base.f_people_num : (this.peopleNum ? this.peopleNum : 0)
+      this.data.baseinfo.base.f_gas_pointsnumber = this.data.baseinfo.base.f_gas_pointsnumber ? this.data.baseinfo.base.f_gas_pointsnumber : (this.pointsNum ? this.pointsNum : 2)
+      this.data.baseinfo.base.f_kitchen_type = this.data.baseinfo.base.f_kitchen_type ? this.data.baseinfo.base.f_kitchen_type : (this.kitchenType ? this.kitchenType : '')
 
       if (this.data.baseinfo.base.f_slice_area) {
         this.data.baseinfo.base.f_slice_area = [this.data.baseinfo.base.f_slice_area]

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

@@ -105,6 +105,7 @@
           f_print: ['普通收据'],
           f_privilege_id: 0,
           f_privilege_money: 0,
+          f_privilege_gas: 0,
           f_after_discount: 0
         }
         this.model = Object.assign({}, this.model, temp)

package/src/components/revenue/base/leftview/SafeCheck.vue

@@ -114,7 +114,7 @@
       </tr>
       <tr>
         <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;width: 17%" >机械读数:</td>
-        <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_item_name ==='机械读数' ? '无': model.f_item_value }}</td>
+        <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_base_num_machinery }}</td>
       </tr>
       <tr >
         <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">用户满意度:</td>

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

@@ -67,6 +67,11 @@
                         v-ref:payment
                         close-on-select></v-select>
             </div>
+            <div class="col-sm-4">
+              <label id="label" for="f_transfer_fees" class="font_normal_body" title="新人口数">&nbsp;新人口数</label>
+              <input class="input_search" style="width:60%" type="number"  v-model="model.f_new_people_num"  placeholder="新人口数"
+                     v-next-el='accopen' v-el:fees >
+            </div>
           </div>
           <div class="row" style="margin-top:10px;" v-if = "bankinfo">
             <div class="col-sm-4">
@@ -94,6 +99,51 @@
                      placeholder="新银行账号" v-el:account>
             </div>
           </div>
+          <div class="row" >
+            <div class="col-sm-8 form-group">
+              <label class="font_normal_body" for="f_taxpayer_id">纳税人识别号</label>
+              <input class="input_search" placeholder="纳税人识别号" style="width:70%" type="text"
+                     v-model="model.f_taxpayer_id" v-next-el="addressphone">
+            </div>
+            <div class="col-sm-4 form-group">
+              <label class="font_normal_body" for="f_paper_name">名&emsp;&emsp;称</label>
+              <input class="input_search" placeholder="名称" style="width:60%" type="text" v-el:papername
+                     v-model="model.f_paper_name" v-next-el="paperaccount">
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-sm-8 form-group">
+              <label class="font_normal_body" for="f_address_phone">地址电话&emsp;&emsp;</label>
+              <input class="input_search" placeholder="地址-电话" style="width:70%" type="text" v-el:addressphone
+                     v-model="model.f_address_phone" v-next-el="papername">
+            </div>
+            <div class="col-sm-4 form-group">
+              <label class="font_normal_body" for="f_paper_type">票据类型</label>
+              <v-select :options='papertype'
+                        :value-single="true"
+                        :value.sync="model.f_paper_type" close-on-select
+                        placeholder='票据类型'></v-select>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-sm-8 form-group">
+              <label class="font_normal_body " for="f_paper_account">开户行及账号</label>
+              <input class="input_search" placeholder="银行名称" style="width:70%" type="text" v-el:paperaccount
+                     v-model="model.f_paper_account">
+            </div>
+            <div class="col-sm-4 form-group">
+              <label class="font_normal_body" for="f_contact_user">联系人名</label>
+              <input class="input_search" placeholder="联系人姓名" style="width:60%" type="text" v-el:contactuser
+                     v-model="model.f_contact_user" >
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-sm-8 form-group">
+              <label class="font_normal_body " for="f_paper_account">推送票据邮箱</label>
+              <input class="input_search" placeholder="推送票据邮箱" style="width:70%" type="text" v-el:f_email
+                     v-model="model.f_email">
+            </div>
+          </div>
           <div class="row" style="margin-top:10px;">
 
             <div class="col-sm-12">
@@ -222,6 +272,14 @@
           f_newbank_accopen: '',
           f_newuser_name: '',
           f_newidnumber: '',
+          f_new_people_num: 4,
+          f_address_phone: '',
+          f_paper_type: '',
+          f_paper_account: '',
+          f_email: '',
+          f_contact_user: '',
+          f_paper_name: '',
+          f_taxpayer_id: '',
           f_newbank_name: ''
         },
         transferdata: {
@@ -252,6 +310,7 @@
         banknames: this.$appdata.getParam('银行名称'),
         costtypes: this.$appdata.getParam('缴费类型'),
         payments: this.$appdata.getParam('付款方式'),
+        papertype: this.$appdata.getParam('票据类型'),
         printstyle: this.$appdata.getParam('打印格式'),
         credentials: this.$appdata.getParam('证件类型'),
         loaduserflag :false,
@@ -260,6 +319,13 @@
     ready () {
       this.model.f_print = [this.config.printType]
       this.blodid = this.row.f_userinfo_id
+      this.model.f_taxpayer_id = this.row.f_taxpayer_id
+      this.model.f_address_phone = this.row.f_address_phone
+      this.model.f_paper_name = this.row.f_paper_name
+      this.model.f_paper_account = this.row.f_paper_account
+      this.model.f_paper_type = this.row.f_paper_type
+      this.model.f_email = this.row.f_email
+      this.model.f_contact_user = this.row.f_contact_user
       asyncTransferManage(this)
       this.getRandomId()
     },
@@ -306,6 +372,14 @@
           f_contract_id: this.model.f_contract_id ? this.model.f_contract_id : '',
           f_cost_type: this.model.f_paymenttype[0],
           version: this.row.userinfo_version,
+          f_taxpayer_id: this.model.f_taxpayer_id,
+          f_address_phone: this.model.f_address_phone,
+          f_paper_name: this.model.f_paper_name,
+          f_paper_account: this.model.f_paper_account,
+          f_email: this.model.f_email,
+          f_paper_type: this.model.f_paper_type,
+          f_contact_user: this.model.f_contact_user,
+          f_people_num: this.model.f_new_people_num ? this.model.f_new_people_num : 0,
           infobank: {
             f_userinfo_id: this.row.f_userinfo_id,
             f_bank_name: this.model.f_newbank_name[0],
@@ -340,6 +414,13 @@
           f_serial_number: this.model.f_serial_number ? this.model.f_serial_number : '',
           f_userfiles_id: this.row.f_userfiles_id ? this.row.f_userfiles_id : '',
           f_user_name: this.row.f_user_name,
+          f_taxpayer_id: this.row.f_taxpayer_id,
+          f_address_phone: this.row.f_address_phone,
+          f_paper_name: this.row.f_paper_name,
+          f_paper_account: this.row.f_paper_account,
+          f_email: this.row.f_email,
+          f_paper_type: this.row.f_paper_type,
+          f_contact_user: this.row.f_contact_user,
           f_user_phone: this.row.f_user_phone ? this.row.f_user_phone : '',
           f_idnumber: this.row.f_idnumber ? this.row.f_idnumber : '',
           f_credentials: this.row.f_credentials ? this.row.f_credentials : '',
@@ -359,6 +440,15 @@
           f_bank_idnumber: this.row.f_bank_idnumber ? this.model.f_bank_idnumber : '',
           f_newbank_idnumber: this.model.f_bank_idnumber ? this.model.f_bank_idnumber : '',
           f_transfer_fees: this.model.f_transfer_fees ? this.model.f_transfer_fees : 0,
+          f_old_people_num: this.row.f_people_num ? this.row.f_people_num : 0,
+          f_new_people_num: this.model.f_new_people_num ? this.model.f_new_people_num : 0,
+          f_newtaxpayer_id: this.model.f_taxpayer_id,
+          f_newaddress_phone: this.model.f_address_phone,
+          f_newpaper_name: this.model.f_paper_name,
+          f_newpaper_account: this.model.f_paper_account,
+          f_newemail: this.model.f_email,
+          f_newpaper_type: this.model.f_paper_type,
+          f_newcontact_user: this.model.f_contact_user,
           f_comments: this.model.f_comments ? this.model.f_comments : '',
           f_operat_type: '过户',
           f_describe: this.$login.f.name + '对用户' + this.row.f_user_name + '进行过户',

package/src/filiale/liaoyuan/ChangeMeter.vue

@@ -352,7 +352,7 @@ export default {
     },
     async confirm () {
       console.log('haunbiao', this.$refs.uploadfile.fileInfoData)
-      if (this.$refs.uploadfile.fileInfoData && this.$refs.uploadfile.fileInfoData.length > 0) {
+      if (this.$refs.uploadfile.fileInfoData && this.$refs.uploadfile.fileInfoData.length > 1) {
         console.log('haunbiao', this.$refs.uploadfile.fileInfoData)
       } else {
         this.$showMessage(`换表请上传新旧表图片`)
@@ -669,7 +669,7 @@ export default {
       console.log('获取到的欠费记录', books)
       this.books = books
       // 如果是机表验证是否有欠费
-      if ((this.row.f_balance - 0) < 0) {
+      if ((this.row.f_balance - 0) < 0 || this.books.data.length > 0) {
         this.$showAlert('该表有欠费，请到机表缴费界面进行缴费', 'warning', 3000)
         this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
       }