manage-client 3.2.8 → 3.2.9-aode

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

@@ -1,25 +1,13 @@
 <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>
-    <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="设备查询">
+      <equipment-query v-if="show[2]"></equipment-query>
     </tabs>
   </tab-button>
 
@@ -33,20 +21,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/DeviceQuery.vue

@@ -7,45 +7,32 @@
             <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
               <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
                 <div class="row">
-                  <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_userinfo_code"
-                            condition="f_userinfo_code = '{}' " placeholder="客户编号">
-                  </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_user_name"
-                            condition="f_user_name like '%{}%'" placeholder="客户名称">
-                  </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_user_phone"
-                            condition="f_user_phone like '%{}%'" placeholder="客户电话">
-                  </div>
+                  <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"></res-select-group>
+
                   <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="btn btn-default" @click="$parent.$parent.stamp()">打印</button>-->
 
-                    <export-excel :data="$parent.$parent.getCondition"
+                    <export-excel :data="$parent.$parent.getCondition" :defaultselect="$parent.$parent.selectfields"
                                   :field="$parent.$parent.getExportField"
-                                  :header="$parent.$parent.other"
-                                  v-if="$parent.$parent.authArr.includes('档案查询导出')"
-                                  sqlurl="rs/logic/exportfile" sql-name="deviceQuery" 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="表具设备查询"
-                                :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                                  sqlurl="rs/logic/exportfile" sql-name="deviceQuery" 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>
                 <div class="row" v-show="$parent.$parent.criteriaShow">
-                  <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_address"
-                            condition="f_address like '%{}%'" placeholder='客户地址'>
+                  <div class="col-sm-2" >
+                    <label class="font_normal_body">客户编号</label>
+                    <input  type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                            condition="f_userinfo_code = '{}' " placeholder="客户编号">
+                  </div>
+                  <div class="col-sm-2" >
+                    <label class="font_normal_body">客户名称</label>
+                    <input  type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                            condition="f_user_name like '%{}%'" placeholder="客户名称">
                   </div>
-                  <div class="col-sm-2 form-group" >
+                  <div class="col-sm-2" >
                     <label class="font_normal_body">客户状态</label>
                     <v-select :value.sync="model.f_user_state"
                               v-model="model.f_user_state"
@@ -53,20 +40,18 @@
                               condition="f_user_state = '{}'"
                               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_user_type"
-                              :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
-                              condition="f_user_type = '{}'"
-                              close-on-select></v-select>
+                  <div class="col-sm-2" >
+                    <label class="font_normal_body">客户地址</label>
+                    <input  type="text" style="width:60%" class="input_search" v-model="model.f_address"
+                            condition="f_address like '%{}%'" placeholder='客户地址'>
                   </div>
-                  <div class="col-sm-2 form-group" >
-                    <label class="font_normal_body">所属表&nbsp;&nbsp;&nbsp;</label>
+                  <div class="col-sm-2" >
+                    <label class="font_normal_body">所&nbsp;属&nbsp;表</label>
                     <input  type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
                             condition="f_meternumber like '%{}%'" placeholder='所属表(表号)'>
                   </div>
 
-                  <div class="col-sm-2 form-group" >
+                  <div class="col-sm-2" >
                     <label class="font_normal_body">设备类型</label>
                     <v-select :value.sync="model.f_devices_type"
                               v-model="model.f_devices_type"
@@ -74,104 +59,18 @@
                               condition="f_devices_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.watchpurchase"
-                              v-model="model.watchpurchase"
-                              :options='$parent.$parent.watchpurchases' placeholder='请选择'
-                              condition="watchpurchase = '{}'"
-                              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_pipe_type"
-                              v-model="model.f_pipe_type"
-                              :options='$parent.$parent.pipetype' placeholder='请选择'
-                              condition="f_pipe_type = '{}'"
-                              close-on-select></v-select>
-                  </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_devices_no"
-                            condition="f_devices_no like '%{}%'" placeholder='设备编号'>
-                  </div>
-                  <div class="col-sm-2 form-group" >
+                  <div class="col-sm-2" >
                     <label class="font_normal_body">设备品牌</label>
                     <input  type="text" style="width:60%" class="input_search" v-model="model.f_brand"
                             condition="f_brand like '%{}%'" placeholder='设备品牌'>
                   </div>
-                  <div class="col-sm-2 form-group" >
+                  <div class="col-sm-2" >
                     <label class="font_normal_body">设备型号</label>
                     <input  type="text" style="width:60%" class="input_search" v-model="model.f_devices_model"
                             condition="f_devices_model like '%{}%'" placeholder='设备型号'>
                   </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_devices_num"
