manage-client 3.3.7 → 3.3.9

package/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
 </classpath>

package/.project

@@ -10,9 +10,26 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1687159111131</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

package/package.json

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

package/src/filiale/qianneng/OtherChargeQuery.vue

@@ -180,6 +180,11 @@
                             close-on-select clear-button>
                   </v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">流水编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_serial_id"
+                         condition="f_serial_id = '{}'" placeholder='流水编号'>
+                </div>
 
               </div>
             </div>
@@ -264,6 +269,9 @@
                 <th>
                   <nobr>收费日期</nobr>
                 </th>
+                <th>
+                  <nobr>流水编号</nobr>
+                </th>
                 <th>
                   <nobr>服务人员</nobr>
                 </th>
@@ -361,6 +369,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_operate_date}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_serial_id}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_service_person}}</nobr>
               </td>

package/src/filiale/qianneng/exportConfig.js

@@ -88,7 +88,7 @@ export default{
     'f_meter_brand': '气表品牌', 'f_bill_number': '收据票号', 'f_brand_spec': '收费类型', 'f_typename': '品名规格',
     'f_typenumber': '型号', 'f_unitprice': '单价', 'f_number': '数量', 'f_money': '应收',
     'f_collection': '收款', 'f_newbalance': '支出', 'f_newcurbalance': '收入', 'f_payment': '付款方式', 'f_state': '状态',
-    'f_old_overdue': '违约金', 'f_operate_date': '收费日期', 'f_service_person': '服务人员', 'f_comments': '备注',
+    'f_old_overdue': '违约金', 'f_operate_date': '收费日期', 'f_serial_id': '流水编号', 'f_service_person': '服务人员', 'f_comments': '备注',
     'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司'
   },
   userConfig: { 'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_enter_number': '入户证号',

package/src/filiale/shanxian/ChargeQuery.vue

@@ -339,7 +339,7 @@
             </div>
           </criteria>
 
-          <data-grid :model="model" partial='list' class="list_area table_sy" style="height: 95%" v-ref:grid>
+          <data-grid :model="model" partial='list' class="list_area table_sy" style="height: 95%" :modelval="$parent.$parent.modelval" v-ref:grid >
             <template partial='head'>
               <tr>
                 <th>
@@ -824,7 +824,7 @@
       </footer>
     </modal>
   </div>
-  <high-meter-idcard :show.sync="false"  v-ref:highcard  ></high-meter-idcard>
+<!--  <high-meter-idcard :show.sync="false"  v-ref:highcard  ></high-meter-idcard>-->
 </template>
 
 <script>
@@ -862,6 +862,7 @@
     await self.$MagLoadParams.loadParam()
     self.initParams()
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
+    self.$refs.paged.$refs.grid.modelval = self.modelval
   }
   export default {
     props:['data'],
@@ -953,6 +954,7 @@
         //   {label: '二阶', value: '二阶'},
         //   {label: '三阶', value: '三阶'}
         // ]
+        modelval: ['用户编号','用户名称','用户地址','用户型号','用气性质','气量','收款','收费日期','一阶单价','二阶单价','三阶单价']
       }
     },
     ready() {
@@ -1005,14 +1007,14 @@
         cardBtnGen(this, val)
       },
       async initmeterbook(orgstr){
-        if(orgstr == null ){
-          orgstr = this.f_filialeid;
-        }
-        //获取新的抄表册,先去清理所有的抄表册
-        this.$GetSaleParam.meterbooks = [];
-        //开始加载新的抄表册
-        await this.$LoadParams.loadMeterBook(orgstr)
-        this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
+        // if(orgstr == null ){
+        //   orgstr = this.f_filialeid;
+        // }
+        // //获取新的抄表册,先去清理所有的抄表册
+        // this.$GetSaleParam.meterbooks = [];
+        // //开始加载新的抄表册
+        // await this.$LoadParams.loadMeterBook(orgstr)
+        // this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
       },
       async getinputtores () {
         // 获取抄表员
@@ -1106,7 +1108,7 @@
         //初始化气表价格
         this.prices = this.$MagGetSaleParam.getPrices();
       },
