manage-client 3.2.291 → 3.2.292-2

package/src/filiale/kelai/sale.js

@@ -1,13 +1,13 @@
-// 分公司特殊组件页面注册
-import Vue from 'vue'
-export default function () {
-  // 汇总查询
-  Vue.component('collect-manage', (resolve) => {require(['./CollectManage'], resolve)})
-  // 开户查询
-  Vue.component('new-account-query', (resolve) => { require(['./NewAccountQuery'], resolve) })
-  // 用户查询
-  Vue.component('user-query', (resolve) => { require(['./UserQuery'], resolve) })
-  Vue.component('area-charge-query', (resolve) => { require(['./AreaChargeQuery'], resolve) })
-  // 收费查询
-  Vue.component('charge-query', (resolve) => { require(['./ChargeQuery'], resolve) })
-}
+// 分公司特殊组件页面注册
+import Vue from 'vue'
+export default function () {
+  // 汇总查询
+  Vue.component('collect-manage', (resolve) => {require(['./CollectManage'], resolve)})
+  // 开户查询
+  Vue.component('new-account-query', (resolve) => { require(['./NewAccountQuery'], resolve) })
+  // 用户查询
+  Vue.component('user-query', (resolve) => { require(['./UserQuery'], resolve) })
+  Vue.component('area-charge-query', (resolve) => { require(['./AreaChargeQuery'], resolve) })
+  // 收费查询
+  Vue.component('charge-query', (resolve) => { require(['./ChargeQuery'], 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/BankManager.vue

@@ -60,7 +60,7 @@ export default {
     set (naturedata, num1, num2, num3) {
       this.xc = echarts.init(document.getElementById('bm'))
       this.xc.setOption({
-        color: ['#FE974B', '#3D72FF', '#00C953'],
+        color: ['#7dabbf', '#9ac57d', '#cfcbbf'],
         title: {
           text: '新增用户散列图',
           subtext: '数据查询来源',