safecheck-client 4.0.0-65 → 4.0.0-67

package/src/components/paper/PaperList.vue

@@ -103,53 +103,53 @@
               </div>
 
 
-            <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">安检状态</label>
-              <v-select id="f_entry"
-                        class="select_list select"
-                        placeholder='安检状态' style="width: 60%"
-                        v-model='model.f_entry'
-                        :value.sync="$parent.$parent.model.f_entry"
-                        :options='$parent.$parent.f_entry_status'
-                        condition=""
-                        :value-single="true"
-                        close-on-select clear-button></v-select>
-            </div>
-            <div class="col-sm-4 form-group" v-show="$parent.$parent.criteriaShow" style="margin: 0">
-              <role-selector-safe
-                role-name="安检员"
-                role-lable="安&nbsp;检&nbsp;员&nbsp;"
-                @re-res="$parent.$parent.getRes"
-                :value.sync="model.f_checker_id"
-                v-model="model.f_checker_id"
-                condition="f_checker_name = '{}'">
-              </role-selector-safe>
-            </div>
-            <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">片&emsp;&emsp;区</label>
-              <v-select class="select_list select"
-                        placeholder='片区/管理站' style="width: 60%"
-                        :value.sync="model.f_slice_area" v-model="model.f_slice_area"
-                        :options='$parent.$parent.sliceArea'
-                        filer-key="name"
-                        close-on-select clear-button
-                        condition="f_slice_area='{}'"
-                        @change="$parent.$parent.getmeterbook(model.f_slice_area)"
-                        :value-single="true">
-              </v-select>
-            </div>
-            <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">抄&ensp;表&ensp;册</label>
-              <v-select class="select_list select"
-                        placeholder='抄表册' style="width: 60%"
-                        :value.sync="model.f_meter_book_num" v-model="model.f_meter_book_num"
-                        :options='$parent.$parent.cbc'
-                        filer-key="name"
-                        close-on-select clear-button
-                        condition="f_meter_book_num={}"
-                        :value-single="true">
-              </v-select>
-            </div>
+              <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">安检状态</label>
+                <v-select id="f_entry"
+                          class="select_list select"
+                          placeholder='安检状态' style="width: 60%"
+                          v-model='model.f_entry'
+                          :value.sync="$parent.$parent.model.f_entry"
+                          :options='$parent.$parent.f_entry_status'
+                          condition=""
+                          :value-single="true"
+                          close-on-select clear-button></v-select>
+              </div>
+              <div class="col-sm-4 form-group" v-show="$parent.$parent.criteriaShow" style="margin: 0">
+                <role-selector-safe
+                  role-name="安检员"
+                  role-lable="安&nbsp;检&nbsp;员&nbsp;"
+                  @re-res="$parent.$parent.getRes"
+                  :value.sync="model.f_checker_id"
+                  v-model="model.f_checker_id"
+                  condition="f_checker_name = '{}'">
+                </role-selector-safe>
+              </div>
+              <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">片&emsp;&emsp;区</label>
+                <v-select class="select_list select"
+                          placeholder='片区/管理站' style="width: 60%"
+                          :value.sync="model.f_slice_area" v-model="model.f_slice_area"
+                          :options='$parent.$parent.sliceArea'
+                          filer-key="name"
+                          close-on-select clear-button
+                          condition="f_slice_area='{}'"
+                          @change="$parent.$parent.getmeterbook(model.f_slice_area)"
+                          :value-single="true">
+                </v-select>
+              </div>
+              <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">抄&ensp;表&ensp;册</label>
+                <v-select class="select_list select"
+                          placeholder='抄表册' style="width: 60%"
+                          :value.sync="model.f_meter_book_num" v-model="model.f_meter_book_num"
+                          :options='$parent.$parent.cbc'
+                          filer-key="name"
+                          close-on-select clear-button
+                          condition="f_meter_book_num={}"
+                          :value-single="true">
+                </v-select>
+              </div>
               <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
                 <label class="font_normal_body">省&ensp;市&ensp;区</label>
                 <v-select class="select_list select"
@@ -228,16 +228,16 @@
                 </v-select>
               </div>
               <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow" >
-               <label class="font_normal_body">气表品牌</label>
+                <label class="font_normal_body">气表品牌</label>
                 <v-select
-                class="select_list select"
-                placeholder='气表品牌' style="width: 60%"
-                v-model='model.tableBrand'
-                :value.sync="model.tableBrand"
-                :options='$parent.$parent.tableBrands'
-                condition="f_meter_brand = '{}'"
-                :value-single="true"
-                close-on-select clear-button></v-select>
+                  class="select_list select"
+                  placeholder='气表品牌' style="width: 60%"
+                  v-model='model.tableBrand'
+                  :value.sync="model.tableBrand"
+                  :options='$parent.$parent.tableBrands'
+                  condition="f_meter_brand = '{}'"
+                  :value-single="true"
+                  close-on-select clear-button></v-select>
               </div>
               <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
                 <label class="font_normal_body">有无计划</label>
@@ -390,7 +390,7 @@
 
             </td>
             <td style="text-align: center" v-if="$parent.$parent.$parent.audioshow">
-<!--              <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.change(row)'>查看</button>-->
+              <!--              <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.change(row)'>查看</button>-->
               <audio controls="controls" v-if="row.f_recording1_path">
                 <source type="audio/mpeg" :src="'rs/audio/file/'+row.f_recording1_path">
               </audio>
@@ -410,29 +410,29 @@
 </template>
 
 <script>
-  import {PagedList} from 'vue-client'
-  import Vue from 'vue'
-  import co from 'co'
-  import AppData from '../../stores/AppData'
-  import * as Util from '../Util'
-  import getNowDate from "../../utils/getNowDate";
-  import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
-  import BenzAMRRecorder from 'benz-amr-recorder'
-  import {toEndDateString, toStartDateString} from "../Util";
+import {PagedList} from 'vue-client'
+import Vue from 'vue'
+import co from 'co'
+import AppData from '../../stores/AppData'
+import * as Util from '../Util'
+import getNowDate from "../../utils/getNowDate";
+import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
+import BenzAMRRecorder from 'benz-amr-recorder'
+import {toEndDateString, toStartDateString} from "../Util";
 
 
-  let select = function* (self) {
-    let http = new HttpResetClass()
-    let getGasman = yield http.load('POST', '/rs/search', {
-      source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
-      userid: self.$login.f.id
-    }, {resolveMsg: null, rejectMsg: null})
-    ////tag
-    self.checkersid.push({label: '全部', value: ''})
-    getGasman.data.forEach((checker) => {
-      self.checkersid.push({label: checker.name, value: checker.id})
-    })
-  }
+let select = function* (self) {
+  let http = new HttpResetClass()
+  let getGasman = yield http.load('POST', '/rs/search', {
+    source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
+    userid: self.$login.f.id
+  }, {resolveMsg: null, rejectMsg: null})
+  ////tag
+  self.checkersid.push({label: '全部', value: ''})
+  getGasman.data.forEach((checker) => {
+    self.checkersid.push({label: checker.name, value: checker.id})
+  })
+}
 
 export default {
   title: '安检结果查看',
@@ -482,46 +482,46 @@ export default {
       model: model,
       excelHeaders: {
         //searchData:searchData,
-          'f_userinfo_code': '客户编号',
-          'f_user_name': '客户姓名',
-          'f_meternumber':'客户表号',
-          'f_user_phone':'客户电话',
-          'f_check_type': '客户类型',
-          'f_residential_area': '小区',
-          'f_address': '客户地址',
-          'f_entry_status': '安检状态',
-          'f_usegas': '用气状态',
-          'f_offsite_time': '安检时间',
-          'f_checker_name': '安检员',
-          'f_safecheck_type':'安检类型',
-          'f_repair_approved_note': '备注',
-          'f_gas_date': '开户时间',
-          'f_plan_name': '计划名称'
-        },
-        fun: this.$login.f,
-        pcds:[],
-        checkersid: [],
-        approveds:this.$appdata.getParam('安检审核状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检审核状态')]:[{label: '全部', value: ''}],
-        safetype: this.$appdata.getParam('安检类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检类型')]:[{label: '全部', value: ''}],
-        criteriaShow: false,
-        checktype: this.$appdata.getParam('用户类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]:[{label: '全部', value: ''}],
-        f_check_type:[{label:'全部',value:''},{label:'民用',value:'民用'},{label:'非民用',value:'非民用'}],
-        showModal: false,
-        safe_types:this.$appdata.getParam('计划类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('计划类型')]:[{label: '全部', value: ''}],
-        f_approval_states: this.$appdata.getParam('安检单审核状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检单审核状态')]:[{label: '全部', value: ''}],
-        f_entry_status: this.$appdata.getParam('安检状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')]:[{label: '全部', value: ''}],
-        no_checkplans: this.$appdata.getParam('有无计划')?[{label: '全部', value: ''}, ...this.$appdata.getParam('有无计划')]:[{label: '全部', value: ''}],
-        usegas: this.$appdata.getParam('用气状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('用气状态')]:[{label: '全部', value: ''}],
-        showcheckmsg: false,
-        checkInfo: {},
-        orderDefault: "'f_offsite_time'",
-        orderFields: {
-          f_offsite_time: 'no'
-        },
-        sliceArea: [],
-        cbc:[]
-      }
-    },
+        'f_userinfo_code': '客户编号',
+        'f_user_name': '客户姓名',
+        'f_meternumber':'客户表号',
+        'f_user_phone':'客户电话',
+        'f_check_type': '客户类型',
+        'f_residential_area': '小区',
+        'f_address': '客户地址',
+        'f_entry_status': '安检状态',
+        'f_usegas': '用气状态',
+        'f_offsite_time': '安检时间',
+        'f_checker_name': '安检员',
+        'f_safecheck_type':'安检类型',
+        'f_repair_approved_note': '备注',
+        'f_gas_date': '开户时间',
+        'f_plan_name': '计划名称'
+      },
+      fun: this.$login.f,
+      pcds:[],
+      checkersid: [],
+      approveds:this.$appdata.getParam('安检审核状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检审核状态')]:[{label: '全部', value: ''}],
+      safetype: this.$appdata.getParam('安检类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检类型')]:[{label: '全部', value: ''}],
+      criteriaShow: false,
+      checktype: this.$appdata.getParam('用户类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]:[{label: '全部', value: ''}],
+      f_check_type:[{label:'全部',value:''},{label:'民用',value:'民用'},{label:'非民用',value:'非民用'}],
+      showModal: false,
+      safe_types:this.$appdata.getParam('计划类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('计划类型')]:[{label: '全部', value: ''}],
+      f_approval_states: this.$appdata.getParam('安检单审核状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检单审核状态')]:[{label: '全部', value: ''}],
+      f_entry_status: this.$appdata.getParam('安检状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')]:[{label: '全部', value: ''}],
+      no_checkplans: this.$appdata.getParam('有无计划')?[{label: '全部', value: ''}, ...this.$appdata.getParam('有无计划')]:[{label: '全部', value: ''}],
+      usegas: this.$appdata.getParam('用气状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('用气状态')]:[{label: '全部', value: ''}],
+      showcheckmsg: false,
+      checkInfo: {},
+      orderDefault: "'f_offsite_time'",
+      orderFields: {
+        f_offsite_time: 'no'
+      },
+      sliceArea: [],
+      cbc:[]
+    }
+  },
   created() {
     // 使用 $on 监听事件
     this.$root.$on('audit-status-changed', () => {
@@ -533,212 +533,212 @@ export default {
     // 记得在组件销毁前移除事件监听
     this.$root.$off('audit-status-changed')
   },
-    methods: {
-      showback1(){
-        this.showinfo1 = true
-        this.showinfo2 = false
-      },
-      showback2(){
-        this.showinfo1 = true
-        this.showinfo3 = false
-      },
-            //气表品牌查询
-      getTableBrands() {
-        new HttpResetClass().load("POST", `/api/af-safecheck/sql/safe_singleTable_OrderBy`,
-          {data: {items: "*", tablename: "t_gasbrand", orderitem: "id", condition: ` 1=1 `}},
-          {resolveMsg: null, rejectMsg: null}).then((resp) => {
-          resp.data.forEach((result) => {
-            this.tableBrands.push({label: result.f_meter_brand, value: result.f_meter_brand})
-          })
-        })
-      },
-      //获取省市区列表
-      getPcd(val){
-        this.pcds = [{label:'全部',value:''}]
-        new HttpResetClass().load("POST", `/api/af-safecheck/sql/safe_singleTable_OrderBy`,
-          {data:{items:"*",tablename:"t_pcd",orderitem:"id",condition:`f_orgid in ${val}`}},
-          {resolveMsg: null, rejectMsg: null}).then((pcdlist)=>{
-          pcdlist.data.forEach((result)=>{
-            this.pcds.push({label:result.f_pcd,value:result.f_pcd})
-          })
+  methods: {
+    showback1(){
+      this.showinfo1 = true
+      this.showinfo2 = false
+    },
+    showback2(){
+      this.showinfo1 = true
+      this.showinfo3 = false
+    },
+    //气表品牌查询
+    getTableBrands() {
+      new HttpResetClass().load("POST", `/api/af-safecheck/sql/safe_singleTable_OrderBy`,
+        {data: {items: "*", tablename: "t_gasbrand", orderitem: "id", condition: ` 1=1 `}},
+        {resolveMsg: null, rejectMsg: null}).then((resp) => {
+        resp.data.forEach((result) => {
+          this.tableBrands.push({label: result.f_meter_brand, value: result.f_meter_brand})
         })
-      },
-      showaudio(){
-        //tag
-        this.audioshow=!this.audioshow
-        //tag
-      },
-      getmeterbook(val){
-        this.cbc=[]
-        this.cbc.push({
-          label:'全部',
-          value:''
+      })
+    },
+    //获取省市区列表
+    getPcd(val){
+      this.pcds = [{label:'全部',value:''}]
+      new HttpResetClass().load("POST", `/api/af-safecheck/sql/safe_singleTable_OrderBy`,
+        {data:{items:"*",tablename:"t_pcd",orderitem:"id",condition:`f_orgid in ${val}`}},
+        {resolveMsg: null, rejectMsg: null}).then((pcdlist)=>{
+        pcdlist.data.forEach((result)=>{
+          this.pcds.push({label:result.f_pcd,value:result.f_pcd})
         })
-        if (val==''){
+      })
+    },
+    showaudio(){
+      //tag
+      this.audioshow=!this.audioshow
+      //tag
+    },
+    getmeterbook(val){
+      this.cbc=[]
+      this.cbc.push({
+        label:'全部',
+        value:''
+      })
+      if (val==''){
 
-          this.cbcs.forEach(res=>{
+        this.cbcs.forEach(res=>{
+          this.cbc.push({
+            label:res.f_book_name,
+            value:res.id
+          })
+        })
+      }else{
+        this.cbcs.forEach(res=>{
+          if (res.f_book_slice_area==val){
             this.cbc.push({
               label:res.f_book_name,
               value:res.id
             })
+          }
+        })
+      }
+    },
+    Mreadibook(val){
+      ////tag
+      ////tag
+      if (val){
+        new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
+            items: 'name',
+            tablename: 't_zone',
+            condition: `parentid  in ${val}`,
+            orderitem: 'id'
+          }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          this.sliceArea=[]
+          this.sliceArea.push({
+            label:'全部',
+            value:''
           })
-        }else{
-          this.cbcs.forEach(res=>{
-            if (res.f_book_slice_area==val){
-              this.cbc.push({
-                label:res.f_book_name,
-                value:res.id
-              })
-            }
-          })
-        }
-      },
-      Mreadibook(val){
-        ////tag
-        ////tag
-        if (val){
-          new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
-              items: 'name',
-              tablename: 't_zone',
-              condition: `parentid  in ${val}`,
-              orderitem: 'id'
-            }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-            this.sliceArea=[]
+          res.data.forEach(ress=>{
             this.sliceArea.push({
-              label:'全部',
-              value:''
+              label:ress.name,
+              value:ress.name
             })
-            res.data.forEach(ress=>{
-              this.sliceArea.push({
-                label:ress.name,
-                value:ress.name
-              })
-            })
-
           })
-        }
-      },
-      getAllMeterBook(val){
-        ////tag
-        ////tag
-        this.cbcs=[]
-        if (val){
-          new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
-              items: 'f_book_name,f_book_slice_area,id',
-              tablename: 't_meter_book',
-              condition: `f_filiale_id  in ${val}`,
-              orderitem: 'id'
-            }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-            res.data.forEach(ress=>{
-              this.cbcs.push({
-                id:ress.id,
-                f_book_name:ress.f_book_name,
-                f_book_slice_area:ress.f_book_slice_area
-              })
+
+        })
+      }
+    },
+    getAllMeterBook(val){
+      ////tag
+      ////tag
+      this.cbcs=[]
+      if (val){
+        new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
+            items: 'f_book_name,f_book_slice_area,id',
+            tablename: 't_meter_book',
+            condition: `f_filiale_id  in ${val}`,
+            orderitem: 'id'
+          }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          res.data.forEach(ress=>{
+            this.cbcs.push({
+              id:ress.id,
+              f_book_name:ress.f_book_name,
+              f_book_slice_area:ress.f_book_slice_area
             })
-            this.cbc=[]
+          })
+          this.cbc=[]
+          this.cbc.push({
+            label:'全部',
+            value:''
+          })
+          this.cbcs.forEach(res=>{
             this.cbc.push({
-              label:'全部',
-              value:''
-            })
-            this.cbcs.forEach(res=>{
-              this.cbc.push({
-                label:res.f_book_name,
-                value:res.id
-              })
+              label:res.f_book_name,
+              value:res.id
             })
           })
-        }
-      },
-      getRes(obj) {
-        this.model.f_filialeid = this.$login.convertToIn(obj.resids);
-        this.searchData.f_filialeid = this.$login.convertToIn(obj.resids);
-        this.Mreadibook(this.model.f_filialeid)
-        this.getAllMeterBook(this.model.f_filialeid)
-        this.getPcd(this.model.f_filialeid)
-        //this.$refs.paged.$refs.criteria.search()
-      },
+        })
+      }
+    },
+    getRes(obj) {
+      this.model.f_filialeid = this.$login.convertToIn(obj.resids);
+      this.searchData.f_filialeid = this.$login.convertToIn(obj.resids);
+      this.Mreadibook(this.model.f_filialeid)
+      this.getAllMeterBook(this.model.f_filialeid)
+      this.getPcd(this.model.f_filialeid)
+      //this.$refs.paged.$refs.criteria.search()
+    },
 
-      change(row) {
-        row.f_upload_state = '已传'
-        this.shouinfodata = JSON.parse(JSON.stringify(row))
-        this.showinfo1 = false
-        if (row.f_safe_type == '已挂表未办卡安检'){
-            this.showinfo2 = false
-            this.showinfo3 = true
-            return
-         }
-           this.showinfo2 = true
-           this.showinfo3 = false
-      },
-      showChooser() {
-        this.showModal = true
-      },
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-      },
-      refresh() {
-        this.$refs.paged.$refs.criteria.search()
-      },
-      ok() {
-        this.showModal = false
-        if (this.$refs.paged.$refs.criteria.$refs.modal.$children[0].selectedRow.id) {
-          this.model.f_plan_id = this.$refs.paged.$refs.criteria.$refs.modal.$children[0].selectedRow.id
-          this.model.f_check_plan=this.$refs.paged.$refs.criteria.$refs.modal.$children[0].selectedRow
-        }
-      },
-      cancel() {
-        this.showModal = false
-        this.model.f_check_plan = {f_plan_name: '', id: ''}
-        this.model.f_plan_id=''
-      },
-      print(row) {
-        this.showcheckmsg = true
-        this.checkInfo = row
-      },
+    change(row) {
+      row.f_upload_state = '已传'
+      this.shouinfodata = JSON.parse(JSON.stringify(row))
+      this.showinfo1 = false
+      if (row.f_safe_type == '已挂表未办卡安检'){
+        this.showinfo2 = false
+        this.showinfo3 = true
+        return
+      }
+      this.showinfo2 = true
+      this.showinfo3 = false
+    },
+    showChooser() {
+      this.showModal = true
+    },
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    refresh() {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    ok() {
+      this.showModal = false
+      if (this.$refs.paged.$refs.criteria.$refs.modal.$children[0].selectedRow.id) {
+        this.model.f_plan_id = this.$refs.paged.$refs.criteria.$refs.modal.$children[0].selectedRow.id
+        this.model.f_check_plan=this.$refs.paged.$refs.criteria.$refs.modal.$children[0].selectedRow
+      }
+    },
+    cancel() {
+      this.showModal = false
+      this.model.f_check_plan = {f_plan_name: '', id: ''}
+      this.model.f_plan_id=''
+    },
+    print(row) {
+      this.showcheckmsg = true
+      this.checkInfo = row
+    },
 
-      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.orderDefault}'`
+    sort(field, rule) {
+      // 将所有排序方式设为不排序，实现相互排斥
+      for (let key in this.orderFields) {
+        if (key === field) {
+          this.orderFields[key] = rule
         } else {
-          this.model.paramSource.orderitem = `'${field} ${rule}'`
+          this.orderFields[key] = 'no'
         }
-        this.search()
-      },
-      search() {
-        console.log('审核通过回调')
-        this.$refs.paged.$refs.criteria.search()
-      },
-      selfSearch(args) {
-        ////tag
-        //args.condition+=" and f_check_type='民用'"
-        if(args.model.f_check_date){
-          const daysBefore = Number(args.model.f_check_date);
-          if ( daysBefore > 0) {
-            // 获取当前日期
-            const now = new Date();
-            // 计算三天前的日期
-            const threeDaysBefore = new Date(now.getTime() - (daysBefore * 24 * 60 * 60 * 1000));
-            // 如果需要格式化日期，可以使用Date对象的方法
-            var formattedDate = threeDaysBefore.toISOString().split('T')[0];
-            args.condition += `  and f_offsite_time <='${formattedDate} 23:59:59'`;
-          } else {
-            console.error('f_check_date不是一个有效的正整数');
-          }
-        }
-        this.model.search(args.condition, args.model, args.condValue)
       }
+      // 如果新规则不排序，还原为默认排序
+      if (rule === 'no') {
+        this.model.paramSource.orderitem = `'${this.orderDefault}'`
+      } else {
+        this.model.paramSource.orderitem = `'${field} ${rule}'`
+      }
+      this.search()
+    },
+    search() {
+      console.log('审核通过回调')
+      this.$refs.paged.$refs.criteria.search()
     },
-    ready() {
+    selfSearch(args) {
+      ////tag
+      //args.condition+=" and f_check_type='民用'"
+      if(args.model.f_check_date){
+        const daysBefore = Number(args.model.f_check_date);
+        if ( daysBefore > 0) {
+          // 获取当前日期
+          const now = new Date();
+          // 计算三天前的日期
+          const threeDaysBefore = new Date(now.getTime() - (daysBefore * 24 * 60 * 60 * 1000));
+          // 如果需要格式化日期，可以使用Date对象的方法
+          var formattedDate = threeDaysBefore.toISOString().split('T')[0];
+          args.condition += `  and f_offsite_time <='${formattedDate} 23:59:59'`;
+        } else {
+          console.error('f_check_date不是一个有效的正整数');
+        }
+      }
+      this.model.search(args.condition, args.model, args.condValue)
+    }
+  },
+  ready() {
     if(this.safeAudit){
       let oa = {
         'f_approved_by':'审核人',
@@ -749,48 +749,48 @@ export default {
       }
       this.excelHeaders = Object.assign({}, this.excelHeaders, oa)
     }
-      this.function = this.f
-      //获取气表品牌
-      this.getTableBrands()
-      let gen = select(this)
-      //this.pianqu()
-      this.Mreadibook(`('${this.$login.f.orgid}')`)
-      co(gen)
-      this.$refs.paged.$refs.criteria.model.f_check_start = Util.toStartDateString() + ' 00:00:00'
-      this.$refs.paged.$refs.criteria.model.f_check_end = Util.toEndDateString() + ' 23:59:59'
-    },
-    watch: {
-      'model.f_no_checkplan'(val) {
-        if (this.model.f_no_checkplan){
-          this.searchData.f_no_checkplan = val
-        }
-        if (this.model.f_no_checkplan == '有计划安检') {
+    this.function = this.f
+    //获取气表品牌
+    this.getTableBrands()
+    let gen = select(this)
+    //this.pianqu()
+    this.Mreadibook(`('${this.$login.f.orgid}')`)
+    co(gen)
+    this.$refs.paged.$refs.criteria.model.f_check_start = Util.toStartDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.criteria.model.f_check_end = Util.toEndDateString() + ' 23:59:59'
+  },
+  watch: {
+    'model.f_no_checkplan'(val) {
+      if (this.model.f_no_checkplan){
+        this.searchData.f_no_checkplan = val
+      }
+      if (this.model.f_no_checkplan == '有计划安检') {
 
-          this.showChooser()
-        }
-      },
-      'model.condition'(val) {
-        if (val) {
-          this.searchData.condition = val
-        }
+        this.showChooser()
+      }
+    },
+    'model.condition'(val) {
+      if (val) {
+        this.searchData.condition = val
+      }
 
-      },
-      'model.f_entry'(val) {
-        this.searchData.f_entry_status = val
-      },
-      'model.f_plan_id'(val) {
-        if (val) {
-          this.searchData.f_plan_id = val
-        }
-      },
-      'model.f_slice_area'(val) {
-      },
-      'model.f_approved'(val) {
-        if (val) {
-          this.searchData.f_approved = val
-        }
+    },
+    'model.f_entry'(val) {
+      this.searchData.f_entry_status = val
+    },
+    'model.f_plan_id'(val) {
+      if (val) {
+        this.searchData.f_plan_id = val
+      }
+    },
+    'model.f_slice_area'(val) {
+    },
+    'model.f_approved'(val) {
+      if (val) {
+        this.searchData.f_approved = val
       }
     }
-
   }
+
+}
 </script>