sale-client 3.7.45 → 3.7.47-ly

package/package.json

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

package/src/components/charge/business/CardChangeFill.vue

@@ -228,8 +228,8 @@
       self.model.f_pregas = (self.model.f_pregas - 0).toFixed(0)
     }
     self.model.f_meter_type = self.row.f_meter_type
-    // 判断限购
-    if ((self.model.f_pregas - 0) - (self.maxgas - 0) <= 0) {
+    // 限购检查只检查购气量（不含补气量），限购值限制的是额外购买的气量
+    if ((self.model.f_pregasBuy - 0) - (self.maxgas - 0) <= 0) {
       if ((self.model.f_fill_gas - 0) < (self.model.f_pregas - 0)) {
         // 超出【补气气量不符】部分走划价
         let gas = self.model.f_pregas - self.model.f_fill_gas
@@ -250,6 +250,13 @@
         self.model.f_collection = 0
       }
       self.remstrgas()
+    } else {
+      self.$showAlert(`购气量不能超过限购值${self.maxgas}方`, 'warning', 3000)
+      self.model.f_preamount = 0
+      self.model.f_totalcost = 0
+      self.model.f_collection = 0
+      self.model.f_pregasBuy = 0
+      self.model.f_pregas = self.model.f_fill_gas
     }
   }
 

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

@@ -37,7 +37,7 @@
             <input type="text" v-show="false" v-model="$refs.model.selectedItems"
                    v-validate:model='{required: true }'>
             <v-select :value.sync="row.gasmodel" :options='row.gasbrand[0].gasmodel' placeholder='气表型号'
-                      close-on-select :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('气表型号') == false && controlledArray.includes('气表型号') == false)"
+                      close-on-select :disabled="!jurisdiction.includes('档案信息查询修改') || (jurisdiction.includes('气表型号') == false && controlledArray.includes('气表型号') == true)"
                       v-model='row.gasmodel' :disabled='row.gasbrand.length === 0 ' v-ref:model></v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.name.required ? 'has-error' : '']">

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