manage-client 3.2.88-2 → 3.2.88-aodeToV4

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

@@ -0,0 +1,149 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main">
+      <div class="flex" v-if="!show">
+    <criteria-paged :model="model" v-ref:paged>
+      <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">
+              <label class="font_normal_body">公&emsp;&emsp;司</label>
+              <right-tree @re-res="$parent.$parent.getorg"
+                          :initresid='$parent.$parent.org'></right-tree>
+            </div>
+
+            <div class="span" style="float:right;">
+              <button class="btn button_search" @click="search()">查询</button>
+              <button class="btn button_clear" @click="$parent.$parent.clear()">查询全部</button>
+              <export-excel-plus :defaultselect="$parent.$parent.selectfields" :data="$parent.$parent.getCondition"
+                            :field="$parent.$parent.getfield"
+                            :exportprogress="true"
+                            sqlurl="api/af-revenue/logic/exportfileplus"  :sql-name="$parent.$parent.sqlName" template-name='抵扣气量导出'  :choose-col="true"></export-excel-plus>
+
+              <!--<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>
+      </criteria>
+      <data-grid :model="model" partial='list' class="list_area table_sy"  v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <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'>
+          <td style="text-align: center;"><nobr>{{$index+1}}</nobr></td>
+          <th style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></th>
+          <td style="text-align: center;"><nobr>{{row.f_remanent_gas}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_deduction_gas}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.gas}}</nobr></td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+    </div>
+  </div>
+</template>
+<script>
+  /**
+   *用户档案查询列表以及添加操作组件
+   */
+  import { PagedList } from 'vue-client'
+  import Vue from 'vue'
+  import plugin from 'system-clients/src/plugins/GetLoginInfoService'
+
+  export default {
+    title: '抵扣气量',
+    data () {
+      return {
+        org:'',
+        criteriaShow: false,
+        meter_classify:'卡表',
+        filialeNameStr: null,
+        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        userid: this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
+        getfield:{"f_orgname":"组织","f_remanent_gas":"总抵扣气量","f_deduction_gas":"剩余抵扣气量","gas":"已补气量"},
+        model: new PagedList('api/af-revenue/sql/getDeductiongas', 50,{}),
+        rows: null,
+        //orgid:'',
+        sumsmodel: {},
+        sqlName:'getDeductiongas',
+        show:false,
+        rowdata:{},
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        defaultfield: [],
+        selectfields:[],
+        searchCondition:[]
+      }
+    },
+    ready () {
+
+    },
+    methods: {
+      getorg (obj) {
+        if(obj.resids.length>0){
+          this.filialeCodeStr =" and f_orgid in " + plugin.convertToIn(obj.resids)
+        }
+        else{
+          this.filialeCodeStr= ""
+        }
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+      selfSearch (args) {
+        if(!this.filialeCodeStr){
+          this.filialeCodeStr = `and c.f_orgid = ${this.$login.f.orgid}`
+        }
+        args.condition = args.condition+ ` ${this.filialeCodeStr}`
+        console.log("拼接的condition", args.condition, this.model)
+        this.model.search(args.condition, args.model)
+      },
+      // show(){
+      //   this.criteriaShow = true
+      // },
+      hidden(){
+        this.criteriaShow = !this.criteriaShow
+      },
+      clear(){
+        this.filialeCodeStr= ""
+        this.model.search('1=1')
+        // Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+        //   this.$refs.paged.$refs.cri.model[key] = []
+        // })
+      }
+
+    },
+    computed: {
+      getCondition () {
+        let result = {
+          condition: '',
+          startDate: '',
+          endDate: ''
+          // diffDay:' 1=1 '
+        }
+        result.condition = this.$refs.paged.$refs.cri.condition + this.filialeCodeStr
+          return result
+      }
+    }
+  }
+</script>
+<style media="screen">
+  .divtext {
+    min-width: 50px;
+    max-width: 200px;
+    border: 1px solid green;
+    display: inline-block;
+  }
+</style>
+

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

@@ -3,128 +3,61 @@
     <div class="basic-main" @keyup.enter="search">
       <div class="flex" v-if="!show">
 
-        <criteria-paged :model="model" v-ref:paged @sort="sort">
+        <criteria-paged :model="model" v-ref:paged>
           <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 for="startDate" class="font_normal_body" title="停用时间">开始日期</label>
+                  <label class="font_normal_body">客户编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_id"
+                         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 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">
-                  <label for="endDate" class="font_normal_body" title="停用时间">结束日期</label>
+                  <label for="endDate" class="font_normal_body">结束日期</label>
                   <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" title="旧客户编号">档案编号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
-                         condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
-                </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"
-                                sqlurl="rs/logic/exportfile" sql-name="disableQuery" template-name='停用查询导出'
+                                :defaultselect="$parent.$parent.selectfields"
+                                sqlurl="api/af-revenue/logic/exportfile" sql-name="disableQuery" 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">
-                <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>
                 <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" multiple-->
-                            <!--:options='$parent.$parent.operattype' placeholder='请选择'-->
-                            <!--condition="f_operat_type = '{}'"-->
-                            <!--close-on-select></v-select>-->
-                <!--</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_meternumber"
-                         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">停用原因</label>
-                  <v-select :value.sync="model.f_disable_reason"
-                            v-model="model.f_disable_reason" multiple
-                            :options='$parent.$parent.disablereason' placeholder='请选择'
-                            condition="f_disable_reason in {}"
-                            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_othereason"
-                         condition="f_othereason like '%{}%'" placeholder='其他原因'>
-                </div>
-                <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>
-                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
               </div>
             </div>
           </criteria>
@@ -133,32 +66,13 @@
             <template partial='head'>
               <tr>
                 <th>
-<!--                  <nobr>客户编号</nobr>-->
-                  <data-order field="f_userinfo_code" name="客户编号"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
+                  <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>-->
-                  <data-order field="f_address" name="客户地址"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+                  <nobr>客户地址</nobr>
                 </th>
                 <th>
                   <nobr>停用原因</nobr>
@@ -170,12 +84,7 @@
                   <nobr>状态</nobr>
                 </th>
                 <th>
-<!--                  <nobr>停用日期</nobr>-->
-                  <data-order field="f_operate_date" name="停用日期"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
-                </th>
-                <th>
-                  <nobr>操作类型</nobr>
+                  <nobr>停用日期</nobr>
                 </th>
                 <th>
                   <nobr>人员</nobr>
@@ -186,7 +95,6 @@
                 <th>
                   <nobr>公司</nobr>
                 </th>
-                <th><nobr>附件</nobr></th>
               </tr>
             </template>
             <template partial='body'>
@@ -197,21 +105,6 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_olduserinfo_code}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_user_type}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_user_phone}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.cy_lxr}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_userfiles_address}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_address}}</nobr>
               </td>
