sale-client 3.6.111 → 3.6.113

package/src/filiale/kelai/GarbageList.vue

@@ -0,0 +1,466 @@
+<template>
+  <div>
+    <div style="flex: 1.5" class="flex">
+      <div class="flex">
+        <criteria-paged :model="model" v-ref:paged @sort="sort">
+          <criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch"
+                    v-show="$parent.searchshow">
+            <div novalidate class="form-inline auto" partial>
+              <div class="row">
+                <res-select-group :style="$parent.$parent.editList?'col-sm-4 form-group':'col-sm-2 form-group'" :initres="$parent.$parent.initres" :show-component="['company']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+              <div
+                :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                class="form-group">
+                <label class="font_normal_body">用户编号</label>
+                <input type="text" class="input_search"  style="width: 60%" v-model="model.f_userinfo_code"
+                       condition="f_userinfo_code like '%{}%'" placeholder='用户编号'>
+              </div>
+              <div style="float:right;margin-top: 8px" class="span">
+<!--                <button class="button_spacing button_search" @click="$parent.$parent.updateAll()">批量维护</button>-->
+                <button class="button_spacing button_search" @click="search()">查 询</button>
+                <export-excel v-if="$parent.$parent.excelTable"
+                              class="auto"
+                              :data="{condition: $parent.$parent.condition}"
+                              :field="$parent.$parent.getfield"
+                              sqlurl="rs/logic/saleExport" progress="saleGetExportProgress"  sql-name="getGarbageRecords"
+                              template-name='垃圾费记录'
+                              :choose-col="true"></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-if="$parent.$parent.criteriaShow">
+                <div
+                  :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                  class="form-group">
+                  <label class="font_normal_body">用户姓名</label>
+                  <input type="text" class="input_search"  style="width: 60%" v-model="model.f_user_name"
+                         condition="f_user_name = '{}'" placeholder='用户姓名'>
+                </div>
+                <div
+                  :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                  class="form-group">
+                  <label class="font_normal_body">开始日期</label>
+                  <datepicker placeholder="开始日期" v-model="model.startDate" :value.sync="model.startDate" style="width:60%"
+                              :format="'yyyy-MM-dd 00:00:00'" condition="f_operate_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div
+                  :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                  class="form-group">
+                  <label class="font_normal_body">结束日期</label>
+                  <datepicker placeholder="结束日期" v-model="model.endDate" :value.sync="model.endDate" style="width:60%"
+                              :format="'yyyy-MM-dd 23:59:59'" condition="f_operate_date <= '{}'">
+                  </datepicker>
+                </div>
+              </div>
+            </div>
+          </criteria>
+          <data-grid :model="model" v-ref:grid class="list_area table_sy" partial='list'>
+            <template partial='head'>
+              <tr>
+<!--                <th>-->
+<!--                  <nobr>全选</nobr>-->
+<!--                  <input @keyup.enter="search" style="width:60%" type="checkbox" v-model='checked1' :checked="$parent.$parent.$parent.checked1"-->
+<!--                         @click="$parent.$parent.$parent.checkedALL()"></th>-->
+                <th><nobr>序号</nobr></th>
+                <th><nobr>用户编号</nobr></th>
+                <th><nobr>用户姓名</nobr></th>
+                <th><nobr>单价</nobr></th>
+                <th><nobr>金额</nobr></th>
+                <th><nobr>付款方式</nobr></th>
+                <th><nobr>跨月数</nobr></th>
+                <th><nobr>所属日期</nobr></th>
+                <th><nobr>操作时间</nobr></th>
+                <th><nobr>操作员</nobr></th>
+                <th><nobr>所属部门</nobr></th>
+                <th><nobr>所属公司</nobr></th>
+
+              </tr>
+            </template>
+            <template partial='body'>
+<!--              <td style="text-align: center;">-->
+<!--                <input @keyup.enter="search" style="width:60%" type="checkbox" checked="checked" name="opertioninput"-->
+<!--                       @click="$parent.$parent.$parent.checked(row)"></td>-->
+              <td style="text-align: center;">{{ $index + 1 }}</td>
+              <td style="text-align: center;"><nobr>{{row.f_userinfo_code}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_price}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_money}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_payment}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_month}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_hand_date}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_operator}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_depname}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></td>
+            </template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+  <modal  :show.sync="updateall" width="1200px" backdrop="true">
+    <header slot="modal-header" class="modal-header">
+      <h3 style="color:black" class="modal-title">批量维护</h3>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <validator name='v'>
+        <form class="form-horizontal  select-overspread">
+          <div class="row">
+            <div class="col-sm-6 form-input-group">
+              <label class="font_normal_body col-sm-3">付款方式</label>
+              <v-select :disabled=false
+                        :options='$parent.$parent.f_payment'
+                        :value-single="true"
+                        :value.sync="model.f_payment"
+                        close-on-select
+                        placeholder='请选择'
+                        v-model="model.f_payment"
+                        search=fasle
+              >
+              </v-select>
+            </div>
+          </div>
+        </form>
+      </validator>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button class="button_search btn-gn" @click="confirm">确认</button>
+      <button class="button_clear btn-gn" @click="cancel">取消</button>
+    </footer>
+  </modal>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+const myMap = new Map()
+
+  export default {
+    'title': '收费记录维护',
+    data () {
+      return {
+        usertypes: this.$appdata.getParam('客户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('客户类型')] : [],
+        f_payment: this.$appdata.getParam('付款方式查询') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式查询')] : [],
+        model: new PagedList('rs/sql/getGarbageRecords', 20,{}),
+        // model: new PagedList('rs/sql/singleTable_OrderBy', 20, {items: '"s.*,ui.f_userinfo_code"', tablename: '"t_sellinggas s left join t_userinfo ui on s.f_userinfo_id=ui.f_userinfo_id"', orderitem: '"f_delivery_date"'}),
+        // 排序
+        orderitem: 'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
+        // 控制查询条件显示
+        searchshow: true,
+        criteriaShow: false,
+        // 控制样式
+        editList: false,
+        // 公司下拉
+        curorgid: [this.$login.f.orgid],
+        excelTable: true,
+        condition: '',
+        getfield: {
+          'f_userinfo_code': '用户编号',
+          'f_user_name': '用户姓名',
+          'f_price': '单价',
+          'f_money': '金额',
+          'f_payment': '收费形式',
+          'f_month': '跨月数',
+          'f_hand_date': '所属时间',
+          'f_operate_date': '收费时间',
+          'f_operator': '操作员',
+          'f_depname': '所属部门',
+          'f_orgname': '所属公司'
+        },
+        f_orgid: '',
+        checked1: true,
+        map: new Map(),
+        updateall:false,
+        da: {
+          rows: []
+        },
+        initres: {
+          org: [this.$login.f.orgid],
+          dep: [],
+          user: []
+        },
+        orgCondtionStr: '',
+        f_meternumber: '',
+        updatemodel:{
+          f_accounting_date: this.$login.toStandardTimeString()
+        }
+      }
+    },
+    ready () {
+      this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+      // this.search()
+      // this.getwarehouse()
+    },
+    events: {
+      'showfiles' (val) {
+        console.log(val)
+      }
+    },
+    props: ['showMessage'],
+    methods: {
+      updateAll(){
+        this.updateall = true
+      },
+      cancel(){
+        this.updateall = false
+        this.updatemodel = {
+          f_accounting_date: this.$login.toStandardTimeString()
+        }
+      },
+      async getRes(condition,obj) {
+        this.orgCondtionStr = condition
+        this.orgname = obj.orgnames[0]
+        this.depname = obj.depnames[0]
+
+      },
+      // async confirm(){
+      //   let array = []
+      //   this.map.forEach((value, key, map) => {
+      //     array.push(map.get(key))
+      //   })
+      //   console.log('asdasd',array)
+      //   if (array.length>0){
+      //     let condition = `id in (''`
+      //     array.forEach((row) => {
+      //       condition = condition+`,'${row.id}'`
+      //     })
+      //     condition = condition+ `)`
+      //
+      //     console.log('asdasd',condition)
+      //     await this.$resetpost('rs/logic/updatesellinggas',{updatemodel:this.updatemodel,condition:condition})
+      //     this.search()
+      //     this.cancel()
+      //   } else{
+      //     this.$showMessage('当前未勾选用户，将为所有查询出来的用户添加限购，确定要操作吗？', ['confirm', 'cancel']).then(async (res) => {
+      //       if (res === 'confirm') {
+      //         await this.$resetpost('rs/logic/updatesellinggas',{updatemodel:this.updatemodel,condition:this.condition})
+      //         this.search()
+      //         this.cancel()
+      //       }
+      //     })
+      //
+      //   }
+      // },
+      checkedALL () {
+        this.checked1 = !this.checked1
+        let box = document.getElementsByName('opertioninput')
+        for (var i = 0; i < box.length; i++) {
+          box[i].checked = this.checked1
+        }
+      },
+      checked (val) {
+        let id = val.id
+        if (this.map.has(id)) {
+          this.map.delete(id)
+        } else {
+          this.map.set(id, {id: id})
+        }
+      },
+      mapset (array) {
+        this.map.clear()
+        for (let i = 0; i < array.length; i++) {
+          let id = array[i].id
+          this.map.set(id, {id: id})
+        }
+      },
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
+      getorg (val) {
+        this.f_orgid = this.$login.convertToIn(val)
+        this.f_filialeid = val[0]
+      },
+      view (row) {
+        this.$parent.showupload = true
+        this.$parent.row = row
+      },
+      init () {
+        this.f_meternumber = ''
+        this.da.rows = []
+        myMap.clear()
+      },
+      cancelSet () {
+        this.showSetModal = false
+        this.init()
+      },
+
+      jump () {
+        this.joinshow2 = false
+        this.showSetModal = true
+      },
+      async getwarehouse () {
+
+      },
+
+      join1 (row) {
+        this.joinrow = row
+        this.joinshow = true
+      },
+
+      joinclose () {
+        this.joinshow = false
+      },
+      joinclose2 () {
+        this.joinshow2 = false
+      },
+
+      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.orderitem}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
+        }
+
+        this.search()
+      },
+      search () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      importFile () {
+        this.show = true
+      },
+      selfSearch (args) {
+        if (!this.$refs.paged.$refs.criteria.model.startDate) {
+          this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+        }
+        if (!this.$refs.paged.$refs.criteria.model.endDate) {
+          this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+        }
+        if (!this.orgCondtionStr) {
+          args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
+        } else {
+          args.condition = `${args.condition}` + this.orgCondtionStr
+        }
+        this.model.search(args.condition, args.model)
+        this.condition = args.condition
+      },
+      mergeRowData (joinrows) {
+
+      },
+      // 多选框初始化
+      selectInit () {
+        this.rowsdata = []
+        this.all = []
+        this.radio = []
+      },
+      select () {
+        let index = this.model1.pageIndex - 1
+        console.log('全选', this.all[index])
+        if (!this.radio[index]) {
+          this.radio.$set(index, [])
+        }
+        if (this.all[index]) {
+          // 数据
+          this.rowsdata[index] = Object.assign([], this.model1.rows)
+          // 勾选
+          for (var i = 0; i < this.model1.rows.length; i++) {
+            this.radio[index].$set(i, true)
+          }
+        } else {
+          // 数据
+          this.rowsdata[index] = []
+          // 不勾选
+          for (var i = 0; i < this.model1.rows.length; i++) {
+            this.radio[index].$set(i, false)
+          }
+        }
+      },
+      selectOne (event, row, i) {
+        console.log('单选', event.target.checked)
+        let index = this.model1.pageIndex - 1
+        if (!this.rowsdata[index]) {
+          this.rowsdata[index] = []
+        }
+        if (!this.radio[index]) {
+          this.radio.$set(index, [])
+        }
+        if (event.target.checked) {
+          // 数据
+          this.rowsdata[index][i] = row
+          // 勾选
+          this.radio[index].$set(i, true)
+          // 判断是否全部选中
+          var allState = true
+          if (this.model1.rows.length != this.radio[index].length) {
+            allState = false
+          }
+          for (var state of this.radio[index]) {
+            if (!state) {
+              allState = false
+            }
+          }
+          if (allState) {
+            this.all.$set(index, true)
+          } else {
+            this.all.$set(index, false)
+          }
+        } else {
+          // 数据
+          this.rowsdata[index][i] = []
+          // 不勾选
+          this.radio[index].$set(i, false)
+          // 任意取消一个则全选状态设为false
+          this.all.$set(index, false)
+        }
+      }
+    },
+    computed: {
+      ischecked () {
+        return function (index, i) {
+          // console.log("计算属性")
+          if (!this.radio[index]) {
+            return false
+          }
+          return this.radio[index][i]
+        }
+      },
+      distributionstate () {
+        return [{label: '全部', value: ''}, {label: '待分配', value: 'is null'}, {label: '已入库', value: 'is not null'}]
+      }
+    },
+    watch: {
+      'model.pageIndex' () {
+        this.checked1 = false
+        this.mapset(this.model.rows)
+        this.checkedALL()
+      },
+      'model.rows' () {
+        this.checked1 = false
+        this.mapset(this.model.rows)
+        this.checkedALL()
+      },
+      'checked1' (val) {
+        if (val) {
+          this.mapset(this.model.rows)
+        } else {
+          this.map.clear()
+        }
+      }
+    }
+  }
+</script>
+<style>
+  .datapanel {
+    color: #333;
+    background-color: white;
+    padding: 10px 20px;
+    border-radius: 15px;
+  }
+</style>

