manage-client 3.3.125 → 3.3.126

package/package.json

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

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

@@ -1,5 +1,5 @@
 <template>
-  <tab-button class="foot_tabset" :active="-1">
+  <tab-button class="foot_tabset" :active="active">
     <tabs header="客户查询" v-if="permission('客户查询')">
       <user-query v-if="show.includes('客户查询')"></user-query>
     </tabs>
@@ -37,28 +37,52 @@
 </template>
 
 <script>
-  import TabButton from "../common/TabButton";
-  import Tabs from "../common/Tabs";
+import TabButton from "../common/TabButton";
+import Tabs from "../common/Tabs";
 
-  export default {
-    title: '档案查询',
-    data(){
-      return{
-        show: []
+export default {
+  title: '档案查询',
+  data() {
+    return {
+      show: [],
+      active: -1,
+      pageMap : {
+        '表具设备查询':2
       }
-    },
-    components: {Tabs, TabButton},
-    methods: {
-      permission (name) {
-        if (this.$login.r.find(value => value == '综合查询')) {
-          if (!this.$login.r.find(value => value == name)) {
-            return false
-          }
+    }
+  },
+  components: {Tabs, TabButton},
+  ready() {
+    console.log("查看url参数")
+    // 获取url查询参数
+    let url = window.location.href
+    let params = url.split('?')[1]
+    let config = {}
+    if (params) {
+      let arr = params.split('&')
+      arr.forEach(item => {
+        let key = decodeURIComponent(item.split('=')[0]);
+        let value = decodeURIComponent(item.split('=')[1]);
+        if (key == 'tab') {
+          this.active = this.pageMap[value]
+          this.show = [value]
+        }
+        config[key] = value
+      })
+    }
+    console.log("查看url参数", config)
+  },
+  methods: {
+    permission(name) {
+      if (this.$login.r.find(value => value == '综合查询')) {
+        if (!this.$login.r.find(value => value == name)) {
+          return false
         }
-        return true
       }
+      return true
     }
   }
+}
 </script>
 
 <style scoped>

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

@@ -226,6 +226,15 @@
                     </v-select>
                   </div>
                   <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"></res-select-group>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body" >是否到期</label>
+                    <v-select :value.sync="model.f_isexpire"
+                              v-model="model.f_isexpire"
+                              :options='$parent.$parent.isexpire' placeholder='请选择'
+                              condition="f_isexpire = '{}'"
+                              close-on-select :search="false">
+                    </v-select>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -268,6 +277,7 @@
                     <!--<nobr>到期日期</nobr>-->
                     <data-order field="f_expire_date" name="到期日期" :order.sync="$parent.$parent.$parent.orderFields.f_expire_date"></data-order>
                   </th>
+                  <th><nobr>是否到期</nobr></th>
                   <th><nobr>操作人</nobr></th>
                   <th>
                     <!--<nobr>操作时间</nobr>-->
@@ -299,6 +309,7 @@
                 <td style="text-align: center;"><nobr>{{row.f_input_person}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_input_date}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_expire_date}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_isexpire}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_operator}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_comments}}</nobr></td>
