manage-client 4.1.139 → 4.1.140

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "4.1.139",
+    "version": "4.1.140",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {
@@ -71,7 +71,7 @@
         "ldap-clients": "3.0.96",
         "url-loader": "^0.5.7",
         "vue-amap": "0.5.10",
-        "vue-client": "1.26.6",
+        "vue-client": "1.26.7",
         "vue-hot-reload-api": "^1.2.0",
         "vue-html-loader": "^1.0.0",
         "vue-loader": "8.2.1",

package/src/components/SellReport/ReportItems.vue

@@ -108,7 +108,7 @@
               <td>{{row.f_files_name}}</td>
               <td>{{row.f_operator}}</td>
               <td>{{row.f_operate_date}}</td>
-              <td><button type="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.delete(row)">删除</button></td>
+              <td><button type="button" class="btn btn-link" @click.stop="$dispatch('delete-history-row', row)">删除</button></td>
             </template>
           </data-grid>
         </criteria-paged>
@@ -164,6 +164,7 @@ export default {
     }
   },
   ready () {
+    this.$on('delete-history-row', (row) => this.delete(row))
     // 获取所有报表类型
     this.getReportInfo(null, '1=1 and f_rank=1')
     this.getReportName()
@@ -178,7 +179,7 @@ export default {
       this.model.search('1=1')
     },
     delete (row) {
-      this.$resetdelete('rs/entity/t_report_record', {id: row.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+      this.$resetpost('api/af-revenue/logic/deletereport', {id: row.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
         this.$dispatch('delect-report', '删除计划', row)
         this.search()
       })

package/src/filiale/fugou/WebHandplanQuery.vue

@@ -22,6 +22,7 @@
                   <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
                   <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
                                 :field="$parent.$parent.getfield" :header="$parent.$parent.other"
+                                :prop-task-export="true"
                                 sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="webhandplanQuery" template-name='物联网表抄表查询导出'
                                 :choose-col="true"></export-excel>
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"

package/src/filiale/liaoyuan/HandplanRatioQuery.vue

@@ -73,6 +73,16 @@
                             close-on-select :search="false">
                   </v-select>
                 </div>
+                <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
+                  <label class="font_normal_body">气量环比&nbsp;</label>
+                  <div class="row">
+                    <input type="text" style="width:27%" class="input_search" v-model="model.amount_ratio1"
+                           condition="amount_ratio >= {} " placeholder="">
+                    <label class="font_normal_body"> ≤ x ≤ </label>
+                    <input type="text" style="width:27%" class="input_search" v-model="model.amount_ratio2"
+                           condition="amount_ratio <= {} " placeholder="">
+                  </div>
+                </div>
 
               </div>
             </div>
@@ -230,7 +240,7 @@
         footer:[],
         data: {},
         ratio: this.$appdata.getSingleValue('环比报警值百分比'),
-        model: new PagedList('api/af-revenue/sql/getHandRatioQuery', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', index: 'this.model.index'}),
+        model: new PagedList('api/af-revenue/sql/getHandRatioQuery', 20, {month_date: 'this.model.month_date', next_month_date: 'this.model.next_month_date', last_month_date: 'this.model.last_month_date'}),
         initres: {
           org:[this.$login.f.orgid],
           dep:[]
@@ -412,6 +422,8 @@
           this.$showMessage('请选择所属年月!')
           return
         }
+        let month_date = this.$refs.paged.$refs.cri.model.last_month_date
+        let { last_month_date, next_month_date } = this.getAdjacentMonths(month_date)
         this.area =  this.$refs.paged.$refs.cri.model.f_residential_area
         if(this.area.length !== 0){
           let str = JSON.stringify(this.area)
@@ -434,7 +446,11 @@
         let ratio1 = this.ratio-0
         let ratio2 = 0-this.ratio
         let condition = `${args.condition} ` + this.orgCondtionStr + ` and (amount_ratio>=${ratio1} or amount_ratio<=${ratio2})`
-        this.model.search(condition, args.model)
+        this.model.search(condition, {
+          last_month_date: last_month_date,
+          next_month_date: next_month_date,
+          month_date: month_date
+        })
       },
       clear() {
         //清空部门和人员
@@ -447,6 +463,30 @@
         })
         this.$refs.paged.$refs.cri.model.f_meter_classify = []
       },
+      getAdjacentMonths(monthDate) {
+        // 解析年份和月份
+        let [year, month] = monthDate.split('-').map(Number)
+
+        // 计算上一个月
+        let lastYear = year
+        let lastMonth = month - 1
+        if (lastMonth < 1) {
+          lastMonth = 12
+          lastYear = year - 1
+        }
+        let last_month_date = `${lastYear}-${String(lastMonth).padStart(2, '0')}`
+
+        // 计算下一个月
+        let nextYear = year
+        let nextMonth = month + 1
+        if (nextMonth > 12) {
+          nextMonth = 1
+          nextYear = year + 1
+        }
+        let next_month_date = `${nextYear}-${String(nextMonth).padStart(2, '0')}`
+
+        return { last_month_date, next_month_date }
+      },
       show() {
         this.criteriaShow = true
       },

package/src/filiale/liaoyuan/WebHandplanRatioQuery.vue

@@ -73,6 +73,16 @@
                             close-on-select :search="false">
                   </v-select>
                 </div>
+                <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
+                  <label class="font_normal_body">气量环比&nbsp;</label>
+                  <div class="row">
+                    <input type="text" style="width:27%" class="input_search" v-model="model.amount_ratio1"
+                           condition="amount_ratio >= {} " placeholder="">
+                    <label class="font_normal_body"> ≤ x ≤ </label>
+                    <input type="text" style="width:27%" class="input_search" v-model="model.amount_ratio2"
+                           condition="amount_ratio <= {} " placeholder="">
+                  </div>
+                </div>
 
               </div>
             </div>