sale-client 4.2.37 → 4.2.38

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
+const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://127.0.0.1:9026']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -19,48 +19,62 @@ var devConfig = {
       children: false // 不输出子模块构建信息
     },
     proxy: {
-    // '/api/af-revenue/batchdeduction/all': {
-    //   pathRewrite: {
-    //     '/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
-    //   },
-    //   target: localUrl
-    // },
-    //   '/api/af-revenue/logic': {
-    //     pathRewrite: {
-    //       '/api/af-revenue/logic': '/logic'
-    //     },
-    //     target: localUrl
-    //   },
-      // '/api/af-revenue/file': {
-      //   // pathRewrite: {
-      //   //   '/api/af-revenue/file': '/file'
-      //   // },
-      //   target: localUrl
-      // },
-      // '/weixin2/rs':{
-      //
-      //   target: 'http://410663id1ia4.vicp.fun'
-      // },
-      // '/api/af-revenue/sql': {
-      //   pathRewrite: {
-      //     '/api/af-revenue/sql': '/sql'
-      //   },
-      //   target: localUrl
-      // },
-      '/rs/pay': {
-        target: 'http://localhost:8080'
+      '/api/af-revenue/logic/depositCharge': {
+        pathRewrite: {
+          '/api/af-revenue/logic': '/logic'
+        },
+        target: 'http://127.0.0.1:9026'
       },
-      '/api/af-revenue': {
+      '/api/af-revenue/logic': {
         pathRewrite: {
-          '/api/af-revenue': '/af-revenue'
+          '/api/af-revenue/logic': '/logic'
         },
-        target: "http://localhost:8080"
+        target: localUrl
       },
-      '/api': {
+      '/api/af-revenue/file': {
+        pathRewrite: {
+          '/api/af-revenue/file': '/file'
+        },
+        target: localUrl
+      },
+      'api/af-revenue/entity/save': {
+        pathRewrite: {
+          '/api/af-revenue/entity/save': '/entity/save'
+        },
+        target: localUrl
+      },
+      '/singlepage': {
+        // pathRewrite: {
+        //   '/weixin2/rs': '/rs'
+        // },
+        target: localUrl
+      },
+      '/weixin2/rs': {
+        pathRewrite: {
+          '/weixin2/rs': '/singlepage/weixin2/rs'
+        },
+        target: localUrl
+      },
+      '/api/af-revenue/sql': {
+        pathRewrite: {
+          '/api/af-revenue/sql': '/sql'
+        },
+        target: localUrl
+      },
+      '/rs/pay': {
         target: serverRul
       },
+      '/api': {
+        target: serverRul,
+        changeOrigin: true
+      },
+      '/resource': {
+        target: serverRul,
+        changeOrigin: true
+      },
       '/rs': {
-        target: serverRul
+        target: serverRul,
+        changeOrigin: true
       }
     }
   }

package/package.json

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

package/src/App.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import Vue from 'vue'
+// import Vue from 'vue'
 
 export default {
   ready () {

package/src/components/charge/bzjcancel.vue

@@ -38,6 +38,17 @@
           </div>
         </div>
         <div class="row" style="margin-top:10px;" v-if="model.f_type == '卡表退费'">
+          <div class="col-sm-4 form-group">
+            <label for="f_print" class="font_normal_body">打印格式</label>
+            <v-select id="print"
+                      v-model="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" :class="[$v.f_pregas.required || $v.f_pregas.dctest ? 'has-error' : 'has-success']">
             <label for="f_pregas" class="font_normal_body">退费气量</label>
             <input  class="input_search" style="width:60%" type="number"
@@ -61,7 +72,8 @@
         <button class="button_clear btn-gn" @click="clean()">取消</button>
       </div>
     </validator>
-    <!--<print-bill :show="print" :bill-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="clean" @printok="printok" :data='printModel'></print-bill>-->
+    <validate-bill v-if="hasValidateBill" :data="row" @validate-bill="validateBill"></validate-bill>
+    <print-bill :show="print" :bill-config='config' :bill-data='billData' @toggle="clean" @printok="printok" :data='row' v-ref:printbill></print-bill>
     <modal :show.sync="modalShow" v-ref:modalShow backdrop="false">
       <article slot="modal-body" class="modal-body">
         <div class="modal_class flex">
@@ -109,6 +121,13 @@
 
 
 <script>
+  let readyGen = async function (self) {
+    await self.$getConfig(self, 'OtherRefundConfig')
+    self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
+    self.model.f_payment = [self.config.payment]
+    self.hasValidateBill = self.config.hasBillManage
+    console.log('其他退费config', self.config, self.model)
+  }
   export default {
     title: '退保证金',
     data () {
@@ -116,9 +135,17 @@
         model: {
           f_refund_fee: '',
           f_comments: '',
+          f_print: '',
+          f_payment: '',
           f_price: 0,
           f_pregas: 0
         },
+        config: {
+          hasPrint: false,  // 默认打票
+          hasBillManage: false,  // 默认不启用发票管理
+          printType: '普通收据',
+          payment: '现金缴费'
+        },
         dis: false,
         blodid: '',
         hasValidateBill: false,
@@ -142,11 +169,13 @@
         modalData: {
           rows: []
         },
-        modalShow: false
+        modalShow: false,
+        printstyle: this.$appdata.getParam('打印格式')
       }
     },
     props: ['row'],
     ready () {
+      readyGen(this)
     },
     watch: {
       async 'model.f_type' (val) {
@@ -279,12 +308,36 @@
           } else {
             url = 'api/af-revenue/logic/yajincancel'
           }
-          await this.$resetpost(url, {data: param}, {
+          let res = await this.$resetpost(url, {data: param}, {
             warnMsg: `确定要进行${this.model.f_type}操作吗？`,
             resolveMsg: `${this.model.f_type}操作成功！！`,
             rejectMsg: `${this.model.f_type}操作失败！！请重试！！`
           })
-          this.$dispatch('success')
+          if (this.model.f_type == '卡表退费') {
+            if (this.model.f_print.indexOf('电子发票') == -1 && this.config.hasPrint) {
+              console.log('this.config.hasBillManage', this.config.hasBillManage)
+              if (this.config.hasBillManage) {
+                // 启用发票管理，获取票据管理中的票号并存储记录
+                this.row.id = res.data.id
+                this.row.f_bill_type = '卡表退费'
+                this.row.f_bill_style = this.model.f_print[0]
+                this.print = true
+              } else {
+                this.row.id = res.data.id
+                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')
+            }
+          } else {
+            this.$dispatch('success')
+          }
         }
       },
       clean () {