npm - manage-client - Versions diffs - 3.2.244 → 3.2.246 - Mend

manage-client 3.2.244 → 3.2.246

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 (15) hide show

package/package.json +1 -1
package/src/components/sale/businessquery/GasInspection.vue +64 -66
package/src/components/sale/businessquery/InspectListGas.vue +25 -4
package/src/components/sale/config/exportConfig.js +25 -5
package/src/filiale/WEINAN/ArchivesManage.vue +65 -0
package/src/filiale/WEINAN/BusinessManage.vue +3 -3
package/src/filiale/WEINAN/DeviceQuery.vue +582 -0
package/src/filiale/WEINAN/MeterQuery.vue +41 -41
package/src/filiale/WEINAN/RecordInfoQuery.vue +44 -45
package/src/filiale/WEINAN/UserQuery.vue +18 -18
package/src/filiale/WEINAN/sale.js +4 -0
package/src/filiale/rongchuang/RecordInfoQuery.vue +1379 -0
package/src/filiale/rongchuang/config/DefaultPrint.js +6 -0
package/src/filiale/rongchuang/config/exportConfig.js +1084 -0
package/src/filiale/rongchuang/sale.js +2 -0

package/package.json CHANGED Viewed

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

package/src/components/sale/businessquery/GasInspection.vue CHANGED Viewed

@@ -64,68 +64,6 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
-            <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
-              <label  class="font_normal_body">欠费月数&emsp;</label>
-              <div class="row">
-                <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_month_nummin"
-                        placeholder="">
-                <label   class="font_normal_body">  ≤ x ≤ </label>
-                <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_month_nummax"
-                        placeholder="">
-              </div>
-            </div>
-            <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
-              <label  class="font_normal_body">欠费条数&emsp;</label>
-              <div class="row">
-                <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_nummin"
-                        placeholder="">
-                <label   class="font_normal_body">  ≤ x ≤ </label>
-                <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_nummax"
-                       placeholder="">
-              </div>
-            </div>
-            <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
-              <label  class="font_normal_body">总欠费气量</label>
-              <div class="row">
-                <input type="text" style="width:30%" class="input_search" v-model="model.model.f_totalowe_gasmin"
-                       placeholder="">
-                <label   class="font_normal_body"> ≤ x ≤ </label>
-                <input type="text" style="width:30%" class="input_search" v-model="model.model.f_totalowe_gasmax"
-                       placeholder="">
-              </div>
-            </div>
-            <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
-              <label  class="font_normal_body">总欠费金额</label>
-              <div class="row">
-                <input type="text" style="width:30%" class="input_search" v-model="model.model.f_totalowe_feemin"
-                        placeholder="">
-                <label   class="font_normal_body">  ≤ x ≤ </label>
-                <input type="text" style="width:30%" class="input_search" v-model="model.model.f_totalowe_feemax"
-                       placeholder="">
-              </div>
-            </div>
-            <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
-              <label  class="font_normal_body">欠费月平均气量</label>
-              <div class="row">
-                <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_avg_gasmin"
-                       placeholder="">
-                <label   class="font_normal_body">  ≤ x ≤ </label>
-                <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_avg_gasmax"
-                        placeholder="">
-              </div>
-            </div>
-            <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
-              <label  class="font_normal_body">用气量&emsp;&emsp;</label>
-              <div class="row">
-                <input type="text" style="width:30%" class="input_search" v-model="model.model.f_oughtamount_min"
-                       placeholder="">
-                <label   class="font_normal_body">  ≤ x ≤ </label>
-                <input type="text" style="width:30%" class="input_search" v-model="model.model.f_oughtamount_max"
-                       placeholder="">
-              </div>
-            </div>
             <div class="col-sm-2 form-group">
               <label class="font_normal_body">表&emsp;&emsp;号&emsp;</label>
               <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
@@ -151,18 +89,18 @@
                      condition="f_userinfo_code = '{}' " placeholder="客户编号">
             </div>
             <div class="col-sm-2 form-group">
-              <label class="font_normal_body" title="旧客户编号">档案编号</label>
+              <label class="font_normal_body" title="旧客户编号">档案编号&emsp;</label>
               <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
                      condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
             </div>
             <div class="col-sm-2 form-group">
-              <label class="font_normal_body">表箱号&emsp;</label>
+              <label class="font_normal_body">表箱号&emsp;&emsp;</label>
               <input type="text" style="width:60%" class="input_search" v-model="model.f_metertitles"
                      condition="f_metertitles = '{}'" placeholder="表箱号">
             </div>
             <div class="col-sm-2 form-group">
-              <label class="font_normal_body">客户地址</label>
-              <input type="text" style="width:55%" class="input_search" v-model="model.f_address"
+              <label class="font_normal_body">客户地址&emsp;</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
                      condition="f_address like '%{}%'" placeholder='客户地址'>
             </div>
             <div class="col-sm-2 form-group">
@@ -199,7 +137,67 @@
                         close-on-select >
               </v-select>
             </div>
