manage-client 3.2.7 → 3.2.8-aode

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

@@ -7,14 +7,25 @@
           <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_id"
+                         condition="f_userinfo_id = '{}' " 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='客户名称'
+                         :size="model.f_user_name ? model.f_user_name.length * 2 : 1">
+                </div>
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">开始日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
                               v-model="model.startDate"
                               :value.sync="model.startDate"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                              condition="f_operate_date >= '{}'">
+                              condition="f_operate_date >= '{} 00:00:00'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -22,79 +33,35 @@
                   <datepicker id="endDate" placeholder="结束日期" style="width:60%"
                               v-model="model.endDate"
                               :value.sync="model.endDate"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                              condition="f_operate_date <= '{}'">
+                              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_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='客户名称'
-                         :size="model.f_user_name ? model.f_user_name.length * 2 : 1">
-                </div>
                 <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.getfield"
-                                :header="$parent.$parent.other"
+                                :defaultselect="$parent.$parent.selectfields"
                                 sqlurl="rs/logic/exportfile" sql-name="enableQuery" template-name='启用查询导出'
                                 :choose-col="true"></export-excel>
-                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
-                               :defaultfield="$parent.$parent.defaultfield"
-                              titletable="启用记录"
-                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+
                   <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>
-
+              <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
               <div class="row" v-show="$parent.$parent.criteriaShow">
-                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <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>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">操作类型</label>
-                  <v-select :value.sync="model.f_operat_type"
-                            v-model="model.f_operat_type"
-                            :options='$parent.$parent.operattype' placeholder='请选择'
-                            condition="f_operat_type = '{}'"
-                            close-on-select></v-select>
-                </div>
               </div>
-              <div class="row">
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">小&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;区</label>
-                  <v-select class="select_list select"
-                            v-model="model.f_residential_area"
-                            :value.sync="model.f_residential_area"
-                            :options='$parent.$parent.residentialarea'
-                            style="width: 60%"
-                            placeholder='选择小区'
-                            condition="f_residential_area = '{}'"
-                            close-on-select>
 
-                  </v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">具体地址</label>
-                  <div class="btn-group select_list select" style="width: 60%;">
-                    <input type="text" style="width: 27%;" placeholder="楼号" class="input_search" v-model="model.f_building" condition="f_building = '{}'"/>&nbsp;-&nbsp;
-                    <input type="text" style="width: 20%;" placeholder="单元" class="input_search" v-model="model.f_unit" condition="f_unit = '{}'"/>&nbsp;-&nbsp;
-                    <input type="text" style="width: 36%;" placeholder="室号" class="input_search" v-model="model.f_room" condition="f_room = '{}'" />
-                  </div>
-                </div>
-              </div>
+
             </div>
           </criteria>
 
@@ -107,9 +74,6 @@
                 <th>
                   <nobr>客户名称</nobr>
                 </th>
-                <th>
-                  <nobr>客户类型</nobr>
-                </th>
                 <th>
                   <nobr>客户地址</nobr>
                 </th>
@@ -125,9 +89,6 @@
                 <th>
                   <nobr>启用日期</nobr>
                 </th>
-                <th>
-                  <nobr>操作类型</nobr>
-                </th>
                 <th>
                   <nobr>人员</nobr>
                 </th>
@@ -137,7 +98,6 @@
                 <th>
                   <nobr>公司</nobr>
                 </th>
-                <th><nobr>附件</nobr></th>
               </tr>
             </template>
             <template partial='body'>
@@ -148,9 +108,6 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_user_type}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_address}}</nobr>
               </td>
@@ -166,9 +123,6 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_operate_date}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_operat_type}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_operator}}</nobr>
               </td>
@@ -178,35 +132,25 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_orgname}}</nobr>
               </td>
-              <td style="text-align: center;"><nobr>
-                <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
-              </nobr></td>
             </template>
             <template partial='foot'></template>
           </data-grid>
         </criteria-paged>
 
-<!--        <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">合计:&emsp;{{sumsmodel.f_pregas}}</td>-->
-<!--          </tr>-->
-<!--        </table>-->
+        <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">合计:&emsp;{{sumsmodel.f_pregas}}</td>
+          </tr>
+        </table>
       </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>
-    <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
-      <article slot="modal-body">
-        <upload :blodid="selected.f_userinfo_id" v-ref:upload isupload="false" takeimg="false"  fusetype="启用" :isremark="false" style="width:auto" ></upload>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-      </footer>
-    </modal>
   </div>
 </template>
 
@@ -216,21 +160,17 @@
   import exportConfig from '../config/exportConfig'
 
   let readySomething = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
-    self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
+    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()
     await self.$MagLoadParams.loadParam()
-    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
   export default {
-    props:['data','residentialarea'],
-    title: '启用查询',
     data() {
       return {
         data: {},
-        other: [],
-        footer: [],
         model: new PagedList('rs/sql/enableQuery', 20, {}),
         criteriaShow: false,
         headData: ["客户编号", "客户名称", "操作人", "操作日期", "启用状态", "停用原因", "其他停用原因", "同步状态"],
@@ -240,67 +180,43 @@
         printshow: false,
         all: false,
         fields: {},
-        config: {
-          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_enable_reason', 'f_othereason', 'f_state', 'f_operate_date', 'f_operat_type', 'f_operator']
-        },
-        //默认打印列
-        defaultfield: [],
         initres: {
-          org: [this.$login.f.orgid],
-          dep: [],
-          user: [],
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
         },
-        show: false,
-        rowdata: {},
+        show:false,
+        rowdata:{},
         thead: '',
-        showupload:false,
-        selected:{},
         tfoot: '',
         //合计数据
         sumsmodel: {},
-        operattype:[{label: '全部', value: ''},{label: '启用', value: '启用'},{label: '复拆表', value: '复拆表'}]
+        selectfields:[]
       }
     },
+    props:['selectorg'],
     ready() {
+      if(this.selectorg != null && this.selectorg != null != ''){
+        this.initres.org=[]
+        this.initres.org.push(this.selectorg);
+      }
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
         this.$emit('error', error)
       })
+      for(var item in exportConfig.dataReportConfig){
+        this.selectfields.push(item)
+      }
     },
     methods: {
-      view(row){
-        this.showupload = true
-        this.selected= row
-      },
-      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.getfield;
-        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() {
+      search(){
         this.$refs.paged.$refs.cri.search()
       },
       cancel() {
         this.show = false
       },
       selfSearch(args) {
-        if (this.data) {
-          this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
-          this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
-        }
         args.condition = `${args.condition} ` + this.orgCondtionStr
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
@@ -313,13 +229,13 @@
         this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
         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] = []
+          this.$refs.paged.$refs.cri.model[key] = ''
         })
       },
       dealmsg(val) {
         console.log('---------------dealmsg')
-        this.rowdata = val
-        this.show = true
+        this.rowdata=val
+        this.show=true
         val.model = this.model.model
         this.$dispatch('deal-msg', val)
       },
@@ -376,14 +292,15 @@
           this.put()
         }
       },
-      sumsmodel: {
-        handler: function (val) {
-          this.getotherfooter();
-        },
-        deep: true
-      },
       'modelval.length'() {
         this.put()
+      },
+      'orgCondtionStr'(val) {
+        let res = val.match(/'(.*?)'/)
+        console.log('正则提取:',res && res[1])
+        if (res) {
+          this.selectorg = res[1]
+        }
       }
     },
     computed: {