sale-client 4.2.70 → 4.2.71

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

@@ -0,0 +1,279 @@
+<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_charge_state" disabled=disabled style="width: 60%" class="input_search">-->
+            <v-select :value.sync="model.f_state" v-model="model.f_state"
+                      :value-single="true"
+                      :search="false"
+                      disabled=disabled
+                      :options='positions' placeholder='收费状态'
+                      close-on-select>
+            </v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="参数:写卡状态">写卡状态</label>
+            <!--            <input type="text" v-model="model.f_write_card" style="width: 60%" class="input_search">-->
+            <v-select :value.sync="model.f_write_card" v-model="model.f_write_card"
+                      :options='writeCards' placeholder='写卡状态'
+                      :value-single="true"
+                      :search="false"
+                      disabled=disabled
+                      close-on-select>
+            </v-select>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-12 form-group">
+            <label class="font_normal_body">地&emsp;&emsp;址</label>
+            <input type="text" v-model="model.f_address" disabled=disabled style="width: 86.5%" class="input_search">
+          </div>
+        </div>
+        <div class="row">
+          <!--<div class="col-sm-4 form-group">
+            <label class="font_normal_body">用户编号</label>
+            <input type="text" v-model="model.f_userinfo_code" 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_payment" style="width: 60%" class="input_search">-->
+            <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_collection" 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">操作时间</label>
+            <!--<input type="text" v-model="model.f_delivery_date"  style="width: 60%"  class="input_search">-->
+            <datepicker id="f_delivery_date" placeholder="操作时间" style="width:60%"
+                        v-model="model.f_operate_date"
+                        disabled=disabled
+                        :value.sync="model.f_operate_date"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :show-reset-button="true">
+            </datepicker>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">购气气量</label>
+            <input type="text" v-model="model.f_pregas" 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_preamount" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+        </div>
+        <div class="row">
+<!--          <res-select-group :show-component="resshow" :style="style" @re-res="getRes" :initres="initres"  :mul="false" v-ref:sel></res-select-group>-->
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">操作人员</label>
+            <input type="text" v-model="model.f_operator" 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_depname" 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 id="f_bill_style"
+                      placeholder='收据类型'
+                      :value-single="true" disabled
+
+                      :value.sync="model.f_bill_style"
+                      :options='equipmentType'
+                      close-on-select clear-button>
+            </v-select>
+          </div>
+        </div>
+
+
+          <div class="col-sm-12 form-group">
+<!--            <label class="font_normal_body">所属公司</label>-->
+<!--            <input type="text" v-model="model.f_orgname" disabled=disabled style="width: 86.5%" class="input_search">-->
+            <label class="font_normal_body">所属公司</label>
+            <res-select v-ref:select
+              :initresid='curorgid'
+              :is-mul ="false"
+              @res-select="getorg"
+              restype='organization'
+            >
+            </res-select>
+          </div>
+
+        <div class="row">
+          <div class="col-sm-12 form-group">
+            <label class="font_normal_body">备注信息</label>
+            <input type="text" v-model="model.f_comments"  style="width: 85%" class="input_search">
+          </div>
+        </div>
+      </form>
+      <div style="float: right">
+        <button v-if="model.f_operator == this.$login.f.name " class="button_search" @click="save">保存</button>
+        <button class="button_clear" @click="cancel">取消</button>
+      </div>
+    </validator>
+    <modal :show.sync="showfiles" width="80%" style="width:auto;"  v-ref:modal  backdrop="false">
+      <article slot="modal-body">
+        <upload :blodid="model.f_userinfo_id"  :businessid="model.id" v-ref:upload  fusetype="收费" isremark="true" style="width:auto" ></upload>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+    <!--文件上传按钮-->
+<!--    <button class="button_search" style="width: max-content" @click="uploadFiles()">上传附件</button>-->
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+
+  var data
+  export default {
+    title: '基本信息',
+
+    data () {
+      return {
+        style: {
+          type: String,
+          default: 'col-sm-2 form-group reshowtype'
+        },
+        equipmentType: this.$appdata.getParam('打印格式') ? [{label: '', value: ''}, ...this.$appdata.getParam('打印格式')] : [],
+        // 构建数组来存储对象
+        editbank: true,
+        uploadText: '收费',
+        curorgid:[],
+        showfiles: false,
+        recordList: [],
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[this.$login.f.depids],
+          user:[this.$login.f.id]
+        },
+        resshow:['operator'],
+        fileNameSet:{
+          'f_payment': '付款方式',
+          'f_orgid': '分公司编号',
+          'f_comments': '备注信息'
+        },
+      }
+    },
+    props: {
+      oldmodel: Object,
+      model: Object
+    },
+    watch:{
+      'model'(val) {
+        this.curorgid = [this.model.f_orgid]
+        console.log(this.$refs.select)
+        this.$refs.select.selectres = [this.model.f_orgid]
+      }
+    },
+    ready () {
+      this.oldmodel = JSON.parse(JSON.stringify(this.model))
+      this.model.f_bill_state = [this.oldmodel]
+      this.curorgid = [this.$login.f.orgid]
+    },
+    created () {
+    },
+    methods: {
+      getRes(obj,objs){
+        if(objs.operatornames.length>0){
+          this.model.f_operator_id = objs.operatornames[0];
+        }
+      },
+      getorg(val) {
+        console.log(val)
+        this.model.f_filialedid = val[0]
+        this.model.f_orgid = val[0]
+        // this.getPricenames =  this.$GetSaleParam.getPriceByOrg(this.f_filialeid)
+      },
+      selectoperator(){
+        let f_operator=this.model.f_operator
+        console.log("处理签的this.f_operatorid",this.f_operatorid)
+        let http = new HttpResetClass()
+        http.load('POST', 'rs/logic/findOperator',
+          {f_operator: f_operator},
+          {resolveMsg: null, rejectMsg: null}).then((res) => {
+          console.log("kanak,res",res)
+          this.model.f_operatorid = res.data[0].id
+          console.log("this.f_operatorid",this.f_operatorid)
+        })
+      },
+      cancel () {
+        this.$dispatch('close')
+      },
+      uploadFiles(){
+        this.showfiles= !this.showfiles
+      },
+      addressValid (val) {
+      },
+      save () {
+        this.recordList = [];
+        for (var item in this.model) {
+          //保证只能修改 付款方式和 备注
+          if (this.model[item] != this.oldmodel[item] && (item == "f_payment"|| item == "f_comments" || item == "f_orgid" ) ) {
+            var car = {
+              chinesename: this.fileNameSet[item],
+              fieldname: item,
+              tablename: 't_sellinggas',
+              oldvalue: this.oldmodel[item],
+              newvalue: this.model[item],
+              state: '有效',
+              modifitime: new Date(),
+              operator: this.$login.f.name,
+              sellingas_id: this.model.id
+            }
+            this.recordList.push(car)
+            // 该方法并未对chinesename fieldname operator等进行判断赋值，此暂写为定值
+          }
+        }
+        this.$resetpost('rs/logic/saveing', {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('收据类型')
+        }
+    },
+  }
+</script>
+<style >
+.reshowtype {
+  width:50%;
+}
+</style>
+

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

@@ -0,0 +1,265 @@
+<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"  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_charge_state"  style="width: 60%" class="input_search">-->
+            <v-select :value.sync="model.f_state" v-model="model.f_state"
+                      :value-single="true"
+                      :search="false"
+                      :options='positions' placeholder='收费状态'
+                      close-on-select>
+            </v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="参数:写卡状态">写卡状态</label>
+            <!--            <input type="text" v-model="model.f_write_card" style="width: 60%" class="input_search">-->
+            <v-select :value.sync="model.f_write_card" v-model="model.f_write_card"
+                      :options='writeCards' placeholder='写卡状态'
+                      :value-single="true"
+                      :search="false"
+                      close-on-select>
+            </v-select>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-12 form-group">
+            <label class="font_normal_body">地&emsp;&emsp;址</label>
+            <input type="text" v-model="model.f_address"  style="width: 86.5%" class="input_search">
+          </div>
+        </div>
+        <div class="row">
+          <!--<div class="col-sm-4 form-group">
+            <label class="font_normal_body">用户编号</label>
+            <input type="text" v-model="model.f_userinfo_code"  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_payment" style="width: 60%" class="input_search">-->
+            <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_collection"   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">操作时间</label>
+            <!--<input type="text" v-model="model.f_delivery_date"  style="width: 60%"  class="input_search">-->
+            <datepicker id="f_delivery_date" placeholder="操作时间" style="width:60%"
+                        v-model="model.f_operate_date"
+                        :value.sync="model.f_operate_date"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :show-reset-button="true">
+            </datepicker>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">购气气量</label>
+            <input type="text" v-model="model.f_pregas"  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_preamount"  style="width: 60%" class="input_search">
+          </div>
+        </div>
+        <div class="row">
+<!--          <res-select-group :show-component="resshow" :style="style" @re-res="getRes" :initres="initres"  :mul="false" v-ref:sel></res-select-group>-->
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">操作人员</label>
+            <input type="text" v-model="model.f_operator" 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_depname" 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 id="f_bill_style"
+                      placeholder='收据类型'
+                      :value-single="true"
+                      :value.sync="model.f_bill_style"
+                      :options='equipmentType'
+                      close-on-select clear-button>
+            </v-select>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="col-sm-12 form-group">
+            <label class="font_normal_body">所属公司</label>
+            <input type="text" v-model="model.f_orgname"  disabled=disabled style="width: 86.5%" class="input_search">
+          </div>
+
+        </div>
+        <div class="row">
+          <div class="col-sm-12 form-group">
+            <label class="font_normal_body">备注信息</label>
+            <input type="text" v-model="model.f_comments"  style="width: 85%" class="input_search">
+          </div>
+        </div>
+      </form>
+      <div style="float: right">
+        <button v-if="model.f_operator == this.$login.f.name " class="button_search" @click="save">保存</button>
+        <button class="button_clear" @click="cancel">取消</button>
+      </div>
+    </validator>
+    <modal :show.sync="showfiles" width="80%" style="width:auto;"  v-ref:modal  backdrop="false">
+      <article slot="modal-body">
+        <upload :blodid="model.f_userinfo_id"  :businessid="model.id" v-ref:upload  fusetype="收费" isremark="true" style="width:auto" ></upload>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+    <!--文件上传按钮-->
+<!--    <button class="button_search" style="width: max-content" @click="uploadFiles()">上传附件</button>-->
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  import * as Util from "../../../../Util";
+
+  var data
+  export default {
+    title: '基本信息',
+
+    data () {
+      return {
+        style: {
+          type: String,
+          default: 'col-sm-2 form-group reshowtype'
+        },
+        equipmentType: this.$appdata.getParam('打印格式') ? [{label: '', value: ''}, ...this.$appdata.getParam('打印格式')] : [],
+        // 构建数组来存储对象
+        editbank: true,
+        uploadText: '收费',
+        showfiles: false,
+        recordList: [],
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[this.$login.f.depids],
+          user:[this.$login.f.id]
+        },
+        resshow:['operator'],
+        fileNameSet:{
+          'f_payment': '付款方式',
+          'f_comments': '备注信息'
+        },
+      }
+    },
+    props: {
+      oldmodel: Object,
+      model: Object
+    },
+
+    ready () {
+      this.oldmodel = JSON.parse(JSON.stringify(this.model))
+      this.model.f_bill_state = [this.oldmodel]
+    },
+    created () {
+    },
+    methods: {
+      getRes(obj,objs){
+        if(objs.operatornames.length>0){
+          this.model.f_operator_id = objs.operatornames[0];
+        }
+      },
+      selectoperator(){
+        let f_operator=this.model.f_operator
+        console.log("处理签的this.f_operatorid",this.f_operatorid)
+        let http = new HttpResetClass()
+        http.load('POST', 'rs/logic/findOperator',
+          {f_operator: f_operator},
+          {resolveMsg: null, rejectMsg: null}).then((res) => {
+          console.log("kanak,res",res)
+          this.model.f_operatorid = res.data[0].id
+          console.log("this.f_operatorid",this.f_operatorid)
+        })
+      },
+      cancel () {
+        this.$dispatch('close')
+      },
+      uploadFiles(){
+        this.showfiles= !this.showfiles
+      },
+      addressValid (val) {
+      },
+      save () {
+        // console.log(this.model.key)
+        //
+        for (var item in this.model) {
+          if (this.model[item] != this.oldmodel[item] && this.model[item] !='s_timestamp') {
+            var car = {
+              chinesename: this.fileNameSet[item],
+              fieldname: item,
+              tablename: 't_sellinggas',
+              oldvalue: this.oldmodel[item],
+              newvalue: this.model[item],
+              state: '有效',
+              modifitime: Util.toStandardTimeString(),
+              operator: this.$login.f.name,
+              sellingas_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
+
+            }
+            debugger
+            this.recordList.push(car)
+            // 该方法并未对chinesename fieldname operator等进行判断赋值，此暂写为定值
+          }
+        }
+        if (this.model.f_bill_date !== '' || this.model.f_bill_date === undefined) {
+          this.model.f_bill_operator = this.$login.f.name
+        }
+        this.$resetpost('rs/logic/saveselling', {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('收据类型')
+        }
+    },
+  }
+</script>
+<style >
+.reshowtype {
+  width:50%;
+}
+</style>
+