manage-client 3.2.293 → 3.2.295

package/src/filiale/ancheng/sale.js

@@ -6,4 +6,8 @@ export default function () {
   Vue.component('charge-query', (resolve) => {
     require(['./businessquery/ChargeQuery'], resolve)
   })
+  // 用气查询
+  Vue.component('fmygas-query', (resolve) => {
+    require(['./businessquery/FMYGasQuery'], resolve)
+  })
 }

package/src/filiale/shanxian/AreaGeneralQuery.vue

@@ -174,6 +174,36 @@
                     close-on-select
                   ></v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label for="startDate1" class="font_normal_body"
+                  >开始日期</label
+                  >
+                  <datepicker
+                    id="startDate1"
+                    placeholder="建档开始日期"
+                    style="width: 60%"
+                    v-model="model.startDate1"
+                    :value.sync="model.startDate1"
+                    :format="'yyyy-MM-dd'"
+                    :show-reset-button="true"
+                    condition="f_createfile_date >= '{} 00:00:00'">
+                  >
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate1" class="font_normal_body">结束日期</label>
+                  <datepicker
+                    id="endDate1"
+                    placeholder="建档结束日期"
+                    style="width: 60%"
+                    v-model="model.endDate1"
+                    :value.sync="model.endDate1"
+                    :format="'yyyy-MM-dd'"
+                    condition="f_createfile_date <= '{} 23:59:59'">
+                    :show-reset-button="true"
+                  >
+                  </datepicker>
+                </div>
                 <!--<div class="col-sm-2 form-group">-->
                 <!--<label class="font_normal_body">气表类型</label>-->
                 <!--<v-select :value.sync="model.f_meter_type" multiple-->

package/src/filiale/shanxian/EchartsBox.vue

@@ -0,0 +1,131 @@
+<template lang="html">
+  <div :class="classname" v-if="jurisdiction.includes('首页')" :style="{width:width,height:height}">
+    <div class="form-horizontal select-overspread container-fluid auto">
+      <div class="row">
+        <div class="col-sm-3 form-group">
+          <label class="font_normal_body" for="startDate">开始日期:</label>
+          <datepicker id="startDate" placeholder="开始日期"
+                      style="width:60%"
+                      v-model="model.startDate"
+                      :value.sync="model.startDate"
+                      :disabled-days-of-Week="[]"
+                      class="datepicker"
+                      :format="'yyyy-MM-dd'"
+                      :show-reset-button="reset">
+          </datepicker>
+        </div>
+        <div class="col-sm-3 form-group">
+          <label class="font_normal_body" for="endDate">结束日期:</label>
+          <datepicker id="endDate" placeholder="结束日期"
+                      style="width:60%"
+                      class="datepicker"
+                      v-model="model.endDate"
+                      :value.sync="model.endDate"
+                      :disabled-days-of-Week="[]"
+                      :format="'yyyy-MM-dd'"
+                      :show-reset-button="reset">
+          </datepicker>
+        </div>
+        <div class="col-sm-3 form-group">
+          <label class="font_normal_body" for="endDate">使用公司:</label>
+          <res-select restype='organization'
+                      @res-select="getRes"
+                      :initresid="model.id">
+          </res-select>
+          <!--<button class="button_search button_spacing" @click="changePage()">下一页</button>-->
+        </div>
+      </div>
+    </div>
+    <div style="height: 97%;" v-if="showPage === 1">
+      <div class="flex-row" style="flex: 1;border-bottom: 1px dashed #888;height: 48%">
+        <div style="flex: 1;border-right: 1px dashed #888;width: 50%">
+          <site-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
+                        v-ref:pay></site-manager>
+<!--        <test></test>-->
+        </div>
+        <div style="flex: 1;width: 50%">
+          <bank-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
+                        v-ref:pay></bank-manager>
+        </div>
+      </div>
+      <div class="flex-row" style="flex: 1;height: 48%">
+
+        <div class="flex-row" style="flex: 1;width: 50%;border-right: 1px dashed #888;">
+          <div style="flex: 1;">
+            <paymentpie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
+                        v-ref:pay></paymentpie>
+          </div>
+          <!--          <div style="flex: 1;">-->
+          <!--            <usertype-pie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></usertype-pie>-->
+          <!--          </div>-->
+        </div>
+
+        <div style="flex: 1;width: 50%">
+          <bussiness-type :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
+                          v-ref:pay></bussiness-type>
+        </div>
+      </div>
+    </div>
+    <!--<div style="height: 97%;" v-if="showPage === 2">-->
+      <!--<div class="flex-row" style="flex: 1;height: 96%">-->
+        <!--<div style="flex: 1">-->
+          <!--<gas-properties-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'></gas-properties-manager>-->
+        <!--</div>-->
+      <!--</div>-->
+    <!--</div>-->
+  </div>
+
+</template>
+
+<script>
+import * as Util from '../../Util'
+
+export default {
+  props: {
+    classname: {
+      type: String,
+      default: 'basic-main'
+    },
+    width: {
+      type: String,
+      default: '98.5%'
+    },
+    height: {
+      type: String,
+      default: '98%'
+    }
+  },
+  data () {
+    return {
+      showPage: 1,
+      page: [1, 2],
+      jurisdiction: this.$login.r,
+      model: {
+        id: [this.$login.f.orgid],
+        orgid: [this.$login.f.orgid],
+        startDate: Util.toStandardDateString(),
+        endDate: Util.toStandardDateString()
+      }
+    }
+  },
+  methods: {
+    searchdata () {
+      this.$refs.pay.searchdata()
+    },
+    changePage () {
+      let curPage = this.page.indexOf(this.showPage)
+      if (curPage + 1 === this.page.length) {
+        this.showPage = this.page[0]
+      } else {
+        this.showPage = this.page[curPage + 1]
+      }
+    },
+    getRes (obj) {
+      this.model.orgid = obj
+    }
+  }
+}
+</script>
+
+<style lang="css">
+</style>

package/src/filiale/shanxian/RecordInfoQuery.vue

@@ -493,7 +493,7 @@
                     <nobr>联系电话</nobr>
                   </th>
                   <th>
-                    <nobr>建档日期</nobr>
+                    <data-order field="f_createfile_date" name="建档日期" :order.sync="$parent.$parent.$parent.orderFields.f_createfile_date"></data-order>
                   </th>
                   <th>
                     <nobr>供气合同编号</nobr>

package/src/filiale/shanxian/reportManage.js

@@ -2,6 +2,7 @@
 import Vue from 'vue'
 
 export default function () {
+  Vue.component('echarts-box', (resolve) => { require(['./EchartsBox'], resolve) })
   // 收费查询
   Vue.component('site-manager', (resolve) => { require(['./SiteManager'], resolve) })
   // 新增用户散列图