manage-client 3.3.35 → 3.3.36

package/package.json

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

package/src/components/sale/businessquery/OtherChargeQuery.vue

@@ -161,7 +161,7 @@
                             placeholder='请选择'
                             condition="f_service_person ='{}'"
                             :value.sync="model.f_service_person"
-                            :options='$parent.$parent.service_person'
+                            :options='$parent.$parent.services'
                             close-on-select clear-button>
                   </v-select>
                 </div>
@@ -403,7 +403,7 @@
 </template>
 
 <script>
-  import {PagedList} from 'vue-client'
+  import {PagedList,HttpResetClass} from 'vue-client'
   import defaultPrint from '../config/DefaultPrint'
   import exportConfig from '../config/exportConfig'
   import OtherChargeDetailQuery from "./OtherChargeDetailQuery";
@@ -418,6 +418,7 @@
     await self.$MagLoadParams.loadParam()
 
     self.initParams()
+    self.initSecuritypersons()
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
   export default {
@@ -460,6 +461,7 @@
         otherchargeid:'',
         rowdata:{},
         meterbrands: [],
+        services:[],
         //合计数据
         sumsmodel: {},
         showupload:false,
@@ -495,6 +497,29 @@
         })
         this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
       },
+      // 初始化安检人
+      initSecuritypersons () {
+        let origin = this.$appdata.getSingleValue('服务人员来源')
+        if (origin) {
+          try {
+            this.services = []
+            let http = new HttpResetClass()
+            http.load('post', '/rs/search', {
+              source: `this.getParentByType($organization$).getChildByName($${origin}$).getUsers()`,
+              userid: this.$login.f.id
+            }, {resolveMsg: null, rejectMsg: null}).then((res) => {
+              console.log('获取安检人员', res.data)
+              for (let i = 0; i < res.data.length; i++) {
+                this.services.push({label: res.data[i].name, value: res.data[i].name})
+              }
+            })
+          } catch (e) {
+            console.log('获取安检人员失败')
+          }
+        }else {
+          this.services = [{label: '全部', value: ''}, ...this.$appdata.getParam('服务人员')]
+        }
+      },
       getotherfooter(){
         // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
         // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];

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

@@ -215,7 +215,7 @@ export default{
     'f_user_state': '客户状态', 'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_card_id': '卡号', 'f_user_name': '客户名称',
     'f_residential_area': '小区名称', 'f_building': '楼栋', 'f_unit': '单元', 'f_floor': '楼层', 'f_room': '门牌号', 'f_address': '详细地址',
     'f_user_phone': '联系电话', 'f_usetype': '使用类型',
-    'f_gas_date': '通气日期', 'f_price_name': '气价名称', 'f_position': '安装位置', 'f_meter_type': '类型', 'f_meter_brand': '品牌',
+    'f_gas_date': '通气日期', 'f_subscribe_date': '预约通气时间', 'f_price_name': '气价名称', 'f_position': '安装位置', 'f_meter_type': '类型', 'f_meter_brand': '品牌',
     'f_meternumber': '表号', 'f_metertitles': '表封号', 'f_aroundmeter': '表向', 'f_install_date': '气表安装日期', 'f_meter_base': '气表底数',
     'f_balance': '账户余额', 'f_hand_date': '最后抄表日期', 'f_whether_hairpin': '是否发卡',
     'f_valve_state': '阀门状态', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'value': '气价详情',

package/src/components/sale/filesquery/RecordInfoQuery.vue

@@ -404,6 +404,26 @@
                                 condition="f_gas_date <= '{} 23:59:59'">
                     </datepicker>
                   </div>
+                  <div class="col-sm-2 form-group" >
+                    <label for="startDate5" class="font_normal_body" title="预约通气时间">预约时间</label>
+                    <datepicker id="startDate5" placeholder="开始日期" style="width:60%"
+                                v-model="model.startDate5"
+                                :value.sync="model.startDate5"
+                                :format="'yyyy-MM-dd'"
+                                :show-reset-button="true"
+                                condition="f_subscribe_date >= '{} 00:00:00'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group" >
+                    <label for="endDate5" class="font_normal_body" title="预约通气时间">预约时间</label>
+                    <datepicker id="endDate5" placeholder="结束日期" style="width:60%"
+                                v-model="model.endDate5"
+                                :value.sync="model.endDate5"
+                                :format="'yyyy-MM-dd'"
+                                :show-reset-button="true"
+                                condition="f_subscribe_date <= '{} 23:59:59'">
+                    </datepicker>
+                  </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_meternumber"
@@ -625,6 +645,7 @@
                   <!--<th><nobr>通气时间</nobr></th>-->
 
 <!--                  <th><nobr>气表型号</nobr></th>-->
+                  <th><nobr>预约通气时间</nobr></th>
                   <th><nobr>表具状态</nobr></th>
                   <th><nobr>初始气表底数</nobr></th>
                   <th><nobr>累计用气金额</nobr></th>
@@ -763,6 +784,7 @@
                 <!--<td style="text-align: center;"><nobr>{{row.f_people_num}}</nobr></td>-->
 
 <!--                <td style="text-align: center;"><nobr>{{row.f_meter_style}}</nobr></td>-->
+                <td style="text-align: center;"><nobr>{{row.f_subscribe_date}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_table_state}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_initial_base}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_total_usegas_amount}}</nobr></td>

package/src/filiale/shanxian/OtherChargeQuery.vue

@@ -161,7 +161,7 @@
                             placeholder='请选择'
                             condition="f_service_person ='{}'"
                             :value.sync="model.f_service_person"
-                            :options='$parent.$parent.service_person'
+                            :options='$parent.$parent.services'
                             close-on-select clear-button>
                   </v-select>
                 </div>
@@ -403,7 +403,7 @@
 </template>
 
 <script>
-  import {PagedList} from 'vue-client'
+  import {PagedList,HttpResetClass} from 'vue-client'
   import defaultPrint from './config/DefaultPrint'
   import exportConfig from './config/exportConfig'
   import OtherChargeDetailQuery from "./OtherChargeDetailQuery";
@@ -418,6 +418,7 @@
     await self.$MagLoadParams.loadParam()
 
     self.initParams()
+    self.initSecuritypersons()
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
   export default {
@@ -450,6 +451,7 @@
         defaultfield: [],
         thead: '',
         tfoot: '',
+        services:[],
         initres: {
           org:[this.$login.f.orgid],
           dep:[],
@@ -495,6 +497,29 @@
         })
         this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
       },
+      // 初始化安检人
+      initSecuritypersons () {
+        let origin = this.$appdata.getSingleValue('服务人员来源')
+        if (origin) {
+          try {
+            this.services = []
+            let http = new HttpResetClass()
+            http.load('post', '/rs/search', {
+              source: `this.getParentByType($organization$).getChildByName($${origin}$).getUsers()`,
+              userid: this.$login.f.id
+            }, {resolveMsg: null, rejectMsg: null}).then((res) => {
+              console.log('获取安检人员', res.data)
+              for (let i = 0; i < res.data.length; i++) {
+                this.services.push({label: res.data[i].name, value: res.data[i].name})
+              }
+            })
+          } catch (e) {
+            console.log('获取安检人员失败')
+          }
+        }else {
+          this.services = [{label: '全部', value: ''}, ...this.$appdata.getParam('服务人员')]
+        }
+      },
       getotherfooter(){
         // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
         // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];