@@ -396,6 +407,7 @@
         // brand: this.$appdata.getParam('设备品牌') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('设备品牌')] : [],
         watchpurchases: this.$appdata.getParam('购买方式') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('购买方式')] : [],
         pipetype:  this.$appdata.getParam('管道类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('管道类型')] : [],
+        isexpire:  [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}, ],
         initres: {
           org:[this.$login.f.orgid],
           dep:[],

package/src/components/webmeter/DrillData/UserGasAll.vue

@@ -42,7 +42,7 @@
                     <button @click="$parent.$parent.clearmsg" class="button_clear button_spacing">清空</button>
                     <export-excel :data="$parent.$parent.getCondition()"
                                   :field="$parent.$parent.getfield"
-                                  sqlurl="rs/logic/exportfile" sql-name="webmeter_getUserGasList" template-name='用气分析'
+                                  sqlurl="rs/logic/exportfile" sql-name="webmeter_getUserGasList" template-name='未用气分析'
                                   v-ref:exports
                                   :choose-col="true"></export-excel>
                     <button class="button_export button_spacing" style="width: max-content" @click="$parent.$parent.showTotalForm()" >显示汇总</button>

package/src/filiale/WEINAN/RecordInfoQuery.vue

@@ -44,7 +44,7 @@
                                   :field="$parent.$parent.getExportField"
                                   :header="$parent.$parent.other"
                                   v-if="$parent.$parent.authArr.includes('档案查询导出')"
-                                  sqlurl="rs/logic/exportfile" sql-name="compreQuery" template-name='综合档案查询导出'  :choose-col="true"></export-excel>
+                                  sqlurl="rs/logic/exportfile" sql-name="compreQuerys" 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="综合档案查询"
@@ -162,6 +162,17 @@
 
                     </v-select>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label for="endDate" class="font_normal_body">单位名称</label>
+                    <v-select :value.sync="model.f_company_id"
+                              class="select_list select"
+                              enter-push
+                              v-model="model.f_company_id" multiple="true"
+                              @select-search="$parent.$parent.getCompanyList"
+                              :options='$parent.$parent.companyList' placeholder='单位名称'
+                              condition="f_company_id in {}">
+                    </v-select>
+                  </div>
                   <div class="col-sm-2 form-group" >
                     <label class="font_normal_body">楼&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
                     <input  type="text" style="width:60%" class="input_search" v-model="model.f_building"
@@ -768,6 +779,7 @@
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_user_state']
         },
         area: [],
+        companyList: [],
         inputtouPerson: [],
         bookinputtorperson:[],
         conditon2:'',
@@ -793,6 +805,7 @@
     },
     ready(){
       this.getaddress()
+      this.getCompanyList()
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
@@ -800,6 +813,30 @@
       })
     },
     methods: {
+      async getCompanyList(searchText){
+        let condition = ' 1 = 1 '
+        if (searchText) {
+          condition = ` f_company_name like '%${searchText}%' `
+        }
+        let HttpReset = new HttpResetClass()
+        HttpReset.load('POST', 'rs/sql/saleSingleTable?pageNo=1&pageSize=100', {
+          data: {
+            items: 'f_company_name, id',
+            tablename: 't_company',
+            orderitem: 'id desc',
+            condition: condition
+          }
+        }, {resolveMsg: null, rejectMsg: '获取单位信息失败!'}).then((req) => {
+          let redata = []
+          req.data.forEach((row, n) => {
+            redata[n] = {
+              label: row.f_company_name,
+              value: row.id
+            }
+          })
+          this.companyList = [{label: '全部', value: ''}, ...redata]
+        })
+      },
       userUseInstitutionChange () {
         this.userusenatures = []
         this.$refs.paged.$refs.cri.model.f_user_usenature = ''

package/src/filiale/WEINAN/UserGasAll.vue

@@ -193,7 +193,6 @@
                               condition="f_user_type = '{}'"
                               id="f_user_type"
                               placeholder='用户类型'
-                              @change="$parent.$parent.userTypeChange()"
                               v-model="model.f_user_type"
                               :value-single="true">
                     </v-select>
@@ -464,19 +463,6 @@ import {HttpResetClass, PagedList} from 'vue-client'
         this.getfield = this.config.excelHeaders
     },
     methods: {
-      userTypeChange () {
-        this.userusetypes = []
-        this.userusenatures = []
-        this.useinstitutions = []
-        this.$refs.paged.$refs.cri.model.f_user_usetype = ''
-        this.$refs.paged.$refs.cri.model.f_use_institution = ''
-        this.$refs.paged.$refs.cri.model.f_user_usenature = ''
-        if (this.$refs.paged.$refs.cri.model.f_user_type) {
-          console.log('this.$refs.paged.$refs.cri.model.f_user_type', this.$refs.paged.$refs.cri.model.f_user_type)
-          let str = this.$refs.paged.$refs.cri.model.f_user_type + '用气类型'
-          this.userusetypes = this.$appdata.getParam(str)
-        }
-      },
       userUseTypeChange () {
         this.useinstitutions = []
         this.userusenatures = []
@@ -629,6 +615,9 @@ import {HttpResetClass, PagedList} from 'vue-client'
       Gasusertype() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },
+      userusetypes () {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用气类型')]
+      },
       valveStatus() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
       },