+            <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
+              <label  class="font_normal_body">欠费月数&emsp;</label>
+              <div class="row">
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_month_nummin"
+                       placeholder="">
+                <label   class="font_normal_body">  ≤ x ≤ </label>
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_month_nummax"
+                       placeholder="">
+              </div>
+            </div>
+            <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
+              <label  class="font_normal_body">欠费条数&emsp;</label>
+              <div class="row">
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_nummin"
+                       placeholder="">
+                <label   class="font_normal_body">  ≤ x ≤ </label>
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_nummax"
+                       placeholder="">
+              </div>
+            </div>
+            <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
+              <label  class="font_normal_body">总欠费气量</label>
+              <div class="row">
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.f_totalowe_gasmin"
+                       placeholder="">
+                <label   class="font_normal_body"> ≤ x ≤ </label>
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.f_totalowe_gasmax"
+                       placeholder="">
+              </div>
+            </div>
+            <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
+              <label  class="font_normal_body">总欠费金额</label>
+              <div class="row">
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.f_totalowe_feemin"
+                       placeholder="">
+                <label   class="font_normal_body">  ≤ x ≤ </label>
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.f_totalowe_feemax"
+                       placeholder="">
+              </div>
+            </div>
+            <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
+              <label  class="font_normal_body">欠费月平均气量</label>
+              <div class="row">
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_avg_gasmin"
+                       placeholder="">
+                <label   class="font_normal_body">  ≤ x ≤ </label>
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.qianfei_avg_gasmax"
+                       placeholder="">
+              </div>
+            </div>
+            <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
+              <label  class="font_normal_body">用气量&emsp;&emsp;</label>
+              <div class="row">
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.f_oughtamount_min"
+                       placeholder="">
+                <label   class="font_normal_body">  ≤ x ≤ </label>
+                <input type="text" style="width:30%" class="input_search" v-model="model.model.f_oughtamount_max"
+                       placeholder="">
+              </div>
+            </div>
           </div>
         </div>

package/src/components/sale/businessquery/InspectListGas.vue CHANGED Viewed

@@ -7,7 +7,7 @@
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
               <div class="row">
                 <div class="col-sm-2">
-                  <label class="font_normal_body">公&emsp;&emsp;&emsp;司</label>
+                  <label class="font_normal_body">&emsp;公&emsp;&emsp;司</label>
                   <right-tree @re-res="$parent.$parent.getorg"
                               :initresid='$parent.$parent.org'></right-tree>
                 </div>
@@ -61,7 +61,6 @@
                                 template-name='购气稽查导出'  :choose-col="true"></export-excel>
                   <print-data :model="$parent.model" :field="$parent.$parent.getfield" :defaultfield="$parent.$parent.defaultfield" print-name="稽查查询打印" :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">
@@ -113,7 +112,14 @@
                             close-on-select >
                   </v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&emsp;气表品牌</label>
+                  <v-select :value.sync="model.f_meter_brand"
+                            v-model="model.f_meter_brand"
+                            :options='$parent.$parent.meterbrands' placeholder='请选择'
+                            condition="f_meter_brand = '{}'"
+                            close-on-select></v-select>
+                </div>
                 <div class="col-sm-2">
                   <label class="font_normal_body">&emsp;&emsp;&emsp;表号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
