sale-client 4.2.143 → 4.2.144

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/CorrectionMeter.vue

@@ -0,0 +1,148 @@
+<template xmlns="http://www.w3.org/1999/html">
+  <div class="auto" style="overflow:auto;">
+    <validator name='v'>
+    <form novalidate class="form-horizontal" style="height:500px;">
+      <div class="row auto" >
+        <div class="col-sm-4 form-group">
+          <label for="f_change_operator" class=" font_normal_body">更&nbsp;&nbsp;正&nbsp;人</label>
+          <input class="input_search" style="width:60%" type="text" v-model="metermessage.f_change_operator" placeholder="更正人">
+        </div>
+        <div class="col-sm-4 form-group">
+          <label for="f_meter_type" class="font_normal_body">新表类型</label>
+          <input type="text" class="input_search" style="width: 60%" v-show="false" v-model="metermessage.f_meter_type" v-validate:metertype='{required: true }'>
+          <v-select :value.sync="metermessage.f_meter_type"
+                    v-model="metermessage.f_meter_type"
+                    :options='meterType' placeholder='新表类型'
+                    close-on-select v-ref:metertype style="width: 60%"></v-select>
+        </div>
+
+        <div class="col-sm-4 form-group" :class="[$v.brand.required ? 'has-error' : '']">
+          <label for="gasbrand" class="font_normal_body">新表品牌</label>
+          <input type="text" class="input_search" style="width:60%" v-show="false" v-model="metermessage.gasbrand" v-validate:brand='{required: true }'>
+          <v-select :value.sync="metermessage.gasbrand" :options='getMeterBrands(metermessage.f_meter_type)' placeholder='新表品牌' close-on-select
+                    search v-model='metermessage.gasbrand' v-ref:brand></v-select>
+        </div>
+        <div class="col-sm-4 form-group" :class="[$v.model.required ? 'has-error' : '']">
+          <label for="gasmodel" class="font_normal_body">新表型号</label>
+          <input type="text" class="input_search" style="width:60%" v-show="false" v-model="metermessage.gasmodel"  v-validate:model='{required: true }'>
+          <v-select :value.sync="metermessage.gasmodel" :options='metermessage.gasbrand[0] ? metermessage.gasbrand[0].gasmodel : [] ' placeholder='新表型号' close-on-select
+                    v-model='metermessage.gasmodel' :disabled= 'metermessage.gasbrand.length === 0 ' v-ref:model></v-select>
+        </div>
+
+      </div>
+      <div class="row auto" >
+          <div class="row auto" >
+            <div class="col-sm-12">
+              <label  class="font_normal_body ">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</label>
+              <textarea class="input_textarea" rows="3" style="width:87%;" v-model="metermessage.f_comments"></textarea>
+            </div>
+          </div>
+          <div style="text-align:right;height:auto;">
+            <button class="button_search" type="button" @click="confirm()" :disabled="!$v.valid">确认</button>
+            <button class="button_clear" type="button" @click="clean()" >取消</button>
+          </div>
+        </div>
+      <div class="row auto">
+        <div class="alert alert-warning" role="alert" style="color:darkred">
+          <dl>
+            <dt style="font-size:18px;line-height: 30px;"><span class="glyphicon glyphicon-alert"></span>&nbsp;&nbsp;&nbsp;更正注意：:</dt>
+            <dd style="line-height:30px;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;1. 本次更正只影响当前表具的表品牌和表类型!</dd>
+            <dd  style="line-height:30px;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2. 请在确认表具是否需要更新，本次更新不涉及补气等操作！</dd>
+          </dl>
+        </div>
+      </div>
+    </form>
+    </validator>
+
+  </div>
+  <upload :blodid="blodid" v-if="config.showupload" isremark="true" fusetype="更正表品牌"></upload>
+</template>
+<script>
+
+import { HttpResetClass } from 'vue-client'
+let getbrand = function(self){
+  self.meterbrands = self.$GetSaleParam.getGasbrand();
+}
+export default {
+  title: '更正表品牌',
+  data () {
+    return {
+      metermessage: {
+        f_meter_type: '气量卡表',
+        gasbrand: [],
+        gasmodel: [],
+        f_comments:'',
+        f_change_operator: this.$login.f.name
+      },
+      meterType: [{label:'气量卡表',value:'气量卡表'}],
+      meterinfo: false,
+      // 控制气量和金额的转换显示
+      changeType: '',
+      config: {
+        showupload:false, //
+        dispatch: false //是否派工
+      },
+      blodid: '',
+      errortype:[{label: '请选择', value: ''}, ...this.$appdata.getParam('错误类型')],
+      meterbrands:[],
+    }
+  },
+  props: ['row'],
+  ready () {
+    this.blodid = this.row.f_userinfo_id;
+    getbrand(this);
+  },
+  methods: {
+    getMeterBrands (meterType) {
+      let res = []
+      if (meterType.length > 0) {
+        this.meterbrands.forEach((item) => {
+          if (item.value.f_meter_type === meterType[0]) {
+            res.push(item)
+          }
+        })
+      }
+      return res
+    },
+    //返回
+    clean() {
+      this.$dispatch('success', '换流量计', this.row)
+    },
+    async confirm() {
+      this.$showMessage("是否对当前用户进行更新表品牌操作",['confirm','cancel']).then(res=>{
+        if(res == 'confirm'){
+          this.saveobj();
+        }
+      })
+
+    },
+    async saveobj() {
+      try {
+        this.metermessage.f_operator=this.$login.f.name
+        this.metermessage.f_operatorid=this.$login.f.id
+        this.metermessage.f_orgid=this.$login.f.orgid
+        this.metermessage.f_orgname=this.$login.f.orgs
+        this.metermessage.f_depid=this.$login.f.depids
+        this.metermessage.f_depname=this.$login.f.deps
+        this.metermessage.f_zoneid = this.$login.f.zoneid
+        this.metermessage.f_zones = this.$login.f.zones
+        let data={
+          model:this.metermessage,
+          old:this.row,
+        }
+        let meterinfo = await this.$resetpost('rs/logic/correctionmeter', data, {
+          resolveMsg: null,
+          rejectMsg: '更正气表品牌失败！！！'
+        });
+        this.$showAlert('更正气表品牌成功','success',2000);
+        this.row.f_userfiles_id=meterinfo.data.new_userfiles_id
+        this.$dispatch('success')
+      } catch (error) {
+           console.log('抛出的错误。。', error)
+          this.$showAlert(error, 'danger', 2000)
+          this.$dispatch('refresh')
+      }
+    },
+  }
+}
+</script>