@@ -227,9 +120,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>
@@ -239,35 +129,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>
 
@@ -277,9 +157,8 @@
   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.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+    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()
     //self.$refs.paged.$refs.cri.model.f_sendsuccess = ['有效']
     await self.$MagLoadParams.loadParam()
@@ -287,14 +166,10 @@
     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/disableQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}),
+        model: new PagedList('api/af-revenue/sql/disableQuery', 20, {}),
         criteriaShow: false,
         headData: ["客户编号", "客户名称", "操作人", "操作日期", "停用状态", "停用原因", "其他停用原因", "同步状态"],
         bodyData: ["f_userinfo_id", "f_user_name", "f_operator", "f_operate_date", "f_state", "f_comments", "f_othereason", "f_sendsuccess"],
@@ -305,19 +180,7 @@
         printshow: false,
         all: false,
         fields: {},
-        config: {
-          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_othereason', 'f_state', 'f_operate_date', 'f_operat_type', 'f_operator']
-        },
-        //排序
-        orderitem:'f_operate_date desc',
-        orderFields: {
-          f_operate_date: 'no'
-        },
         thead: '',
-        showupload:false,
-        selected:{},
-        //默认打印列
-        defaultfield: [],
         tfoot: '',
         initres: {
           org:[this.$login.f.orgid],
@@ -326,46 +189,29 @@
         },
         //合计数据
         sumsmodel: {},
-        operattype:[{label: '全部', value: ''},{label: '停用', value: '停用'},{label: '拆表', value: '拆表'}]
+        selectfields:[]
       }
     },
+    props:['selectorg'],
     ready() {
+      if(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(){
         this.$refs.paged.$refs.cri.search()
       },
       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
@@ -377,7 +223,7 @@
         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] = ''
         })
       },
       show() {
@@ -401,7 +247,7 @@
       put() {
         // 对Modelval进行排序
         this.sortModelval()
-        this.thead = `<tr><th colspan=${this.modelval.length}>停用查询报表</th></tr><tr>`
+        this.thead = `<tr><th colspan=${this.modelval.length}>启用查询报表</th></tr><tr>`
         for (let key of this.modelval) {
           this.thead += '<th>' + this.fields[key] + '</th>'
         }
@@ -435,26 +281,7 @@
         })
         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: {
       'all'(val) {
@@ -465,28 +292,23 @@
           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: {
       getCondition() {
-        return {
-          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
-          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"
-        }
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
       getfield() {
         return exportConfig.disableConfig
-      },
-      disablereason () {
-        return this.$appdata.getParam('停用原因')
       }
     }
   }