npm - manage-client - Versions diffs - 3.2.69 → 3.2.70 - Mend

manage-client 3.2.69 → 3.2.70

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (32) hide show

package/.gradle/{5.5 → 4.4}/fileChanges/last-build.bin +0 -0
package/.gradle/4.4/fileContent/fileContent.lock +0 -0
package/.gradle/4.4/fileHashes/fileHashes.bin +0 -0
package/.gradle/4.4/fileHashes/fileHashes.lock +0 -0
package/.gradle/4.4/taskHistory/taskHistory.bin +0 -0
package/.gradle/4.4/taskHistory/taskHistory.lock +0 -0
package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
package/.gradle/buildOutputCleanup/cache.properties +2 -2
package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
package/CHANGELOG.md +1 -0
package/build/dev-server.js +176 -174
package/build/libs/ManageClient-3.1.0-17.jar +0 -0
package/build/tmp/jar/MANIFEST.MF +2 -0
package/package.json +1 -1
package/src/App.vue +28 -28
package/src/components/MeterManage/MeterList.vue +2 -2
package/src/components/SellReport/GYReportWH.vue +181 -0
package/src/components/SellReport/ReportItems.vue +250 -241
package/src/components/SellReport/ReportItemsSpecial.vue +246 -0
package/src/components/SellReport/ReportPoolSpecial.vue +60 -0
package/src/components/SellReport/SYReportWH.vue +181 -0
package/src/components/SellReport/tongchuan/ReportGasType.vue +230 -0
package/src/components/sale/filesquery/DeviceQuery.vue +1 -1
package/src/components/sale/filesquery/RecordInfoQuery.vue +1 -1
package/src/components/sale/report/aode/DayReportList.vue +371 -371
package/src/components/webmeter/DrillData/UserGasAll.vue +607 -607
package/src/filiale/shaoguan/HandplanQuery.vue +22 -24
package/src/filiale/shaoguan/RecordInfoQuery.vue +1108 -1108
package/src/filiale/zhongsheng/UserGasAll.vue +625 -0
package/src/reportManage.js +532 -506
package/.gradle/5.5/fileHashes/fileHashes.lock +0 -0
package/.gradle/5.5/gc.properties +0 -0

package/src/filiale/shaoguan/HandplanQuery.vue CHANGED Viewed

@@ -7,30 +7,6 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
-               <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
-                <div class="span" style="float:right;">
-                  <button class="button_search button_spacing" @click="search()">查询</button>
-                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
-                  <button class="btn btn-default" @click="$parent.$parent.Fileinput()" v-show="$parent.$parent.authArr.includes('送反盘权限')">反盘导入</button>
-                  <export-excel :data="$parent.$parent.getCondition"
-                                :field="$parent.$parent.getBankfield" :header="$parent.$parent.other" v-show="$parent.$parent.authArr.includes('送反盘权限')"
-                                sqlurl="rs/logic/offerexportfile" sql-name="newhandplanQuery_shaoguan" template-name='送盘导出' btn-name="送盘导出"
-                                :choose-col="true"></export-excel>
-                  <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
-                                :field="$parent.$parent.getfield" :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile" sql-name="handplanQuery" template-name='抄表查询导出'
-                                :choose-col="true"></export-excel>
-                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
-                              :defaultfield="$parent.$parent.defaultfield" print-name="抄表查询打印"
-                               titletable="抄表查询"
-                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
-                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
-                </div>
-              </div>
-              <div class="row" v-show="$parent.$parent.criteriaShow">
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">录入日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -61,7 +37,29 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
                          condition="f_user_name like '%{}%'" placeholder="客户名称">
                 </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                  <button class="btn btn-default" @click="$parent.$parent.Fileinput()" v-show="$parent.$parent.authArr.includes('送反盘权限')">反盘导入</button>
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getBankfield" :header="$parent.$parent.other" v-show="$parent.$parent.authArr.includes('送反盘权限')"
+                                sqlurl="rs/logic/offerexportfile" sql-name="newhandplanQuery_shaoguan" template-name='送盘导出' btn-name="送盘导出"
+                                :choose-col="true"></export-excel>
+                  <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
+                                :field="$parent.$parent.getfield" :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile" sql-name="handplanQuery" template-name='抄表查询导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
+                              :defaultfield="$parent.$parent.defaultfield" print-name="抄表查询打印"
+                               titletable="抄表查询"
+                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+                </div>
+              </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">小区名称</label>
                   <v-select :value.sync="model.f_residential_area"