sale-client 3.6.118 → 3.6.119

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.118",
+  "version": "3.6.119",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/common/userinfo_detail/ic_detail/AutomaticPurse.vue

@@ -139,6 +139,7 @@ let reprintGen = function *(self, row) {
         }, ...this.$appdata.getParam('缴费状态')] : [],
         // 控制单选
         radio: [],
+        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
         // 选中的页
         all: [],
         // row数据

package/src/components/common/userinfo_detail/ic_detail/CardHandRecord.vue

@@ -141,6 +141,7 @@
         all: [],
         // row数据
         rowsdata: [],
+        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
         fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_meternumber': '表号', 'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_real_amount': '用气量', 'f_real_amount': '补差气量', 'f_change_price': '补差单价', 'f_real_fee': '补差金额', 'f_hand_date': '录入日期', 'f_inputtor': '抄表员', 'f_meter_state': '抄表状态', 'f_operator': '操作人'},
         defaultfield: [
           'f_userinfo_code', 'f_user_name', 'f_meternumber', 'f_last_tablebase', 'f_tablebase', 'f_real_amount', 'f_real_amount', 'f_change_price', 'f_change_price', 'f_real_fee', 'f_hand_date', 'f_inputtor', 'f_meter_state', 'f_inputtor', 'f_operator'
@@ -156,7 +157,7 @@
     },
     methods: {
       async search () {
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}' and f_orgid = '${this.$login.f.orgid}'`
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' and f_orgid = '${this.$login.f.orgid}'`
         this.model.search(this.condition, this.model)
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/sale_cardhandplanQuery', {

package/src/components/common/userinfo_detail/ic_detail/ChangeMeterQueryUser.vue

@@ -115,6 +115,7 @@
         }, ...this.$appdata.getParam('是否有效')] : [],
         // row数据
         rowsdata: [],
