sale-client 3.6.520 → 3.6.522-rc

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Thu Apr 10 10:42:44 CST 2025
+#Fri Aug 23 18:20:38 CST 2024
 gradle.version=5.2.1

package/build/dev-server.js

@@ -19,6 +19,13 @@ var devConfig = {
       children: false // 不输出子模块构建信息
     },
     proxy: {
+      'af-revenue/images': {
+          pathRewrite: {
+            'resource/af-revenue/images': '/api/af-revenue/sql'
+          },
+          changeOrigin: true,
+          target: 'http://192.168.50.4:8400/'
+      },
       '/api': {
         target: v4Url
       },

package/package.json

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

package/src/filiale/bayan/FilesManage/FileUserFiles.vue

@@ -338,7 +338,7 @@
                       <v-select :options='$parent.$parent.devicetypes' :search='true'
                                 :value.sync="model.f_devices_type"
                                 close-on-select
-                                condition="f_devices_type = '{}'" placeholder='用气设备'
+                                condition="f_devices_type like '%{}%'" placeholder='用气设备'
                                 v-model='model.f_devices_type'>
                       </v-select>
                     </div>

package/src/filiale/bayan/ServiceRepair.vue

@@ -67,8 +67,8 @@ import {HttpResetClass} from 'vue-client'
           .then((res) => {
             this.service = res.data[0]
             console.log('99889', this.service)
-            // self.getrepair()
-            this.$goto('new-repair-paper', {curActivity: this.service.serviceacitivity[1]})
+            const repairActivity = this.service.serviceacitivity.find(item => item.f_workorder_type === '报修单')
+            this.$goto('new-repair-paper', {curActivity: repairActivity || this.service.serviceacitivity[1]})
           })
       },
       async getServiceRepair () {

package/src/filiale/fugu/components/revenue/DisableManage.vue

@@ -38,7 +38,7 @@ import LogicService from "../plugins/LogicService";
   let asyncMachineMeterCenter = async function (self){
     await self.$getConfig(self,'disableGen')
     console.log('欠费禁用config', self.config)
-    self.data.disable = self.config.disableGen
+    self.disable = self.config.disableGen
   }
 
   export default {
@@ -49,7 +49,7 @@ import LogicService from "../plugins/LogicService";
         config: {
           disableGen: true
         },
-        disable:true,
+        disable:'',
         blodid: '',
         showupload: true,
         model: {},

package/src/filiale/rongcheng/CustomerDeviceInfoTest.vue

@@ -15,7 +15,7 @@
                 </div>
                 <div class="col-sm-6 form-group" style="padding-right: 5px;">
                   <label class=" font_normal_body">厂&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;家&nbsp;</label>
-                  <input type="text" class="input_search" style="width:60%" v-model="row.f_manufactor"
+                  <input type="text" class="input_search" style="width:60%" v-model="row.f_brand"
                          placeholder='厂家' v-next-el="{id: $index+'brand'}">
                 </div>
               </div>
@@ -37,8 +37,8 @@
               <div class="row auto" style="margin-left: 10px;">
                 <div class="col-sm-6 form-group" style="padding-right: 5px;">
                   <label class="font_normal_body">&nbsp;安&nbsp;装&nbsp;人&nbsp;</label>
-                  <input type="text" class="input_search" style="width:60%" v-model="row.f_instaler_person"
-                         placeholder='安装人' v-next-el="{id: $index+'f_instaler_person'}" :id="$index+'brand'">
+                  <input type="text" class="input_search" style="width:60%" v-model="row.f_input_person"
+                         placeholder='安装人' v-next-el="{id: $index+'f_input_person'}" :id="$index+'brand'">
                 </div>
                 <div class="col-sm-6 form-group" style="padding-right: 5px;">
                   <label class="font_normal_body">生产日期</label>

package/src/filiale/rongcheng/UserDeviceInfoTest.vue

@@ -25,7 +25,7 @@
                 </div>
                 <div class="col-sm-6 form-group" style="padding-right: 5px;">
                   <label class="font_normal_body">安装人&nbsp;&nbsp;&nbsp;</label>
-                  <input type="text" class="input_search" style="width:60%" v-model="row.f_instaler_person" placeholder='安装人' v-next-el="{id: $index+'devicesmodel'}"   :id="$index+'brand'">
+                  <input type="text" class="input_search" style="width:60%" v-model="row.f_input_person" placeholder='安装人' v-next-el="{id: $index+'devicesmodel'}"   :id="$index+'brand'">
                 </div>
 
               </div>

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/yangchun/sale'
+import FilialeSale from './filiale/rongcheng/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'