sale-client 3.7.52 → 3.7.53

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Wed Mar 18 10:18:57 CST 2026
+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, v4Url ] = ['http://192.168.50.67:30785/', 'http://localhost:8080/', 'http://192.168.50.67:30785']
+const [ serverRul, localUrl, v4Url ] = ['http://10.218.0.52:8600/', 'http://10.218.0.52:8600/', 'http://10.218.0.52:8600/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.7.52",
+  "version": "3.7.53",
   "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.25.38",
+    "vue-client": "1.26.8",
     "yarn": "^1.22.10"
   },
   "devDependencies": {
@@ -76,7 +76,7 @@
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
     "ldap-clients": "3.0.96",
-    "system-clients": "4.0.12",
+    "system-clients": "3.2.90-tongchuan",
     "less": "^2.7.3",
     "manage-client": "3.1.8-88",
     "mkdirp": "^0.5.1",

package/src/filiale/tongchuan/FileUserFiles.vue

@@ -135,7 +135,7 @@
                   </div>
                   <div  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                         class="form-group">
-                    <label class="font_normal_body">开户时间</label>
+                    <label class="font_normal_body">户档案开户时间</label>
                     <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
                                 class="datepicker"
                                 condition="f_open_date >= '{} 00:00:00' "
@@ -155,6 +155,28 @@
                                 v-model="model.f_end_date"
                     ></datepicker>
                   </div>
+                  <div  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                        class="form-group">
+                    <label class="font_normal_body">表档案开户时间</label>
+                    <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
+                                class="datepicker"
+                                condition="f_open_date_uf >= '{} 00:00:00' "
+                                placeholder="起始时间"
+                                style="width:60%"
+                                v-model="model.f_start_date"
+                    ></datepicker>
+                  </div>
+                  <div  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                        class="form-group" >
+                    <label class="font_normal_body" >&emsp;&ensp;至&emsp;&ensp;</label>
+                    <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
+                                class="datepicker"
+                                condition="f_open_date_uf <= '{} 23:59:59' "
+                                placeholder="结束时间"
+                                style="width:60%"
+                                v-model="model.f_end_date"
+                    ></datepicker>
+                  </div>
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                     class="form-group">
@@ -418,7 +440,10 @@
                     <nobr>发卡状态</nobr>
                   </th>
                   <th v-if="!$parent.$parent.$parent.createFile">
-                    <nobr>开户时间</nobr>
+                    <nobr>户档案开户时间</nobr>
+                  </th>
+                  <th v-if="!$parent.$parent.$parent.createFile">
+                    <nobr>表档案开户时间</nobr>
                   </th>
                   <th v-if="!$parent.$parent.$parent.createFile">
                     <nobr>建档人</nobr>
@@ -480,6 +505,7 @@
                 <td style="text-align: center;">{{row.f_price_name}}</td>
                 <td style="text-align: center;">{{row.f_whether_hairpin}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_open_date}}</td>
+                <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_open_date_uf}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_createfile_person}}</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_feed_method}}</td>

package/src/filiale/tongchuan/MeterinfoTest.vue

@@ -179,6 +179,7 @@
             <datepicker style="width:60%" placeholder="通气日期"
                         v-model="row.f_gas_date"
                         v-ref:f_gas_date
+                        :disabled ="isedit"
                         :value.sync="row.f_gas_date"
                         :format="'yyyy-MM-dd HH:mm:ss'"
                         :show-reset-button="reset"
@@ -471,7 +472,7 @@ let meterBookGen = function * (self) {
         finalDate: ''
       }
     },
-    props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id'],
+    props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id', 'isedit'],
     ready () {
       console.log('看看meter里面的数据', this.meter, this.row)
       console.log('--------------====================', this.meter.f_aroundmeter, this.row.f_aroundmeter)

package/src/filiale/tongchuan/UserGeneralInfoTest.vue

@@ -17,7 +17,7 @@
 
       <div style="height: auto;width: 100%">
         <file-user-meter-info :meterinfo="data.meterinfo" :f_filialeid="f_filialeid" :metervalid.sync="meterInfo"
-                         :f_userinfo_id="data.baseinfo.base.f_userinfo_id" v-ref:meter></file-user-meter-info>
+                         :f_userinfo_id="data.baseinfo.base.f_userinfo_id" :isedit="isedit" v-ref:meter></file-user-meter-info>
       </div>
 
       <div style="height: auto;width: 100%">

package/src/filiale/tongchuan/UserMeterInfoTest.vue

@@ -9,7 +9,7 @@
         <button class="button_search" style="width: max-content" @click="showDevices($index, row)">用气设备信息</button>
       </div>
       <file-meter-info :meter="row" :f_filialeid="f_filialeid" :usertype="usertype" :gasproperties="gasproperties" @self-valid='valida'
-                  @delete-meter="deleteMeter($index)" :f_userinfo_id="f_userinfo_id"></file-meter-info>
+                  @delete-meter="deleteMeter($index)" :f_userinfo_id="f_userinfo_id" :isedit="isedit"></file-meter-info>
 
     </div>
     <div class="panel panel-default auto text-center" @click="addMeter()" style="cursor: pointer;">
@@ -46,7 +46,8 @@ export default {
         twoWay: true
       },
       f_filialeid: {},
-      f_userinfo_id: {}
+      f_userinfo_id: {},
+      isedit: ''
     },
     ready () {
       console.log('表具信息，，，，', this.meterinfo)

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