sale-client 4.2.35 → 4.2.37

package/src/filiale/meihekou/specificInformation.vue

@@ -0,0 +1,552 @@
+<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">
+            <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">
+            <label class="font_normal_body">付款方式</label>
+            <v-select :value.sync="model.f_payment" :value-single="true"
+                      v-model="model.f_payment"
+                      class="select_list select"
+                      :options='payments'
+                      close-on-select>
+            </v-select>
+          </div>
+<!--          <div class="col-sm-4">-->
+<!--            <label class="font_normal_body">缴费类型</label>-->
+<!--            <input type="text" v-model="model.payment"  style="width: 60%" class="input_search">-->
+<!--          </div>-->
+          <div class="col-sm-4">
+            <label class="font_normal_body">收据类型</label>
+            <v-select :value.sync="model.f_bill_style" :value-single="true"
+                      v-model="model.f_bill_style"
+                      class="select_list select"
+                      :options='bill_styles'
+                      close-on-select>
+            </v-select>
+          </div>
+<!--          <div class="col-sm-4">-->
+<!--            <label class="font_normal_body">收据类型</label>-->
+<!--            <input type="text" v-model="model.bill_style"  style="width: 60%" class="input_search">-->
+<!--          </div>-->
+          <div class="col-sm-4" title="参数:操作时间, 权限:【其他收费金额修改】">
+            <label class="font_normal_body">缴费金额</label>
+            <input type="text" v-model="model.f_collection"  :disabled="!editcollection"  style="width: 60%" class="input_search">
+          </div>
+            <div class="col-sm-4">
+              <label class="font_normal_body">收费时间</label>
+              <datepicker id="operate_date"
+                          placeholder="收费时间"
+                          style="width:60%"
+                          v-model="model.f_operate_date"
+                          :value.sync="model.f_operate_date"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+              >
+              </datepicker>
+            </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="参数:操作人员">操作人员</label>
+            <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_serial_id"  style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-12 form-group">
+            <label class="font_normal_body">备&emsp;&emsp;注</label>
+            <input type="text" v-model="model.f_comments"  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>
+      <form novalidate class="form-horizontal">
+        <p></p>
+        <p class="bg-info text-center" style="padding: 8px;font-size: 20px">其他维护明细</p>
+        <div class="responsive-table">
+        <table class="auto-table">
+          <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.brand_spec}}</td>
+            <td   style="text-align: center;">{{row.number}}</td>
+            <td  style="text-align: center;" >{{row.unitprice}}</td>
+            <td style="text-align: center;" >{{row.typename}}</td>
+            <td style="text-align: center;">{{row.typenumber}}</td>
+            <td style="text-align: center;">
+
+            <button class="button_new nowrap-btn" type="button"  @click="editBeizhu(row)">编辑</button>
+            </td>
+          </tr>
+        </table>
+        </div>
+      </form>
+      <modal :show.sync="editshow" v-ref:modal backdrop='false'>
+        <article slot="modal-body" class="modal-body">
+          <div class="row auto">
+            <div class="form-group form-input-group">
+              <label for="" class="control-label">品牌：</label>
+              <v-select :value.sync="mingxi.brand_spec" :value-single="true"
+                        v-model="mingxi.brand_spec"
+                        class="select_list select"
+                        :options='materialTypeList'
+                        @change="setTypename(mingxi.brand_spec)"
+                        close-on-select clear-button>
+              </v-select>
+            </div>
+          </div>
+          <div class="row auto">
+            <div class="form-group form-input-group" title="权限:【其他收费金额修改】">
+              <label for="" class="control-label">数量：</label>
+              <input type="text" width="300px"  class="form-control" v-model="mingxi.number"   :disabled="!editcollection">
+            </div>
+          </div>
+          <div class="row auto">
+            <div class="form-group form-input-group" title="权限:【其他收费金额修改】">
+              <label for="" class="control-label">单价：</label>
+              <input type="text" width="300px"  class="form-control" v-model="mingxi.unitprice"  :disabled="!editcollection" >
+            </div>
+          </div>
+          <div class="row auto">
+            <div class="form-group form-input-group">
+              <label for="" class="control-label">规格：</label>
+              <v-select :value.sync="mingxi.typename" :value-single="true"
+                        v-model="mingxi.typename"
+                        class="select_list select"
+                        :options='typeNameList'
+                        @change="setTypenumber(mingxi.typename)"
+                        close-on-select clear-button>
+              </v-select>
+            </div>
+          </div>
+          <div class="row auto">
+            <div class="form-group form-input-group">
+              <label for="" class="control-label">型号：</label>
+              <v-select :value.sync="mingxi.typenumber" :value-single="true"
+                        v-model="mingxi.typenumber"
+                        class="select_list select"
+                        :options='typenumberList'
+                        @change="setTypeprice(mingxi.typenumber)"
+                        close-on-select clear-button>
+              </v-select>
+            </div>
+          </div>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button type="button" class="btn btn-default" @click='editclose' id="vc-messagebox-close">取消</button>
+          <button type="button" class="btn btn-success" @click='updatedefail' id="vc-messagebox-confirm">确认</button>
+        </footer>
+      </modal>
+      <!--<split-price :showdata="model" :pricesplit="priceSplit" v-if="priceSplit" ></split-price>-->
+    </validator>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import * as Util from "../../Util";
+  // var data
+  export default {
+    title: '基本信息',
+
+    data () {
+      return {
+        // 物料联动数据
+        materialList: [],
+        materialTypeList: [],
+        materialsLoading: false,
+        materialsLoaded: false,
+        materialsPromise: null,
+        editingInit: false,
+        bill_styles: this.$appdata.getParam('打印格式') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('打印格式')] : [],
+        payments: this.$appdata.getParam('付款方式') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')] : [],
+        editshow: false,
+        editcollection: false,
+        mingxi: '',
+        oldmingxi: '',
+        brand_spec: '',
+        unitprice: '',
+        typeNameList: [],
+        typenumberList: [],
+        // 操作记录表
+        recordList3: [],
+        total: '',
+        // 明细操作记录
+        recordList2: [],
+        // 其他记录
+        fileNameSet: {
+          f_payment: '缴费类型',
+          f_bill_style: '收据类型',
+          f_collection: '缴费金额',
+          f_serial_id: '支付流水号',
+          f_operate_date: '缴费时间',
+          f_comments: '备注',
+          name: '用户姓名',
+          f_operator: '操作人'
+        },
+        // 其他记录明细
+        fileNameSet2: {
+          brand_spec: '品牌类别',
+          number: '数量',
+          unitprice: '单价',
+          typename: '规格',
+          typenumber: '型号',
+          operator: '操作人'
+        },
+        brand_specs: []
+      }
+    },
+    props: {
+      model: Object,
+      oldmodel: Object,
+      // recordList:Array
+      recordlist: Array
+    },
+    ready () {
+      if (this.$login.r.includes('其他收费金额修改')) {
+        this.editcollection = true
+      }
+      this.cou()
+      this.oldmodel = JSON.parse(JSON.stringify(this.model))
+      console.log('126456',this.model)
+      this.getMaterialList()
+    },
+    created () {
+    },
+    methods: {
+      async getMaterialList () {
+        if (this.materialsLoaded) return
+        if (this.materialsLoading && this.materialsPromise) { await this.materialsPromise; return }
+        // 先尝试使用全局/会话缓存，避免触发后端判重
+        if (window.__materialListCache && Array.isArray(window.__materialListCache.data)) {
+          this.materialList = window.__materialListCache.data
+          this.materialTypeList = window.__materialListCache.types
+          this.materialsLoaded = true
+          return
+        }
+        this.materialsLoading = true
+        const nonce = Date.now() + '-' + Math.random().toString(16).slice(2)
+        console.log('getMaterialList request')
+        this.materialsPromise = this.$resetpost('api/af-revenue/sql/saleSingleTable', {
+          data: { tablename: 't_material_management', condition: '1=1', __nonce: nonce }
+        }, {resolveMsg: null, rejectMsg: '获取物料信息失败!'})
+          .then((res) => {
+            console.log('getMaterialList ok')
+            this.materialList = res.data || []
+            this.materialTypeList = [...new Set(this.materialList.filter(i => i.f_material_type).map(i => i.f_material_type))]
+              .map(type => ({ label: type, value: type }))
+            // 写入全局缓存
+            window.__materialListCache = { data: this.materialList, types: this.materialTypeList, ts: Date.now() }
+            this.materialsLoaded = true
+          })
+          .catch((e) => {
+            console.log('getMaterialList error', e)
+            // 若后端返回603且有其他页面已缓存，则直接读取缓存
+            if (String(e.status) === '603' && window.__materialListCache && Array.isArray(window.__materialListCache.data)) {
+              this.materialList = window.__materialListCache.data
+              this.materialTypeList = window.__materialListCache.types
+              this.materialsLoaded = true
+              return
+            }
+            // 退避一段时间后再试一次（避免与其它同路径请求撞车）
+            this.materialsPromise = new Promise((resolve) => setTimeout(resolve, 1200))
+              .then(async () => {
+                const nonce2 = Date.now() + '-' + Math.random().toString(16).slice(2)
+                const res2 = await this.$resetpost('api/af-revenue/sql/saleSingleTable', {
+                  data: { tablename: 't_material_management', condition: '1=1', __nonce: nonce2 }
+                }, {resolveMsg: null, rejectMsg: '获取物料信息失败!'})
+                this.materialList = res2.data || []
+                this.materialTypeList = [...new Set(this.materialList.filter(i => i.f_material_type).map(i => i.f_material_type))]
+                  .map(type => ({ label: type, value: type }))
+                window.__materialListCache = { data: this.materialList, types: this.materialTypeList, ts: Date.now() }
+                this.materialsLoaded = true
+              })
+          })
+          .finally(() => {
+            this.materialsLoading = false
+          })
+        await this.materialsPromise
+      },
+      async setTypename (val) {
+        const typeLabel = val
+        const categories = this.materialList.filter(i => i.f_material_stype === '分类' && i.f_material_type === typeLabel)
+        this.typeNameList = categories.map(i => ({ label: i.f_material_name, value: i.f_material_name, id: i.id }))
+        if (!this.editingInit) {
+          this.mingxi.typename = ''
+          this.typenumberList = []
+          this.mingxi.typenumber = ''
+          this.mingxi.unitprice = ''
+        }
+      },
+      setTypenumber (val) {
+        const categoryName = val
+        const category = this.typeNameList.find(i => i.value === categoryName)
+        const categoryId = category ? category.id : ''
+        const models = this.materialList.filter(i => i.f_material_stype === '型号' && String(i.parent_id) === String(categoryId))
+        this.typenumberList = models.map(i => ({ label: i.f_material_name, value: i.f_material_name, id: i.id }))
+        if (!this.editingInit) {
+          this.mingxi.typenumber = ''
+          this.mingxi.unitprice = ''
+        }
+      },
+      setTypeprice (val) {
+        const modelName = val
+        const model = this.typenumberList.find(i => i.value === modelName)
+        const modelId = model ? model.id : ''
+        const modelObj = this.materialList.find(i => i.f_material_stype === '型号' && String(i.id) === String(modelId))
+        if (modelObj && modelObj.f_material_price) this.mingxi.unitprice = Number(modelObj.f_material_price)
+        else this.mingxi.unitprice = ''
+      },
+      selectoperator () {
+        let f_operator = this.model.f_operator
+        console.log('处理签的this.model.f_operatorid', this.model.f_operator)
+        let http = new HttpResetClass()
+        http.load('POST', 'api/af-revenue/logic/findOperator',
+          {f_operator: f_operator},
+          {resolveMsg: null, rejectMsg: null}).then((res) => {
+            console.log('kanak,res', res)
+          if(res.data.length>0){
+            this.model.f_operatorid = res.data[0].id
+          }else{
+            this.model.f_operator=''
+            this.$showAlert('操作员信息未找到，请在参数管理进行添加','warning',2000)
+          }
+            console.log('this.model.f_operatorid', this.model.f_operatorid)
+          })
+      },
+      editclose () {
+        this.mingxi = ''
+        this.editshow = false
+      },
+      async editBeizhu  (val) {
+        this.editshow = true
+        // 深拷贝原始行，保留一份用于对比
+        this.mingxi = JSON.parse(JSON.stringify(val))
+        this.oldmingxi = JSON.parse(JSON.stringify(val))
+        this.editingInit = true
+        const origBrand = val.brand_spec || ''
+        const origType = val.typename || ''
+        const origModel = val.typenumber || ''
+        const origPrice = (val.unitprice !== undefined && val.unitprice !== null) ? val.unitprice : ''
+        // 强制把当前行值直接回到表单模型
+        this.mingxi.brand_spec = origBrand
+        this.mingxi.typename = origType
+        this.mingxi.typenumber = origModel
+        this.mingxi.unitprice = origPrice
+        // 简化策略：仅回填现有数据到下拉，不做任何联动与覆盖
+        await this.getMaterialList()
+        const brandVal = this.mingxi.brand_spec || ''
+        if (brandVal && !this.materialTypeList.find(i => i.value === brandVal)) {
+          this.materialTypeList = [{label: brandVal, value: brandVal}, ...this.materialTypeList]
+        }
+        this.mingxi.brand_spec = brandVal
+        const typeVal = origType
+        this.typeNameList = typeVal ? [{label: typeVal, value: typeVal, id: ''}] : []
+        this.mingxi.typename = typeVal
+        const modelVal = origModel
+        this.typenumberList = modelVal ? [{label: modelVal, value: modelVal, id: ''}] : []
+        this.mingxi.typenumber = modelVal
+        // 不再根据型号改写单价，保持用户看到的就是当前数据
+        this.$nextTick(() => { this.editingInit = false })
+      },
+      async saveOtherdetail () {
+        for (var item in this.mingxi) {
+          if (this.mingxi[item] instanceof Array) {
+            this.mingxi[item] = this.mingxi[item].length > 0 ? this.mingxi[item][0] : ''
+          }
+          if (this.mingxi[item] != this.oldmingxi[item]) {
+            var car3 = {
+              tablename: 't_othercharge_detail',
+              chinesename: this.fileNameSet2[item] != '' ? this.fileNameSet2[item] : '',
+               // chinesename: this.fileNameSet2[item],
+              oldvalue: this.oldmingxi[item],
+              newvalue: this.mingxi[item],
+              modifitime: Util.toStandardTimeString(),
+              fieldname: item,
+              state: '有效',
+              charge_detail_id:this.mingxi.did,
+              operator: this.$login.f.name != '' ? this.$login.f.name : ''
+            }
+            this.recordList2.push(car3)
+             // 该方法并未对chinesename fieldname operator等进行判断赋值，此暂写为定值
+            console.log(car3)
+          }
+        }
+        await this.$resetpost('api/af-revenue/logic/savedetailoperting', {
+          data: {
+            recordlist2: this.recordList2
+          }
+        }, {
+          resolveMsg: '修改成功',
+          rejectMsg: '未通过，修改出错!!!'
+        })
+      },
+      // 修改其他记录明细
+      async updatedefail () {
+        this.editshow = false
+        let param={
+          f_number:this.mingxi.number,
+          f_unitprice:this.mingxi.unitprice,
+          f_brand_spec: this.mingxi.brand_spec,
+          f_typenumber:this.mingxi.typenumber,
+          f_typename:this.mingxi.typename,
+          id: this.mingxi.did
+        }
+        await this.$resetpost('api/af-revenue/logic/updatedetail', {data: param}, {
+          resolveMsg: '修改成功',
+          rejectMsg: '未通过，修改出错!!!'
+        })
+        this.saveOtherdetail()
+        this.$dispatch('close')
+        this.$dispatch('refresh')
+      },
+      // 计算总金额
+      cou () {
+        let sum = []
+        this.recordlist.forEach((item, index) => {
+          var sub = item.number * item.unitprice
+          console.log(sub)
+          sum.push(sub)
+        })
+        console.log(sum)
+        let res = 0
+        for (let i = 0; i < sum.length; i++) {
+          res += sum[i]
+        }
+        console.log(res)
+        this.total = res
+      },
+      cancel () {
+        this.$dispatch('close')
+        this.$dispatch('refresh')
+      },
+      // 保存操作记录
+      async save2 () {
+        for (var item in this.model) {
+          if (this.model[item] instanceof Array) {
+            this.model[item] = this.model[item].length > 0 ? this.model[item][0] : ''
+          }
+          if (this.model[item] != this.oldmodel[item]) {
+            var car2 = {
+              tablename: 't_othercharge',
+              chinesename: this.fileNameSet[item],
+              oldvalue: this.oldmodel[item],
+              newvalue: this.model[item],
+              modifitime: Util.toStandardTimeString(),
+              fieldname: item,
+              state: '有效',
+              othercharge_id:this.model.id,
+              operator: this.$login.f.name != '' ? this.$login.f.name : '',
+              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.recordList3.push(car2)
+             // 该方法并未对chinesename fieldname operator等进行判断赋值，此暂写为定值
+            console.log(car2)
+          }
+        }
+        let condition = this.model.id
+        await this.$resetpost('api/af-revenue/logic/operationRecord', {data: {recordlist3: this.recordList3, condition: condition}}, {
+          resolveMsg: '修改成功',
+          rejectMsg: '未通过，修改出错!!!'
+        })
+        console.log('this.model', this.model)
+        this.$dispatch('close')
+        this.$dispatch('refresh')
+      },
+      // 修改其他记录
+      async save () {
+        // let condition = " f_collection='" + this.model.collection + "' , f_unitprice='"+ this.model.collection+"' where f_othercharge_id= '"+this.model.id+"'"
+        this.model.f_collection = this.total
+        let param={
+          f_user_name:this.model.f_user_name,
+          f_comments:this.model.f_comments,
+          f_payment:this.model.f_payment,
+          f_collection:this.model.f_collection,
+          f_bill_style:this.model.f_bill_style,
+          f_serial_id:this.model.f_serial_id?this.model.f_serial_id:'',
+          f_operate_date:this.model.f_operate_date,
+          f_operator:this.model.f_operator,
+          f_operatorid:this.model.f_operatorid?this.model.f_operatorid:'',
+          id:this.model.id
+        }
+        await this.$resetpost('api/af-revenue/logic/saveotherrecord',{data:param}, {
+          resolveMsg: '修改成功',
+          rejectMsg: '未通过，修改出错!!!'
+        })
+        this.save2()
+        this.$dispatch('close')
+        this.$dispatch('refresh')
+      }
+    },
+    computed: {
+      foperator () {
+        return [...this.$appdata.getParam('操作人员')]
+      }
+    },
+    watch: {
+      'model.f_user_name' () {
+        if (this.model.f_operator) {
+          this.selectoperator()
+        }
+      },
+      'mingxi.brand_spec'(){
+        this.setTypename(this.mingxi.brand_spec)
+      },
+      'model.operator' () {
+        if (this.model.f_operator) {
+          this.selectoperator()
+        }
+      },
+      recordlist: {
+        handler (val) {
+          console.log('数组值有了'),
+            this.cou()
+        }
+      }
+    }
+
+  }
+</script>
+
+<style scoped>
+.responsive-table {
+  overflow-x: auto;
+  -webkit-overflow-scrolling: touch;
+}
+.auto-table {
+  width: 100%;
+  min-width: 720px;
+  border-collapse: collapse;
+}
+.auto-table th, .auto-table td {
+  padding: 6px 8px;
+  word-break: break-word;
+}
+.nowrap-btn {
+  white-space: nowrap;
+}
+</style>

