sale-client 3.7.44 → 3.7.45-ly

package/package.json

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

package/src/filiale/liaoyuan/FileManage/MeterinfoTest.vue

@@ -15,7 +15,7 @@
                    v-next-el="{id: 'meterbase'}" :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('表箱号') == false && controlledArray.includes('表箱号') == true)">
           </div>
           <div class="col-sm-4 form-group">
-            <label for="f_meter_base" class="font_normal_body">&ensp;表&ensp;读&ensp;数 {{jurisdiction.includes('表读数')}} </label>
+            <label for="f_meter_base" class="font_normal_body">&ensp;表&ensp;读&ensp;数</label>
             <input type="number" class="input_search" style="width:60%" v-model="row.f_meter_base" placeholder='表底数'
                    :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('表读数') == false && controlledArray.includes('表读数') == true)" :readonly="!row.f_userfiles_id">
           </div>
@@ -353,12 +353,11 @@ let meterBookGen = function *(self) {
         meterbookoptions: [],  // 抄表册选项
         opteratormetrbook: false, // 抄表册操作
         oldrow: [],
-        controlledArray: this.$appdata.getParam('档案信息受控配置'),
+        controlledArray: this.$appdata.getParam('档案信息受控配置').map(item => item.value),
       }
     },
     props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id'],
     ready () {
-      console.log('这是参数',this.$appdata.getParam('档案信息受控配置'))
       console.log('看看meter里面的数据', this.meter, this.row)
       this.row = Object.assign(this.row, this.meter, {})
       this.oldrow = this.row

package/src/filiale/liaoyuan/FileManage/UserEssentialInfoTest.vue

@@ -254,7 +254,7 @@
         readCardFlag: true,
 
         isSelect: false,
-        controlledArray: this.$appdata.getParam('档案信息受控配置'),
+        controlledArray: this.$appdata.getParam('档案信息受控配置').map(item => item.value),
       }
     },
     ready () {

package/src/plugins/GetSaleParams.js

@@ -21,8 +21,8 @@ let GetSaleParam = {
   inputtors: [],
   async initinputtor () {
     let res = await Vue.resetpost('rs/sql/sale_getAlluserRes?pageNo=1&pageSize=999999', {data: {
-      condition: ' 1=1'
-    }}, {resolveMsg: null, rejectMsg: '获取用户出错！！！'})
+        condition: ' 1=1'
+      }}, {resolveMsg: null, rejectMsg: '获取用户出错！！！'})
     console.log('resdata:', res.data)
     if (res.data) {
       GetSaleParam.inputtors = res.data
@@ -115,7 +115,7 @@ let GetSaleParam = {
   getPriceByOrgNoLow (filialeid) {
     let result = []
     GetSaleParam.prices.forEach((item) => {
-      if (item.f_state === '有效' && filialeid == item.f_filialeid && item.f_islow_income != 0) {
+      if (item.f_state === '有效' && filialeid == item.f_filialeid && (item.f_islow_income == null || item.f_islow_income == 0)) {
         let value = {
           label: item.f_price_name,
           value: item
@@ -247,7 +247,7 @@ let GetSaleParam = {
         if (item.f_state === '有效' && object.f_user_type === item.f_user_type &&
           object.f_gasproperties === item.f_gasproperties &&
           object.f_price_type === item.f_price_type &&
-          object.filter == item.f_filialeid && item.f_islow_income != 0) {
+          object.filter == item.f_filialeid && (item.f_islow_income == null || item.f_islow_income == 0)) {
           let value = {
             label: item.f_price_name,
             value: item
@@ -257,7 +257,7 @@ let GetSaleParam = {
       })
     } else {
       GetSaleParam.prices.forEach((item) => {
-        if (item.f_state === '有效' && object.f_user_type === item.f_user_type && object.f_gasproperties === item.f_gasproperties && object.f_price_type === item.f_price_type && item.f_islow_income != 0) {
+        if (item.f_state === '有效' && object.f_user_type === item.f_user_type && object.f_gasproperties === item.f_gasproperties && object.f_price_type === item.f_price_type && (item.f_islow_income == null || item.f_islow_income == 0)) {
           let value = {
             label: item.f_price_name,
             value: item