@@ -272,7 +278,8 @@
   import plugin from 'system-clients/src/plugins/GetLoginInfoService'
   let readySomething = async function (self) {
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
     // self.$refs.paged.$refs.cri.model.startDate =  self.$login.toStandardDateString() + ' 00:00:00'
     // self.$refs.paged.$refs.cri.model.endDate =  self.$login.toStandardDateString() + ' 23:59:59'
     let year = new Date().getFullYear()
@@ -286,6 +293,7 @@
     title: '购气稽查',
     data () {
       return {
+        meterbrands: [],
         other:[],
         footer:[],
         org:[this.$login.f.orgid],
@@ -364,6 +372,19 @@
       })
     },
     methods: {
+      initParams () {
+        // 初始化气表品牌
+        let brandArr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          console.log('item-->',item)
+          let temp = {}
+          temp.label = item.label
+          temp.value = item.value.f_meter_brand
+          brandArr.push(temp)
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+        console.log('气表品牌---------->',this.meterbrands)
+      },
       getotherfooter(){
         // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
         // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];

package/src/components/sale/config/exportConfig.js CHANGED Viewed

@@ -394,11 +394,31 @@ export default{
     'f_version': '版本号', 'f_state': '状态', 'detailvalue': '气价信息'
   },
   fmygasConfig: {
-    'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_user_phone': '客户电话', 'f_credentials': '证件类型',
-    'f_idnumber': '证件号码', 'f_address': '客户地址', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_residential_area': '小区',
-    'f_meternumber': '表号', 'f_meter_brand': '气表品牌', 'f_meter_classify': '气表类型', 'f_price_value': '气价详情', 'f_createfile_date': '建档日期',
-    'f_pregas': '预购气量', 'f_preamount': '预购金额', 'f_collection': '实交金额', 'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区',
-    'f_hand_number': '抄表次数', 'f_date': '抄表区间', 'f_input_day': '天数', 'f_oughtamount': '用气量', 'f_oughtfee': '用气金额', 'f_usetype': '使用类型'
+    "f_userinfo_code": "客户编号",
+    "f_user_name": "客户名称",
+    "f_olduserinfo_code": "档案编号",
+    "f_user_phone": "客户电话",
+    "f_credentials": "证件类型",
+    "f_idnumber": "证件号码",
+    "f_residential_area": "小区",
+    "f_address": "客户地址",
+    "f_user_type": "客户类型",
+    "f_gasproperties": "用气性质",
+    "f_meternumber": "表号",
+    "f_meter_brand": "气表品牌",
+    "f_meter_classify": "气表类型",
+    "f_price_value": "气价详情",
+    "f_balance": "账户余额",
+    "f_pregas": "预购气量",
+    "f_preamount": "预购金额",
+    "f_collection": "实交金额",
+    "f_inputtor": "抄表员",
+    "f_book_slice_area": "表册片区",
+    "f_hand_number": "抄表次数",
+    "f_date": "抄表区间",
+    "f_input_day": "天数",
+    "f_oughtamount": "用气量",
+    "f_oughtfee": "用气金额"
   },
   notgasConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_user_phone': '客户电话', 'f_credentials': '证件类型',

package/src/filiale/WEINAN/ArchivesManage.vue ADDED Viewed

@@ -0,0 +1,65 @@
+<template>
+  <tab-button class="foot_tabset" :active="-1">
+    <tabs header="客户查询" v-if="permission('客户查询')">
+      <user-query v-if="show.includes('客户查询')"></user-query>
+    </tabs>
+    <tabs header="表具查询" v-if="permission('表具查询')">
+      <meter-query v-if="show.includes('表具查询')"></meter-query>
+    </tabs>
+    <tabs header="表具设备查询" v-if="permission('表具设备查询')">
+      <equipment-query v-if="show.includes('表具设备查询')"></equipment-query>
+    </tabs>
+<!--    <tabs header="点火查询" v-if="permission('点火查询')">-->
+<!--      <fire-query v-if="show.includes('点火查询')"></fire-query>-->
+<!--    </tabs>-->
+    <tabs header="综合档案信息查询" v-if="permission('综合档案信息查询')">
+      <record-info-query v-if="show.includes('综合档案信息查询')"></record-info-query>
+    </tabs>
+    <tabs header="档案变更记录" v-if="permission('档案变更记录')">
+      <changeuser-query v-if="show.includes('档案变更记录')" @deal-msg="dealMsg"></changeuser-query>
+    </tabs>
+    <tabs header="用户设备查询" v-if="permission('用户设备查询')">
+      <user-equipment-query v-if="show.includes('用户设备查询')"></user-equipment-query>
+    </tabs>
+    <tabs header="调价记录查询" v-if="permission('调价记录查询')">
+      <price-change-query v-if="show.includes('调价记录查询')"></price-change-query>
+    </tabs>
+    <tabs header="民用用气设备查询" v-if="permission('民用用气设备查询')">
+      <my-gas-device-query v-if="show.includes('民用用气设备查询')"></my-gas-device-query>
+    </tabs>
+    <tabs header="非民用用气设备查询" v-if="permission('非民用用气设备查询')">
+      <fmy-gas-device-query v-if="show.includes('非民用用气设备查询')"></fmy-gas-device-query>
+    </tabs>
+  </tab-button>
+</template>
+<script>
+  import TabButton from "./../../components/sale/common/TabButton";
+  import Tabs from "./../../components/sale/common/Tabs";
+  export default {
+    title: '档案查询',
+    data(){
+      return{
+        show: []
+      }
+    },
+    components: {Tabs, TabButton},
+    methods: {
+      permission (name) {
+        if (this.$login.r.find(value => value == '综合查询')) {
+          if (!this.$login.r.find(value => value == name)) {
+            return false
+          }
+        }
+        return true
+      }
+    }
+  }
+</script>
+<style scoped>
+</style>

package/src/filiale/WEINAN/BusinessManage.vue CHANGED Viewed

@@ -42,9 +42,9 @@
     <tabs header="调价补差查询" v-if="false">
       <priceadjust-query v-if="show.includes('调价补差查询')" @deal-msg="dealMsg" :data="data"></priceadjust-query>
     </tabs>
-<!--    <tabs header="迁表查询" v-if="permission('迁表查询')">-->
-<!--      <movemeter-query v-if="show.includes('迁表查询')" @deal-msg="dealMsg" :data="data"></movemeter-query>-->
-<!--    </tabs>-->
+    <tabs header="迁表查询" v-if="permission('迁表查询')">
+      <movemeter-query v-if="show.includes('迁表查询')" @deal-msg="dealMsg" :data="data"></movemeter-query>
+    </tabs>
 <!--    <tabs header="卡表抄表查询" v-if="permission('卡表抄表查询')">-->
 <!--      <card-handplan-query v-if="show.includes('卡表抄表查询')" @deal-msg="dealMsg" :data="data"></card-handplan-query>-->
 <!--    </tabs>-->