package/src/filiale/kelai/GarbageMain.vue

@@ -0,0 +1,45 @@
+<template>
+  <div style="padding-right:25px;padding-left: 20px;">
+    <!--分配状态是全部-->
+    <tabset >
+      <tab header="具体信息">
+        <garbage-operate-main :model="model" :oldmodel="oldmodel"></garbage-operate-main>
+      </tab>
+      <tab header="操作记录">
+        <garbage-add :recordlist="recordlist"></garbage-add>
+      </tab>
+    </tabset>
+  </div>
+</template>
+<script>
+  export default {
+    name: 'WareHouseOperation',
+    data () {
+      return {
+        showupload: false
+      }
+    },
+    props: {
+      recordlist: Array,
+   //   row: Object,
+      model: Object,
+      oldmodel: Object
+    },
+    created () {
+    },
+    ready () {
+
+    },
+    methods: {
+    },
+    events: {
+      'showfiles' (val) {
+        console.log('events!!!!!!!!!!!!!', val)
+      }
+    }
+  }
+</script>
+
+<style lang="less">
+
+</style>

package/src/filiale/kelai/GarbageOperateMain.vue

@@ -0,0 +1,180 @@
+<template>
+  <div class="auto">
+    <validator name='a' @valid="addressValid(true)" @invalid="addressValid(false)">
+      <form class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">用户姓名</label>
+            <input type="text" v-model="model.f_user_name" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="参数:收费状态">收费状态</label>
+            <input type="text" v-model="model.f_state" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="参数:付款方式查询">付款方式</label>
+            <v-select :value.sync="model.f_payment" v-model="model.f_payment"
+                      :options='payments' placeholder='付款方式'
+                      :value-single="true"
+                      :search="false"
+                      close-on-select>
+            </v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">购买单价</label>
+            <input type="text" v-model="model.f_price" disabled=disabled  style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">收款金额</label>
+            <input type="text" v-model="model.f_money" disabled=disabled  style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">所跨月数</label>
+            <input type="text" v-model="model.f_month" disabled=disabled  style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-6 form-group">
+            <label class="form-group">所属日期</label>
+            <input type="text" v-model="model.f_hand_date" disabled=disabled  style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-6 form-group">
+            <label class="form-group">操作日期</label>
+            <input type="text" v-model="model.f_operate_date" disabled=disabled  style="width: 60%" class="input_search">
+          </div>
+          <!--<div class="col-sm-4 form-group">-->
+            <!--<label class="font_normal_body">收据类型</label>-->
+            <!--<input type="text" v-model="model.f_bill_style" style="width: 60%" class="input_search">-->
+          <!--</div>-->
+        </div>
+
+        <div class="row">
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="参数:操作人员查询">操作人员</label>
+            <input type="text" v-model="model.f_operator" disabled=disabled style="width: 60%" class="input_search">
+
+<!--            <v-select :value.sync="model.f_operator"-->
+<!--                      v-model="model.f_operator"-->
+<!--                      :value-single="true"  @change="selectoperator()"-->
+<!--                      :options='foperator'-->
+<!--                      close-on-select></v-select>-->
+            <!--                      @click="selectoperator"-->
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">所属部门</label>
+            <input type="text" v-model="model.f_depname" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">所属公司</label>
+            <input type="text" v-model="model.f_orgname" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+        </div>
+      </form>
+      <div style="float: right">
+        <button class="button_search" @click="save">保存</button>
+        <button class="button_clear" @click="cancel">取消</button>
+      </div>
+    </validator>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  import * as Util from "../../Util";
+  var data
+  export default {
+    title: '基本信息',
+
+    data () {
+      return {
+        equipmentType: this.$appdata.getParam('打印格式') ? [{label: '', value: ''}, ...this.$appdata.getParam('打印格式')] : [],
+        // 构建数组来存储对象
+        editbank: true,
+        uploadText: '收费',
+        showfiles: false,
+        recordList: [],
+        fileNameSet: {
+          'f_payment': '收费形式',
+          'f_serial_id': '流水号'
+        }
+      }
+    },
+    props: {
+      oldmodel: Object,
+      model: Object
+    },
+
+    ready () {
+      if (this.$login.r.includes('维护银行转账信息')) {
+        this.editbank = true
+      }
+      this.oldmodel = JSON.parse(JSON.stringify(this.model))
+      this.model.f_bill_state = [this.oldmodel]
+      console.log('看看收费id', this.oldmodel)
+    },
+    created () {
+    },
+    methods: {
+
+      cancel () {
+        this.$dispatch('close')
+      },
+      uploadFiles () {
+        this.showfiles = !this.showfiles
+      },
+      addressValid (val) {
+      },
+      save () {
+        this.recordList = []
+        for (var item in this.model) {
+          if (this.model.f_payment != this.oldmodel.f_payment && item==='f_payment' ) {
+            var car = {
+              chinesename: this.fileNameSet[item],
+              fieldname: item,
+              tablename: 't_flotsamprice',
+              oldvalue: this.oldmodel[item],
+              newvalue: this.model[item],
+              state: '有效',
+              modifitime: Util.toStandardTimeString(),
+              operator: this.$login.f.name,
+              garbage_id: this.model.id,
+              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
+
+            }
+            this.recordList.push(car)
+            // 该方法并未对chinesename fieldname operator等进行判断赋值，此暂写为定值
+            console.log('看看car的值', car)
+          }
+        }
+
+        this.$resetpost('rs/logic/saveGarbage', {data: {recordlist: this.recordList, newData: this.model}}).then((res) => {
+          console.log('this.model', this.model)
+        })
+        this.$dispatch('close')
+      }
+    },
+    computed: {
+      foperator () {
+        return [...this.$appdata.getParam('操作人员')]
+      },
+      positions () {
+        return this.$appdata.getParam('收费状态')
+      },
+      payments () {
+        return this.$appdata.getParam('付款方式查询')
+      },
+      writeCards () {
+        return this.$appdata.getParam('写卡状态')
+      },
+      billStyles () {
+        return this.$appdata.getParam('收据类型')
+      }
+    },
+    watch: {
+
+    }
+  }
+</script>