package/src/components/revenue/comprehen/SpecialUser/BlackList/BlackUserList.vue

@@ -0,0 +1,136 @@
+<template>
+  <div @keyup.enter="search" class="flex-auto" style="flex:1;">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria @condition-changed='$parent.selfSearch' partial='criteria' v-ref:cri>
+        <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+          <div class="row">
+            <div :class="$parent.$parent.style" >
+              <label class="font_normal_body">公&emsp;&emsp;司</label>
+              <res-select
+                :initresid='$parent.$parent.curorgid'
+                @res-select="$parent.$parent.getorg"
+                is-mul="false"
+                restype='organization'
+              >
+              </res-select>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">用户编号</label>
+              <input class="input_search" condition="f_userinfo_code like '{}%'" placeholder="用户编号" style="width:60%"
+                     style="width: 90px"
+                     type="text" v-model="model.ename"
+              />
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">用户姓名</label>
+              <input  class="input_search" condition="f_user_name like '%{}%'" placeholder="用户姓名" style="width:60%" style="width: 90px"
+                      type="text" v-model="model.name"
+              />
+            </div>
+            <div :class="$parent.$parent.style" v-if="!$parent.$parent.downshow&&!$parent.$parent.$parent.isdetail">
+              <label class="font_normal_body">电&emsp;&emsp;话</label>
+              <input :size="model.f_user_phone ? model.f_user_phone.length : 2" class="input_search" condition="f_user_phone = '{}'" placeholder='电话' style="width:60%"
+                     type="text"
+                     v-model="model.f_user_phone">
+            </div>
+            <div :class="$parent.$parent.style" v-if="!$parent.$parent.downshow&&!$parent.$parent.$parent.isdetail">
+              <label class="font_normal_body">地&emsp;&emsp;址</label>
+              <input  :size="model.f_address ? model.f_address.length * 2 : 4" class="input_search" condition="f_address like '%{}%'" placeholder='用户地址' style="width:60%"
+                      type="text"
+                      v-model="model.f_address">
+            </div>
+            <div class="form-group col-sm-3 button-range" style="float: left">
+              <button @click="$parent.$parent.search()" class="button_search button_spacing" style="width:80px;margin-left:30px;" v-el:cx>查询</button>
+
+              <div :class="{'button_shrink_top':$parent.$parent.downshow,'button_shrink_bottom':!$parent.$parent.downshow}"  @click="$parent.$parent.downshow=!$parent.$parent.downshow" class="button_spacing"
+                   style="float: right" v-if="$parent.$parent.$parent.isdetail"></div>
+            </div>
+          </div>
+          <div class="row" v-if="$parent.$parent.downshow">
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">电&emsp;&emsp;话</label>
+              <input :size="model.f_user_phone ? model.f_user_phone.length : 2" class="input_search" condition="f_user_phone = '{}'" placeholder='电话' style="width:60%"
+                     type="text"
+                     v-model="model.f_user_phone">
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">地&emsp;&emsp;址</label>
+              <input :size="model.f_address ? model.f_address.length * 2 : 4" class="input_search" condition="f_address like '%{}%'" placeholder='用户地址' style="width:60%"
+                     type="text"
+                     v-model="model.f_address">
+            </div>
+          </div>
+
+        </div>
+      </criteria>
+      <data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th style="text-align: center; ">序号</th>
+            <th style="text-align: center;">用户编号</th>
+            <th style="text-align: center;">姓名</th>
+            <th style="text-align: center;">电话</th>
+           <th style="text-align: center;">公司</th>
+            <th style="text-align: center;">地址</th>
+          </tr>
+        </template>
+        <template partial='body'>
+
+          <td style="text-align: center;">{{$index+1}}</td>
+          <td style="text-align: center;">{{row.f_userinfo_code}}</td>
+          <td style="text-align: center;">{{row.f_user_name}}</td>
+          <td style="text-align: center;">{{row.f_user_phone}}</td>
+          <td style="text-align:center"><nobr>{{row.f_orgname}}</nobr></td>
+          <td style="text-align: center;">{{row.f_address}}</td>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+
+  import {PagedList} from 'vue-client'
+  import Vue from 'vue'
+  export default {
+    data () {
+      return {
+        model: new PagedList('rs/sql/sale_getBlackUserList', 20),
+        // 公司下拉
+        curorgid: [this.$login.f.orgid],
+        f_filialeid:this.$login.f.orgid
+      }
+    },
+    ready () {
+    },
+    methods: {
+      search () {
+        this.$refs.paged.$refs.cri.search()
+        this.$dispatch('search')
+      },
+      getorg (val) {
+        this.f_orgid = this.$login.convertToIn(val)
+        this.f_filialeid = this.$login.convertToIn(val)
+      },
+      selfSearch (args) {
+
+        if (!this.f_orgid) {
+          this.getorg([this.$login.f.orgid])
+        }
+        if(!this.f_orgid){
+          this.f_orgid = `('${this.$login.f.orgid}')`
+        }
+        console.log('查询。。。', this.f_orgid)
+        if (this.f_orgid) {
+          // args.condition = `${args.condition} and s.f_filialeid  in ${this.f_orgid}`
+          args.condition = `${args.condition} and i.f_orgid  in ${this.f_orgid}`
+        }
+        this.model.search(args.condition, args.model)
+      }
+
+    },
+    watch: {
+    }
+  }
+</script>

