manage-client 3.3.265 → 3.3.266-1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "3.3.265",
+    "version": "3.3.266-1",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {

package/src/components/sale/businessquery/GasInspection.vue

@@ -322,7 +322,7 @@
         org:[this.$login.f.orgid],
         criteriaShow: false,
         filialeNameStr: null,
-        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        filialeCodeStr: `and f_orgid = '${this.$login.f.orgid}'`,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
         model: new PagedList('api/af-revenue/sql/getGasInspection', 50,{mycondition:'this.model.model.mycondition'},{

package/src/components/sale/businessquery/InspectListGas.vue

@@ -306,7 +306,7 @@
         criteriaShow: false,
         meter_classify:'卡表',
         filialeNameStr: null,
-        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        filialeCodeStr: `and f_orgid = '${this.$login.f.orgid}'`,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
         getfield:{"f_userinfo_code":"客户编号","f_user_phone":"客户电话","f_olduserinfo_code":"档案编号","f_meternumber":"表号",

package/src/components/sale/businessquery/InspectListUser.vue

@@ -408,7 +408,7 @@
         criteriaShow: false,
         meter_classify:'卡表',
         filialeNameStr: null,
-        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        filialeCodeStr: `and f_orgid = '${this.$login.f.orgid}'`,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
         getfield:{"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号","f_user_name":"客户名称",

package/src/components/valueaddinfo/ValueAddinfoQuery.vue

@@ -236,7 +236,7 @@
     data() {
       return {
         org:[this.$login.f.orgid],
-        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        filialeCodeStr: `and f_orgid = '${this.$login.f.orgid}'`,
         config: {
           defaultPrint: ['f_userinfo_code', 'f_address', 'f_pregas', 'f_preamount']
         },

package/src/components/valueaddinfo/valueAddCountQuery.vue

@@ -130,7 +130,7 @@
     data() {
       return {
         org:[this.$login.f.orgid],
-        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        filialeCodeStr: `and f_orgid = '${this.$login.f.orgid}'`,
         config: {
           defaultPrint: ['f_userinfo_code', 'f_address', 'f_pregas', 'f_preamount']
         },

package/src/components/valueaddinfo/valueAddUserQuery.vue

@@ -197,7 +197,7 @@
     data() {
       return {
         org:[this.$login.f.orgid],
-        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        filialeCodeStr: `and f_orgid = '${this.$login.f.orgid}'`,
         config: {
           defaultPrint: ['f_userinfo_code', 'f_address', 'f_pregas', 'f_preamount']
         },

package/src/components/webmeter/DrillData/GetNoMetereadData.vue

@@ -273,7 +273,7 @@
         operator: [],
         meterbrands: [],
         meterstyle:{},
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+        orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
         orgid:[this.$login.f.orgid],
         condition: '1=1',
         org:[this.$login.f.orgid]

package/src/components/webmeter/DrillData/LostContactAnalysisList.vue

@@ -453,7 +453,7 @@
         ],
         styles:false,
         filename: '',
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+        orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
         echarts: false,
         orgid:[this.$login.f.orgid],
         searchshow: false,

package/src/components/webmeter/DrillData/UserGasAll.vue

@@ -501,7 +501,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
         if (this.orgCondtionStr)
           this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid in ${this.orgCondtionStr}`
         else
-          this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid = ${this.$login.f.orgid}`
+          this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid = '${this.$login.f.orgid}'`
         if(this.zonesdata){
           this.condition = this.$refs.paged.$refs.cri.condition + ` and ${this.zonesdata}`
         }

package/src/components/webmeter/gasAnalysis/NewWebmeterSettlementAnalysis.vue

@@ -304,7 +304,7 @@
         meterbrands: [],
         states: [],
         meterstyle:{},
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+        orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
         orgid:[this.$login.f.orgid],
         condition: '1=1',
         org:[this.$login.f.orgid]

package/src/components/webmeter/gasAnalysis/WebmeterSettlementAnalysis.vue

@@ -309,7 +309,7 @@
         meterbrands: [],
         states: [],
         meterstyle:{},
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+        orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
         orgid:[this.$login.f.orgid],
         condition: '1=1',
         org:[this.$login.f.orgid]

package/src/components/webmeter/newwebmeter/NewException/TotalExceptionByMeter.vue

@@ -368,7 +368,7 @@
         },
         condition: '1=1',
         org:`${[this.$login.f.orgid]}`,
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`
+        orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`
       }
     },
     ready() {
@@ -403,8 +403,6 @@
           for (let i = 0; i < res.data.length; i++) {
             if (groupname == 'f_meter_brand') {
               self.WarningType.push({label: res.data[i].f_meter_brand, value:res.data[i].f_meter_brand})
-              console.log('气表品牌~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~')
-              console.log( self.WarningType)
             } else if (groupname == 'f_meter_style') {
               //气表类型
               self.Warningstyle.push({label: res.data[i].f_meter_style, value:res.data[i].f_meter_style})

package/src/components/webmeter/newwebmeter/NewException/TotalExceptionByMeterShiQuan.vue

@@ -382,7 +382,7 @@ export default {
       },
       condition: '1=1',
       org: [this.$login.f.orgid],
-      orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`
+      orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`
     }
   },
   ready() {
@@ -427,8 +427,6 @@ export default {
         for (let i = 0; i < res.data.length; i++) {
           if (groupname == 'f_meter_brand') {
             self.WarningType.push({label: res.data[i].f_meter_brand, value: res.data[i].f_meter_brand})
-            console.log('气表品牌~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~')
-            console.log(self.WarningType)
           } else if (groupname == 'f_meter_style') {
             //气表类型
             self.Warningstyle.push({label: res.data[i].f_meter_style, value: res.data[i].f_meter_style})

package/src/filiale/WEINAN/InspectListGas.vue

@@ -325,7 +325,7 @@
         criteriaShow: false,
         meter_classify:'卡表',
         filialeNameStr: null,
-        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        filialeCodeStr: `and f_orgid = '${this.$login.f.orgid}'`,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
         getfield:{"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号",

package/src/filiale/WEINAN/InspectListUser.vue

@@ -282,7 +282,7 @@
         prices: [],
         f_filialeid: this.$login.f.f_orgid,
         filialeNameStr: null,
-        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        filialeCodeStr: `and f_orgid = '${this.$login.f.orgid}'`,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
         getfield:{"f_userinfo_code":"客户编号","f_user_phone":"用户电话","f_meternumber":"表号","f_user_name":"客户名称","f_address":"地址","f_user_type":"用户类型",

package/src/filiale/WEINAN/UserGasList.vue

@@ -346,9 +346,6 @@
               dr.value = res.data[i].f_meter_brand
               //气表品牌
               self.WarningType.push(dr)
-              console.log('气表品牌~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~')
-              console.log(dr)
-              console.log( self.WarningType)
             } else if (groupname == 'f_meter_style') {
               dr.label = res.data[i].f_meter_style
               dr.value = res.data[i].f_meter_style

package/src/filiale/WEINAN/UserLostContactAnalysis.vue

@@ -399,7 +399,7 @@
         },
         styles:false,
         org:[this.$login.f.orgid],
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+        orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
         echarts: false,
         searchshow: false,
         isActiveTotalForm: false,

package/src/filiale/WEINAN/webmeter/LostContactAnalysisList.vue

@@ -431,7 +431,7 @@
         useinstitutions: [],
         userusenatures: [],
         filename: '',
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+        orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
         echarts: false,
         orgid:[this.$login.f.orgid],
         searchshow: false,

package/src/filiale/WEINAN/webmeter/TotalExceptionByMeter.vue

@@ -405,7 +405,7 @@
         userusenatures: [],
         condition: '1=1',
         org:[this.$login.f.orgid],
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`
+        orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`
       }
     },
     ready() {
@@ -456,8 +456,6 @@
           for (let i = 0; i < res.data.length; i++) {
             if (groupname == 'f_meter_brand') {
               self.WarningType.push({label: res.data[i].f_meter_brand, value:res.data[i].f_meter_brand})
-              console.log('气表品牌~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~')
-              console.log( self.WarningType)
             } else if (groupname == 'f_meter_style') {
               //气表类型
               self.Warningstyle.push({label: res.data[i].f_meter_style, value:res.data[i].f_meter_style})

package/src/filiale/bayan/webmeter/NewWebmeterSettlementAnalysis.vue

@@ -336,7 +336,7 @@ export default {
       meterbrands: [],
       states: [],
       meterstyle: {},
-      orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+      orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
       orgid: [this.$login.f.orgid],
       condition: '1=1',
       org: {

package/src/filiale/hantou/GetNoMetereadData.vue

@@ -275,7 +275,7 @@ import MagLoadParams from "../../stores/MagLoadParams";
         operator: [],
         meterbrands: [],
         meterstyle:{},
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+        orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
         orgid:[this.$login.f.orgid],
         condition: '1=1',
         org:[this.$login.f.orgid]

package/src/filiale/hantou/LostContactAnalysisList.vue

@@ -446,7 +446,7 @@
         ],
         styles:false,
         filename: '',
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+        orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
         echarts: false,
         orgid:[this.$login.f.orgid],
         searchshow: false,

package/src/filiale/hantou/NewWebmeterSettlementAnalysis.vue

@@ -304,7 +304,7 @@ import MagLoadParams from "../../stores/MagLoadParams";
         operator: [],
         meterbrands: [],
         meterstyle:{},
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+        orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
         orgid:[this.$login.f.orgid],
         condition: '1=1',
         org:[this.$login.f.orgid],

package/src/filiale/hantou/UserGasAll.vue

@@ -501,7 +501,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
         if (this.orgCondtionStr)
           this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid in ${this.orgCondtionStr}`
         else
-          this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid = ${this.$login.f.orgid}`
+          this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid = '${this.$login.f.orgid}'`
         if(this.zonesdata){
           this.condition = this.$refs.paged.$refs.cri.condition + ` and ${this.zonesdata}`
         }

package/src/filiale/lixianV3/UserLostContactAnalysis.vue

@@ -383,7 +383,7 @@
         ],
         styles:false,
         org:[this.$login.f.orgid],
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+        orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
         echarts: false,
         searchshow: false,
         isActiveTotalForm: false,

package/src/filiale/macheng/WebmeterSettlementAnalysis.vue

@@ -256,7 +256,7 @@ export default {
       meterbrands: [],
       states: [],
       meterstyle: {},
-      orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+      orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
       orgid: [this.$login.f.orgid],
       condition: '1=1',
       org: [this.$login.f.orgid]

package/src/filiale/meihekou/CardHandplanQuery.vue

@@ -170,9 +170,9 @@
                 <th>
                   <nobr>表号</nobr>
                 </th>
-                <th>
-                  <nobr>地址</nobr>
-                </th>
+<!--                <th>-->
+<!--                  <nobr>地址</nobr>-->
+<!--                </th>-->
                 <th>
                   <nobr>上期底数</nobr>
                 </th>
@@ -253,9 +253,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_meternumber}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_address}}</nobr>
-              </td>
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_address}}</nobr>-->
+<!--              </td>-->
               <td style="text-align: center;">
                 <nobr>{{row.f_last_tablebase}}</nobr>
               </td>

package/src/filiale/ningjin/GasInspection.vue

@@ -317,7 +317,7 @@
         org:[this.$login.f.orgid],
         criteriaShow: false,
         filialeNameStr: null,
-        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        filialeCodeStr: `and f_orgid = '${this.$login.f.orgid}'`,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
         model: new PagedList('api/af-revenue/sql/getGasInspection', 50,{mycondition:'this.model.model.mycondition'},{

package/src/filiale/ningjin/GetNoMetereadData.vue

@@ -264,7 +264,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
         operator: [],
         meterbrands: [],
         meterstyle:{},
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+        orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
         orgid:[this.$login.f.orgid],
         condition: '1=1',
         org:[this.$login.f.orgid]

package/src/filiale/ningjin/InspectListGas.vue

@@ -300,7 +300,7 @@
         criteriaShow: false,
         meter_classify:'卡表',
         filialeNameStr: null,
-        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        filialeCodeStr: `and f_orgid = '${this.$login.f.orgid}'`,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
         getfield:{"f_userinfo_code":"客户编号","f_user_phone":"客户电话","f_olduserinfo_code":"档案编号","f_meternumber":"表号",

package/src/filiale/ningjin/InspectListUser.vue

@@ -409,7 +409,7 @@
         criteriaShow: false,
         meter_classify:'卡表',
         filialeNameStr: null,
-        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        filialeCodeStr: `and f_orgid = '${this.$login.f.orgid}'`,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
         getfield:{"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号","f_user_name":"客户名称",

package/src/filiale/ningjin/LostContactAnalysisList.vue

@@ -439,7 +439,7 @@ export default {
       ],
       styles: false,
       filename: '',
-      orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+      orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
       echarts: false,
       orgid: [this.$login.f.orgid],
       searchshow: false,

package/src/filiale/ningjin/MeterExceptionList.vue

@@ -421,7 +421,7 @@
                 GetErrorType:[],
                 condition: '1=1',
                 org:[this.$login.f.orgid],
-                orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`
+                orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`
             }
         },
         ready() {

package/src/filiale/ningjin/UserLostContactAnalysis.vue

@@ -390,7 +390,7 @@
         ],
         styles:false,
         org:[this.$login.f.orgid],
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+        orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
         echarts: false,
         searchshow: false,
         isActiveTotalForm: false,

package/src/filiale/rizhao/InspectListUser.vue

@@ -268,7 +268,7 @@
         criteriaShow: false,
         meter_classify:'卡表',
         filialeNameStr: null,
-        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        filialeCodeStr: `and f_orgid = '${this.$login.f.orgid}'`,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
         getfield:{"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号","f_user_name":"客户名称",

package/src/filiale/shangluo/webmeter/WebmeterSettlementAnalysis.vue

@@ -305,7 +305,7 @@
         meterbrands: [],
         states: [],
         meterstyle:{},
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+        orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
         orgid:[this.$login.f.orgid],
         condition: '1=1',
         org:[this.$login.f.orgid]

package/src/filiale/shanxian/GasInspection.vue

@@ -302,7 +302,7 @@
         org:[this.$login.f.orgid],
         criteriaShow: false,
         filialeNameStr: null,
-        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        filialeCodeStr: `and f_orgid = '${this.$login.f.orgid}'`,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
         model: new PagedList('api/af-revenue/sql/getGasInspection', 50,{mycondition:'this.model.model.mycondition'},{

package/src/filiale/shanxian/InspectListGas.vue

@@ -313,7 +313,7 @@
         criteriaShow: false,
         meter_classify:'卡表',
         filialeNameStr: null,
-        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        filialeCodeStr: `and f_orgid = '${this.$login.f.orgid}'`,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
         getfield:{"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号",

package/src/filiale/shanxian/InspectListUser.vue

@@ -266,7 +266,7 @@
         criteriaShow: false,
         meter_classify:'卡表',
         filialeNameStr: null,
-        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        filialeCodeStr: `and f_orgid = '${this.$login.f.orgid}'`,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
         getfield:{"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号","f_user_name":"客户名称",

package/src/filiale/shanxian/InspectListUserNew.vue

@@ -289,7 +289,7 @@
         criteriaShow: false,
         // meter_classify:'卡表',
         filialeNameStr: null,
-        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        filialeCodeStr: `and f_orgid = '${this.$login.f.orgid}'`,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
         getfield:{"f_userinfo_code":"用户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号","f_user_name":"用户名称",

package/src/filiale/shanxian/LostContactAnalysisList.vue

@@ -394,7 +394,7 @@
         ],
         styles:false,
         filename: '',
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+        orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
         echarts: false,
         orgid:[this.$login.f.orgid],
         searchshow: false,

package/src/filiale/shanxian/UserGasAll.vue

@@ -449,7 +449,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
         if (this.orgCondtionStr)
           this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid in ${this.orgCondtionStr}`
         else
-          this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid = ${this.$login.f.orgid}`
+          this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid = '${this.$login.f.orgid}'`
         if(this.zonesdata){
           this.condition = this.$refs.paged.$refs.cri.condition + ` and ${this.zonesdata}`
         }

package/src/filiale/shanxian/UserLostContactAnalysis.vue

@@ -382,7 +382,7 @@
         ],
         styles:false,
         org:[this.$login.f.orgid],
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+        orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
         echarts: false,
         searchshow: false,
         isActiveTotalForm: false,

package/src/filiale/shanxian/newwebmeter/TotalExceptionByMeter.vue

@@ -369,7 +369,7 @@
         },
         condition: '1=1',
         org:[this.$login.f.orgid],
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`
+        orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`
       }
     },
     ready() {
@@ -404,8 +404,6 @@
           for (let i = 0; i < res.data.length; i++) {
             if (groupname == 'f_meter_brand') {
               self.WarningType.push({label: res.data[i].f_meter_brand, value:res.data[i].f_meter_brand})
-              console.log('气表品牌~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~')
-              console.log( self.WarningType)
             } else if (groupname == 'f_meter_style') {
               //气表类型
               self.Warningstyle.push({label: res.data[i].f_meter_style, value:res.data[i].f_meter_style})

package/src/filiale/tongchuan/GasInspection.vue

@@ -364,7 +364,7 @@
         org:[this.$login.f.orgid],
         criteriaShow: false,
         filialeNameStr: null,
-        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        filialeCodeStr: `and f_orgid = '${this.$login.f.orgid}'`,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
         model: new PagedList('api/af-revenue/sql/getGasInspection', 50,{mycondition:'this.model.model.mycondition'},{

package/src/filiale/tongchuan/InspectListGas.vue

@@ -378,7 +378,7 @@
         criteriaShow: false,
         meter_classify:'卡表',
         filialeNameStr: null,
-        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        filialeCodeStr: `and f_orgid = '${this.$login.f.orgid}'`,
         userid: this.$login.f.id,
         // 气表型号
         meterstyle: {},

package/src/filiale/wenxi/GetNoMetereadData.vue

@@ -245,7 +245,7 @@
         operator: [],
         meterbrands: [],
         meterstyle:{},
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+        orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
         orgid:[this.$login.f.orgid],
         condition: '1=1',
         org:[this.$login.f.orgid]

package/src/filiale/wuhai/UserGasAll.vue

@@ -540,7 +540,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
         if (this.orgCondtionStr)
           this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid in ${this.orgCondtionStr}`
         else
-          this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid = ${this.$login.f.orgid}`
+          this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid = '${this.$login.f.orgid}'`
         if(this.zonesdata){
           this.condition = this.$refs.paged.$refs.cri.condition + ` and ${this.zonesdata}`
         }

package/src/filiale/yuncheng/GasInspection.vue

@@ -334,7 +334,7 @@
         org:[this.$login.f.orgid],
         criteriaShow: false,
         filialeNameStr: null,
-        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        filialeCodeStr: `and f_orgid = '${this.$login.f.orgid}'`,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
         model: new PagedList('api/af-revenue/sql/getGasInspection', 50,{mycondition:'this.model.model.mycondition'},{

package/src/filiale/yuncheng/LostContactAnalysisList.vue

@@ -457,7 +457,7 @@
         ],
         styles:false,
         filename: '',
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+        orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
         echarts: false,
         orgid:[this.$login.f.orgid],
         searchshow: false,

package/src/filiale/zhongyi/LostContactAnalysisList.vue

@@ -439,7 +439,7 @@ export default {
       ],
       styles: false,
       filename: '',
-      orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+      orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
       echarts: false,
       orgid: [this.$login.f.orgid],
       searchshow: false,

package/src/filiale/zhongyi/MeterExceptionList.vue

@@ -410,7 +410,7 @@
                 GetErrorType:[],
                 condition: '1=1',
                 org:[this.$login.f.orgid],
-                orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`
+                orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`
             }
         },
         ready() {

package/src/filiale/zhongyi/UserLostContactAnalysis.vue

@@ -391,7 +391,7 @@
         ],
         styles:false,
         org:[this.$login.f.orgid],
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
+        orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
         echarts: false,
         searchshow: false,
         isActiveTotalForm: false,

package/.npmignore

@@ -1,10 +0,0 @@
-src/bootstrap
-.idea/
-.DS_Store
-node_modules/
-dist/static/*.map
-npm-debug.log
-selenium-debug.log
-test/unit/coverage
-test/e2e/reports
-yarn.lock

package/build/.npmignore

@@ -1 +0,0 @@
-