sale-client 3.5.270-2 → 3.5.271

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [localUrl, serverRul] = ['http://59.48.150.94:7300', 'http://59.48.150.94:7300']
+const [localUrl, serverRul] = ['http://101.200.150.80:8400/', 'http://101.200.150.80:8400/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -8,7 +8,7 @@ var devConfig = {
     hot: true,
     publicPath: baseConfig.output.publicPath,
     historyApiFallback: true,
-    host: "127.0.0.1",
+    host: '127.0.0.1',
     port: 8089,
     open: true,
     stats: {
@@ -35,9 +35,6 @@ var devConfig = {
       '/rs/logic/getSaleInitData': {
         target: serverRul
       },
-      // '/rs/logic/filemanage_getFilesDetail': {
-      //   target: 'http://127.0.0.1:8080'
-      // },
       // 用户登录服务地址
       '/rs/user': {
         target: serverRul

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.270-2",
+  "version": "3.5.271",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -74,7 +74,7 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
-    "ldap-clients": "3.0.7",
+    "ldap-clients": "3.0.62",
     "less": "^2.7.3",
     "manage-client": "3.1.8-88",
     "mkdirp": "^0.5.1",
@@ -89,7 +89,7 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.2.55",
+    "system-clients": "3.2.64",
     "url-loader": "^0.5.7",
     "vue-client": "1.24.79",
     "vue-clipboard2": "0.3.1",

package/src/components/FilesManage/FileAddressManage.vue

@@ -3,7 +3,7 @@
     <div :class="{'basic-main':!useraddressShow,'binary-left':useraddressShow}" v-show="isSelect">
       <file-address-list @select-changed="selected" v-ref:addresslist :style="style" :select=select :company=company :f_filialeids.sync="f_filialeids"></file-address-list>
     </div>
-    <div v-show="useraddressShow"  :class="{'basic-main':!isSelect, 'binary-right': isSelect}">
+    <div v-show="useraddressShow"  :class="{'basic-main':!isSelect, 'binary-right': isSelect}" style="width:60%">
       <div class="flex">
         <file-user-address :f_filialeids.sync="f_filialeids" :is_pecial="isSpecial" :isedit="isSelect" :row="row" v-ref:fileuseraddress></file-user-address>
 

package/src/components/FilesManage/UserEssentialInfoTest.vue

@@ -205,7 +205,7 @@
         </div>
       </form>
     </validator>
-    <modal v-if="showselectaddress" :show.sync="showselectaddress" width="50%" height="80%" title="地址信息" v-ref:modal large backdrop="false">
+    <modal v-if="showselectaddress" :show.sync="showselectaddress" width="70%" height="80%" title="地址信息" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body" style="height: 700px;padding: 0!important;">
         <file-address-manage :is-select="isSelect" :fileinfo="addressinfo"
                              @address-valid="doNothing"   :showselectaddress.sync="showselectaddress" v-ref:fileaddress ></file-address-manage>

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -93,7 +93,7 @@
         </div>
         <div class="row">
           <div class="col-sm-2"></div>
-          <input v-if="fileSaveData.reason==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
+          <input v-if="fileSaveData.reason ==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">

package/src/components/charge/business/refund/machineRefund.vue

@@ -1,193 +1,193 @@
-<template>
-    <div class="auto">
-        <validator name='v'>
-            <form novalidate class="form-horizontal">
-                <div class="row">
-                    <div class="col-sm-4 form-group">
-                        <label class="font_normal_body" title="参数名称：付款方式">收款方式</label>
-
-                        <v-select v-model="f_payment"
-                                  placeholder='请选择'
-                                  style="width:60%"
-                                  :value.sync="model.f_payment"
-                                  :options='paytype'
-                                  close-on-select clear-button></v-select>
-
-                    </div>
-                    <div class="col-sm-4 form-group">
-                        <label for="f_print" class="font_normal_body">打印格式</label>
-
-                        <v-select id="print"
-                                  v-model="f_print"
-                                  style="width:60%"
-                                  placeholder='请选择'
-                                  :value.sync="model.f_print"
-                                  :options='printstyle'
-                                  close-on-select clear-button>
-                        </v-select>
-                    </div>
-
-                    <div class="col-sm-4 form-group">
-                        <label class="font_normal_body">剩余金额</label>
-                        <input class="input_search" style="width:60%" type="number" v-model="data.f_balance" readonly>
-                    </div>
-                </div>
-
-                <div class="row">
-
-
-                    <div class="col-sm-8">
-                        <label for="f_paper_account" class="font_normal_body ">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
-                        <input class="input_search" style="width:80%"  v-model="model.f_comments">
-                    </div>
-                    <div class="col-sm-4 form-group" v-if="!config.overBalance"
-                         :class="[$v.f_refund_fee.required || $v.f_refund_fee.dctest ? 'has-error' : 'has-success']">
-                        <label class="font_normal_body">退费金额</label>
-                        <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_fee"
-                               v-validate:f_refund_fee='{required: true,  dctest: [data.f_balance, "<=" ]}' placeholder="退费金额">
-                    </div>
-                  <div class="col-sm-4 form-group" v-if="config.overBalance"
-                       :class="[$v.f_refund_fee.required || $v.f_refund_fee.dctest ? 'has-error' : 'has-success']">
-                    <label class="font_normal_body">退费金额</label>
-                    <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_fee"
-                           v-validate:f_refund_fee='{required: true,  dctest: [0, ">=" ]}' placeholder="退费金额">
-                  </div>
-                </div>
-            </form>
-            <div style="text-align:right;">
-                <button class="button_search btn-gn" @click="confirm()" :disabled='!$v.valid'>确认</button>
-                <button class="button_clear btn-gn" @click="clean()">取消</button>
-            </div>
-        </validator>
-        <validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>
-        <!--<print-bill :show="print" :bill-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="clean" @printok="printok" :data='printModel'></print-bill>-->
-        <print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok" :data='printModel'  v-ref:printbill></print-bill>
-    </div>
-
-    <upload :blodid="data.f_userinfo_id"  isremark="true" fusetype="退费管理"></upload>
-</template>
-
-
-<script>
-    let readyGen = async function (self) {
-      await self.$getConfig(self, 'MachineTRefund')
-      console.log('机表退费config', self.config)
-        // 默认打印格式
-      self.blodid = self.data.f_userinfo_id
-      self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
-      self.model.f_payment = [self.config.payment]
-
-      self.model.f_use_type = self.config.billType
-      self.model.f_bill_type = self.model.f_print
-      self.hasValidateBill = self.config.hasBillManage
-    }
-
-    export default {
-      title: '机表退费',
-      data () {
-        return {
-          config: {
-            showupload: false, // 默认不上传附件
-            hasPrint: false,  // 默认打票
-            hasBillManage: false,  // 默认不启用发票管理
-            overBalance: false,   //为true时退费金额可以大于余额
-            printType: '普通收据', // 收据/电子票/专用发票/国税发票
-            payment: '现金缴费',
-            billType: '燃气费'
-          },
-          model: {
-            f_refund_fee: '',
-            f_comments: '',
-            f_payment: '',
-            f_print: ''
-          },
-
-          blodid: '',
-          hasValidateBill: false,
-          validateOk: false,
-
-          printModel: {},
-          print: false,
-          billUrl: '',
-          billData: {
-            url: 'rs/report/refund_sell',
-            bill: ''
-          },
-
-                // 下拉框值
-          paytype: this.$appdata.getParam('付款方式'),
-          printstyle: this.$appdata.getParam('打印格式')
-        }
-      },
-      props: ['data'],
-      ready () {
-            /* if (this.data.f_billing === '按气量') {
-                this.$showAlert('按气量缴费的机表退费功能尚未开放！！', 'warning', 3000)
-                this.$dispatch('refresh')
-            } else { */
-        readyGen(this)
-           /* } */
-      },
-      methods: {
-        async confirm () {
-          let param = {
-            f_user_id: this.data.f_user_id,
-            f_userfiles_id: this.data.f_userfiles_id,
-            version: this.data.version,
-            f_refund_fee: this.model.f_refund_fee,
-            f_comments: this.model.f_comments,
-            f_payment: this.model.f_payment[0],
-            f_print: this.model.f_print[0],
-            f_price_id: this.data.f_price_id,
-
-            f_total_fee: this.data.f_total_fee,
-            f_stairprice_id: this.data.f_stairprice_id,
-            operInfo: {
-              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
-            }
-          }
-
-          let res = await this.$resetpost('rs/logic/machineRefund', {data: param}, {warnMsg: `确定要对用户${this.data.f_user_name}进行退费吗？`, resolveMsg: '退费成功！！', rejectMsg: '退费失败！！请重试！！'})
-
-          if (this.model.f_print.indexOf('电子发票') == -1 && this.config.hasPrint && !this.$login.r.includes('不打印发票')) {
-            console.log('this.config.hasBillManage', this.config.hasBillManage)
-            if (this.config.hasBillManage) {
-                        // 启用发票管理，获取票据管理中的票号并存储记录
-              this.printModel.id = res.data.id
-              this.printModel.f_bill_type = '退费'
-              this.printModel.f_bill_style = this.model.f_print[0]
-                        // this.billUrl = 'rs/report/refund_sell'
-              this.print = true
-            } else {
-              this.printModel.id = res.data.id
-                        // this.billUrl = 'rs/report/refund_sell'
-              this.print = true
-            }
-          } else if (this.config.printType === '国税发票') {
-                    // TODO
-            this.$dispatch('success')
-          } else if (this.config.printType === '电子发票') {
-                    // TODO
-            this.$dispatch('success')
-          } else {
-            this.$dispatch('success')
-          }
-        },
-        clean () {
-          this.$dispatch('refresh')
-        },
-        printok () {
-          this.$dispatch('success')
-        },
-        validateBill (val) {
-          this.validateOk = !val.isOk
-          this.billData.bill = val.bill
-        }
-      }
-    }
-</script>
+<template>
+    <div class="auto">
+        <validator name='v'>
+            <form novalidate class="form-horizontal">
+                <div class="row">
+                    <div class="col-sm-4 form-group">
+                        <label class="font_normal_body" title="参数名称：付款方式">收款方式</label>
+
+                        <v-select v-model="f_payment"
+                                  placeholder='请选择'
+                                  style="width:60%"
+                                  :value.sync="model.f_payment"
+                                  :options='paytype'
+                                  close-on-select clear-button></v-select>
+
+                    </div>
+                    <div class="col-sm-4 form-group">
+                        <label for="f_print" class="font_normal_body">打印格式</label>
+
+                        <v-select id="print"
+                                  v-model="f_print"
+                                  style="width:60%"
+                                  placeholder='请选择'
+                                  :value.sync="model.f_print"
+                                  :options='printstyle'
+                                  close-on-select clear-button>
+                        </v-select>
+                    </div>
+
+                    <div class="col-sm-4 form-group">
+                        <label class="font_normal_body">剩余金额</label>
+                        <input class="input_search" style="width:60%" type="number" v-model="data.f_balance" readonly>
+                    </div>
+                </div>
+
+                <div class="row">
+
+
+                    <div class="col-sm-8">
+                        <label for="f_paper_account" class="font_normal_body ">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
+                        <input class="input_search" style="width:80%"  v-model="model.f_comments">
+                    </div>
+                    <div class="col-sm-4 form-group" v-if="!config.overBalance"
+                         :class="[$v.f_refund_fee.required || $v.f_refund_fee.dctest ? 'has-error' : 'has-success']">
+                        <label class="font_normal_body">退费金额</label>
+                        <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_fee"
+                               v-validate:f_refund_fee='{required: true,  dctest: [data.f_balance, "<=" ]}' placeholder="退费金额">
+                    </div>
+                  <div class="col-sm-4 form-group" v-if="config.overBalance"
+                       :class="[$v.f_refund_fee.required || $v.f_refund_fee.dctest ? 'has-error' : 'has-success']">
+                    <label class="font_normal_body">退费金额</label>
+                    <input class="input_search" style="width:60%" type="number" v-model="model.f_refund_fee"
+                           v-validate:f_refund_fee='{required: true,  dctest: [0, ">=" ]}' placeholder="退费金额">
+                  </div>
+                </div>
+            </form>
+            <div style="text-align:right;">
+                <button class="button_search btn-gn" @click="confirm()" :disabled='!$v.valid'>确认</button>
+                <button class="button_clear btn-gn" @click="clean()">取消</button>
+            </div>
+        </validator>
+        <validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>
+        <!--<print-bill :show="print" :bill-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="clean" @printok="printok" :data='printModel'></print-bill>-->
+        <print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok" :data='printModel'  v-ref:printbill></print-bill>
+    </div>
+
+    <upload :blodid="data.f_userinfo_id"  isremark="true" fusetype="退费管理"></upload>
+</template>
+
+
+<script>
+    let readyGen = async function (self) {
+      await self.$getConfig(self, 'MachineTRefund')
+      console.log('机表退费config', self.config)
+        // 默认打印格式
+      self.blodid = self.data.f_userinfo_id
+      self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
+      self.model.f_payment = [self.config.payment]
+
+      self.model.f_use_type = self.config.billType
+      self.model.f_bill_type = self.model.f_print
+      self.hasValidateBill = self.config.hasBillManage
+    }
+
+    export default {
+      title: '机表退费',
+      data () {
+        return {
+          config: {
+            showupload: false, // 默认不上传附件
+            hasPrint: false,  // 默认打票
+            hasBillManage: false,  // 默认不启用发票管理
+            overBalance: false,   //为true时退费金额可以大于余额
+            printType: '普通收据', // 收据/电子票/专用发票/国税发票
+            payment: '现金缴费',
+            billType: '燃气费'
+          },
+          model: {
+            f_refund_fee: '',
+            f_comments: '',
+            f_payment: '',
+            f_print: ''
+          },
+
+          blodid: '',
+          hasValidateBill: false,
+          validateOk: false,
+
+          printModel: {},
+          print: false,
+          billUrl: '',
+          billData: {
+            url: 'rs/report/refund_sell',
+            bill: ''
+          },
+
+                // 下拉框值
+          paytype: this.$appdata.getParam('付款方式'),
+          printstyle: this.$appdata.getParam('打印格式')
+        }
+      },
+      props: ['data'],
+      ready () {
+            /* if (this.data.f_billing === '按气量') {
+                this.$showAlert('按气量缴费的机表退费功能尚未开放！！', 'warning', 3000)
+                this.$dispatch('refresh')
+            } else { */
+        readyGen(this)
+           /* } */
+      },
+      methods: {
+        async confirm () {
+          let param = {
+            f_user_id: this.data.f_user_id,
+            f_userfiles_id: this.data.f_userfiles_id,
+            version: this.data.version,
+            f_refund_fee: this.model.f_refund_fee,
+            f_comments: this.model.f_comments,
+            f_payment: this.model.f_payment[0],
+            f_print: this.model.f_print[0],
+            f_price_id: this.data.f_price_id,
+
+            f_total_fee: this.data.f_total_fee,
+            f_stairprice_id: this.data.f_stairprice_id,
+            operInfo: {
+              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
+            }
+          }
+
+          let res = await this.$resetpost('rs/logic/machineRefund', {data: param}, {warnMsg: `确定要对用户${this.data.f_user_name}进行退费吗？`, resolveMsg: '退费成功！！', rejectMsg: '退费失败！！请重试！！'})
+
+          if (this.model.f_print.indexOf('电子发票') == -1 && this.config.hasPrint && !this.$login.r.includes('不打印发票')) {
+            console.log('this.config.hasBillManage', this.config.hasBillManage)
+            if (this.config.hasBillManage) {
+                        // 启用发票管理，获取票据管理中的票号并存储记录
+              this.printModel.id = res.data.id
+              this.printModel.f_bill_type = '退费'
+              this.printModel.f_bill_style = this.model.f_print[0]
+                        // this.billUrl = 'rs/report/refund_sell'
+              this.print = true
+            } else {
+              this.printModel.id = res.data.id
+                        // this.billUrl = 'rs/report/refund_sell'
+              this.print = true
+            }
+          } else if (this.config.printType === '国税发票') {
+                    // TODO
+            this.$dispatch('success')
+          } else if (this.config.printType === '电子发票') {
+                    // TODO
+            this.$dispatch('success')
+          } else {
+            this.$dispatch('success')
+          }
+        },
+        clean () {
+          this.$dispatch('refresh')
+        },
+        printok () {
+          this.$dispatch('success')
+        },
+        validateBill (val) {
+          this.validateOk = !val.isOk
+          this.billData.bill = val.bill
+        }
+      }
+    }
+</script>