manage-client 3.3.86 → 3.3.88

package/package.json

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

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

@@ -1114,6 +1114,77 @@ export default{
   enterpriseGasConfig: {
     'f_userinfo_code': '燃气户号', 'f_paper_name': '企业名称', 'f_taxpayer_id': '统一社会信用代码', 'f_orgname': '燃气公司标志',
     'f_oughtamount': '用气量', 'f_oughtfee': '用气金额', 'f_whether_pay': '是否缴费', 'f_input_date': '抄表日期'
+  },
+  gasDeviceConfig: {
+    'f_residential_area': '小区名称',
+    'f_user_name': '户主姓名',
+    'f_idnumber': '身份证号',
+    'f_address': '客户地址',
+    'f_user_phone': '联系电话',
+
+    'f_meter_brand': '品牌',
+    'f_meternumber': '表号',
+    'f_meter_type': '类型',
+    'f_meter_style': '型号',
+    'f_aroundmeter': '表向',
+    'f_position': '生产年月',
+
+    'f_createfile_date': '建档日期',
+    'f_contract_id': '供用气合同编号',
+    'f_gas_date': '通气日期',
+    'f_gas_person': '通气人员',
+    'ventilation_years': '通气年限',
+    'f_defendcard': '防盗卡号',
+
+    'f_icgd_brand': '独立式可燃气体探测器品牌',
+    'f_conn_model': '接头型号',
+    'f_icgd_prdate': '生产日期',
+    'f_gssv_brand': '燃气切断电磁阀品牌',
+    'f_gssv_prdate': '生产日期',
+
+    'zaoju_brand': '品牌',
+    'zaoju_make_date': '生产日期',
+
+    'zaoju_pipe_material': '材质',
+    'zaoju_pipe_length': '长度(米)',
+    'zaoju_pipe_prdate': '生产日期',
+
+    'reshui_brand': '品牌',
+    'reshui_filing_date': '备案日期',
+    'reshui_make_date': '生产日期',
+
+    'reshui_pipe_material': '材质',
+    'reshui_pipe_length': '长度(米)',
+    'reshui_pipe_prdate': '生产日期',
+
+    'bigua_brand': '品牌',
+    'bigua_filing_date': '备案日期',
+    'bigua_make_date': '生产日期',
+
+    'bigua_pipe_material': '材质',
+    'bigua_pipe_length': '长度(米)',
+    'bigua_pipe_prdate': '生产日期',
+
+    'f_fee_type': '类型',
+    'f_money': '金额(元)',
+    'fee_operate_date': '日期',
+
+    'f_min_operate_date': '充值时间',
+    'f_preamount': '金额(元)',
+
+    'yeartimes': '充值时间',
+    'f_preamount_all': '金额(元)',
+
+    'f_upload_date': '安检日期',
+    'f_checker_name': '安检人员',
+    'f_total_gas': '用气总量',
+    'f_total_fee': '总充值额',
+    'f_balance_gas': '剩余气量',
+    'f_defect_content': '发现问题',
+    'f_repair_date': '整改日期',
+
+    'f_comments': '备注'
+
   }
 }
 

package/src/components/sale/filesquery/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/easyExcel/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>
@@ -302,7 +305,7 @@
                   <nobr>{{row.f_gssv_brand}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_icgd_prdate}}</nobr>
+                  <nobr>{{row.f_gssv_prdate}}</nobr>
                 </td>
                 <td style="text-align: center;" :class="$parent.$parent.$parent.formatTime(row.alarm_exp_date).indexOf('已过期')!==-1? 'back-red' : 'back-blue'">
                   <nobr>{{$parent.$parent.$parent.formatTime(row.alarm_exp_date)}}</nobr>
@@ -911,7 +914,7 @@
       },
 
       getCondition() {
-        return {condition: this.condition2,orderitem:this.orderitem}
+        return {condition: this.condition2,orderitem: 'f_userfiles_id desc'}
       },
       getfield() {
         let data = {}
@@ -931,7 +934,7 @@
         return data
       },
       getExportField() {
-        return exportConfig.userConfig
+        return exportConfig.gasDeviceConfig
       },
       addressstate() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]

