manage-client 3.2.84-1 → 3.2.85-aode

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

@@ -1,28 +1,16 @@
 <template>
-  <tab-button class="foot_tabset" :active="-1">
-    <tabs header="客户查询" v-if="permission('客户查询')">
-      <user-query v-if="show.includes('客户查询')"></user-query>
+  <tab-button class="foot_tabset" :active="1">
+    <tabs  header="客户查询">
+      <user-query v-if="show[0]"></user-query>
     </tabs>
-    <tabs header="表具查询" v-if="permission('表具查询')">
-      <meter-query v-if="show.includes('表具查询')"></meter-query>
+    <tabs header="表具查询">
+      <meter-query ></meter-query>
     </tabs>
-    <tabs header="表具设备查询" v-if="permission('表具设备查询')">
-      <equipment-query v-if="show.includes('表具设备查询')"></equipment-query>
+    <tabs header="设备查询">
+      <equipment-query v-if="show[2]"></equipment-query>
     </tabs>
-    <tabs header="点火查询" v-if="permission('点火查询')">
-      <fire-query v-if="show.includes('点火查询')"></fire-query>
-    </tabs>
-    <tabs header="综合档案信息查询" v-if="permission('综合档案信息查询')">
-      <record-info-query v-if="show.includes('综合档案信息查询')"></record-info-query>
-    </tabs>
-    <tabs header="档案变更记录" v-if="permission('档案变更记录')">
-      <changeuser-query v-if="show.includes('档案变更记录')" @deal-msg="dealMsg"></changeuser-query>
-    </tabs>
-    <tabs header="用户设备查询" v-if="permission('用户设备查询')">
-      <user-equipment-query v-if="show.includes('用户设备查询')"></user-equipment-query>
-    </tabs>
-    <tabs header="调价记录查询" v-if="permission('调价记录查询')">
-      <price-change-query v-if="show.includes('调价记录查询')"></price-change-query>
+    <tabs header="档案变更查询">
+      <changeuser-query></changeuser-query>
     </tabs>
   </tab-button>
 
@@ -36,20 +24,10 @@
     title: '档案查询',
     data(){
       return{
-        show: []
+        show: [true]
       }
     },
     components: {Tabs, TabButton},
-    methods: {
-      permission (name) {
-        if (this.$login.r.find(value => value == '综合查询')) {
-          if (!this.$login.r.find(value => value == name)) {
-            return false
-          }
-        }
-        return true
-      }
-    }
   }
 </script>
 

package/src/components/sale/filesquery/{PriceChangeQuery.vue → ChangeUserQuery.vue}

@@ -2,7 +2,7 @@
   <div id="unit" class="flex-row" class="foot_tabset"  @keyup.enter="search">
     <div class="basic-main">
       <div class="flex" v-if="!show">
-        <criteria-paged :model="model" v-ref:paged>
+        <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>
               <div class="row">
@@ -46,7 +46,7 @@
                   <export-excel :data="$parent.$parent.getCondition"
                                 :field="$parent.$parent.getfield"
                                 :header="$parent.$parent.other"
-                                v-if="$parent.$parent.authArr.includes('档案查询导出')"
+                                v-if="$parent.$parent.authArr.includes('档案变更导出')"
                                 sqlurl="rs/logic/exportfile" sql-name="changeuserquery" template-name='档案变更导出'
                                 :choose-col="true"></export-excel>
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
@@ -69,22 +69,25 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
                          condition="f_user_phone like '%{}%'" placeholder="客户电话">
                 </div>
-
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&nbsp;旧&nbsp;气&nbsp;价</label>
-                  <v-select :value.sync="model.f_used_content"
-                            v-model="model.f_used_content"
-                            :options='$parent.$parent.price' placeholder='请选择'
-                            condition="f_used_content = '{}'"
-                            close-on-select></v-select>
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meter_number"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
+                         condition="f_card_id = '{}'" placeholder='卡号'>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&nbsp;新&nbsp;气&nbsp;价</label>
-                  <v-select :value.sync="model.f_new_content"
-                            v-model="model.f_new_content"
-                            :options='$parent.$parent.price ' placeholder='请选择'
-                            condition="f_new_content = '{}'"
-                            close-on-select></v-select>
+                  <label class="font_normal_body">更改内容</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_field_name"
+                         condition="f_field_name like '%{}%'" placeholder='更改内容'>
+<!--                  <v-select :value.sync="model.f_field_name"-->
+<!--                            v-model="model.f_field_name"-->
+<!--                            :options='$parent.$parent.field_name' placeholder='请选择'-->
+<!--                            condition="f_field_name = '{}'"-->
+<!--                            close-on-select></v-select>-->
                 </div>
               </div>
             </div>
@@ -94,7 +97,8 @@
             <template partial='head'>
               <tr>
                 <th>