package/src/main.js

@@ -1,33 +1,33 @@
-import Vue from 'vue'
-import all from 'vue-client/src/all'
-import App from './App'
-import system from 'system-clients/src/system'
-import FilialeSale from './filiale/fugou/sale'
-import sale from './sale'
-import address from 'address-client/src/address'
-import ldap from 'ldap-clients/src/ldap'
-import VueClipboard from 'vue-clipboard2'
-
-// 开启 nginx 加密
-// Vue.mmType = 'nginx'
-// Vue.HWQMM = [51, 150, 231, 300, 565, 708, 721, 952, 738, 560, 935, 912, 1274, 1148, 840, 1440]
-
-// 开启 AES 加密
-// Vue.mmType = 'AES'
-// Vue.mm = '3KMKqvgwR8ULbR8Z'
-
-Vue.use(VueClipboard)
-Vue.config.silent = true
-
-all()
-system(false)
-sale()
-address()
-ldap()
-FilialeSale()
-require('system-clients/src/styles/less/bootstrap.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import all from 'vue-client/src/all'
+import App from './App'
+import system from 'system-clients/src/system'
+import FilialeSale from './filiale/yuncheng/sale'
+import sale from './sale'
+import address from 'address-client/src/address'
+import ldap from 'ldap-clients/src/ldap'
+import VueClipboard from 'vue-clipboard2'
+
+// 开启 nginx 加密
+// Vue.mmType = 'nginx'
+// Vue.HWQMM = [51, 150, 231, 300, 565, 708, 721, 952, 738, 560, 935, 912, 1274, 1148, 840, 1440]
+
+// 开启 AES 加密
+// Vue.mmType = 'AES'
+// Vue.mm = '3KMKqvgwR8ULbR8Z'
+
+Vue.use(VueClipboard)
+Vue.config.silent = true
+
+all()
+system(false)
+sale()
+address()
+ldap()
+FilialeSale()
+require('system-clients/src/styles/less/bootstrap.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})