package/src/components/revenue/recordMainten/sellinggas/AddWarehousemain.vue

@@ -0,0 +1,65 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+        <p class="bg-info text-center" style="padding: 8px;font-size: 20px">操作记录</p>
+        <!-- <data-grid :model="inData" v-ref:grid  partial='list'>
+           <template partial='head'>-->
+        <table style="width: 100%" class="table table-bordered">
+          <thead>
+            <tr>
+              <th style="text-align: center">序号</th>
+              <th style="text-align: center">修改内容</th>
+              <th style="text-align: center">变更前</th>
+              <th style="text-align: center">变更后</th>
+              <th style="text-align: center">状态</th>
+              <th style="text-align: center">修改时间</th>
+              <th style="text-align: center">操作人</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr v-for="row in recordlist">
+              <td style="text-align: center;">{{$index + 1}}</td>
+              <td style="text-align: center;">{{row.chinesename}}</td>
+              <td style="text-align: center;">{{row.oldvalue}}</td>
+              <td style="text-align: center;">{{row.newvalue}}</td>
+              <td style="text-align: center;">{{row.state}}</td>
+              <td style="text-align: center;">{{row.modifitime}}</td>
+              <td style="text-align: center;">{{row.operator}}</td>
+            </tr>
+          </tbody>
+        </table>
+      </form>
+    </validator>
+  </div>
+</template>
+
+<script>
+
+
+  export default {
+    name: 'addwarehouse',
+
+    data () {
+      return {
+        inData: [],
+        obj: {},
+        userid: this.$login.f.id
+
+      }
+    },
+    props: {
+      recordlist: Array
+    },
+    created () {
+    },
+    ready () {
+    },
+    methods: {
+
+    }
+  }
+</script>
+
+<style lang="less">
+</style>