+        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
         fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_type': '换表类型', 'f_meter_base': '旧表底数', 'f_newmeter_base': '新表底数', 'f_changemeter_fee': '换表费', 'f_operator': '操作员', 'f_changemeter_date': '换表日期'},
         defaultfield: [
           'f_userinfo_code', 'f_user_name', 'f_type', 'f_meter_base', 'f_newmeter_base', 'f_changemeter_fee', 'f_operator', 'f_changemeter_date'
@@ -130,7 +131,7 @@
     },
     methods: {
       async search () {
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}' and f_orgid = '${this.$login.f.orgid}'`
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' and f_orgid = '${this.$login.f.orgid}'`
         this.model.search(this.condition, this.model)
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/sale_ChangeMeterQuery', {

package/src/components/common/userinfo_detail/ic_detail/ChangeRecord.vue

@@ -92,6 +92,7 @@
         radio: [],
         // 选中的页
         all: [],
+        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
         // row数据
         rowsdata: [],
         fields: {'f_userinfo_code': '用户编号',
@@ -126,7 +127,7 @@
     },
     methods: {
       async search () {
-        this.condition = `i.f_user_id = '${this.row.f_user_id}' and u.f_orgid = '${this.$login.f.orgid}' and  ${this.$refs.paged.$refs.criteria.condition}`
+        this.condition = `i.${this.searchValue} = '${this.row[this.searchValue]}' and u.f_orgid = '${this.$login.f.orgid}' and  ${this.$refs.paged.$refs.criteria.condition}`
         this.model.search(this.condition, this.model)
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/getChangeRecord', {

package/src/components/common/userinfo_detail/ic_detail/ChargeQueryUser.vue

@@ -250,6 +250,7 @@ export default {
       }, ...this.$appdata.getParam('收费类型')] : [],
       // 控制单选
       radio: [],
+      searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
       // 选中的页
       all: [],
       other: [],
@@ -317,7 +318,7 @@ export default {
     },
     async search () {
       console.log('aaa:', this.$refs.paged.$refs.criteria.condition)
-      this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}' and f_orgid = '${this.$login.f.orgid}'`
+      this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' and f_orgid = '${this.$login.f.orgid}'`
       this.model.search(this.condition, this.model)
       this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       let http = new HttpResetClass()

package/src/components/common/userinfo_detail/ic_detail/FillCardQueryUser.vue

@@ -79,6 +79,7 @@
         all: [],
         // row数据
         rowsdata: [],
+        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
         fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_card_id': '卡号', 'f_meter_brand': '气表品牌', 'f_reason': '补卡原因', 'f_cardfees': '卡费', 'f_operate_date': '补卡日期'},
         defaultfield: [
           'f_userinfo_code', 'f_user_name', 'f_card_id', 'f_meter_brand', 'f_reason', 'f_cardfees', 'f_operate_date'
@@ -95,7 +96,7 @@
     methods: {
       async search () {
         if (this.row.f_meter_type.includes('卡表')) {
-          this.condition = `f_user_id = '${this.row.f_user_id}' and f_orgid = '${this.$login.f.orgid}'`
+          this.condition = `${this.searchValue} = '${this.row[this.searchValue]}' and f_orgid = '${this.$login.f.orgid}'`
           if (this.$refs.paged.$refs.criteria.condition) {
             this.condition += `and ${this.$refs.paged.$refs.criteria.condition}`
           }

package/src/components/common/userinfo_detail/ic_detail/FillGasQueryUser.vue

@@ -103,6 +103,7 @@
         all: [],
         // row数据
         rowsdata: [],
+        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
         fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_pregas': '补气量', 'f_preamount': '补气金额', 'f_type ': '补气类型', 'f_operate_date': '补气日期'},
         defaultfield: [
           'f_userinfo_code', 'f_user_name', 'f_pregas', 'f_preamount', 'f_type ', 'f_operate_date'
@@ -118,7 +119,7 @@
     },
     methods: {
       async search () {
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}'`
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f.${this.searchValue} = '${this.row[this.searchValue]}'`
         this.model.search(this.condition, this.model)
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/sale_FillGasQuery', {

package/src/components/common/userinfo_detail/ic_detail/HandQueryUser.vue

@@ -57,7 +57,7 @@
                             :starthead="$parent.$parent.starthead"
                             titletable="预存气费打印明细"
                              ></print-data>
-                <export-excel :data="{condition:$parent.$parent.condition}"
+                <export-excel :data="$parent.$parent.getCondition"
                               :field="$parent.$parent.fields"
                               sqlurl="rs/logic/saleExport" sql-name="sale_HandplanQuery" template-name='抄表查询'
                               v-ref:exports
@@ -207,6 +207,7 @@
         all: [],
         // row数据
         rowsdata: [],
+        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
         starthead: '',
         fields: {'f_userinfo_code': '用户编号',
           'f_user_name': '姓名',
@@ -252,12 +253,13 @@
       //   this.model.search(this.condition, this.model)
       // },
       async search () {
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}' and f_orgid = '${this.$login.f.orgid}'`
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' and f_orgid = '${this.$login.f.orgid}'`
         this.model.search(this.condition, this.model)
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/sale_HandplanQuery', {
           data: {
-            condition: this.condition
+            condition: this.condition,
+            f_user_id: this.row.f_user_id
           }
         }, {resolveMsg: null, rejectMsg: null})
         this.printModel.rows = res.data
@@ -351,6 +353,12 @@
       }
     },
     computed: {
+      getCondition () {
+        return {
+          condition: this.condition,
+          f_user_id: this.row.f_user_id
+        }
+      },
       whetherpaies () {
         return [
           {label: '全部', value: ''},

package/src/components/common/userinfo_detail/ic_detail/MachineRecordQuery.vue

@@ -131,6 +131,7 @@
         radio: [],
         // 选中的页
         all: [],
+        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
         // row数据
         rowsdata: [],
         fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_address': '地址',  'fee': '金额', 'gas': '气量', 'f_type': '类型', 'f_operator': '操作员', 'f_operate_date': '操作时间'},
@@ -149,7 +150,7 @@
     },
     methods: {
       async search () {
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}' and f_orgid = '${this.$login.f.orgid}'`
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' and f_orgid = '${this.$login.f.orgid}'`
         this.model.search(this.condition, this.model)
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/machineRecordQuery', {

package/src/components/common/userinfo_detail/ic_detail/OtherChargeQueryUser.vue

@@ -115,6 +115,7 @@ export default {
         }, ...this.$appdata.getParam('是否有效')] : [],
         // 控制单选
         radio: [],
+        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
         showdetail: false,
         otherchargeid: '',
         // 选中的页
@@ -139,7 +140,7 @@ export default {
     },
     methods: {
       async search () {
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}' and f_orgid = '${this.$login.f.orgid}'`
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' and f_orgid = '${this.$login.f.orgid}'`
         this.model.search(this.condition, this.model)
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/sale_OtherChargeQuery', {

package/src/components/common/userinfo_detail/ic_detail/RecordQueryUser.vue

@@ -124,6 +124,7 @@
         }, ...this.$appdata.getParam('是否有效')] : [],
         // 控制单选
         radio: [],
+        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
         // 选中的页
         all: [],
         // row数据
@@ -144,7 +145,7 @@
     },
     methods: {
       async search () {
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}' and f_orgid = '${this.$login.f.orgid}'`
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' and f_orgid = '${this.$login.f.orgid}'`
         this.model.search(this.condition, this.model)
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/sale_RecordQuery', {

package/src/components/common/userinfo_detail/ic_detail/Repurchase.vue

@@ -106,6 +106,7 @@ export default {
           label: '全部',
           value: ''
         }, ...this.$appdata.getParam('缴费状态')] : [],
+        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
         fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_preamount': '购气金额', 'f_pregas': '购气量', 'f_operate_date,': '缴费时间', 'f_operator': '操作员', 'f_comments': '备注'},
         defaultfield: [
           'f_userinfo_code', 'f_user_name', 'f_preamount', 'f_pregas', 'f_operate_date', 'f_operator', 'f_comments'
@@ -120,7 +121,7 @@ export default {
     methods: {
       async search () {
         console.log('aaa:', this.$refs.paged.$refs.criteria.condition)
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_userfiles_id = '${this.row.f_userfiles_id}'`
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}'`
         this.model.search(this.condition, this.model)
       }
     },

package/src/components/common/userinfo_detail/ic_detail/TransferQueryUser.vue

@@ -99,6 +99,7 @@
         }, ...this.$appdata.getParam('是否有效')] : [],
         // row数据
         rowsdata: [],
+        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
         fields: {'f_userinfo_code': '客户编号', 'f_user_name': '原用户姓名', 'f_newuser_name': '新用户姓名', 'f_transfer_fees': '过户费', 'f_operate_date': '过户日期'},
         defaultfield: [
           'f_userinfo_code', 'f_user_name', 'f_newuser_name', 'f_transfer_fees', 'f_operate_date'
@@ -114,7 +115,7 @@
     },
     methods: {
       async search () {
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}' and f_orgid = '${this.$login.f.orgid}'`
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' and f_orgid = '${this.$login.f.orgid}'`
         this.model.search(this.condition, this.model)
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/sale_TransferQuery', {

package/src/components/common/userinfo_detail/ic_detail/WebAutomaticPurse.vue

@@ -139,6 +139,7 @@ let reprintGen = function *(self, row) {
         }, ...this.$appdata.getParam('缴费状态')] : [],
         // 控制单选
         radio: [],
+        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
         // 选中的页
         all: [],
         // row数据

package/src/components/common/userinfo_detail/ic_detail/WebHandQueryUser.vue

@@ -167,7 +167,7 @@
     data () {
       return {
         condition: '1=1',
-        model: new PagedList(`${this.row.f_meter_type === '物联网表'?'rs/sql/sale_WebHandplanQuery':'rs/sql/sale_HandplanQuery'}`, 20, {}, {
+        model: new PagedList(`${this.row.f_meter_type === '物联网表'?'rs/sql/sale_WebHandplanQuery':'rs/sql/sale_HandplanQuery'}`, 20, {f_user_id: this.row.f_user_id}, {
           f_oughtfee: 0,
           f_oughtamount: 0,
           f_stairamount1: 0,
@@ -193,6 +193,7 @@
         all: [],
         // row数据
         rowsdata: [],
+        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
         starthead: '',
         fields: {'f_userinfo_code': '用户编号',
           'f_user_name': '姓名',
@@ -237,11 +238,12 @@
       //   this.model.search(this.condition, this.model)
       // },
       async search () {
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}' and f_orgid = '${this.$login.f.orgid}'`
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' and f_orgid = '${this.$login.f.orgid}'`
         this.model.search(this.condition, this.model)
         let http = new HttpResetClass()
         let res = await http.load('POST', `${this.row.f_meter_type === '物联网表'?'rs/sql/sale_WebHandplanQuery':'rs/sql/sale_HandplanQuery'}`, {
           data: {
+            f_user_id: this.row.f_user_id,
             condition: this.condition
           }
         }, {resolveMsg: null, rejectMsg: null})

package/src/components/revenue/comprehen/Maintenance/pictureManage/pictureListMaintain.vue

@@ -0,0 +1,370 @@
+<template>
+  <div>
+    <div  class="flex" >
+      <div class="basic-main" style="height: 98%;">
+        <criteria-paged :model="model" v-ref:paged @sort="sort">
+          <criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch"
+                    v-show="$parent.searchshow">
+            <div novalidate class="form-inline auto" partial>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">组织机构</label>
+                <res-select :initresid='$parent.$parent.curorgid'
+                            @res-select="$parent.$parent.getorg"
+                            class="select select_list"
+                            restype='organization'
+                            style="width: 60%">
+                </res-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">合同照片</label>
+                <v-select :disabled=false
+                          :options='$parent.$parent.pj'
+                          :value-single="true"
+                          :value.sync="model.f_hetong"
+                          close-on-select
+                          placeholder='请选择'
+                          v-model="model.f_hetong"
+                          condition="f_hetong  = '{}'"
+                          search=fasle
+                >
+                </v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">换表照片</label>
+                <v-select :disabled=false
+                          :options='$parent.$parent.pj'
+                          :value-single="true"
+                          :value.sync="model.f_changemeter"
+                          close-on-select
+                          placeholder='请选择'
+                          v-model="model.f_changemeter"
+                          condition="f_changemeter   = '{}'"
+                          search=fasle
+                >
+                </v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">安检照片</label>
+                <v-select :disabled=false
+                          :options='$parent.$parent.pj'
+                          :value-single="true"
+                          :value.sync="model.f_security_check"
+                          close-on-select
+                          placeholder='请选择'
+                          v-model="model.f_security_check"
+                          condition="f_security_check   = '{}'"
+                          search=fasle
+                >
+                </v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">身份证照片</label>
+                <v-select :disabled=false
+                          :options='$parent.$parent.pj'
+                          :value-single="true"
+                          :value.sync="model.f_idcard"
+                          close-on-select
+                          placeholder='请选择'
+                          v-model="model.f_idcard"
+                          condition="f_idcard   = '{}'"
+                          search=fasle
+                >
+                </v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">房产证照片</label>
+                <v-select :disabled=false
+                          :options='$parent.$parent.pj'
+                          :value-single="true"
+                          :value.sync="model.f_house"
+                          close-on-select
+                          placeholder='请选择'
+                          v-model="model.f_house"
+                          condition="f_house   = '{}'"
+                          search=fasle
+                >
+                </v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">承诺书照片</label>
+                <v-select :disabled=false
+                          :options='$parent.$parent.pj'
+                          :value-single="true"
+                          :value.sync="model.f_responsibility_letter"
+                          close-on-select
+                          placeholder='请选择'
+                          v-model="model.f_responsibility_letter"
+                          condition="f_responsibility_letter   = '{}'"
+                          search=fasle
+                >
+                </v-select>
+              </div>
+              <div class="span" style="float:right;">
+                <button class="button_search" @click="search()">查 询</button>
+              </div>
+            </div>
+          </criteria>
+          <data-grid :model="model" v-ref:grid class="list_area table_sy" partial='list'>
+            <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>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;"><nobr>{{$index + 1}}</nobr></td>
+              <td style="text-align: center;"><nobr>
+                {{row.f_userinfo_code}}
+              </nobr> </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_phone}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_address}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_orgname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <button v-if="row.f_hetong=='有'" class="btn btn-link" @click.stop="$parent.$parent.$parent.showPicture(row,'合同照片')">查看</button>
+                <button v-if="row.f_hetong=='无'" class="btn btn-link" @click.stop="$parent.$parent.$parent.uploadPicture(row,'合同照片')">上传</button>
+              </td>
+              <td style="text-align: center;">
+                <button v-if="row.f_changemeter=='有'" class="btn btn-link" @click.stop="$parent.$parent.$parent.showPicture(row,'换表&清零')">查看</button>
+              </td>
+              <td style="text-align: center;">
+                <button v-if="row.f_security_check=='有'" class="btn btn-link" @click.stop="$parent.$parent.$parent.showPicture(row,'安检照片')">查看</button>
+              </td>
+              <td style="text-align: center;">
+                <button v-if="row.f_idcard=='有'" class="btn btn-link" @click.stop="$parent.$parent.$parent.showPicture(row,'身份证照片')">查看</button>
+                <button v-if="row.f_idcard=='无'" class="btn btn-link" @click.stop="$parent.$parent.$parent.uploadPicture(row,'身份证照片')">上传</button>
+              </td>
+              <td style="text-align: center;">
+                <button v-if="row.f_house=='有'" class="btn btn-link" @click.stop="$parent.$parent.$parent.showPicture(row,'房产证照片')">查看</button>
+                <button v-if="row.f_house=='无'" class="btn btn-link" @click.stop="$parent.$parent.$parent.uploadPicture(row,'房产证照片')">上传</button>
+              </td>
+              <td style="text-align: center;">
+                <button v-if="row.f_responsibility_letter=='有'" class="btn btn-link" @click.stop="$parent.$parent.$parent.showPicture(row,'承诺书照片')">查看</button>
+                <button v-if="row.f_responsibility_letter=='无'" class="btn btn-link" @click.stop="$parent.$parent.$parent.uploadPicture(row,'承诺书照片')">上传</button>
+              </td>
+
+            </template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+    <!-- 展示图片 -->
+    <modal :show.sync="showPictures" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="close"><span>&times;</span></button>
+        <h4 class="modal-title">图片展示</h4>
+      </header>
+      <article slot="modal-body">
+        <div style="padding:0px 0px 10px 0px;margin-left: 20px;overflow: auto;">
+          <timeline >
+            <timeline-item v-for="item in files"
+                           :color="$index === files.length - 1 ? 'blue' : 'default'">
+              <div class="row" >
+
+
+                <p> {{item.days}}</p>
+
+                <!-- 派单 -->
+                <div v-for="file in item.arrays" class="col-sm-6">
+
+                  <div style="height:180px;">
+                    <img style="height:100%" :src="file.f_downloadURL"/>
+                  </div>
+
+                  <div >
+                    <div class="showtext">上传时间:&nbsp;<span>{{file.f_uploaddate}}</span></div>
+                    <div class="showtext">操作员:&nbsp;<span>{{file.f_username}}</span></div>
+                    <div class="showtext">分类:&nbsp;<span>{{file.fusetype}}</span></div>
+                    <div class="showtext">文件说明:&nbsp;{{file.fremarks}}</div>
+                    <div class="flex-row showtext">
+                      <a   target="_blank" :href="file.f_downloadURL">预览</a>
+                    </div>
+                  </div>
+                </div>
+              </div>
+
+            </timeline-item>
+          </timeline>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+    <!-- 上传图片 -->
+    <modal :show.sync="showUpload" width="80%" style="width:auto;"  v-ref:modal1 middle backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="close"><span>&times;</span></button>
+        <h4 class="modal-title">上传图片</h4>
+      </header>
+      <article slot="modal-body" style="padding:0px 0px 10px 0px;margin-left: 20px;height: 900px;">
+        <upload :blodid="modelData.f_userinfo_id"   v-ref:upload  :fusetype="modelData.fusetype" isremark="true" style="width:auto" ></upload>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  import {PagedList, HttpResetClass} from 'vue-client'
+const myMap = new Map()
+
+  export default {
+    title: '图片统计',
+    name: 'pictureManage',
+    data () {
+      return {
+        model: new PagedList('rs/sql/pictureStatisticsQuery', 20),
+        pj: [{label: '全部', value: ''}, {label: '有', value: '有'}, {label: '无', value: '无'}],
+        // 控制查询条件显示
+        searchshow: true,
+        curorgid: [this.$login.f.orgid],
+        showUpload: false,
+        showPictures: false,
+        modelData: {
+          f_userinfo_id: '',
+          fusetype: '',
+          businessid: ''
+        },
+        files: [],
+        f_orgid: '',
+        da: {
+          rows: []
+        },
+        f_meternumber: ''
+      }
+    },
+    ready () {
+      this.search()
+    },
+    methods: {
+      uploadPicture (row, val) {
+        this.modelData.fusetype = val
+        this.$refs.upload.headers.fusetype = val
+        this.modelData.f_userinfo_id = row.f_userinfo_id
+        this.showUpload = true
+      },
+      showPicture (row, val) {
+        this.fusetype = val
+        this.showPictures = true
+        this.files = []
+        let condition = `f_blobid = '${row.f_userinfo_id}' and fusetype='${val}'`
+        let http = new HttpResetClass()
+        if (row.f_userinfo_id) {
+          http.load('POST', 'rs/logic/getAllFiles', {
+            data: {
+              condition: condition
+            }
+          }, {resolveMsg: null, rejectMsg: '获取附件出错！！！'}).then((res) => {
+            for (var i = 0; i < res.data.days.length; i++) {
+              // 循环日期。将files组织成[{day:'',array:''},{day:'',array:''}...]格式
+              this.files.push({
+                days: null,
+                arrays: []
+              })
+              this.files[i].days = res.data.days[i].uploadday
+              for (var j = 0; j < res.data.array.length; j++) {
+                // 循环查出来的所有附件
+
+                if (res.data.array[j].uploadday == this.files[i].days) {
+                  // 如果使用类型包含导入字样,则是execl文件导入的,不做显示
+                  if (res.data.array[j].fusetype && res.data.array[j].f_filetype.includes('xls')) {
+                    res.data.array[j].splice(i, 1)
+                    i--
+                    continue
+                  }
+                  let temp = res.data.array[j].f_downloadpath
+                  let URL = temp.substring(temp.lastIndexOf(':\\') + 2)
+                  res.data.array[j].f_downloadURL = 'http://' + location.host + '/' + URL
+                  this.files[i].arrays.push(res.data.array[j])
+                }
+              }
+            }
+          })
+        }
+      },
+      close () {
+        this.showUpload = false
+        this.showPictures = false
+      },
+      getorg (val) {
+        this.f_orgid = this.$login.convertToIn(val)
+        this.f_filialeid = val[0]
+      },
+      search () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      selfSearch (args) {
+        if (!this.f_orgid) {
+          this.getorg([this.$login.f.orgid])
+        }
+        console.log('查询。。。', this.f_orgid)
+        if (this.f_orgid) {
+          args.condition = `${args.condition} and f_orgid  in ${this.f_orgid}`
+        }
+        this.model.search(args.condition, args.model)
+      }
+    },
+    computed: {
+      ischecked () {
+        return function (index, i) {
+          // console.log("计算属性")
+          if (!this.radio[index]) {
+            return false
+          }
+          return this.radio[index][i]
+        }
+      }
+    }
+  }
+</script>
+<style>
+  .datapanel {
+    color: #333;
+    background-color: white;
+    padding: 10px 20px;
+    border-radius: 15px;
+  }
+</style>

package/src/filiale/dongguan/components/common/userinfo_detail/ic_detail/HandQueryUser.vue

@@ -173,7 +173,7 @@
     data () {
       return {
         condition: '1=1',
-        model: new PagedList('rs/sql/sale_HandplanQuery', 20, {}, {
+        model: new PagedList('rs/sql/sale_HandplanQuery', 20, {f_user_id: this.row.f_user_id}, {
           f_oughtfee: 0,
           f_oughtamount: 0,
           f_qianfei_fee: 0,
@@ -250,7 +250,8 @@
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/sale_HandplanQuery', {
           data: {
-            condition: this.condition
+            condition: this.condition,
+            f_user_id: this.row.f_user_id
           }
         }, {resolveMsg: null, rejectMsg: null})
         this.printModel.rows = res.data

package/src/filiale/macheng/ic_detail/HandQueryUser.vue

@@ -57,7 +57,7 @@
                             :starthead="$parent.$parent.starthead"
                             titletable="预存气费打印明细"
                              ></print-data>
-                <export-excel :data="{condition:$parent.$parent.condition}"
+                <export-excel :data="$parent.$parent.getCondition"
                               :field="$parent.$parent.fields"
                               sqlurl="rs/logic/saleExport" sql-name="sale_HandplanQuery" template-name='抄表查询'
                               v-ref:exports
@@ -180,7 +180,7 @@
     data () {
       return {
         condition: '1=1',
-        model: new PagedList('rs/sql/sale_HandplanQuery', 20, {}, {
+        model: new PagedList('rs/sql/sale_HandplanQuery', 20, {f_user_id: this.row.f_user_id}, {
           f_oughtfee: 0,
           f_oughtamount: 0,
           f_qianfei_fee: 0,
@@ -257,7 +257,8 @@
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/sale_HandplanQuery', {
           data: {
-            condition: this.condition
+            condition: this.condition,
+            f_user_id: this.row.f_user_id
           }
         }, {resolveMsg: null, rejectMsg: null})
         this.printModel.rows = res.data
@@ -351,6 +352,12 @@
       }
     },
     computed: {
+      getCondition () {
+        return {
+          condition: this.condition,
+          f_user_id: this.row.f_user_id
+        }
+      },
       whetherpaies () {
         return [
           {label: '全部', value: ''},

package/src/filiale/macheng/ic_detail/WebHandQueryUser.vue

@@ -167,7 +167,7 @@
     data () {
       return {
         condition: '1=1',
-        model: new PagedList(`${this.row.f_meter_type === '物联网表'?'rs/sql/sale_WebHandplanQuery':'rs/sql/sale_HandplanQuery'}`, 20, {}, {
+        model: new PagedList(`${this.row.f_meter_type === '物联网表'?'rs/sql/sale_WebHandplanQuery':'rs/sql/sale_HandplanQuery'}`, 20, {f_user_id: this.row.f_user_id}, {
           f_oughtfee: 0,
           f_oughtamount: 0,
           f_stairamount1: 0,
@@ -242,7 +242,8 @@
         let http = new HttpResetClass()
         let res = await http.load('POST', `${this.row.f_meter_type === '物联网表'?'rs/sql/sale_WebHandplanQuery':'rs/sql/sale_HandplanQuery'}`, {
           data: {
-            condition: this.condition
+            condition: this.condition,
+            f_user_id: this.row.f_user_id
           }
         }, {resolveMsg: null, rejectMsg: null})
         this.printModel.rows = res.data

package/src/filiale/qianneng/revenue/common/ic_detail/HandQueryUser.vue

@@ -167,7 +167,7 @@
     data () {
       return {
         condition: '1=1',
-        model: new PagedList(`${this.row.f_meter_type === '物联网表'?'rs/sql/sale_WebHandplanQuery':'rs/sql/sale_HandplanQuery'}`, 20, {}, {
+        model: new PagedList(`${this.row.f_meter_type === '物联网表'?'rs/sql/sale_WebHandplanQuery':'rs/sql/sale_HandplanQuery'}`, 20, {f_user_id: this.row.f_user_id}, {
           f_oughtfee: 0,
           f_oughtamount: 0,
           f_stairamount1: 0,
@@ -242,7 +242,8 @@
         let http = new HttpResetClass()
         let res = await http.load('POST', `${this.row.f_meter_type === '物联网表'?'rs/sql/sale_WebHandplanQuery':'rs/sql/sale_HandplanQuery'}`, {
           data: {
-            condition: this.condition
+            condition: this.condition,
+            f_user_id: this.row.f_user_id
           }
         }, {resolveMsg: null, rejectMsg: null})
         this.printModel.rows = res.data
@@ -336,6 +337,12 @@
       }
     },
     computed: {
+      getCondition () {
+        return {
+          condition: this.condition,
+          f_user_id: this.row.f_user_id
+        }
+      },
       whetherpaies () {
         return [
           {label: '全部', value: ''},

package/src/filiale/tongchuan/common/userinfo_detail/ic_detail/HandQueryUser.vue

@@ -173,7 +173,7 @@
     data () {
       return {
         condition: '1=1',
-        model: new PagedList('rs/sql/sale_HandplanQuery', 20, {}, {
+        model: new PagedList('rs/sql/sale_HandplanQuery', 20, {f_user_id: this.row.f_user_id}, {
           f_oughtfee: 0,
           f_oughtamount: 0,
           f_qianfei_fee: 0,
@@ -250,7 +250,8 @@
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/sale_HandplanQuery', {
           data: {
-            condition: this.condition
+            condition: this.condition,
+            f_user_id: this.row.f_user_id
           }
         }, {resolveMsg: null, rejectMsg: null})
         this.printModel.rows = res.data

package/src/filiale/xiangyun/machineChargeQuery.vue

@@ -52,14 +52,14 @@
                   <v-select :value.sync="model.f_user_type"
                             @change="$parent.$parent.userTypeChange()"
                             :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
-                            condition="uf.f_user_type = '{}'"
+                            condition="hd.f_user_type = '{}'"
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">用气性质</label>
                   <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
                             :options='$parent.$parent.gasproperties' placeholder='请选择'
-                            condition="uf.f_gasproperties = '{}'"
+                            condition="hd.f_gasproperties = '{}'"
                             close-on-select></v-select>
                 </div>
                 <div  class="form-group" :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}">

package/src/filiale/xiangyun/machineChargeQuery1.vue

@@ -52,14 +52,14 @@
                   <v-select :value.sync="model.f_user_type"
                             @change="$parent.$parent.userTypeChange()"
                             :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
-                            condition="uf.f_user_type = '{}'"
+                            condition="hd.f_user_type = '{}'"
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">用气性质</label>
                   <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
                             :options='$parent.$parent.gasproperties' placeholder='请选择'
-                            condition="uf.f_gasproperties = '{}'"
+                            condition="hd.f_gasproperties = '{}'"
                             close-on-select></v-select>
                 </div>
                 <div

package/src/sale.js

@@ -1175,4 +1175,6 @@ export default function () {
   Vue.component('transfer-audit', (resolve) => { require(['./components/revenue/third/rizhao/transferAudit'], resolve) })
   // 日照第三方过户预约审核数据展示页面
   Vue.component('transfer-audit-dispose-basics', (resolve) => { require(['./components/revenue/third/rizhao/transferAuditDisposeBasics'], resolve) })
+  // 图片统计查询
+  Vue.component('maintenance-picture', (resolve) => { require(['./components/revenue/comprehen/Maintenance/pictureManage/pictureListMaintain'], resolve) })
 }