sale-client 3.6.111 → 3.6.113

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.111",
+  "version": "3.6.113",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/SellGasCharge/ChargeCancel/CardMeterChargeCancel.vue

@@ -260,10 +260,9 @@ export default {
     return {
       config: {
         cancleother: false,  // 默认可以撤销别人的操作
-        // cancletime: false,  // 默认可以冲正今天以前的操作
         hasBillManage: false,  // 默认不启用发票管理
         cancelType: 'newBill',
-        cancletime: true // 是否限制当天不能冲正
+        cancletime: false // 是否限制当天不能冲正
       },
       model: {
         f_payment: '',

package/src/filiale/fugu/components/BlackList/BlackListBatch.vue

@@ -142,11 +142,16 @@ export default {
     }
   },
   watch:{
-    'data' () {
+    'data' (val) {
+      this.data = val
       this.initModel()
     }
   },
   methods: {
+    close () {
+      this.blackbatchshow = false
+      this.$dispatch('bacthColse')
+    },
     gg () {
       if (this.f_limit[0] === '限购气量') {
         this.model.f_limit_amount = ''

package/src/filiale/fugu/components/BlackList/BlackListList.vue

@@ -103,7 +103,7 @@
               ></datepicker>
             </div>
             <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}">
-              <label class="font_normal_body">到</label>
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
               <datepicker placeholder="截止日期"
                           style="width:60%"
                           class="datepicker"
@@ -314,7 +314,6 @@
           this.$showMessage('你没有新增黑名单的权限,请联系管理员!')
           return
         }
-        this.style = 'col-sm-3'
         let dataArr = this.$refs.paged.$refs.grid.getRowData();
         if (dataArr.length === 0) {
           this.$showMessage('请选择要添加的用户')

package/src/filiale/fugu/components/BlackList/BlackListManage.vue

@@ -2,18 +2,18 @@
   <div id="unit" class="flex-row">
     <black-list-list class="binary-left" v-ref:list :row="row"   :style="style" @select-changed="selected"
                      style="width:auto;"></black-list-list>
+    <black-list-batch style="height: 55%; margin-bottom: 30px;" :data="list" :blackbatchshow="isBatchShow" v-if="isBatchShow" v-ref:batch></black-list-batch>
     <div class="binary-right" style="overflow-y: auto;" v-if="isdetail" :style="{width: isdetail?'50%':'auto'}">
       <!-- <p class="bg-info text-center" style="padding: 8px;" v-if="row.pricecount">气价变更情况汇总</p> -->
 <!--      <black-list-batch style="margin-bottom: 30px;" :v-if="isBatchShow" v-ref:batch></black-list-batch>-->
-      <black-list-batch style="height: 55%; margin-bottom: 30px;" :data="list" :blackbatchshow="isBatchShow" v-show="isBatchShow" v-ref:batch></black-list-batch>
       <black-list style="height: 55%; margin-bottom: 30px;"  :list="list" :data="row" v-ref:gas></black-list>
-      <div  v-show="row" class="auto">
+      <div  v-if="row" class="auto">
         <ul class="nav nav-tabs" >
           <li class="active"><a href="#">黑名单操作记录</a></li>
         </ul>
         <black-list-record v-ref:update :data="row"></black-list-record>
       </div>
-      <div  v-show="row" class="auto">
+      <div  v-if="row" class="auto">
         <ul class="nav nav-tabs" >
           <li class="active"><a href="#">限购充值明细</a></li>
         </ul>
@@ -98,15 +98,14 @@
         this.row = null
       },
       'batchAdd' () {
-        this.style = 'col-sm-3 form-group'
-        this.isdetail = true
+        this.row = null
+        this.style = 'col-sm-2 form-group'
         this.blodid = ''
         this.isBatchShow = true
+        this.isdetail = false
         this.$refs.list.$refs.paged.$refs.grid.selectStore.selected = null
         const map = this.$refs.list.$refs.paged.$refs.grid.getRowData()
-        const checked1 = this.$refs.list.checked1
         console.log('map',map)
-        this.row = null
         this.list = map
       },
       'blackclose'(){
@@ -118,6 +117,9 @@
         this.isdetail = false
         this.row = null
         this.list = []
+      },
+      'bacthColse' () {
+        this.isBatchShow = false
       }
     },
     watch: {

package/src/filiale/kelai/GarbageAdd.vue

@@ -0,0 +1,61 @@
+<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 class="list_area table_sy" style="width: 600px">
+          <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>
+
+          <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>
+        </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>

package/src/filiale/kelai/GarbageEditManage.vue

@@ -0,0 +1,136 @@
+<template>
+  <div id="unit" class="row" :class="{'binary':showItem}">
+    <div :class="{'basic-main':!showItem,'binary-left':showItem}" style="height:98%">
+      <garbage-list @select-changed="idsearch" :showMessage.sync="showAddMssage" v-if="stepControl"
+                  v-ref:stocklist></garbage-list>
+    </div>
+    <div class="binary-right"  v-show="showItem">
+      <garbage-main :recordlist="recordlist" :model="model" :oldmodel="oldmodel" v-show="showItem"
+                            :f_distribution_state="f_distribution_state" :row="row" :rowsdata="rowsdata1"
+                            :warehousename="warehousename"></garbage-main>
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '垃圾费费记录维护',
+    name: 'GarbageManage',
+    data () {
+      return {
+        showupload: false,
+        recordlist: [],
+        model: {},
+        oldmodel: {},
+        showAddMssage: false,
+        // 分配状态z
+        f_distribution_state: '',
+        // 单选数据
+        row: {},
+        // 多选数据
+        rowsdata: [],
+        rowsdata1: {},
+        stepControl: true,
+        warehousename: '',
+        showItem: false
+      }
+    },
+    created () {
+    },
+    ready () {
+      this.arrAddFun()
+    },
+    methods: {
+      arrAddFun () {
+        // 拓展数组去空值的方法
+        Array.prototype.removeEmpty = function () {
+          for (var i = 0; i < this.length; i++) {
+            if (this[i] == '' || typeof (this[i]) == 'undefined') {
+              this.splice(i, 1)
+              i--
+            }
+          }
+          return this
+        }
+      },
+      // 合并二维数组并去空
+      mergeRowData (rowsdata) {
+        let data = []
+        // 合并
+        for (let array of rowsdata) {
+          data.push.apply(data, array)
+        }
+        // 去空
+        data = data.removeEmpty()
+        this.rowsdata = data
+      },
+      selected (row) {
+        this.row = row.val
+      },
+      join (rowsdata) {
+      },
+      idsearch (row) {
+        this.$refs.stocklist.editList = true
+        this.showAddMssage = true
+        this.showItem = true
+        this.model = JSON.parse(JSON.stringify(row.val))
+        this.oldmodel = JSON.parse(JSON.stringify(row.val))
+        this.getGroupData()
+      },
+      getGroupData () {
+        let data = {}
+        let condition = ' garbage_id= ' + this.model.id
+        condition += " and tablename='t_flotsamprice'"
+        data.condition = condition
+        let http = new HttpResetClass()
+        http.load('POST', 'rs/logic/OperationRecord',
+          {data: data},
+          {resolveMsg: null, rejectMsg: null}).then((res) => {
+            this.recordlist = res.data
+          })
+      }
+    },
+    events: {
+      'change-state' (state) {
+        this.f_distribution_state = state
+        this.rowsdata1 = {}
+      },
+      'getwarehouse' (a) {
+        this.warehousename = a
+      },
+      'change-receive' (state) {
+        this.f_distribution_state = state
+      },
+      'change-state1' (state) {
+        console.log('选择分配状态', state)
+        this.rowsdata1 = {}
+      },
+      'select' (rowsdata) {
+        this.mergeRowData(rowsdata)
+      },
+      'join' (rowsdata) {
+        this.rowsdata1 = Object.assign({}, rowsdata)
+        console.log('111:', this.rowsdata1)
+      },
+      // 重新查询
+      'refresh' () {
+      },
+      'close' () {
+        this.$refs.stocklist.editList = false
+        this.showItem = false
+        this.$refs.stocklist.$refs.paged.$refs.criteria.search()
+        console.log('this.$refs', this.$refs)
+        console.log('showitem', this.showItem)
+      },
+      // 调拨组件选择调出仓库,根据选择仓库进行查询
+      'idsearch' (f_warehouse_id) {
+      }
+    }
+  }
+</script>
+
+<style lang="less">
+
+</style>