sale-client 3.6.359 → 3.6.360

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Thu Aug 08 09:41:12 CST 2024
+#Wed Aug 14 11:29:51 CST 2024
 gradle.version=5.2.1

package/package.json

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

package/src/components/FilesManage/FileUserAddress.vue

@@ -64,10 +64,8 @@
             </v-select>
           </div>
 
-          <div class="col-sm-6 form-group " :class="[$v.slice1.required ? 'has-error' : 'has-success']">
+          <div class="col-sm-6 form-group ">
             <label class="font_normal_body">片&emsp;&emsp;区</label>
-            <input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"
-                   v-validate:slice1='{required: true }'>
             <v-select :value.sync="model.slice_area" v-model="model.slice_area"
                       :options='sliceArea' placeholder='片区/管理站' filer-key="name"
                       close-on-select v-ref:slice>

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

@@ -138,7 +138,7 @@
                      v-el:fcollection
                      @blur="config.calculatePreByCollection && calculatePreByCollection()"
                      @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
-                     v-scale="[model.f_collection, row.f_fee_decimal||4]" :disabled="!config.calculatePreByCollection">
+                     v-scale="[model.f_collection, row.f_fee_decimal||4]">
             </div>
             <div class="col-sm-1 form-group" v-show=" row.f_meter_type.includes('卡表')">
               <give-change :curbalance="curbalance" :collection.sync="model.f_collection" v-ref:givechange></give-change>

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

@@ -354,16 +354,6 @@
         }
         this.inputtoreser = [{label: '全部', value: ''}, ...rs]
       },
-      updateParams () {
-        // await this.$MagLoadParams.loadParam(this.f_filialeid)
-        this.inputtoreser = []
-        this.inputtoreser.push({label: '全部', value: ''})
-        if (this.allorgid != null) {
-          this.allorgid.forEach((res) => {
-            this.inputtoreser = this.inputtoreser.concat(this.$MagGetSaleParam.getresinputtor(res))
-          })
-        }
-      },
       userTypeChange () {
         this.gasproperties = []
         if (this.$refs.paged.$refs.cri.model !== null) {
@@ -419,6 +409,7 @@
         this.initSlice(this.f_filialeid)
         this.inputtores = []
         this.inputtores.push({label: '全部', value: ''})
+        console.log('所有分公司'+ this.allorgid)
         if (this.allorgid != null) {
           this.allorgid.forEach((res) => {
             this.inputtores = this.inputtores.concat(this.$GetSaleParam.getresinputtor(res))
@@ -455,15 +446,8 @@
         console.log('正则提取:', res && res[1])
         if (res) {
           this.f_filialeid = res[1]
-          if (res.input != null) {
-            let resorgid = res.input.substring(res.input.indexOf("'"))
-            if (resorgid != null && resorgid != '') {
-              resorgid = resorgid.substring(0, resorgid.lastIndexOf("'") + 1)
-            // resorgid = resorgid.replaceAll("'","");
-              resorgid = resorgid.replace(/'/g, '')
-              this.allorgid = resorgid.split(',')
-            }
-          }
+          console.log(res)
+          this.allorgid = res
           this.updateParams()
         }
       }

package/src/filiale/shanxian/components/revenue/base/Userinfo.vue

@@ -164,10 +164,21 @@
           f_depid: this.$login.f.depids,
           f_depname: this.$login.f.deps
         }
-        await this.$resetpost('/rs/logic/changeuserinfo', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
+        await this.$resetpost('/rs/logic/changeuserinfo', {data: param}, {resolveMsg: null, rejectMsg: null})
         this.data.f_user_phone = this.newuserphone
         this.$parent.$parent.close()
         this.$parent.$parent.clean()
+        this.$showMessage('修正成功，用户编号已经复制到剪切板！', ['confirm', 'cancel']).then(
+          async (response) => {
+            if (response === 'confirm') {
+             // console.log('编号', this.data)
+              await this.$copyText(this.data.f_userinfo_code)
+              this.$dispatch('confirm')
+              this.$goto('charge-manage', {f: this.$login.f}, 'main')
+            } else if (response === 'cancel') {
+              this.$dispatch('cancel')
+            }
+          })
         this.$parent.$parent.$refs.list.searchNoData()
         this.close()
       },

package/src/filiale/shexian/ChargeList.vue

@@ -627,23 +627,23 @@ let cardBtnGen = async function (self, val) {
         // 查询未写卡记录
         let getUnWriteSell = await self.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and (f_write_card = '未写卡' or (f_write_card = '写卡失败' and f_operate_date >= DATEADD(HOUR, -3, GETDATE()))) and f_userfiles_id = '${getUser.data[0].f_userfiles_id}'`)
         console.log('获取未写卡记录', getUnWriteSell)
-        self.systemTotalFee = getUser.data[0].f_total_fee
+        self.systemTotalFee = getUser.data[0].f_write_totalfee
         self.systemTotalGas = getUser.data[0].f_total_gas
         self.meterType = getUser.data[0].f_meter_type
         self.userCode = getUser.data[0].f_userinfo_code
         self.userName = getUser.data[0].f_user_name
         self.userAddress = getUser.data[0].f_address
         if (getUser.data[0].f_meter_type === '金额卡表') {
-          console.log('------------', self.cardInfo.TotalMoney - getUser.data[0].f_total_fee)
-          if (self.cardInfo.TotalMoney - getUser.data[0].f_total_fee > 0) {
+          console.log('------------', self.cardInfo.TotalMoney - getUser.data[0].f_write_totalfee)
+          if (self.cardInfo.TotalMoney - getUser.data[0].f_write_totalfee > 0) {
             self.showCardError2 = false
             self.showCardTotalError = true
             return
-          } else if (self.cardInfo.TotalMoney - getUser.data[0].f_total_fee < 0 && getUnWriteSell.data.length < 1) {
+          } else if (self.cardInfo.TotalMoney - getUser.data[0].f_write_totalfee < 0 && getUnWriteSell.data.length < 1) {
             self.showCardError2 = false
             self.showCardTotalError = true
             return
-          } else if (self.cardInfo.TotalMoney - getUser.data[0].f_total_fee < 0 && getUnWriteSell.data.length > 0) {
+          } else if (self.cardInfo.TotalMoney - getUser.data[0].f_write_totalfee < 0 && getUnWriteSell.data.length > 0) {
             self.showCardError2 = true
             self.showCardTotalError = true
             return