sale-client 4.2.46 → 4.2.48

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Sat Sep 13 14:19:54 CST 2025
+#Wed Sep 04 10:25:06 CST 2024
 gradle.version=5.2.1

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://123.57.3.66:31467/', 'http://123.57.3.66:31467/']
+const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -50,17 +50,14 @@ var devConfig = {
       '/rs/pay': {
         target: 'http://localhost:8080'
       },
-      // '/api/af-revenue': {
-      //   pathRewrite: {
-      //     '/api/af-revenue': '/af-revenue'
-      //   },
-      //   target: "http://localhost:8080"
-      // },
-      '/api': {
-        target: serverRul,
+      '/api/af-revenue': {
         pathRewrite: {
-          '/api/af-revenue': '/singlepage/rs'
-        }
+          '/api/af-revenue': '/af-revenue'
+        },
+        target: "http://localhost:8080"
+      },
+      '/api': {
+        target: serverRul
       },
       '/rs': {
         target: serverRul

package/package.json

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

package/src/filiale/qingjian/FileUserFiles.vue

@@ -160,6 +160,14 @@
                               condition="f_meter_brand in {}"
                               close-on-select></v-select>
                   </div>
+                  <div  class="form-group" :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}">
+                    <label class="font_normal_body">现场表具型号</label>
+                    <v-select :value.sync="model.f_xc_meter_style" multiple
+                              v-model="model.f_xc_meter_style"
+                              :options='$parent.$parent.metermodels' placeholder='请选择'
+                              condition="f_xc_meter_style in {}"
+                              close-on-select></v-select>
+                  </div>
 <!--                  <div-->
 <!--                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"-->
 <!--                    class="form-group">-->
@@ -347,6 +355,9 @@
                   <th>
                     <nobr>气表品牌</nobr>
                   </th>
+                  <th>
+                    <nobr>现场表具型号</nobr>
+                  </th>
                   <th>
                     <nobr>发卡状态</nobr>
                   </th>
@@ -391,6 +402,7 @@
                 <td style="text-align: center;">{{row.f_gasproperties}}</td>
                 <td style="text-align: center;">{{row.f_meter_classify}}</td>
                 <td style="text-align: center;">{{row.f_meter_brand}}</td>
+                <td style="text-align: center;">{{row.f_xc_meter_style}}</td>
                 <td style="text-align: center;">{{row.f_whether_hairpin}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_userfiles_address}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_user_state}}</td>
@@ -433,7 +445,7 @@
 
     <modal :show.sync="show" width="500px" title="文件导入" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body">
-        <file-upload class="my-file-uploader " name="UploadFile" class="btn btn-success" style="border-radius: 2px;"
+        <file-upload class="my-file-uploader btn btn-success" name="UploadFile" style="border-radius: 2px;"
                      action="rs/file/uploadFile" tagname="导入档案" v-ref:file :headers="headers"></file-upload>
       </article>
       <footer slot="modal-footer" class="modal-footer">
@@ -613,6 +625,7 @@ let loadParamGem = async function (self) {
           value: ''
         }, ...this.$appdata.getParam('气表类型')] : [],
         meterbrands: [],
+        metermodels: [],
         f_whether_hairpin: this.$appdata.getParam('发卡状态') ? [{
           label: '全部',
           value: ''
@@ -949,6 +962,24 @@ let loadParamGem = async function (self) {
           brandArr.push(temp1)
         })
         this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+
+        // 初始化气表型号
+        let modelArr = []
+        this.$GetSaleParam.getGasbrand().forEach((item) => {
+          if (item.value.gasmodel && item.value.gasmodel.length > 0) {
+            item.value.gasmodel.forEach((model) => {
+              let temp2 = {}
+              temp2.label = model.label
+              temp2.value = model.label
+              modelArr.push(temp2)
+            })
+          }
+        })
+        // 去重
+        let uniqueModels = modelArr.filter((item, index, self) =>
+          index === self.findIndex(t => t.label === item.label)
+        )
+        this.metermodels = [{label: '全部', value: ''}, ...uniqueModels]
       },
       importFile () {
         this.show = true
@@ -1095,12 +1126,12 @@ let loadParamGem = async function (self) {
   .nav-tabss ul > li > a {
     padding: 5px 10px;
   }
-  // 两个字符占用4个字符距离
+  /* 两个字符占用4个字符距离 */
   .w2 {
     letter-spacing:2em; /*如果需要y个字两端对齐，则为(x-y)/(y-1),这里是（4-2）/(2-1)=2em */
     margin-right:-2em; /*同上*/
   }
-  // 三个字符占用4个字符距离
+  /* 三个字符占用4个字符距离 */
   .w3 {
     letter-spacing: 0.5em;
     margin-right: -0.5em

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/qingjian/sale'
+import FilialeSale from './filiale/yuncheng/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'