manage-client 3.3.229 → 3.3.231

package/package.json

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

package/src/components/SellReport/ReportItems.vue

@@ -178,16 +178,13 @@ export default {
       this.model.search('1=1')
     },
     getReportInfo (tname, cond) {
-      this.$refs.pv.load('api/af-revenue/sql/manageSingleTable', {
-        data: {
+      this.$resetpost('api/af-revenue/sql/manageSingleTable',{data: {
           tablename: tname ? tname : this.tablename,
           condition: cond ? cond : this.conditionStr
-        }
-      }).then((res) => {
+        }},{rejectMsg:null,resolveMsg:null}).then((res) => {
         console.log('sssss:', res.data)
         this.types = res.data
       }).catch((error) => {
-
       })
     },
     // 返回

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

@@ -309,6 +309,9 @@
             <th style="text-align:center" >
               <nobr>组织机构</nobr>
             </th>
+            <th style="text-align:center" >
+              <nobr>部门</nobr>
+            </th>
 
           </tr>
 
@@ -349,6 +352,9 @@
           <td style="text-align:center">
             <nobr>{{row.f_orgname}}</nobr>
           </td>
+          <td style="text-align:center">
+            <nobr>{{row.f_depname}}</nobr>
+          </td>
 
         </template>
       </data-grid>
@@ -418,7 +424,8 @@
           "sldays":"累计失联天数",
           "new_days":"最新失联天数",
           "f_meter_brand":"气表厂家",
-          "f_orgname":"组织机构"},
+          "f_orgname":"组织机构",
+          "f_depname":"部门"},
         reportStr: null,
         show: false,
         showdetail:false,
@@ -596,13 +603,9 @@
         this.userresid = obj
         this.queryData.f_depid = obj
         console.log(this.queryData.f_depid)
-
         if (obj.length > 0) {
           this.orgCondtionStr += " and f_depid in " + plugin.convertToIn(obj)
-        } else {
-          this.orgCondtionStr += " and f_depid = " + this.$login.f.depid
         }
-
         if (this.depresid && this.depresid.length > 0) {
           this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(this.depresid) + this.orgCondtionStr
         } else {

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

@@ -271,6 +271,9 @@
               <th style="text-align:center" >
                 <nobr>组织机构</nobr>
               </th>
+              <th style="text-align:center" >
+                <nobr>部门</nobr>
+              </th>
           </tr>
 
           </template>
@@ -312,6 +315,9 @@
             <td style="text-align:center">
               <nobr>{{row.f_orgname}}</nobr>
             </td>
+            <td style="text-align:center">
+              <nobr>{{row.f_depname}}</nobr>
+            </td>
           <!--<td style="text-align:center">{{row.new_days}}</td>-->
           <!--<td style="text-align:center">{{row.f_state}}</td>-->
 
@@ -378,7 +384,7 @@
           "lastinsertdate":"最后上报日期",
           "f_meter_base":"最后表读数",
           "slday":"失联天数",
-          "f_meter_brand":"气表厂家","f_orgname":"组织机构"},
+          "f_meter_brand":"气表厂家","f_orgname":"组织机构","f_depname":"部门"},
         reportStr: null,
         show: false,
         showdetail:false,
@@ -530,13 +536,9 @@
         this.userresid = obj
         this.queryData.f_depid = obj
         console.log(this.queryData.f_depid)
-
         if (obj.length > 0) {
           this.orgCondtionStr += " and f_depid in " + plugin.convertToIn(obj)
-        } else {
-          this.orgCondtionStr += " and f_depid = " + this.$login.f.depid
         }
-
         if (this.depresid && this.depresid.length > 0) {
           this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(this.depresid) + this.orgCondtionStr
         } else {