sale-client 4.2.69 → 4.2.71

package/src/components/FilesManage/ncUserinfoList.vue

@@ -0,0 +1,315 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex">
+        <div style="flex:1;" class="flex" >
+          <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 labelother">NC客戶编码</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_customer"
+                           condition="f_customer = '{}' " placeholder="客户编号">
+                  </div>
+                  <div class="col-sm-2">
+                    <label class="font_normal_body labelother">NC客戶名称</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">
+                    <label class="font_normal_body labelother">联系人电话</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-4">
+                    <label class="font_normal_body labelother">客戶地址</label>
+                    <input type="text" style="width:80%" class="input_search" v-model="model.f_address"
+                           condition="f_address like '%{}%'" 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>
+                    <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 class="row" style="margin-top: 11px;" v-show="$parent.$parent.criteriaShow">
+                  <div class="col-sm-2">
+                    <label class="font_normal_body labelother">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                           condition="f_meternumber like '%{}%'" placeholder='表号'>
+                  </div>
+                  <div class="col-sm-2">
+                    <label class="font_normal_body labelother">卡&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
+                           condition="f_card_id like '%{}%'" placeholder='卡号'>
+                  </div>
+                  <div class="col-sm-2">
+                    <label class="font_normal_body labelother">气表&nbsp;&nbsp;&nbsp;状态</label>
+                    <v-select :value.sync="model.f_table_state"
+                              v-model="model.f_table_state"
+                              :options='$parent.$parent.tablestate' placeholder='请选择'
+                              condition="f_table_state = '{}'"
+                              close-on-select></v-select>
+                  </div>
+                </div>
+              </div>
+            </criteria>
+
+            <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy" :classname="$parent.classname">
+              <template partial='head'>
+                <tr>
+                  <th>
+                    <nobr>选择</nobr>
+                  </th>
+                  <th>
+                    <nobr>序号</nobr>
+                  </th>
+                  <th>
+                    <nobr>NC客戶编码</nobr>
+                  </th>
+                  <th>
+                    <nobr>NC客戶名称</nobr>
+                  </th>
+                  <th>
+                    <nobr>联系人电话</nobr>
+                  </th>
+                  <th>
+                    <nobr>身份证号</nobr>
+                  </th>
+                  <th>
+                    <nobr>客戶地址</nobr>
+                  </th>
+                  <th>
+                    <nobr>NC客戶类型</nobr>
+                  </th>
+                </tr>
+              </template>
+              <template partial='body'>
+                <td style="text-align:center">
+                  <button type="button" name="button" class="button_export"
+                          @click.stop="$parent.$parent.$parent.confirmaddress(row)">确认选择</button>
+                </td>
+                <td style="text-align: center;"><nobr>
+                  <span >{{$index+1}}</span>
+                </nobr> </td>
+                <td style="text-align: center;"><nobr>
+                  <span >{{row.f_customer}}</span>
+                </nobr> </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_user_name}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_user_phone}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_idnumber}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_address}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_user_type}}</nobr>
+                </td>
+              </template>
+              <template partial='foot'>
+              </template>
+            </data-grid>
+          </criteria-paged>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+  let readySomething = async function (self) {
+    await self.$MagLoadParams.loadParam();
+    self.initParams();
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
+  }
+
+  export default {
+    data() {
+      return {
+        model: new PagedList('rs/sql/ncarchivesQuery', 20),
+        criteriaShow: false,
+        modelval: [],
+        printshow: false,
+        all: false,
+        fields: {},
+        rowdata:{},
+        meterbrands: [],
+        pricenames: [],
+        gasproperties:[],
+        prices: [],
+        //合计数据
+        sumsmodel: {},
+        selectfields:[],
+        usertypes:[{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')],
+        metertypes:[{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')],
+        pricetypes:[{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
+      }
+    },
+    props:['f_filialeid','fileinfo','meterinfo','usertype'],
+    ready() {
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+      this.search();
+    },
+    methods: {
+      confirmaddress (row) {
+        this.$dispatch('confirmuserinfo',row)
+      },
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      selfSearch(args) {
+        if (!this.f_orgid) {
+          this.getorg([this.$login.f.orgid])
+        }
+        args.condition = `${args.condition}` + " and f_filialeid = " + this.f_filialeid;
+        args.condition =  `${args.condition} `;
+        this.model.search(args.condition, args.model);
+      },
+      clear() {
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = ''
+        })
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+
+      close() {
+        this.printshow = false;
+        this.all = false
+      },
+      userTypeChange () {
+        this.gasproperties=[]
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties=''
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+        }
+        else{
+          this.gasproperties =[{label: '全部', value: ''}]
+        }
+      },
+      getorg (val) {
+        this.f_orgid = this.$login.convertToIn(val)
+        this.f_filialeids = val[0]
+      },
+      initParams() {
+        // 初始化气表品牌
+        let brandArr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          temp.label = item.label
+          temp.value = item.value.f_meter_brand
+          brandArr.push(temp)
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+        //初始化气表价格
+        this.prices = this.$MagGetSaleParam.getPrices();
+      },
+      // 对选择的列进行排序
+      sortModelval() {
+        let sortModel = []
+        Object.keys(this.fields).forEach((key) => {
+          if (this.modelval.includes(key)) {
+            sortModel.push(key)
+          }
+        })
+        this.modelval = sortModel
+        console.log('选择的打印的字段', this.modelval)
+      },
+      async updateParams() {
+        await this.$MagLoadParams.loadParam(this.f_filialeid)
+        this.initParams()
+      },
+    },
+    watch: {
+      'all'(val) {
+        if (val) {
+          this.modelval = this.bodyData
+        } else {
+          this.modelval = defaultPrint.config
+          this.put()
+        }
+      },
+      'modelval.length'() {
+        this.put()
+      },
+    },
+    computed: {
+      getPricenames() {
+        let f_user_type = this.$refs.paged.$refs.cri.model.f_user_type;
+        let f_gasproperties = this.$refs.paged.$refs.cri.model.f_gasproperties;
+        let pricetype = this.$refs.paged.$refs.cri.model.pricetype;
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          let rs = []
+          let priceArr = []
+          if (f_user_type.length > 0 && f_gasproperties.length > 0 && pricetype.length >0) {
+            let params = {
+              f_user_type: f_user_type[0],
+              f_gasproperties: f_gasproperties[0],
+              f_price_type: pricetype[0],
+              filter: this.f_filialeid,
+              prices: this.prices
+            }
+            this.$MagGetSaleParam.getPrice(params).forEach((item) => {
+              let temp = {}
+              temp.label = item.label
+              temp.value = item.value.f_price_name
+              priceArr.push(temp)
+            })
+            rs = [{label: '全部', value: ''}, ...priceArr]
+          }
+          if (rs.length === 0) {
+            console.log('rs读出来是空')
+            this.$refs.paged.$refs.cri.model.f_price_name = ''
+          }
+          return rs
+        }
+      },
+      areas() {
+        let rs = []
+        for (let i = 0; i < this.$login.f.f_allArea.length; i++) {
+          let temp = {
+            label: this.$login.f.f_allArea[i].label,
+            value: this.$login.f.f_allArea[i].label
+          }
+          rs.push(temp)
+        }
+        return [{label: '全部', value: ''}, ...rs]
+      },
+      sliceArea() {
+        let rs = []
+        if (this.$refs.paged.$refs.cri.model.f_area.length > 0) {
+          for (let i = 0; i < this.$login.f.f_allArea.length; i++) {
+            if (this.$login.f.f_allArea[i].label === this.$refs.paged.$refs.cri.model.f_area[0]) {
+              rs = this.$login.f.f_allArea[i].value
+            }
+          }
+        }
+        return [{label: '全部', value: ''}, ...rs]
+      },
+
+      tablestate() {
+        return [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '停用', value: '停用'}]
+      },
+      bgl(){
+        return [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}]
+      }
+    }
+  }
+</script>
+<style scoped>
+  .labelother {
+    line-height: 18px;
+  }
+</style>

package/src/components/SellGasCharge/MeterCharge/CardDataRewrite.vue

@@ -0,0 +1,107 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-4">
+            <label for="f_paytype" class=" font_normal_body">写卡气量:</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.ql" disabled/>
+          </div>
+          <div class="col-sm-4">
+            <label for="f_pregas" class=" font_normal_body">写卡次数:</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.cs" disabled>
+          </div>
+
+          <div class="col-sm-4">
+            <label for="f_preamount" class=" font_normal_body">返回错误:</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_json_return" disabled>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-4">
+            <label for="f_paytype" class=" font_normal_body">写卡类型:</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_records_tpye" disabled/>
+          </div>
+          <div class="col-sm-4">
+            <label for="f_pregas" class=" font_normal_body">写卡状态:</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_state" disabled>
+          </div>
+
+          <div class="col-sm-4">
+            <label for="f_preamount" class=" font_normal_body">数据版本:</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.version" disabled>
+          </div>
+        </div>
+        <div class="row" style="margin-top:6px;">
+          <div class="col-sm-4">
+            <label for="f_print" class="font_normal_body">操&ensp;作&ensp;人:</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_operator" disabled>
+          </div>
+          <div class="col-sm-4">
+            <label for="f_print" class="font_normal_body">部&emsp;&emsp;门:</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_depname" disabled>
+          </div>
+          <div class="col-sm-4">
+            <label for="f_print" class="font_normal_body">操作时间:</label>
+            <input type="text" class="input_search" style="width: 60%" v-model="model.f_operate_date" disabled>
+          </div>
+        </div>
+      </form>
+      <div style="text-align:right;margin-top:80px;margin-right:50px;">
+        <button class="button_search" @click="confirm()"  :disabled='clickConfirm'>写卡</button>
+        <button class="button_clear" @click="clean()">取消</button>
+      </div>
+    </validator>
+  </div>
+</template>
+<script>
+  /**
+   *综合业务
+   *卡表收费组件
+   */
+  export default {
+    title: '卡数据重写',
+    data() {
+      return {
+        model: {},
+        clickConfirm: false,
+      }
+    },
+    props: ['row', 'cardData'],
+    ready() {
+      //卡数据赋值
+      if (this.row.NoCardSucc) {
+        this.model = this.row.NoCardSucc[0]
+      }
+    },
+    methods: {
+      async confirm() {
+        let params=JSON.parse(this.model.f_json_send)
+        params.kzt="1"
+        params.bkcs=this.row.f_fillcard_times + 1
+        let cardRes = await this.$resetpost("http://127.0.0.1:8003/WriteNewCard", params,  {resolveMsg: null,rejectMsg: '写卡失败'})
+        if (cardRes.data.Err || cardRes.data.Exception) {
+          await this.$resetpost('rs/entity/t_send_carddata', this.model, {resolveMsg: null, rejectMsg: '保存写卡数据失败'})
+          await this.$showAlert('重新写卡失败！！！ 请联系管理员进行处理', 'danger', 5000)
+        }else {
+          this.model.f_state="成功"
+          let updateFiles = {
+            f_userfiles_id: this.row.f_userfiles_id,
+            version: this.row.version,
+            f_fillcard_times: params.bkcs
+          }
+          await this.$resetpost('rs/entity/t_userfiles',updateFiles, {resolveMsg: null, rejectMsg: null})
+          await this.$resetpost('rs/entity/t_send_carddata', this.model, {resolveMsg: null, rejectMsg:  '保存写卡数据失败'})
+          await this.$showAlert('重新写卡成功！！！', 'success', 5000)
+        }
+        await this.$dispatch('success')
+      },
+      clean() {
+        this.$dispatch('refresh', this.row)
+      }
+    }
+  }
+</script>
+
+<style>
+</style>

package/src/components/SendCard/SendCardData.vue

@@ -0,0 +1,208 @@
+<template>
+  <div id="unit" class="flex-row" >
+    <div class="basic-main" >
+      <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="form-group col-sm-2">
+              <label class="font_normal_body">组织机构</label>
+              <res-select restype='organization'
+                          @res-select="$parent.$parent.getorg"
+                          is-mul="false"
+                          :initresid='$parent.$parent.curorgid'>
+              </res-select>
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">数据状态</label>
+              <v-select id="f_paytype"
+                        v-model="model.f_state"
+                        placeholder='数据状态'
+                        :value.sync="model.f_state"
+                        :options='$parent.$parent.tableStates'
+                        condition="f_state = '{}'"
+                        style="width: 60%"
+                        close-on-select></v-select>
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">卡&emsp;&emsp;号</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_card_id" placeholder='卡号'
+                     condition="f_card_id like '%{}%'">
+            </div>
+            <div class="form-group col-sm-2" >
+              <label class="font_normal_body">客户编号</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" placeholder='客户编号'
+                     condition="f_userinfo_code = '{}'"
+              >
+            </div>
+            <div class="form-group col-sm-2"  >
+              <label class="font_normal_body">客户名称</label>
+              <input type="text" class="input_search" style="width:60%"
+                     v-model="model.f_user_name" placeholder='客户名称'
+                     condition="f_user_name like '%{}%'">
+            </div>
+            <div class="form-group col-sm-2"  >
+              <label class="font_normal_body">地址信息</label>
+              <input type="text" class="input_search" style="width:60%"
+                     v-model="model.f_address" placeholder='客户名称'
+                     condition="f_address like '%{}%'">
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">客户名称</label>
+              <input type="text" class="input_search" style="width:60%"
+                     v-model="model.f_user_name" placeholder='客户名称'
+                     condition="f_user_name like '%{}%'">
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">开始时间</label>
+              <datepicker id="startDate" placeholder="开始时间"
+                          v-model="model.f_operate_date_stat"
+                          :value.sync="model.f_operate_date_stat"
+                          condition="f_operate_date >'{}'"
+                          :format="'yyyy-MM-dd'"
+                          style="width: 60%">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">结束时间</label>
+              <datepicker id="endDate" placeholder="结束时间"
+                          v-model="model.f_operate_date_end"
+                          :value.sync="model.f_operate_date_end"
+                          condition="f_operate_date <'{}'"
+                          :format="'yyyy-MM-dd'"
+                          style="width: 60%">
+              </datepicker>
+            </div>
+            <div style="float:right;">
+              <button class="button_search button_spacing" @click="search()" >查询</button>
+              <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+            </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 >客户编号</th>
+              <th >客户信息</th>
+              <th >卡号</th>
+              <th >操作时间</th>
+              <th >操作人</th>
+              <th >写卡次数</th>
+              <th >业务类型</th>
+              <th >数据状态</th>
+              <th >操作</th>
+
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr>
+              <td >{{$index + 1}}</td>
+              <td>{{row.f_userinfo_code}}</td>
+              <td>{{row.f_user_name}} {{row.f_user_phone}} {{row.f_address}}</td>
+              <td>{{row.f_card_id}}</td>
+              <td>{{row.f_operate_date}}</td>
+              <td>{{row.f_operator}}</td>
+              <td>{{row.version}}</td>
+              <td>{{row.f_records_tpye}}</td>
+              <td>{{row.f_state}}</td>
+              <td><nobr>
+                <button v-show="row.f_state=='待写卡'" type="button" name="button" class="btn btn-link"
+                        @click.stop="$parent.$parent.$parent.send(row)">重写卡</button>
+                <button v-show="row.f_state=='待写卡' && row.f_operator!='悦生活' " type="button" name="button" class="btn btn-link"
+                        @click.stop="$parent.$parent.$parent.updatestate(row)">修改状态为成功</button>
+              </nobr></td>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>    </div>
+  </div>
+</template>
+<script>
+  import { PagedList } from 'vue-client'
+
+  export default {
+
+    data () {
+      return {
+        criteriaShow: false,
+        model: new PagedList('rs/sql/get_sendCardCata_list',50),
+        // 公司下拉
+        tableStates: [{label: '全部', value: ''},{label: '成功', value: '成功'},{label: '失败', value: '失败'},{label: '待写卡', value: '待写卡'},],
+        curorgid: [this.$login.f.orgid],
+        f_orgid: ''
+      }
+    },
+    title: '卡云数据维护',
+    props:{
+      f_filialeids:{
+        type: String
+      },
+      style: {
+        type: String,
+        default: 'col-sm-2'
+      },
+      f_special:{
+        type: String
+      }
+    },
+    ready(){
+      this.$refs.paged.$refs.cri.model.f_state = "待写卡"
+      this.search()
+    },
+    methods: {
+      search() {
+        this.$refs.paged.$refs.cri.search()
+      },
+      modify(val){
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('modify',val)
+      },
+      //重新发送卡服务数据
+      async send(val){
+        let cardRes = await this.$resetpost(val.f_send_url, val,  {resolveMsg: null,rejectMsg: '卡表收费失败'})
+        if (cardRes.data.Err || cardRes.data.Exception) {
+          await this.$resetpost('rs/entity/t_send_carddata', val, {resolveMsg: null, rejectMsg: '保存写卡数据失败'})
+          await this.$showAlert('重新写卡失败！！！ 请联系管理员进行处理', 'danger', 5000)
+        }else {
+          val.f_state="成功"
+          await this.$resetpost('rs/entity/t_send_carddata', val, {resolveMsg: null, rejectMsg:  '保存写卡数据失败'})
+          await this.$showAlert('重新写卡成功！！！', 'success', 5000)
+        }
+        await this.search()
+      },
+      updatestate(val){
+        this.$showMessage(`是否修改${val.f_user_name}的${val.f_records_tpye}操作写卡状态为成功,请确定本次业务已经写卡成功?`,['confirm','cancel']).then(async res=>{
+          if (res === 'confirm'){
+            val.f_state="成功"
+            await this.$resetpost('rs/entity/t_send_carddata', val, {resolveMsg: null, rejectMsg:  '保存写卡数据失败'})
+            await this.$showAlert('重新写卡成功！！！', 'success', 5000)
+          }
+        })
+      },
+      selfSearch (args) {
+        if (!this.f_orgid) {
+          this.getorg([this.$login.f.orgid])
+        }
+        console.log('查询。。。', this.f_orgid)
+        args.condition =  `${args.condition} and f_orgid in ${this.f_orgid}`
+        this.model.search(args.condition, args.model)
+      },
+      //清空
+      clear(){
+        this.$refs.paged.$refs.cri.model = {}
+      },
+      getorg (val) {
+        this.f_orgid = this.$login.convertToIn(val)
+        this.f_filialeids = val[0]
+      }
+    },
+    watch:{
+
+    }
+
+  }
+</script>
+<style>
+
+</style>