sale-client 3.5.228 → 3.5.230

package/build/dev-server.js

@@ -1,81 +1,81 @@
-var path = require('path')
-const [localUrl, serverRul] = ['http://127.0.0.1:8080', 'http://192.168.50.4:8400']
-var merge = require('webpack-merge')
-var baseConfig = require('./webpack.dev.conf')
-var devConfig = {
-  devServer: {
-    contentBase: path.join(__dirname, 'src'),
-    hot: true,
-    publicPath: baseConfig.output.publicPath,
-    historyApiFallback: true,
-    port: 8089,
-    open: true,
-    stats: {
-      colors: false, // 配置控制台输出彩色日志
-      chunks: false, // 不输出构建 chunk 信息
-      children: false // 不输出子模块构建信息
-    },
-    proxy: {
-      '/rs/file': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/search': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/logic/getLogin': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/logic/getInitData': {
-        target: serverRul
-      },
-      '/rs/logic/getSaleInitData': {
-        target: serverRul
-      },
-      // 用户登录服务地址
-      '/rs/user': {
-        target: serverRul
-      },
-      '/rs/path': {
-        target: serverRul
-      },
-      '/rs/data': {
-        target: serverRul
-      },
-      '/rs/license': {
-        target: serverRul
-      },
-      '/rs/db': {
-        target: serverRul
-      },
-      '/excel': {
-        target: serverRul
-      },
-      '/rs/config': {
-        target: serverRul
-      },
-      '/rs/report': {
-        target: serverRul
-      },
-      '/rs/vue': {
-        target: serverRul
-      },
-      '/rs/logic': {
-        target: localUrl
-      },
-      '/rs/sql': {
-        target: localUrl
-      },
-      '/webmeter': {
-        target: serverRul
-      },
-      '/rs': {
-        target: serverRul
-        // changeOrigin: true
-      }
-    }
-  }
-}
-module.exports = merge(baseConfig, devConfig)
+var path = require('path')
+const [localUrl, serverRul] = ['http://61.240.138.248:8400', 'http://61.240.138.248:8400']
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.dev.conf')
+var devConfig = {
+  devServer: {
+    contentBase: path.join(__dirname, 'src'),
+    hot: true,
+    publicPath: baseConfig.output.publicPath,
+    historyApiFallback: true,
+    port: 8089,
+    open: true,
+    stats: {
+      colors: false, // 配置控制台输出彩色日志
+      chunks: false, // 不输出构建 chunk 信息
+      children: false // 不输出子模块构建信息
+    },
+    proxy: {
+      '/rs/file': {
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/search': {
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/logic/getLogin': {
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/logic/getInitData': {
+        target: serverRul
+      },
+      '/rs/logic/getSaleInitData': {
+        target: serverRul
+      },
+      // 用户登录服务地址
+      '/rs/user': {
+        target: serverRul
+      },
+      '/rs/path': {
+        target: serverRul
+      },
+      '/rs/data': {
+        target: serverRul
+      },
+      '/rs/license': {
+        target: serverRul
+      },
+      '/rs/db': {
+        target: serverRul
+      },
+      '/excel': {
+        target: serverRul
+      },
+      '/rs/config': {
+        target: serverRul
+      },
+      '/rs/report': {
+        target: serverRul
+      },
+      '/rs/vue': {
+        target: serverRul
+      },
+      '/rs/logic': {
+        target: localUrl
+      },
+      '/rs/sql': {
+        target: localUrl
+      },
+      '/webmeter': {
+        target: serverRul
+      },
+      '/rs': {
+        target: serverRul
+        // changeOrigin: true
+      }
+    }
+  }
+}
+module.exports = merge(baseConfig, devConfig)

package/package.json

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

package/src/components/charge/business/IOTMeterCenter.vue

@@ -209,7 +209,6 @@
    */
 
   import {HttpResetClass} from 'vue-client'