-      selfSearch(args) {
+      async selfSearch(args) {
         if (this.data) {
           this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
           this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
@@ -1120,10 +1122,12 @@
         if(this.IdCardInfo!=''){
           args.condition +=` and f_idnumber='${this.IdCardInfo}'`
         }
-        this.model.search(args.condition, args.model)
+        await this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
         this.card=''
         this.IdCardInfo=''
+        await this.$refs.paged.$refs.grid.InitializedData()
+        await this.$refs.paged.$refs.grid.displayColumnSettings(undefined)
       },
       clear() {
         //清空部门和人员

package/src/filiale/shanxian/InspectListUserNew.vue

@@ -101,16 +101,13 @@
                         close-on-select >
               </v-select>
             </div>
-            <div class="col-sm-2 flex-row" style="white-space: nowrap">
+            <div class="col-sm-2 form-group">
               <label class="font_normal_body">未购天数</label>
-              <div class="row">
-                <input type="text" style="width:30%" class="input_search" v-model="model.diffdaymin"
+                <input type="text" style="width:23%" class="input_search" v-model="model.diffdaymin"
                        condition="diffday >= {} " placeholder="">
                 <label   class="font_normal_body">  ≤ x ≤ </label>
-                <input type="text" style="width:30%" class="input_search" v-model="model.diffdaymax"
+                <input type="text" style="width:23%" class="input_search" v-model="model.diffdaymax"
                        condition="diffday <= {} " placeholder="">
-              </div>
-
             </div>
             <div class="col-sm-2 form-group" >
               <label class="font_normal_body">总购次数</label>
@@ -200,13 +197,11 @@
         <template partial='head'>
           <tr>
             <th><nobr>序号</nobr></th>
-            <th><nobr>组织机构</nobr></th>
-            <th><nobr>小区名称</nobr></th>
             <th><nobr>用户名称</nobr></th>
-            <th><nobr>详细地址</nobr></th>
+            <th><nobr>用户地址</nobr></th>
             <th><nobr>用户编号</nobr></th>
             <th><nobr>用户电话</nobr></th>
-            <!--<th><nobr>档案编号</nobr></th>-->
+            <th><nobr>档案编号</nobr></th>
             <th><nobr>表号</nobr></th>
             <th><nobr>用户状态</nobr></th>
             <th><nobr>建档日期</nobr></th>
@@ -216,30 +211,27 @@
             <th><nobr>气表品牌</nobr></th>
             <th><nobr>气价名称</nobr></th>
             <th><nobr>最后购气日期</nobr></th>
-            <th><nobr>未购气天数</nobr></th>
             <th><nobr>总购气次数</nobr></th>
-<!--            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>总抄表次数</nobr></th>-->
+            <!--            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>总抄表次数</nobr></th>-->
 
             <th><nobr>总购气量</nobr></th>
             <th><nobr>总购金额</nobr></th>
-<!--            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>总用气量</nobr></th>-->
+            <!--            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>总用气量</nobr></th>-->
 
             <th><nobr>累计未购气天数</nobr></th>
-<!--            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>累计未抄表天数</nobr></th>-->
-
+            <!--            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>累计未抄表天数</nobr></th>-->
+            <th><nobr>组织机构</nobr></th>
           </tr>
         </template>
         <template partial='body'>
           <td style="text-align: center;"><nobr>{{$index+1}}</nobr></td>
-          <th style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.f_residential_area}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_address}}</nobr></th>
           <td style="text-align: center;"><nobr>
             <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
           </nobr> </td>
           <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
-          <!--<td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</nobr></td>-->
+          <td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
           <th style="text-align: center;"><nobr>{{row.f_user_state}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_createfile_date}}</nobr></th>
@@ -249,12 +241,12 @@
           <th style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_price_name}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.delivery_date}}</nobr></th>
-          <th style="text-align: center;"><nobr>{{row.diffday}}</nobr></th>
 
           <th style="text-align: center;"><nobr>{{row.cishu}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.pregas}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.collection}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.diffday}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></th>
         </template>
       </data-grid>
     </criteria-paged>