package/src/filiale/qianneng/QnAqzzYsmx.vue

@@ -2,7 +2,7 @@
   <div id="unit" class="flex-row">
     <div class="basic-main" @keyup.enter="search" v-if="!show">
       <div class="flex">
-        <div style="flex:1;" class="flex" >
+        <!-- <div style="flex:1;" class="flex" > deleted-->
           <criteria-paged :model="model" v-ref:paged @sort="sort">
             <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
               <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
@@ -103,6 +103,59 @@
                     ></v-select>
                   </div>
                 </div>
+
+                <div class="row" v-show="$parent.$parent.criteriaShow">
+                  <div class="col-sm-2 form-group">
+                    <label for="startCreatetimegmt" class="font_normal_body">结算日期起</label>
+                    <datepicker id="startJsrq" placeholder="结算日期起" style="width:60%"
+                                v-model="model.startJsrq"
+                                :value.sync="model.startJsrq"
+                                :format="'yyyy-MM-dd HH:mm:ss'"
+                                :show-reset-button="true"
+                                condition="datefield_lmooize9 >= '{}'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label for="endCreatetimegmt" class="font_normal_body">结算日期止</label>
+                    <datepicker id="endJsrq" placeholder="结算日期止" style="width:60%"
+                                v-model="model.endJsrq"
+                                :value.sync="model.endJsrq"
+                                :format="'yyyy-MM-dd HH:mm:ss'"
+                                :show-reset-button="true"
+                                condition="datefield_lmooize9 <= '{}'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">结算人员</label>
+                    <v-select :value.sync="model.textfield_lmoi6q8p"
+                              :options='$parent.$parent.jsryArray' placeholder='请选择' v-model="model.textfield_lmoi6q8p" multiple
+                              condition="textfield_lmoi6q8p in {}"
+                    ></v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">安装施工队伍</label>
+                    <v-select :value.sync="model.departmentselectfield_lmpm06s8"
+                              :options='$parent.$parent.jsbmArray' placeholder='请选择' v-model="model.departmentselectfield_lmpm06s8" multiple
+                              condition="departmentselectfield_lmpm06s8 in {}"
+                    ></v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">队伍核对结果</label>
+                    <v-select :value.sync="model.textfield_lmpm06sb"
+                              :options='$parent.$parent.dwhdjgArray' placeholder='请选择' v-model="model.textfield_lmpm06sb" multiple
+                              condition="textfield_lmpm06sb in {}"
+                    ></v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">是否结算</label>
+                    <v-select :value.sync="model.sfjs"
+                              :options="[{label: '全部', value: ''},{label: '已结算', value: '已结算'},{label: '未结算', value: '未结算'}]"
+                              placeholder='请选择'
+                              v-model="model.sfjs"
+                              condition="sfjs in {}"
+                    ></v-select>
+                  </div>
+                </div>
               </div>
             </criteria>
 
@@ -147,15 +200,30 @@
                   <th>
                     <nobr>宜达补贴项金额</nobr>
                   </th>
-
                   <th>
                     <nobr>与收费比对结果</nobr>
                   </th>
+
+                  <th>
+                    <div style="color: teal"><nobr>结算日期</nobr></div>
+                  </th>
+                  <th>
+                    <div style="color: teal"><nobr>结算人员</nobr></div>
+                  </th>
+                  <th>
+                    <div style="color: teal"><nobr>安装施工队伍</nobr></div>
+                  </th>
+                  <th>
+                    <div style="color: teal"><nobr>结算施工队伍</nobr></div>
+                  </th>
+                  <th>
+                    <div style="color: teal"><nobr>队伍核对结果</nobr></div>
+                  </th>
                 </tr>
               </template>
               <template partial='body'>
                 <td style="text-align: center;">