-                            condition="f_devices_num = {}" placeholder='设备数量'>
-                  </div>
-                  <div class="col-sm-2 form-group" >
-                    <label  class="font_normal_body" title="安装日期大于">安装日期</label>
-                    <datepicker  placeholder="安装日期大于" style="width:60%"
-                                 v-model="model.f_input_start_date"
-                                 :value.sync="model.f_input_start_date"
-                                 :format="'yyyy-MM-dd'"
-                                 :show-reset-button="true"
-                                 condition="f_input_date >= '{} 00:00:00'">
-                    </datepicker>
-                  </div>
-                  <div class="col-sm-2 form-group" >
-                    <label  class="font_normal_body" title="安装日期小于">安装日期</label>
-                    <datepicker  placeholder="安装日期小于" style="width:60%"
-                                 v-model="model.f_input_end_date"
-                                 :value.sync="model.f_input_end_date"
-                                 :format="'yyyy-MM-dd'"
-                                 :show-reset-button="true"
-                                 condition="f_input_date <= '{} 23:59:59'">
-                    </datepicker>
-                  </div>
-                  <div class="col-sm-2 form-group" >
-                    <label  class="font_normal_body" >到期日期</label>
-                    <datepicker  placeholder="到期日期大于" style="width:60%"
-                                 v-model="model.f_expire_start_date"
-                                 :value.sync="model.f_expire_start_date"
-                                 :format="'yyyy-MM-dd'"
-                                 :show-reset-button="true"
-                                 condition="f_expire_date >= '{} 00:00:00'">
-                    </datepicker>
-                  </div>
-                  <div class="col-sm-2 form-group" >
-                    <label  class="font_normal_body">到期日期</label>
-                    <datepicker  placeholder="到期日期小于" style="width:60%"
-                                 v-model="model.f_expire_end_date"
-                                 :value.sync="model.f_expire_end_date"
-                                 :format="'yyyy-MM-dd'"
-                                 :show-reset-button="true"
-                                 condition="f_expire_date <= '{} 23:59:59'">
-                    </datepicker>
-                  </div>
-                  <div class="col-sm-2 form-group" >
-                    <label  class="font_normal_body" title="生产日期大于" >生产日期</label>
-                    <datepicker  placeholder="生产日期大于" style="width:60%"
-                                 v-model="model.f_make_start_date"
-                                 :value.sync="model.f_make_start_date"
-                                 :format="'yyyy-MM-dd'"
-                                 :show-reset-button="true"
-                                 condition="f_make_date >= '{} 00:00:00'">
-                    </datepicker>
-                  </div>
-                  <div class="col-sm-2 form-group" >
-                    <label  class="font_normal_body" title="生产日期小于">生产日期</label>
-                    <datepicker  placeholder="生产日期小于" style="width:60%"
-                                 v-model="model.f_make_end_date"
-                                 :value.sync="model.f_make_end_date"
-                                 :format="'yyyy-MM-dd'"
-                                 :show-reset-button="true"
-                                 condition="f_make_date <= '{} 23:59:59'">
-                    </datepicker>
-                  </div>
-                  <div class="col-sm-2 form-group" >
-                    <label for="startDate" class="font_normal_body" title="操作开始日期">开始日期</label>
+                  <div class="col-sm-2" >
+                    <label for="startDate" class="font_normal_body">开始日期</label>
                     <datepicker id="startDate" placeholder="开始日期" style="width:60%"
                                 v-model="model.startDate"
                                 :value.sync="model.startDate"
@@ -180,8 +79,8 @@
                                 condition="f_operate_date >= '{} 00:00:00'">
                     </datepicker>
                   </div>
-                  <div class="col-sm-2 form-group" >
-                    <label for="endDate" class="font_normal_body" title="操作结束日期">结束日期</label>
+                  <div class="col-sm-2" >
+                    <label for="endDate" class="font_normal_body">结束日期</label>
                     <datepicker id="endDate" placeholder="结束日期" style="width:60%"
                                 v-model="model.endDate"
                                 :value.sync="model.endDate"
@@ -190,26 +89,7 @@
                                 condition="f_operate_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_service_life"
-                            condition="f_service_life = '{}'" placeholder='使用年限'>
-                  </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_comments"
-                            condition="f_comments like '%{}%'" placeholder='备注'>
-                  </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body" >抄表员&emsp;</label>
-                    <v-select :value.sync="model.f_inputtor"
-                              v-model="model.f_inputtor"
-                              :options='$parent.$parent.inputtores' placeholder='请选择'
-                              condition="f_inputtor = '{}'"
-                              close-on-select :search="false">
-                    </v-select>
-                  </div>
-                  <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"></res-select-group>
+
                 </div>
               </div>
             </criteria>