-  import XML from '../../../plugins/ObjTree'
 
   // 输入金额，换算气量
 /*  let preamountGen = async function (self) {

package/src/filiale/liaoyuan/CardList.vue

@@ -495,14 +495,14 @@
         co(cancel)
       },
       selfSearch (args) {
-        if (!this.$login.f.parent.parent.name.includes('统一资源管理')) {
-          args.condition += `and f_filialeids = '${this.$login.f.f_orgids}'`
-        }
-        if (this.f_orgid) {
-          args.condition += `and r.f_orgid in ${this.f_orgid}`
-        } else {
-          args.condition += `and r.f_orgid = '${this.$login.f.orgid}'`
-        }
+        // if (!this.$login.f.parent.parent.name.includes('统一资源管理')) {
+        //   args.condition += `and f_filialeids = '${this.$login.f.f_orgids}'`
+        // }
+        // if (this.f_orgid) {
+        //   args.condition += `and r.f_orgid in ${this.f_orgid}`
+        // } else {
+        //   args.condition += `and r.f_orgid = '${this.$login.f.orgid}'`
+        // }
         if (this.authArr.includes('操作记录查询限定')) {
           args.condition += ` and r.f_operatorid = '${this.$login.f.id}'`
         }

package/src/filiale/qianneng/FilesManage/UserGeneralInfoTest.vue

@@ -23,7 +23,7 @@
 
       <div style="height: auto;width: 100%">
         <div style="margin-bottom: 2%; margin-top: 2%">
-          <img style="margin-top: -5px" src="../../../static/images/lefticon/矩形1183.png">
+          <img style="margin-top: -5px" src="../../../../static/images/lefticon/矩形1183.png">
           <a style="font-size: 20px;font-weight: 500;">发票信息</a>&nbsp;<a style="color: #999999"></a>
         </div>
         <user-paper-info-test :baseinfo="data.baseinfo"></user-paper-info-test>
@@ -106,7 +106,7 @@
 </template>
 
 <script>
-import UserPaperInfoTest from './UserPaperInfoTest'
+  import UserPaperInfoTest from '../../../components/FilesManage/UserPaperInfoTest'
 import {HttpResetClass} from 'vue-client'
 
 let getFileGen = async function (self, data) {

package/src/filiale/rizhao/replaceMentList.vue

@@ -42,6 +42,7 @@
                             placeholder='用户类型'
                             :options='$parent.$parent.equipmentType'
                             condition="f_user_type = '{}'"
+
                             close-on-select clear-button>
                   </v-select>
                 </div>
@@ -114,8 +115,8 @@
                 </div>
                 <div :class="$parent.$parent.styles">
                   <label class="font_normal_body">补卡原因</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_type"
-                         condition="f_type like '{}%'" placeholder='补卡原因'>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_comments"
+                         condition="f_comments like '{}%'" placeholder='补卡原因'>
                 </div>
                 <!--                <div :class="$parent.$parent.styles">-->
                 <!--                  <label class="font_normal_body">补卡日期</label>-->
@@ -208,7 +209,7 @@
               <td style="text-align: center;"><nobr>{{row.f_payment}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_bill_style}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_ispick_table}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_reason}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_comments}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_fillcard_date}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_state}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></td>

package/src/filiale/rizhao/replacementSingleInfoOperation.vue

@@ -0,0 +1,296 @@
+<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">表编号&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" v-model="model.f_userinfo_id" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body">用户编号</label>
+            <input type="text" v-model="model.f_user_id" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+          <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>-->
+          <!--<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">
+            <label class="font_normal_body">用户类型</label>
+            <input type="text" v-model="model.f_user_type" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body">用气性质</label>
+            <input type="text" v-model="model.f_gasproperties" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body">补卡类型</label>
+            <input type="text" v-model="model.f_type" disabled=disabled  style="width: 60%" class="input_search">
+          </div>
+
+        </div>
+        <div class="row">
+          <div class="col-sm-4">
+            <label class="font_normal_body">卡&nbsp;&nbsp;&nbsp;号&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" v-model="model.f_card_id" disabled=disabled  style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body">卡&nbsp;&nbsp;&nbsp;费&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" v-model="model.f_cardfees"  style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-4">
+            <!--            <label class="font_normal_body">付款方式</label>-->
+            <!--            <input type="text" v-model="model.f_payment"  style="width: 60%" class="input_search">-->
+            <label class="font_normal_body" title="参数:付款方式">付款方式</label>
+            <v-select id="f_payment"
+                      v-model="model.f_payment" :value-single="true"
+                      class="select_list select"
+                      :value.sync="model.f_payment"
+                      :options='paytype'
+                      close-on-select >
+            </v-select>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-4">
+            <label class="font_normal_body" title="参数:票据类型">票据类型</label>
+            <v-select :value.sync="model.f_bill_style" v-model="model.f_bill_style"
+                      :options='papertype' :value-single="true"
+                      class="select_list select"
+                      close-on-select></v-select>
+            <!--            <label class="font_normal_body">票据类型</label>-->
+            <!--            <input type="text" v-model="model.f_bill_style" style="width: 60%" class="input_search">-->
+          </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body">是否接表</label>
+            <input type="text" v-model="model.f_ispick_table" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body">补卡原因</label>
+            <input type="text" v-model="model.f_comments"   style="width: 60%" class="input_search">
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-4">
+            <label class="font_normal_body">补卡日期</label>
+            <datepicker id="f_fillcard_date" placeholder="补卡日期" style="width:60%"
+                        v-model="model.f_operate_date"
+                        :value.sync="model.f_operate_date"
+                        :format="'yyyy-MM-dd'"
+                        :show-reset-button="true">
+            </datepicker>
+          </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body">补卡状态</label>
+            <!--            <input type="text" v-model="model.f_fillcard_state" disabled=disabled style="width: 60%" class="input_search">-->
+            <v-select :value.sync="model.f_state" v-model="model.f_state"
+                      :options='fillcard_state' :value-single="true"
+                      class="select_list select"
+                      close-on-select></v-select>
+          </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body">组&nbsp;&nbsp;&nbsp;织&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" v-model="model.f_orgname" disabled=disabled  style="width: 60%" class="input_search">
+          </div>
+
+        </div>
+        <div class="row">
+          <div class="col-sm-4">
+            <label class="font_normal_body">部&nbsp;&nbsp;&nbsp;门&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" v-model="model.f_depname" disabled=disabled  style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-4 ">
+            <label class="font_normal_body" title="参数:操作人员查询">操作人员</label>
+            <v-select :value.sync="model.f_operatorid"
+                      v-model="model.f_operatorid"
+                      :value-single="true"  @change="selectoperator()"
+                      :options='foperator'
+                      close-on-select></v-select>
+          </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body">流水号&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" v-model="model.f_serial_id" 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>
+    <!--<modal :show.sync="showfiles" width="80%" style="width:auto;"  v-ref:modal middle 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>-->
+    <!--&lt;!&ndash;文件上传按钮&ndash;&gt;-->
+    <!--<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 "../../../src/Util";
+var data
+let readyGen = async function (self) {
+  await  self.$LoadParams.loadParam(self.f_filialeid)
+  await    self.$GetSaleParam.initinputtor()
+  await self.initoperator()
+}
+export default {
+  title: '基本信息',
+  data () {
+    return {
+      equipmentType: this.$appdata.getParam('打印格式') ? [{label: '', value: ''}, ...this.$appdata.getParam('打印格式')] : [],
+      // 构建数组来存储对象
+      editbank: true,
+      uploadText: '收费',
+      papertype: this.$appdata.getParam('票据类型') ? [{label: '', value: ''}, ...this.$appdata.getParam('票据类型')] : [],
+      paytype: this.$appdata.getParam('付款方式') ? [{label: '', value: ''}, ...this.$appdata.getParam('付款方式')] : [],
+      showfiles: false,
+      recordList: [],
+      foperator:[],
+      fileNameSet: {
+        // 要更改字段的中文名
+        'f_cardfees': '卡费',
+        'f_payment': '付款方式',
+        'f_bill_style': '票据类型',
+        'f_reason': '补卡原因',
+        'f_fillcard_date': '补卡日期',
+        'f_state':'补卡状态',
+        'f_operator':'操作人',
+      },
+    }
+  },
+  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]
+    readyGen(this)
+  },
+  created () {
+  },
+  methods: {
+    initoperator(){
+      this.foperator=[]
+      console.log("this.$login-------------------------",this.$login,this.oldmodel,this.model)
+      let arr = this.$GetSaleParam.inputtors.filter((res) => {
+        if (res.rolestr != null && res.rolestr != '') {
+          return res.rolestr.indexOf('营业员') > -1 && res.f_department_name == this.model.f_depname
+        }
+      })
+      arr.forEach((res) => {
+        this.foperator.push({label: res.name, value: res.id})
+      })
+    },
+    selectoperator () {
+      let id = this.model.f_operatorid
+      if(!this.model.f_operatorid){
+        return
+      }
+      let http = new HttpResetClass()
+      http.load('POST', 'rs/sql/saleSingleTable',
+        {data:{tablename: 't_user',
+            condition: `id = '${id}'`}},
+        {resolveMsg: null, rejectMsg: null}).then((res) => {
+        console.log('kanak,res', res)
+        if(res.data.length>0){
+          this.model.f_operator = res.data[0].name
+        }else{
+          this.model.f_operatorid=''
+          this.$showAlert('操作员信息未找到','warning',2000)
+        }
+        console.log('this.f_operatorid', this.model.f_operator)
+      })
+    },
+    cancel () {
+      this.$dispatch('close')
+    },
+    uploadFiles () {
+      this.showfiles = !this.showfiles
+    },
+    addressValid (val) {
+    },
+    save () {
+      // console.log(this.model.key)
+      this.recordList = [] // 清空，防止重复提交
+      console.log('newdate' + new Date())
+      console.log('MODEL BEFORE:', this.model)
+      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] && this.model[item] !='s_timestamp') {
+          var car = { // 需要更改的字段
+            // t_fillcard
+            id: this.model.id,
+            f_user_id: this.model.f_user_id,
+            chinesename: this.fileNameSet[item],
+            fieldname: item,
+            tablename: 't_fillcard',
+            oldvalue: this.oldmodel[item],
+            newvalue: this.model[item],
+            state: '有效',
+            modifitime: Util.toStandardTimeString(),
+            operator: this.$login.f.name,
+            changemeter_id: this.model.id,
+            f_operate_date: this.model.f_operate_date,
+            f_cardfees: this.model.f_cardfees?this.model.f_cardfees:null,
+            f_payment: this.model.f_payment,
+            f_bill_style: this.model.f_bill_style,
+            f_reason: this.model.f_comments ? this.model.f_comments : '',
+            f_fillcard_date: this.model.f_operate_date,
+            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.model.f_reason=this.model.f_comments ? this.model.f_comments : ''
+      this.model.f_fillcard_date=this.model.f_operate_date
+      console.log('model--------abc-', this.model)
+      this.$resetpost('rs/logic/replacementCardSaving', {data: {recordlist: this.recordList, newData: this.model}}).then((res) => {
+        console.log('this.model', this.model)
+      })
+      this.$dispatch('close')
+    }
+  },
+  computed: {
+    fillcard_state () {
+      return [...this.$appdata.getParam('补卡状态')]
+    },
+  },
+  watch: {
+    'model'(){
+      this.initoperator()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/filiale/rizhao/sale.js

@@ -36,4 +36,7 @@ export default function () {
   Vue.component('user-meterinfodetail', (resolve) => { require(['./meterinfodetail'], resolve) })
   // 补卡记录列表页面
   Vue.component('replace-mentlist', (resolve) => { require(['./replaceMentList'], resolve) })
+  // 单条记录维护界面
+  Vue.component('replacement-single-info-operation', (resolve) => { require(['./replacementSingleInfoOperation'], resolve) })
+
 }

package/src/filiale/rongcheng/MeterinfoTest.vue

@@ -43,8 +43,15 @@
           </div>
           <div class="col-sm-4 form-group" >
             <label for="f_bqf_type" class="font_normal_body">表前阀型号</label>
-            <input type="text" class="input_search" style="width:60%" v-model="row.f_bqf_type"
-                   placeholder='表前阀型号'>
+            <v-select
+                      :value.sync="row.f_bqf_type"
+                      v-model="row.f_bqf_type"
+                      width="60%"
+                      search="true"
+                      enterPush="true"
+                      :options="bqftype"
+                      placeholder="表前阀型号"
+                      close-on-select></v-select>
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_meter_base" class="font_normal_body">&ensp;表&ensp;读&ensp;数</label>
@@ -401,6 +408,13 @@ let meterBookGen = function * (self) {
       co(meterBookGen(this))
     },
     methods: {
+      toggleDropdown() {
+        this.width = this.$els.group.clientWidth *  this.width +'px'
+        this.show = !this.show
+      },
+      bqfTypeChange () {
+        console.log('bqfTypeChange')
+      },
       async confirmUserfiles () {
         if (this.$refs.addparamlist.confirm()) {
           var paramlist = this.$refs.addparamlist.addGasParameter
@@ -520,6 +534,8 @@ let meterBookGen = function * (self) {
     },
     computed: {
 
+
+
       // 控制用户类型修改
       permissionUserType () {
         let res = false
@@ -597,6 +613,9 @@ let meterBookGen = function * (self) {
       positions () {
         return this.$appdata.getParam('安装位置')
       },
+      bqftype(){
+        return this.$appdata.getParam('表前阀型号')
+      },
       usetype () {
         return this.$appdata.getParam('使用类型')
       },