-                  <a href="javascript:void(0);" onclick="window.open('dingtalk://dingtalkclient/page/link?url=https%3A%2F%2Fyzidur.aliwork.com%2FAPP_FG6RSKCTOEQ3PYSLQT6H%2FprocessDetail%3FprocInsId%3D{{row.forminstanceid}}%26formUuid%3DFORM-4G8667A1HNWACQ0E7FV1U9SI1K0O2V0WSR9ILG%26isAdmin%3Dtrue%26isRenderNav%3Dfalse%26iframeState%3Dadmin%26isFromTable%3Dtrue%26ddtab%3Dtrue')">{{row.title}}</a>
+                  <nobr><a href="javascript:void(0);" onclick="window.open('dingtalk://dingtalkclient/page/link?url=https%3A%2F%2Fyzidur.aliwork.com%2FAPP_FG6RSKCTOEQ3PYSLQT6H%2FprocessDetail%3FprocInsId%3D{{row.forminstanceid}}%26formUuid%3DFORM-4G8667A1HNWACQ0E7FV1U9SI1K0O2V0WSR9ILG%26isAdmin%3Dtrue%26isRenderNav%3Dfalse%26iframeState%3Dadmin%26isFromTable%3Dtrue%26ddtab%3Dtrue')">{{row.title}}</a></nobr>
                 </td>
                 <td style="text-align: center;">
                   <nobr>{{row.createtimegmt}}</nobr>
@@ -191,10 +259,25 @@
                 <td style="text-align: center;">
                   <nobr>{{row.ydbtxje}}</nobr>
                 </td>
-
                 <td style="text-align: center;">
                   <nobr>{{row.matchedaofeng}}</nobr>
                 </td>
+
+                <td style="text-align: center;">
+                  <nobr>{{row.datefield_lmooize9}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.textfield_lmoi6q8p}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.departmentselectfield_lmpm06s8}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.departmentselectfield_ln159o9v}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.textfield_lmpm06sb}}</nobr>
+                </td>
               </template>
               <template partial='foot'>
               </template>
@@ -211,7 +294,7 @@
               </td>
             </tr>
           </table>
-        </div>
+        <!-- </div>deleted-->
 
       </div>
     </div>
@@ -257,6 +340,9 @@ export default {
       },
       originatorArray:[],
       modifyuserArray:[],