@@ -300,11 +292,11 @@
         filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
         userid: this.$login.f.id,
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
-        getfield:{"f_orgname":"组织机构","f_residential_area":"小区名称","f_user_name":"用户名称","f_userinfo_code":"用户编号","f_address":"详细地址",
-          "f_meternumber":"表号", "f_user_state":"用户状态","f_user_phone":"用户电话","f_createfile_date":"建档日期","f_user_type":"用户类型",
+        getfield:{"f_userinfo_code":"用户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号","f_user_name":"用户名称",
+          "f_user_state":"用户状态","f_user_phone":"用户电话","f_address":"用户地址","f_createfile_date":"建档日期","f_user_type":"用户类型",
           "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
-          "delivery_date":"最后购气日期","diffday":"未购气总天数","cishu":"总购气次数","pregas":"总购气量","collection":"总购金额"
-          },
+          "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购气量","collection":"总购金额",
+          "diffday":"未购气总天数"},
         model: new PagedList('rs/sql/inspectListNew', 50,{startDate:'this.model.startDate',endDate:'this.model.endDate'},{pregas: 0,collection: 0}),
         rows: null,
         //orgid:'',

package/src/filiale/wenxi/ChargeQuery.vue

@@ -812,7 +812,7 @@
           dep:[],
           user:[]
         },
-        model: new PagedList('rs/sql/chargeQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`},{
+        model: new PagedList('rs/sql/chargeQuery', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate',orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`},{
           f_pregas: 0,
           f_preamount: 0,
           f_delaypay: 0,

package/src/filiale/wenxi/FmyGasDeviceQuery.vue

@@ -895,6 +895,9 @@ export default {
     },
   },
   computed: {
+    userstates() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('客户状态')]
+    },
     authArr () {
       return this.$login.r ? this.$login.r : []
     },
@@ -922,6 +925,9 @@ export default {
     getExportField() {
       return exportConfig.userConfig
     },
+    TableStates () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
+    },
     addressstate() {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]
     }

package/src/filiale/wenxi/GasDeviceQuery.vue

@@ -45,7 +45,10 @@
                   <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="button_clear button_spacing"  style="margin-top: 10px;background-color: #6aa6e2;"  @click="$parent.$parent.downloadFiles()">导出</button>
+                    <export-excel :data="$parent.$parent.getCondition"
+                                  :field="$parent.$parent.getExportField"
+                                  sqlurl="rs/wxEasyExcel/gasDeviceExport" sql-name="myGasDeviceQuery" template-name='民用用气设备查询'
+                                  :choose-col="true"></export-excel>
                     <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>
@@ -187,7 +190,7 @@
                   <th colspan="6"><nobr>燃气灶具连接管</nobr></th>
                   <th colspan="5"><nobr>燃气热水器</nobr></th>
                   <th colspan="5"><nobr>燃气壁挂炉</nobr></th>
-                  <th colspan="5"><nobr>燃气保险信息</nobr></th>
+                  <th colspan="4"><nobr>燃气保险信息</nobr></th>
                   <th colspan="2"><nobr>初次充值信息</nobr></th>
 <!--                  <th colspan="2"><nobr>每年充值</nobr></th>-->
                   <th colspan="7"><nobr>安检信息</nobr></th>
@@ -805,33 +808,6 @@
         }
         this.residentialArea = house
       },
-      async downloadFiles() {
-        if (this.condition2) {
-          let data = {
-            sqlName: 'myGasDeviceQuery',
-            condition: this.condition2,
-            fileName: '民用用气设备查询'
-          }
-          let HttpReset = new HttpResetClass()
-          let res = await HttpReset.load('POST', 'rs/deviceExport/gasDevices', {
-            data: data
-          }, {resolveMsg: null, rejectMsg: null})
-          if (res){
-            let downurl = 'rs/deviceExport/download?filename=民用用气设备查询.xlsx';
-            this.$resetget(downurl, {}).then(res => {
-              var link = document.createElement('a');
-              link.target = "_blank"
-              link.href = downurl;
-              link.setAttribute("download", "民用用气设备查询.xlsx"); //指定下载后的文件名，防跳转
-              document.body.appendChild(link);
-              link.click();
-            })
-          }
-        } else {
-          this.$showAlert('查询条件为空，请查询后再导出', 'warning', 3000)
-          return
-        }
-      },
       //把数据库查询数据转换为下拉数据
       calculate(rows){
         let data = []
@@ -1002,7 +978,7 @@
         return data
       },
       getExportField() {
-        return exportConfig.userConfig
+        return exportConfig.gasDeviceConfig
       },
       addressstate() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]

