qymljy преди 2 години
родител
ревизия
d9c0c68f7d

+ 15 - 1
src/HDrpManagement/orderManage/details/index.vue

@@ -361,7 +361,21 @@ export default {
         }
       })
       this.tool.showMessage(res,()=>{
-        this.tool.showMessage(res)
+        /*this.tool.showMessage(res)*/
+       /* this.$store.dispatch('changeDetailDrawer',false)
+        this.$store.dispatch('changeDetailDrawer',true)
+        this.$router.push({path:'/orderdetail',query:{id:res.data.sa_orderid,rowindex:res.data.rowindex}})*/
+
+        this.$store.dispatch('changeDetailDrawer',false)
+        setTimeout(()=>{
+          this.$router.replace({
+            path:'/orderdetail',
+            query:{
+              id:res.data.sa_orderid
+            }
+          })
+          this.$store.dispatch('changeDetailDrawer',true)
+        },500)
       })
     },
     select (data) {

+ 1 - 1
src/SDrpManagement/agentOrder/modules/edit.vue

@@ -39,7 +39,7 @@
             <div v-if="checked" class="flex-align-center">
               <p class="inline-16"><b>返利金余额:{{tool.formatAmount(defaultData.rebatebalance,2)}}</b></p>
               <el-input class="inline-16" size="mini" style="width:150px" v-model="rebateamount" @blur="useRebate" placeholder="输入使用金额"></el-input>
-              <small>(返利金最高使用比例{{data.order_rebate_userate}}%,本单上限:{{tool.formatAmount(data.amount * data.order_rebate_userate / 100,2)}})</small>
+              <small>(返利金最高使用比例{{data.order_rebate_userate}},本单上限:{{tool.formatAmount(data.amount * data.order_rebate_userate / 100,2)}})</small>
             </div>
           </div>
         </div>

+ 1 - 0
src/SDrpManagement/myaccountclass/index.vue

@@ -15,6 +15,7 @@
               </div>
             </el-col>
           </el-row>
+
           <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :fixedName="'operation'" height="calc(100vh - 390px)">
             <template v-slot:customcol="scope">
               <div v-if="scope.column.columnname == 'type'">

+ 2 - 2
src/SDrpManagement/sinvoiceapp/modules/add.vue

@@ -32,7 +32,7 @@
                 </el-popover>
               </el-form-item>
               <el-form-item label="开票单位">
-                <el-input readonly v-model="form.invo_enterprisename" placeholder="开票单位"></el-input>
+                <el-input readonly v-model="form.enterprisename" placeholder="开票单位"></el-input>
               </el-form-item>
               <el-form-item label="开票地址">
                 <el-input readonly v-model="form.address" placeholder="开票地址"></el-input>
@@ -171,7 +171,7 @@ export default {
     // 选择开票信息
     selectTaxRow (row) {
       this.visible1 = false
-      this.form.invo_enterprisename = row.enterprisename
+      this.form.enterprisename = row.enterprisename
       this.form.taxno = row.taxno
       this.form.address = row.address
       this.form.phonenumber = row.phonenumber

+ 2 - 2
vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          target: 'http://61.164.207.46:8000',  // target host
-            /*target: 'http://122.226.136.204:8082/',  // target host*/
+          /*target: 'http://61.164.207.46:8000',  // target host*/
+            target: 'http://122.226.136.204:8082/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites