sale-client 4.2.82 → 4.2.83

package/src/components/webMeter/instructionView/NewQueryInstruct.vue

@@ -1,509 +0,0 @@
-<template >
-  <div class="flex-row">
-    <div @keyup.enter="search1" class="basic-main">
-      <criteria-paged :model="model" v-ref:paged>
-        <criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
-          <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
-            <div class="row">
-              <div class="col-sm-3 form-group" style="width: 27%;margin-right: -6%;">
-                <label class="font_normal_body">公&emsp;&emsp;司</label>
-                <right-tree @re-res="$parent.$parent.getorg"
-                            :initresid='initres.org'></right-tree>
-              </div>
-              <div class="col-sm-2 form-group" style="margin-right:-2%">
-                <label class="font_normal_body">指令时间</label>
-                <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_start_date"
-                            condition="f_instruct_date >= '{}'"
-                            placeholder="起始时间"
-                            style="width:66%"
-                            v-model="model.f_start_date"
-                ></datepicker>
-              </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">&emsp;至&emsp;</label>
-                <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_end_date"
-                            condition="f_instruct_date <= '{}'"
-                            placeholder="结束时间"
-                            style="width:66%"
-                            v-model="model.f_end_date"
-                ></datepicker>
-              </div>
-              <div class="col-sm-2 form-group ">
-                <label class="font_normal_body">客户编号</label>
-                <input :size="model.f_userinfo_code ? model.f_userinfo_code.length : 6"
-                       class="input_search" condition="f_userinfo_code like '{}%'"
-                       placeholder='客户编号'
-                       style="width:60%"
-                       type="text"
-                       v-model="model.f_userinfo_code">
-              </div>
-
-              <div class="col-sm-2 form-group" v-if="$parent.$parent.clientWidth>1600">
-                <label class="font_normal_body">公&emsp;&emsp;司</label>
-                <right-tree :initresid='$parent.$parent.org'
-                            @re-res="$parent.$parent.getorg"></right-tree>
-              </div>
-
-              <div style="float:right">
-                <button @click="search()" class="button_search" v-el:cba>查询</button>
-                <button @click="$parent.$parent.clearmsg" class="button_clear">清空</button>
-                <export-excel
-                  :choose-col="true"
-                  :data="$parent.$parent.getconditions"
-                  :defaultselect="$parent.$parent.selectfields"
-                  :field="$parent.$parent.excelHeaders" sql-name="iot_getNewQueryInstruct" sqlurl="rs/logic/saleExport"
-                  template-name='指令查看'></export-excel>
-                <div
-                  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
-                  @click="$parent.$parent.hidden()" class="button_spacing" style="float: right"></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 :size="model.f_address ? model.f_address.length : 6" class="input_search"
-                       condition="f_address like '%{}%'"
-                       placeholder='客户地址'
-                       style="width:60%"
-                       type="text"
-                       v-model="model.f_address"
-                >
-              </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">客户名称</label>
-                <input :size="model.f_user_name ? model.f_user_name.length : 6"
-                       class="input_search" condition="f_user_name like '%{}%'"
-                       placeholder='客户名称'
-                       style="width:60%"
-                       type="text"
-                       v-model="model.f_user_name"
-                >
-              </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">表&ensp;&ensp;&ensp;&ensp;号</label>
-                <input :size="model.f_meternumber ? model.f_meternumber.length : 6"
-                       class="input_search" condition="f_meternumber like '%{}%'"
-                       placeholder='表号'
-                       style="width:60%"
-                       type="text"
-                       v-model="model.f_meternumber">
-              </div>
-              <div class="col-sm-2 form-group" v-if="$parent.$parent.clientWidth<1600">
-                <label class="font_normal_body">公&emsp;&emsp;司</label>
-                <right-tree :initresid='$parent.$parent.org'
-                            @re-res="$parent.$parent.getorg"></right-tree>
-              </div>
-
-              <!--                <div class="col-sm-2 form-group">-->
-              <!--                  <label class="font_normal_body">客户类型</label>-->
-              <!--                  <v-select style="width:60%" :value.sync="model.f_user_type" v-model="model.f_user_type"-->
-              <!--                            placeholder='客户类型'-->
-              <!--                            value-single="true"-->
-              <!--                            :options='$parent.$parent.userType'-->
-              <!--                            close-on-select-->
-              <!--                            condition="f_user_type ='{}'"-->
-              <!--                  ></v-select>-->
-              <!--                </div>-->
-              <!--                <div class="col-sm-2 form-group">-->
-              <!--                  <label class="font_normal_body">用气性质</label>-->
-              <!--                  <v-select style="width:60%" :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"-->
-              <!--                            placeholder='用气性质'-->
-              <!--                            value-single="true"-->
-              <!--                            :options='$parent.$parent.Gasproperties'-->
-              <!--                            close-on-select-->
-              <!--                            condition="f_gasproperties = '{}'"-->
-              <!--                  ></v-select>-->
-              <!--                </div>-->
-
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">气表品牌</label>
-                <v-select
-                  :options='$parent.$parent.meterbrand'
-
-                  :value.sync="model.f_gasbrand"
-                  close-on-select
-                  condition="f_meter_brand='{}'"
-                  placeholder='气表品牌'
-                  style="width:60%"
-                  v-model="model.f_gasbrand">
-                </v-select>
-              </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">指令类型</label>
-                <v-select :options='$parent.$parent.instructtype' :value.sync="model.f_instruct_type" close-on-select
-                          condition="f_instruct_type='{}'"
-                          placeholder='指令类型'
-                          style="width:60%"
-                          v-model="model.f_instruct_type"></v-select>
-              </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">执行状态</label>
-                <v-select :options='$parent.$parent.instructstate' :value.sync="model.f_instruct_state" close-on-select
-                          condition="f_instruct_state='{}'"
-                          placeholder='执行状态'
-                          style="width:60%"
-                          v-model="model.f_instruct_state"
-                ></v-select>
-              </div>
-
-
-            </div>
-          </div>
-        </criteria>
-        <data-grid :model="model" class="list_area table_sy" id="queryinstruct" partial='list' v-ref:grid>
-          <template partial='head'>
-            <tr>
-              <th style="text-align:center">
-                <nobr>序号</nobr>
-              </th>
-              <th style="text-align:center">
-                <nobr>客户编号</nobr>
-              </th>
-              <th style="text-align:center">
-                <nobr>客户名称</nobr>
-              </th>
-              <th style="text-align:center">
-                <nobr>客户地址</nobr>
-              </th>
-              <th style="text-align:center">
-                <nobr>表号</nobr>
-              </th>
-              <th style="text-align:center">
-                <nobr>气表品牌</nobr>
-              </th>
-              <th style="text-align:center">
-                <nobr>指令类型</nobr>
-              </th>
-              <th style="text-align:center">
-                <nobr>指令标题</nobr>
-              </th>
-              <th style="text-align:center">
-                <nobr>执行状态</nobr>
-              </th>
-              <th style="text-align:center"><nobr>执行结果</nobr></th>
-              <th style="text-align:center"><nobr>指令生成时间</nobr></th>
-              <th style="text-align:center"><nobr>指令发送时间</nobr></th>
-              <th style="text-align:center"><nobr>上表时间</nobr></th>
-              <th style="text-align:center">
-                <nobr>操作内容</nobr>
-              </th>
-              <th style="text-align:center">
-                <nobr>操作人(记录)</nobr>
-              </th>
-              <th style="text-align:center">
-                <nobr>操作时间(记录)</nobr>
-              </th>
-              <th style="text-align:center">
-                <nobr>操作类型</nobr>
-              </th>
-              <th style="text-align:center">
-                <nobr>记录状态</nobr>
-              </th>
-              <th style="text-align:center"><nobr>组织机构</nobr></th>
-              <th  v-if="$parent.$parent.$parent.changeshow" style="text-align:center"><nobr>操作</nobr></th>
-            </tr>
-          </template>
-          <template partial='body'>
-            <tr>
-              <td style="text-align:center">
-                <nobr>{{$index+1}}</nobr>
-              </td>
-              <td style="text-align:center">
-                <span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
-              </td>
-              <td style="text-align:center">
-                <nobr>{{row.f_user_name}}</nobr>
-              </td>
-              <td style="text-align:center">
-                <nobr>{{row.f_address}}</nobr>
-              </td>
-              <td style="text-align:center">
-                <nobr>{{row.f_meternumber}}</nobr>
-              </td>
-              <td style="text-align:center">
-                <nobr>{{row.f_meter_brand}}</nobr>
-              </td>
-              <td style="text-align:center">
-                <nobr>{{row.f_instruct_type}}</nobr>
-              </td>
-              <td style="text-align:center">
-                <nobr>{{row.f_instruct_title}}</nobr>
-              </td>
-              <td style="text-align:center">
-                <nobr>{{row.f_instruct_state}}</nobr>
-              </td>
-              <td style="text-align:center">
-                <nobr>{{row.f_receive_state}}</nobr>
-              </td>
-              <td style="text-align:center">
-                <nobr>{{row.f_instruct_date}}</nobr>
-              </td>
-              <td style="text-align:center"><nobr>{{row.f_send_date}}</nobr></td>
-              <td style="text-align:center"><nobr>{{row.f_callback_date}}</nobr></td>
-              <td style="text-align:center">
-                <nobr>{{row.note}}</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_operate_type}}</nobr>
-              </td>
-              <td style="text-align:center">
-                <nobr>{{row.f_state}}</nobr>
-              </td>
-              <td style="text-align:center">
-                <nobr>{{row.f_orgname}}</nobr>
-              </td>
-              <td v-if="$parent.$parent.$parent.changeshow"><button type="button" name="button" class="btn btn-link" v-if="row.f_instruct_state.includes('失败')"
-                          @click.stop="$parent.$parent.$parent.modifyInstructState(row)">指令重发</button>
-              </td>
-            </tr>
-          </template>
-        </data-grid>
-      </criteria-paged>
-    </div>
-  </div>
-</template>
-<script>
-  import {PagedList} from 'vue-client'
-  import co from 'co'
-  import * as Util from '../../../Util'
-  import getLodop from '../../../plugins/LodopFuncs'
-  import {HttpResetClass} from 'vue-client'
-
-  let readyGen = async function (self) {
-    await self.$LoadParams.loadParam()
-    self.initQueryParam()
-    self.getinstructtype()
-    self.getinstructstate()
-    // self.reflash()
-  }
-  export default {
-    title: '指令查看',
-    data () {
-      return {
-        model: new PagedList('rs/sql/iot_getNewQueryInstruct', 50),
-        row: null,
-        isLoading: true,
-        searchshow: true,
-        criteriaShow:false,
-        Gasproperties:[],
-        meterbrand: [],
-        userType:[],
-        initres: {
-          org:[this.$login.f.orgid]
-        },
-        instructtype:[],
-        instructstate:[],
-        org:[this.$login.f.orgid],
-        orgcondition:' and f_filialeid = ' + this.$login.f.orgid,
-        show: false,
-        condition:'',
-        getfield: {},
-        selectfields:[],
-        excelHeaders: {
-          'f_userinfo_code': '客户编号','f_address': '客户地址','f_user_name': '客户姓名',
-          'f_meternumber': '表号','f_meter_brand': '气表品牌','f_instruct_type': '指令类型',
-          'f_instruct_state': '执行状态','f_receive_state': '执行结果','f_instruct_date': '指令时间',
-          'note':'操作内容','f_operator':'操作人(记录)','f_operate_date':'操作时间(记录)','f_operate_type':'操作类型','f_state':'操作状态',
-          'f_orgname': '组织机构',
-        },
-        f_orgid_new:this.$login.f.orgid,
-        changeshow:false,
-      }
-    },
-    ready () {
-      for(var item in this.excelHeaders){
-        this.selectfields.push(item)
-      }
-      if(this.$login.r.includes('指令重发')){
-        this.changeshow = true;
-      }
-      readyGen(this)
-      this.$refs.paged.$refs.criteria.model.f_start_date = Util.toStandardDateString() + ' 00:00:00'
-      this.$refs.paged.$refs.criteria.model.f_end_date = Util.toStandardDateString() + ' 23:59:59'
-      this.$refs.paged.$refs.criteria.search()
-    },
-    methods: {
-      hidden(){
-        this.criteriaShow = !this.criteriaShow
-      },
-      getorg(obj) {
-        if (obj.resids.length > 0) {
-          this.orgcondition = " and f_filialeid in " + this.$login.convertToIn(obj.resids)
-          if(obj.resids instanceof  Array){
-            this.f_orgid_new = obj.resids[0]
-          }else{
-            this.f_orgid_new = obj.resids
-          }
-        } else {
-          this.orgcondition = " and f_filialeid = " + this.$login.f.orgid
-        }
-      },
-      initQueryParam () {
-        let arr = []
-        this.$GetSaleParam.getGasbrand().forEach((item) => {
-          let temp = {}
-          if(item.value.f_meter_type==='物联网表'){
-            temp.label = item.label
-            temp.value = item.value.f_meter_brand
-            arr.push(temp )
-          }
-
-        })
-        this.meterbrand = [{label: '全部', value: ''}, ...arr]
-      },
-      getinstructtype(){
-        this.instructtype=[]
-        let load = new HttpResetClass()
-        load.load('POST', 'rs/sql/querySingleTable', {
-          data: {
-            items:'f_instruct_type',
-            tablename:'t_instruct',
-            condition:'f_instruct_type is not null  group by f_instruct_type'
-          }
-        },{warnMsg:null,resolveMsg:null}).then((res) => {
-          this.instructtype.push({label: '全部', value: ''})
-          res.data.forEach((item) => {
-            this.instructtype.push({label: item.f_instruct_type, value: item.f_instruct_type})
-          })
-        })
-
-      },
-      getinstructstate(){
-        this.instructstate=[]
-        let load = new HttpResetClass()
-        load.load('POST', 'rs/sql/querySingleTable', {
-          data: {
-            items:'f_instruct_state',
-            tablename:'t_instruct',
-            condition:'f_instruct_state is not null  group by f_instruct_state'
-          }
-        },{warnMsg:null,resolveMsg:null}).then((res) => {
-          this.instructstate.push({label: '全部', value: ''})
-          res.data.forEach((item) => {
-            this.instructstate.push({label: item.f_instruct_state, value: item.f_instruct_state})
-          })
-        })
-
-      },
-      clearmsg () {
-        this.$refs.paged.$refs.criteria.model = {}
-      },
-      clickshow () {
-        this.searchshow = !this.searchshow
-      },
-      dealmsg (val) {
-        val.model = this.model.model
-        this.$emit('deal-msg', val)
-      },
-      async search (args) {
-        // this.obj.resids = this.obj.resids.replace(/\./g, ''),
-        args.condition =  `${args.condition}`+this.orgcondition
-        console.log(args.condition+"args.condition")
-        this.condition = args.condition
-        if( this.$refs.paged.$refs.criteria.model.f_start_date!=null &&  this.$refs.paged.$refs.criteria.model.f_start_date!=''){
-          this.model.params.f_start_date = `'${this.$refs.paged.$refs.criteria.model.f_start_date}'`;
-        }else{
-          this.model.params.f_start_date = '';
-        }
-        if( this.$refs.paged.$refs.criteria.model.f_end_date!=null &&  this.$refs.paged.$refs.criteria.model.f_end_date!=''){
-          this.model.params.f_end_date = `'${this.$refs.paged.$refs.criteria.model.f_end_date}'`;
-        }else{
-          this.model.params.f_end_date  = "";
-        }
-        if(this.f_orgid_new == '' || this.f_orgid_new == null){
-          this.model.params.f_orgid = `'${this.$login.f.orgid}'`;
-          await this.$LoadParams.loadParam(this.$login.f.orgid)
-        }else{
-          this.model.params.f_orgid = `'${this.f_orgid_new}'`;
-          await this.$LoadParams.loadParam(this.f_orgid_new)
-        }
-        // this.condition =
-        this.model.search(args.condition, args.model)
-        this.initQueryParam();
-      },
-      modifyInstructState(row) {
-        let insructrestdata = {
-          f_userinfo_id: row.f_userinfo_id,
-          f_user_name: row.f_user_name,
-          f_operator: this.$login.f.name,
-          f_operatorid: this.$login.f.id,
-          f_orgid: this.$login.f.orgid,
-          f_orgname: this.$login.f.orgs,
-          f_depid: this.$login.f.depids,
-          f_depname: this.$login.f.deps,
-          f_meternumber: row.f_meternumber,
-          f_userfiles_id: row.f_userfiles_id,
-          f_instruct_state_old: row.f_instruct_state,
-          f_receive_state: row.f_receive_state,
-          state: '待发送',
-          id: row.id
-        };
-
-        this.$showMessage('确认要重置执行状态吗?', ['confirm', 'cancel']).then(
-          (response) => {
-            if (response === 'confirm') {
-              this.$resetpost('rs/logic/iot_changeInstructState', {
-                data: insructrestdata
-              })
-                .then(() => {
-                  this.model.search(this.condition)
-                })
-            }
-          }
-        )
-      }
-
-    },
-    computed: {
-      userType() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
-      },
-      Gasproperties() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
-      },
-
-      getconditions(){
-        let param = {
-          condition: `${this.$refs.paged.$refs.criteria.condition}` +this.orgcondition
-        }
-        if( this.$refs.paged.$refs.criteria.model.f_start_date!=null &&  this.$refs.paged.$refs.criteria.model.f_start_date!=''){
-          param.f_start_date = `'${this.$refs.paged.$refs.criteria.model.f_start_date}'`;
-        }else{
-          param.f_start_date = '';
-        }
-        if( this.$refs.paged.$refs.criteria.model.f_end_date!=null &&  this.$refs.paged.$refs.criteria.model.f_end_date!=''){
-          param.f_end_date = `'${this.$refs.paged.$refs.criteria.model.f_end_date}'`;
-        }else{
-          param.f_end_date  = "";
-        }
-        if(this.f_orgid_new == '' || this.f_orgid_new == null){
-          param.f_orgid = `'${this.$login.f.orgid}'`;
-        }else{
-          param.f_orgid = `'${this.f_orgid_new}'`;
-        }
-        return param;
-      },
-    }
-
-  }
-</script>
-<style>
-  .form-input-group label {
-    text-align: right;
-    width: auto;
-  }
-  .datapanel {
-    color: #333;
-    background-color: white;
-    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px ;
-    padding: 10px 30px 10px 30px;
-    border-radius:15px;
-  }
-</style>

package/src/components/webMeter/instructionView/NewQueryInstructMain.vue

@@ -1,48 +0,0 @@
-<template>
-  <div class="row" style="overflow:hidden;">
-    <div v-show="listpage">
-      <new-query-instruct @deal-msg="dealMsg"></new-query-instruct>
-    </div>
-    <div v-if="!listpage">
-      <user-info-detail-manage :f_userinfo_id="rowData.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
-    </div>
-  </div>
-</template>
-
-<script>
-
-  export default {
-    title: '指令查看',
-    name: 'instruct-Manage',
-    data () {
-      return {
-        // 页面开关
-        listpage: true,
-        width: {
-          left: "100%",
-          right: "0%"
-        },
-        rowData: {}
-      }
-    },
-    ready () {
-
-    },
-    methods: {
-      dealMsg (obj) {
-        this.listpage = false
-        this.rowData = obj
-      },
-      cancel () {
-        this.listpage = true
-      }
-    },
-    watch: {
-
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>