package/src/filiale/wenxi/RecordInfoQuery.vue

@@ -46,7 +46,7 @@
                     <export-excel :data="$parent.$parent.getCondition"
                                   :field="$parent.$parent.getExportField"
                                   v-if="$parent.$parent.authArr.includes('档案查询导出')"
-                                  sqlurl="rs/easyExcel/compreExport" sql-name="compreQuery" template-name='综合档案查询导出'  :choose-col="true"></export-excel>
+                                  sqlurl="rs/easyExcel/exportExcel" sql-name="compreQuery" template-name='综合档案查询导出'  :choose-col="true"></export-excel>
                     <print-data :sum-field="$parent.$parent.getExportField" :model="$parent.model" :field="$parent.$parent.getExportField"
                                  :defaultfield="$parent.$parent.defaultfield"
                                 titletable="综合档案查询"

package/src/filiale/wenxi/config/exportConfig.js

@@ -910,7 +910,64 @@ export default{
     'f_overCurrentProtection': '过流保护',
     'f_die_meter': '死表',
     'f_upload_type': '上报类型'
+  },
+  gasDeviceConfig: {
+    'f_userinfo_code': '客户编号',
+    'f_user_name': '客户名称',
+    'f_idnumber': '身份证号',
+    'f_user_phone': '联系电话',
+    'f_residential_area': '小区名称',
+    'f_address': '客户地址',
+    'f_user_state': '客户状态',
+    'f_meter_brand': '品牌',
+    'f_meternumber': '表号',
+    'f_meter_type': '类型',
+    'f_table_state': '型号',
+    'f_meter_style': '表向',
+    'f_aroundmeter': '上报类型',
+    'f_position': '安装位置',
+    'f_install_date': '安装日期',
+    'f_createfile_date': '建档日期',
+    'f_contract_date': '合同日期',
+    'f_open_date': '开户日期',
+    'f_open_person': '开户操作人',
+    'f_gas_date': '通气日期',
+    'f_gas_person': '通气人员',
+    'ventilation_years': '通气年限',
+    'alarm_brand': '报警器品牌',
+    'alarm_num': '数量',
+    'alarm_make_date': '生产日期',
+    'alarm_exp_date': '超期提醒',
+    'zaoju_brand': '灶具品牌',
+    'zaoju_num': '数量',
+    'zaoju_make_date': '生产日期',
+    'zaoju_exp_date': '超期提醒',
+    'f_has_pepe': '有无不锈钢波纹管',
+    'f_pipe_num': '数量',
+    'f_is_zibifa': '有无自闭阀',
+    'f_zibifa_num': '数量',
+    'zaoju_pipe_expdate': '超期提醒',
+    'reshui_brand': '品牌',
+    'reshui_num': '数量',
+    'reshui_make_date': '生产日期',
+    'reshui_exp_date': '超期提醒',
+    'bigua_brand': '品牌',
+    'bigua_num': '数量',
+    'bigua_make_date': '生产日期',
+    'bigua_exp_date': '超期提醒',
+    'f_fee_type': '类型',
+    'f_money': '金额(元)',
+    'fee_operate_date': '日期',
+    'f_expiration_date': '充值时间',
+    'f_min_operate_date': '金额(元)',
+    'f_preamount': '安检日期',
+    'f_upload_date': '安检人员',
+    'f_checker_name': '用气总量',
+    'f_total_gas': '总充值额',
+    'f_balance_gas': '剩余气量',
+    'f_defect_content': '发现问题',
+    'f_repair_date': '整改日期',
+    'f_comments': '备注'
   }
-
 }
 

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Mon Oct 26 16:02:57 CST 2020
-gradle.version=6.1.1