sale-client 3.6.453 → 3.6.455

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.453",
+  "version": "3.6.455",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -75,7 +75,7 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
-    "ldap-clients": "3.0.60",
+    "ldap-clients": "3.0.96",
     "less": "^2.7.3",
     "manage-client": "3.1.8-88",
     "mkdirp": "^0.5.1",
@@ -90,7 +90,7 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.2.87",
+    "system-clients": "3.3.2",
     "url-loader": "^0.5.7",
     "vue-clipboard2": "0.3.1",
     "vue-hot-reload-api": "^1.2.0",

package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -92,7 +92,7 @@
         <saletab header="合同查看"  v-if="permission('合同查看')">
           <contract-signing-list :row="row" v-if="show == '合同查看'" @deal-msg="dealMsg"></contract-signing-list>
         </saletab>
-        <saletab header="用户重点记录" >
+        <saletab header="用户重点记录" v-if="permission('用户重点记录')">
           <user-key-record :row="row"  @deal-msg="dealMsg"></user-key-record>
         </saletab>
 <!--        <saletab header="报装流转记录"   v-if="permission('报装流转记录查看')">-->

package/src/components/revenue/comprehen/SpecialUser/BlackList/BlackList.vue

@@ -10,20 +10,20 @@
             <div class="col-sm-4 form-group" id="f_user_id">
               <label for="f_userinfo_code" class="font_normal_body">表&emsp;&emsp;号</label>
               <input class="input_search" style="width:60%" type="text"
-                     v-model="model.f_meternumber"  @keyup.enter="getinfo('f_meternumber')"
-                     :disabled='isEdit' placeholder="输入表号,回车查询">
+                     v-model="model.f_meternumber"
+                     :disabled='isEdit' placeholder="输入表号">
             </div>
             <div class="col-sm-4 form-group" id="f_user_id">
               <label for="f_userinfo_code" class="font_normal_body">卡&emsp;&emsp;号</label>
               <input class="input_search" style="width:60%" type="text"
-                     v-model="model.f_card_id"  @keyup.enter="getinfo('f_card_id')"
-                     :disabled='isEdit' placeholder="输入卡号,回车查询">
+                     v-model="model.f_card_id"
+                     :disabled='isEdit' placeholder="输入卡号">
             </div>
             <div class="col-sm-4 form-group" id="f_user_id" :class="[$v.f_userinfo_code.required ? 'has-error' : 'has-success']">
               <label for="f_userinfo_code" class="font_normal_body">用户编号</label>
               <input class="input_search" style="width:60%" type="text" class="input_search" style="width:60%"
-                     v-model="model.f_userinfo_code"  @keyup.enter="getinfo('f_userinfo_code')"
-                     v-validate:f_userinfo_code='{required: true }' :disabled='isEdit' placeholder="输入编号,回车查询">
+                     v-model="model.f_userinfo_code"
+                     v-validate:f_userinfo_code='{required: true }' :disabled='isEdit' placeholder="输入编号">
             </div>
             <div class="col-sm-4 form-group" id="name"  :class="[$v.f_user_name.required ? 'has-error' : 'has-success']">
               <label for="f_user_name" class=" font_normal_body">用户姓名</label>
@@ -132,8 +132,9 @@
     self.model.f_limit_amount = res.data[0].f_limit_amount
     self.model.isblacklist = res.data[0].isblacklist
     self.model.isshow = true
-    if (typeof res.data[0].f_limit_type === 'undefined') {
-      self.f_limit = '限购气量'
+    if (!res.data[0].f_limit_type) {
+      self.model.isshow = false
+      // self.f_limit = '限购气量'
     } else {
       self.f_limit = (res.data[0].f_limit_type === '金额') ? '限购金额' : '限购气量'
     }

package/src/components/revenue/machineHandManage/HandplanQuery.vue

@@ -1239,7 +1239,7 @@
         return this.config.excelHeaders
       },
       getBankfield () {
-        return this.config.batchBankConfig2
+        return this.batchBankConfig2
       },
       usertypes () {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]

package/src/filiale/ningjin/UserInfoDetailManageNew.vue

@@ -92,7 +92,7 @@
         <saletab header="合同查看"  v-if="permission('合同查看')">
           <contract-signing-list :row="row" v-if="show == '合同查看'" @deal-msg="dealMsg"></contract-signing-list>
         </saletab>
-        <saletab header="用户重点记录" >
+        <saletab header="用户重点记录" v-if="permission('用户重点记录')">
           <user-key-record :row="row"  @deal-msg="dealMsg"></user-key-record>
         </saletab>
 <!--        <saletab header="报装流转记录"   v-if="permission('报装流转记录查看')">-->

package/src/filiale/yuansheng/UserInfoDetailManageNew.vue

@@ -92,7 +92,7 @@
         <saletab header="合同查看"  v-if="permission('合同查看')">
           <contract-signing-list :row="row" v-if="show == '合同查看'" @deal-msg="dealMsg"></contract-signing-list>
         </saletab>
-        <saletab header="用户重点记录" >
+        <saletab header="用户重点记录" v-if="permission('用户重点记录')">
           <user-key-record :row="row"  @deal-msg="dealMsg"></user-key-record>
         </saletab>
         <!--        <saletab header="报装流转记录"   v-if="permission('报装流转记录查看')">-->

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

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Wed Nov 20 11:54:44 CST 2024
-gradle.version=5.2.1