manage-client 3.3.82 → 3.3.83

package/package.json

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

package/src/filiale/WEINAN/ManageCompanyGasSummary.vue

@@ -9,8 +9,8 @@
                 <div :class="$parent.$parent.style">
                   <label for="startDate" class="font_normal_body">开始日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
-                              v-model="model.startDate"
-                              :value.sync="model.startDate"
+                              v-model="$parent.$parent.startDate"
+                              :value.sync="$parent.$parent.startDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true">
                   </datepicker>
@@ -18,8 +18,8 @@
                 <div :class="$parent.$parent.style">
                   <label for="endDate" class="font_normal_body">结束日期</label>
                   <datepicker id="endDate" placeholder="结束日期" style="width:60%"
-                              v-model="model.endDate"
-                              :value.sync="model.endDate"
+                              v-model="$parent.$parent.endDate"
+                              :value.sync="$parent.$parent.endDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true">
                   </datepicker>
@@ -214,8 +214,8 @@ import exportConfig from './config/exportConfig'
 import PrintDataSelf from '../../components/sale/common/PrintDataSelf'
 
 let readySomething = async function (self) {
-  self.$refs.paged.$refs.cri.model.startDate = self.getCurrentMonthFirst()
-  self.$refs.paged.$refs.cri.model.endDate = self.getCurrentMonthLast()
+  self.startDate = self.getCurrentMonthFirst()
+  self.endDate = self.getCurrentMonthLast()
   // self.getCompanyList()
 }
 export default {
@@ -241,7 +241,6 @@ export default {
         startDate: 'this.model.startDate',
         endDate: 'this.model.endDate',
         f_user_type : 'this.model.f_user_type',
-
         f_user_usetype : 'this.model.f_user_usetype',
         f_user_usenature : 'this.model.f_user_usenature',
         f_use_institution : 'this.model.f_use_institution'
@@ -412,6 +411,8 @@ export default {
       } else {
         args.condition = `${args.condition}` + this.orgConditionStr
       }
+      this.$refs.paged.$refs.cri.model.startDate = this.startDate
+      this.$refs.paged.$refs.cri.model.endDate = this.endDate
       this.condition = args.condition
       console.log("查看条件",this.condition)
       await this.model.search(args.condition, args.model)
@@ -491,8 +492,8 @@ export default {
     getCondition () {
       return {
         condition: this.condition,
-        startDate: this.$refs.paged.$refs.cri.model.startDate,
-        endDate: this.$refs.paged.$refs.cri.model.endDate,
+        startDate: this.startDate,
+        endDate: this.endDate,
         f_user_usetype : this.$refs.paged.$refs.cri.model.f_user_usetype,
         f_user_type : this.$refs.paged.$refs.cri.model.f_user_type,
         f_user_usenature : this.$refs.paged.$refs.cri.model.f_user_usenature,

package/src/main.js

@@ -6,7 +6,7 @@ import { all } from 'vue-client'
 import { system } from 'system-clients'
 import { ldap } from 'ldap-clients'
 import saleManage from './saleManage'
-import ShanXianSaleManage from './filiale/tongchuan/sale'
+import ShanXianSaleManage from './filiale/shanxian/sale'
 import ShanXianWebmeterManage from './filiale/shanxian/webmeterManage'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'