-                  <nobr>客户编号</nobr>
+                  <!--<nobr>客户编号</nobr>-->
+                  <data-order field="f_userinfo_code" name="客户编号" :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
                 </th>
                 <th>
                   <nobr>客户名称</nobr>
@@ -106,16 +110,20 @@
                   <nobr>客户电话</nobr>
                 </th>
                 <th>
-                  <nobr>更改前气价</nobr>
+                  <nobr>更改内容</nobr>
                 </th>
                 <th>
-                  <nobr>更改后气价</nobr>
+                  <nobr>更改前</nobr>
+                </th>
+                <th>
+                  <nobr>更改后</nobr>
                 </th>
                 <th>
                   <nobr>操作人</nobr>
                 </th>
                 <th>
-                  <nobr>操作日期</nobr>
+                  <!--<nobr>操作日期</nobr>-->
+                  <data-order field="f_operate_date" name="操作日期" :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
                 </th>
                 <th>
                   <nobr>部门</nobr>
@@ -123,11 +131,14 @@
                 <th>
                   <nobr>公司</nobr>
                 </th>
+                <th>
+                  <nobr>修改原因</nobr>
+                </th>
               </tr>
             </template>
             <template partial='body'>
               <td style="text-align: center;"><nobr>
-                <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
+                {{row.f_userinfo_code}}
               </nobr> </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
@@ -138,6 +149,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_phone}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_field_name}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_used_content}}</nobr>
               </td>
@@ -156,14 +170,17 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_orgname}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_comments}}</nobr>
+              </td>
             </template>
             <template partial='foot'></template>
           </data-grid>
         </criteria-paged>
       </div>
-      <div class="flex" v-if="show">
-        <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
-      </div>
+<!--      <div class="flex" v-if="show">-->
+<!--        <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>-->
+<!--      </div>-->
     </div>
   </div>
 </template>
@@ -181,10 +198,9 @@
     await self.$MagLoadParams.loadParam()
     self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
-    self.getPricenames()
   }
   export default {
-    title: '调价记录查询',
+    title: '档案变更记录',
     data() {
       return {
         data: {},
@@ -192,13 +208,18 @@
         footer:[],
         meterbrands: [],
         pricenames: [],
-        model: new PagedList('rs/sql/pricechangequery', 20),
+        model: new PagedList('rs/sql/changeuserquery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],
         printshow: false,
         all: false,
         fields: {},
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         initres: {
           org:[this.$login.f.orgid],
           dep:[],
@@ -212,7 +233,7 @@
         rowdata:{},
         thead: '',
         tfoot: '',
-        price: [],
+
         // tablestate: [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '停用', value: '停用'}],
 
 
@@ -224,18 +245,6 @@
       readySomething(this)
     },
     methods: {
-      getPricenames() {
-          this.price = []
-          let priceArr = []
-        debugger
-            this.$MagGetSaleParam.prices.forEach((item) => {
-              let temp = {}
-              temp.label = item.f_price_name
-              temp.value = item.f_price_name
-              priceArr.push(temp)
-            })
-        this.price  = [{label: '全部', value: ''}, ...priceArr]
-      },
       getotherfooter () {
         // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
         // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];
@@ -259,10 +268,10 @@
       cancel() {
         this.show = false
       },
-      showmsg(obj){
-        this.rowdata=obj
-        this.show=true
-      },
+      // showmsg(obj){
+      //   this.rowdata=obj
+      //   this.show=true
+      // },
 
       selfSearch(args) {
         args.condition = `${args.condition}` + this.orgCondtionStr
@@ -277,7 +286,7 @@
         this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
         Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
           this.$refs.paged.$refs.cri.model[key] = []
-        })
+      })
       },
       show() {
         this.criteriaShow = true
@@ -325,11 +334,29 @@
         let sortModel = []
         Object.keys(this.fields).forEach((key) => {
           if (this.modelval.includes(key)) {
-            sortModel.push(key)
-          }
-        })
+          sortModel.push(key)
+        }
+      })
         this.modelval = sortModel
         console.log('选择的打印的字段', this.modelval)
+      },
+      sort (field, rule) {
+        // 将所有排序方式设为不排序，实现相互排斥
+        for (let key in this.orderFields) {
+          if (key === field) {
+            this.orderFields[key] = rule
+          } else {
+            this.orderFields[key] = 'no'
+          }
+        }
+        // 如果新规则不排序，还原为默认排序
+        if (rule === 'no') {
+          this.model.paramSource.orderitem = `'${this.orderitem}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
+        }
+
+        this.search()
       }
     },
     watch: {
@@ -356,7 +383,7 @@
         return this.$login.r ? this.$login.r : []
       },
       getCondition() {
-        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,orderitem:this.orderitem}
       },
       getfield() {
         return exportConfig.changUserConfig