@@ -219,26 +99,13 @@
                 <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>
-                  <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'>
@@ -246,26 +113,13 @@
                   <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
                 </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_user_state}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
-                <td style="text-align: center;"><nobr>{{row.watchpurchase}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_devices_type}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_devices_no}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_brand}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_devices_model}}</nobr></td>
-                <td style="text-align: center;"><nobr>{{row.f_devices_num}}</nobr></td>
-                <td style="text-align: center;"><nobr>{{row.f_userinfodevices_state}}</nobr></td>
-                <td style="text-align: center;"><nobr>{{row.f_pipe_type}}</nobr></td>
-                <td style="text-align: center;"><nobr>{{row.f_make_date}}</nobr></td>
-                <td style="text-align: center;"><nobr>{{row.f_service_life}}</nobr></td>
-                <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_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>
               </template>
               <template partial='foot'>
 
@@ -276,7 +130,7 @@
           <table class="table-hover">
             <tr style="position: relative" class="table-bordered">
               <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">汇总信息</td>
-              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">暂无合计字段</td>
+              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">暂无合计字段</td>
             </tr>
           </table>
 
@@ -307,8 +161,8 @@
             </footer>
           </modal>
         </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 v-if="show">
+          <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
         </div>
       </div></div></div>
 </template>
@@ -319,42 +173,30 @@
   import exportConfig from '../config/exportConfig'
 
   let readySomething = async function (self) {
-    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
-    self.$MagGetSaleParam.initinputtor();
-    self.getinputtores();
     // self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
     // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
     // await self.$refs.paged.$refs.cri.search()
   }
   export default {
-    title: '表具设备查询',
     data() {
       return {
-        other:[],
-        footer:[],
+        selectfields:[],
         model: new PagedList('rs/sql/deviceQuery', 20),
         criteriaShow: false,
-        orgCondtionStr: '',
+        orgCondtionStr:'',
+
         modelval: [],
         printshow: false,
         all: false,
         fields: {},
         thead: '',
         tfoot: '',
-        defaultfield: [],
-        config: {
-          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone']
-        },
         show:false,
         rowdata:{},
         // 下拉框参数
-        inputtores:[],
-        usertypes:this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : [],
         userstates:this.$appdata.getParam('用户状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')] : [],
         deviceTypes: this.$appdata.getParam('设备类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('设备类型')] : [],
-        // 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('管道类型')] : [],
+        brand: this.$appdata.getParam('设备品牌') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('设备品牌')] : [],
         initres: {
           org:[this.$login.f.orgid],
           dep:[],
@@ -370,39 +212,11 @@
       }).catch((error) => {
         this.$emit('error', error)
       })
+      for(var item in exportConfig.dataReportConfig){
+        this.selectfields.push(item)
+      }
     },
     methods: {
-      async getinputtores () {
-        // 获取抄表员
-        let rs = []
-        if (this.$login.f.f_gasman.length > 0) {
-          for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
-            let temp = {
-              label: this.$login.f.f_gasman[i].name,
-              value: this.$login.f.f_gasman[i].name
-            }
-            rs.push(temp)
-          }
-        }
-        this.inputtores = [{label: '全部', value: ''}, ...rs]
-      },
-      getotherfooter () {
-        // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
-        // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];
-        this.other = [];
-        this.footer = [];
-        let exportdata = this.getCondition;
-        let otherInData = [];
-        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
-        // let footerData = [], exportfield = this.getExportField;
-        // footerData.push("合计");
-        // let self = this;
-        // for (var field in self.sumsmodel) {
-        //   footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
-        // }
-        // this.footer.push(footerData);
-        this.other.push(otherInData);
-      },
       search(){
         this.$refs.paged.$refs.cri.search()
       },
@@ -426,7 +240,7 @@
       },
       clear(){
         Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
-          this.$refs.paged.$refs.cri.model[key] = []
+          this.$refs.paged.$refs.cri.model[key] = ''
         })
       },
       hidden(){
@@ -482,20 +296,11 @@
           this.put()
         }
       },
-      sumsmodel:{
-        handler: function(val) {
-          this.getotherfooter();
-        },
-        deep: true
-      },
       'modelval.length' () {
         this.put()
       },
     },
     computed:{
-      authArr () {
-        return this.$login.r ? this.$login.r : []
-      },
       getCondition(){
         return {condition: `${this.$refs.paged.$refs.cri.condition}`+this.orgCondtionStr}
       },