apply-clients 3.1.55 → 3.1.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.1.55",
+  "version": "3.1.56",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/product/Process/Service/ServiceControl.vue

@@ -447,7 +447,7 @@
             this.show_data.fields[i].label === '用气性质'
           ) {
             let http = new HttpResetClass()
-            let condition = "f_orgid = '" + this.$login.f.orgid + "'"
+            let condition = "f_filialeid = '" + this.$login.f.orgid + "'"
             let res = await http.load('POST','rs/sql/applysingleTable',{data:{tablename:'t_stairprice',condition:condition}}, {resolveMsg: null, rejectMsg: null})
             for (let i = 0; i < this.show_data.fields.length; i++) {
               if (this.show_data.fields[i].label == '气价名称') {
@@ -482,7 +482,7 @@
 
               if (this.show_data.fields[i].label == '气价名称' && this.show_data.fields[i].value.length != 0) {
                 let http2 = new HttpResetClass()
-                let condition2 = "s.f_orgid = '" + this.$login.f.orgid + "'" + " and s.f_price_name = '" + this.show_data.fields[i].value + "'"
+                let condition2 = "s.f_filialeid = '" + this.$login.f.orgid + "'" + " and s.f_price_name = '" + this.show_data.fields[i].value + "'"
                 let res2 = await http2.load('POST','rs/sql/searchGasPrice',{data:{condition:condition2}}, {resolveMsg: null, rejectMsg: null})
                 console.log("气价数据：" + JSON.stringify(res2.data))
                 for (let j = 0; j < this.show_data.fields.length; j++) {
@@ -490,21 +490,26 @@
                     console.log("气价类型：" + res2.data[0])
                     console.log("气价类型1：" + res2.data[0].f_price_type)
                     this.show_data.fields[j].value = res2.data[0].f_price_type
+                    this.show_data.f_price_type = this.show_data.fields[j].value
                     console.log("气价类型2：" + this.show_data.fields[j].value)
                   }
                   //气价拼接
                   if (this.show_data.fields[j].label == '气价') {
-                    let p = 1
-                    let resultPrice = ''
-                    for(let l = 0; l < res2.data.length; l++){
-                      resultPrice = resultPrice + res2.data[l].price + ' |'
-                      if (p == 3) {
-                        break
+                    if(this.show_data.f_price_type == '阶梯气价'){
+                      let p = 1
+                      let resultPrice = ''
+                      for(let l = 0; l < res2.data.length; l++){
+                        resultPrice = resultPrice + res2.data[l].price + ' |'
+                        if (p == 3) {
+                          break
+                        }
+                        p++
                       }
-                      p++
+                      console.log("拼接的价格:" + resultPrice)
+                      this.show_data.fields[j].value = resultPrice
+                    }else {
+                      this.show_data.fields[j].value = res2.data[0].price
                     }
-                    console.log("拼接的价格:" + resultPrice)
-                    this.show_data.fields[j].value = resultPrice
                   }
                   if (this.show_data.fields[j].label == '用气性质') {
                     this.show_data.fields[j].value = res2.data[0].f_gasproperties