sale-client 3.6.504 → 3.6.505

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed Mar 12 09:11:13 CST 2025
+#Mon Mar 17 13:40:05 CST 2025
 gradle.version=5.2.1

package/package.json

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

package/src/components/revenue/comprehen/Maintenance/revenue/MeterOperatemain.vue

@@ -336,8 +336,11 @@ var data
           this.model.f_bill_operator = this.$login.f.name
         }
         this.$resetpost('rs/logic/saveing', {data: {recordlist: this.recordList, newData: this.model}}).then((res) => {
-          console.log('this.model', this.model)
+          console.log('this.model:', this.model)
+          this.recordList = []
+          console.log('this.recordList:', this.recordList)
         })
+        this.recordList = []
         this.$dispatch('close')
       }
     },

package/src/components/webMeter/meterinfo/NewMeterList.vue

@@ -93,9 +93,10 @@
                 value-single="true"
                 :value.sync="model.f_gasproperties"
                 style="width:60%"
+                multiple
                 v-model="model.f_gasproperties"
                 :options='$parent.$parent.Gasproperties'
-                close-on-select condition="f_gasproperties ='{}'">
+                close-on-select condition="f_gasproperties  in {}">
               </v-select>
             </div>
             <div class="col-sm-2 form-group">
@@ -114,13 +115,13 @@
               <label class="font_normal_body">气表品牌</label>
               <v-select
                 placeholder='气表品牌'
-
+                multiple
                 :value.sync="model.f_gasbrand"
                 style="width:60%"
                 v-model="model.f_gasbrand"
                 :options='$parent.$parent.meterbrand'
                 close-on-select
-                condition="f_meter_brand='{}'">
+                condition="f_meter_brand in {}">
               </v-select>
             </div>
             <div class="col-sm-2 form-group">

package/src/filiale/bayan/ServiceRepair.vue

@@ -41,20 +41,20 @@
   </div>
 </template>
 <script>
-  /**
-   *用户信息
-   *维修情况
-   */
+/**
+ *用户信息
+ *维修情况
+ */
 
-  import {HttpResetClass} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
 
   export default {
     title: '安检维修情况',
     data () {
       return {
         model: {},
-        pared: 0
-
+        pared: 0,
+        service: null
       }
     },
     props: ['data'],
@@ -63,10 +63,16 @@
     methods: {
       repairlist (row) {
         console.log(row)
-        this.$goto('new-repair-paper', {curActivity: row})
+        this.$resetpost('rs/path/getService', {data: {id: row.id}}, {resolveMsg: null, rejectMsg: null})
+          .then((res) => {
+            this.service = res.data[0]
+            console.log('99889', this.service)
+            // self.getrepair()
+            this.$goto('new-repair-paper', {curActivity: this.service.serviceacitivity[1]})
+          })
       },
       async getServiceRepair () {
-        if(this.data && this.data.f_userinfo_id){
+        if (this.data && this.data.f_userinfo_id) {
           let data = {
             f_userinfo_id: this.data.f_userinfo_id
           }
@@ -79,7 +85,7 @@
           } else {
             this.pared = 0
           }
-        } else{
+        } else {
           this.pared = 0
         }
       }

package/src/filiale/tongchuan/HandManager.vue

@@ -1359,7 +1359,7 @@
           f_tablebase: row.f_tablebase,
           f_userinfo_id: row.f_userinfo_id
         }
-        this.$resetpost('rs/logic/sale_commonEnter', {data: param}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        this.$resetpost('rs/logic/sale_commonEnter', {data: param}, {resolveMsg: null, rejectMsg: null,newly:true}).then((res) => {
           row.f_meter_state = res.data.f_meter_state
           row.f_whether_pay = res.data.f_whether_pay
           row.f_oughtfee = res.data.f_oughtfee
@@ -1374,13 +1374,13 @@
             f_input_date = ` ,f_input_date = '${row.f_input_date}'`
           }
           let sqldata = `update t_handplan set f_result_state = '${f_result_state}' ${f_input_date} where id = '${row.id}'`
-          this.$resetpost('rs/logic/runSQL', {data: {sql: sqldata}}, {resolveMsg: null, rejectMsg: '业务单号保存失败'})
+          this.$resetpost('rs/logic/runSQL', {data: {sql: sqldata}}, {resolveMsg: null, rejectMsg: '业务单号保存失败',newly:true})
           //   }).catch((error) => {
           //   row.state = '失败'
           //  Vue.set(row, 'error', JSON.stringify(error))
           //   this.speckText('抄表出错，请注意!')
           // })
-          // this.search()
+
         }).catch((error) => {
           row.state = '失败'
           Vue.set(row, 'error', JSON.stringify(error))

package/src/filiale/tongchuan/OverUseCharge.vue

@@ -281,6 +281,7 @@ export default {
         url: 'rs/report/overuse_bill',
         bill: ''
       },
+      dataSource: '',
       print: false,
       eticket_msg: false,
       eticket_show: false,
@@ -381,6 +382,7 @@ export default {
       this.billData.bill = val.bill
     },
     async calPreamount () {
+      this.dataSource = 'gas'
       this.collectionreload = false
       this.model.f_preamount = ((this.model.f_pregas - 0) * (this.model.f_price - 0)).toFixed(4)
       this.model.f_totalcost = this.model.f_balance > this.model.f_preamount ? 0 : (this.model.f_preamount - 0) - (this.model.f_balance - 0)
@@ -388,7 +390,9 @@ export default {
       await this.$nextTick()
       this.collectionreload = true
     },
+
     async calCollection () {
+      this.dataSource = 'amount'
       this.collectionreload = false
       this.model.f_totalcost = this.model.f_balance > this.model.f_preamount ? 0 : (this.model.f_preamount - 0) - (this.model.f_balance - 0)
       this.model.f_pregas = ((this.model.f_preamount - 0) / (this.model.f_price - 0)).toFixed(4)
@@ -409,7 +413,10 @@ export default {
   },
   watch: {
     'model.f_pregas' () {
-      this.calPreamount()
+      if (this.dataSource !== 'amount') {
+        this.calPreamount()
+      }
+      this.dataSource = ''
     },
     'model.f_price' (newVal, oldVal) {
       this.oldprice = oldVal

package/src/plugins/FileManageService.js

@@ -262,6 +262,7 @@ let FileManageService = {
       meter.devicesinfo.forEach((devitem) => {
         let userfilesdevice = Object.assign({}, userfilesdevice, devitem)
         userfilesdevice.f_user_id = data.meterinfo[0].f_user_id ? data.meterinfo[0].f_user_id : null
+        userfilesdevice.f_userinfo_id = result.f_userinfo_id || null
         userfilesdevice.f_devices_type = userfilesdevice.f_devices_type
         userfilesdevice.WatchPurchase = userfilesdevice.WatchPurchase
         userfilesdevice.f_state = userfilesdevice.f_state ? userfilesdevice.f_state : '有效'