+      jsryArray:[],
+      jsbmArray:[],
+      dwhdjgArray:[],
       //默认打印列
       defaultfield: [],
       config: {
@@ -311,6 +397,9 @@ export default {
     //self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
     this.getModifyuserArray();
     this.getOriginatorArray();
+    this.getJsryArray();
+    this.getJsbmArray();
+    this.getDwhdjgArray();
   },
   methods: {
     async getinputtores () {
@@ -373,6 +462,58 @@ export default {
       }
       this.modifyuserArray = nameArr
     },
+    async getJsryArray(){
+      let HttpReset = new HttpResetClass()
+      var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
+        data: {
+          condition: "1=1",
+          tablename: 'qn_yida_azjslr',
+          groupitem: "textfield_lmoi6q8p",
+          orderitem: 'textfield_lmoi6q8p',
+          items: 'textfield_lmoi6q8p'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取失败!'})
+      let nameArr = []
+      for (let row of data.data){
+        nameArr.push({label: row.textfield_lmoi6q8p.replace("+"," "), value: row.textfield_lmoi6q8p.replace("+"," ")})
+      }
+      this.jsryArray = nameArr
+    },
+    async getJsbmArray(){
+      let HttpReset = new HttpResetClass()
+      var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
+        data: {
+          condition: "1=1",
+          tablename: 'qn_yida_azjslr',
+          groupitem: "departmentselectfield_lmpm06s8",
+          orderitem: 'departmentselectfield_lmpm06s8',
+          items: 'departmentselectfield_lmpm06s8'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取失败!'})
+      let nameArr = []
+      for (let row of data.data){
+        nameArr.push({label: row.departmentselectfield_lmpm06s8.replace("+"," "), value: row.departmentselectfield_lmpm06s8.replace("+"," ")})
+      }
+      this.jsbmArray = nameArr
+    },
+    async getDwhdjgArray(){
+      let HttpReset = new HttpResetClass()
+      var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
+        data: {
+          condition: "1=1",
+          tablename: 'qn_yida_azjslr',
+          groupitem: "textfield_lmpm06sb",
+          orderitem: 'textfield_lmpm06sb',
+          items: 'textfield_lmpm06sb'
+        }
+      }, {resolveMsg: null, rejectMsg: '获取失败!'})
+      let nameArr = []
+      for (let row of data.data){
+        nameArr.push({label: row.textfield_lmpm06sb.replace("+"," "), value: row.textfield_lmpm06sb.replace("+"," ")})
+      }
+      this.dwhdjgArray = nameArr
+    },
+
     getotherfooter () {
       // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
       // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];

package/src/filiale/qianneng/exportConfig.js

@@ -223,7 +223,8 @@ export default{
   qnAqzzYsmx:{
     'title':'标题','createtimegmt':'发起时间','originator':'发起人','modifiedtimegmt':'验收时间','modifyuser':'验收人',
     'textfield_li9rszui':'用户编号','textfield_li9rszuj':'用户姓名',
-    'textfield_li9rszuo':'地址','afgxhje':'奥枫个性化金额','afbtxje':'奥枫补贴项金额','ydgxhje':'宜达个性化金额','ydbtxje':'宜达补贴项金额','matchedaofeng':'与收费比对结果'
+    'textfield_li9rszuo':'地址','afgxhje':'奥枫个性化金额','afbtxje':'奥枫补贴项金额','ydgxhje':'宜达个性化金额','ydbtxje':'宜达补贴项金额','matchedaofeng':'与收费比对结果',
+    'datefield_lmooize9':'结算日期','textfield_lmoi6q8p':'结算人员','departmentselectfield_lmpm06s8':'安装施工队伍','departmentselectfield_ln159o9v':'结算施工队伍','textfield_lmpm06sb':'队伍核对结果'
   },
 }
 

package/src/filiale/wenxi/GasDeviceQuery.vue

@@ -190,7 +190,7 @@
                   <th colspan="6"><nobr>燃气灶具连接管</nobr></th>
                   <th colspan="5"><nobr>燃气热水器</nobr></th>
                   <th colspan="5"><nobr>燃气壁挂炉</nobr></th>
-                  <th colspan="4"><nobr>燃气保险信息</nobr></th>
+                  <th colspan="5"><nobr>燃气保险信息</nobr></th>
                   <th colspan="2"><nobr>初次充值信息</nobr></th>
 <!--                  <th colspan="2"><nobr>每年充值</nobr></th>-->
                   <th colspan="7"><nobr>安检信息</nobr></th>

package/src/filiale/wenxi/HandplanQuery.vue

@@ -741,6 +741,7 @@
    // self.loadMeterBooks()
     self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
     self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
+    self.$refs.paged.$refs.cri.model.f_meter_classify = ['机表']
     // self.$refs.paged.$refs.cri.model.handStartDate = self.$login.toStandardDateString() + ' 00:00:00'
     // self.$refs.paged.$refs.cri.model.handEndDate = self.$login.toStandardDateString() + ' 23:59:59'
 
@@ -825,6 +826,7 @@
         inputtores:[{label: '全部',value: ''}],  //抄表员
         //表册片区
         bookSlice:[{label: '全部',value: ''}],
+        metertypes:[{label: '机表',value: '机表'}],
         imgshow:false,
         imgfilename:'',
         percent:0,
@@ -1226,9 +1228,6 @@
     },
     computed: {
 
-      metertypes() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
-      },
       banklist() {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('银行名称')]
       },