1、采购页面新增银行卡选择

src/views/bussiness/bussinessinfo.vue

@@ -42,7 +42,7 @@
     <bussinessinfo-add v-if="addVisible" @submit="submit" :form1="data1" :form2="data2" :form3="data3" :curEvent="currentEvent" ref="addDialog" @closeDialog="closeDialog"></bussinessinfo-add>
     <bussinessinfo-detail v-if="detailVisible" :form1="detailData" ref="detailDialog"></bussinessinfo-detail>
     <el-dialog title="商户进件申请记录" :append-to-body="true" :visible.sync="registerRequestVisible" top="1vh" @close="dialogClose" :close-on-click-modal="false">
-      <bussiness-register-request :bussiness-info-id="bussinessInfoId" v-if="registerRequestVisible"></bussiness-register-request>
+      <bussiness-register-request :bussiness-info-id="bussinessInfoId" v-if="registerRequestVisible && permission.bussinessinfo_registerrequest"></bussiness-register-request>
     </el-dialog>
   </basic-container>
 </template>

src/views/wel/index.vue

@@ -6,7 +6,7 @@
 
       </avue-form>
     </el-dialog>
-    <el-dialog :modal-append-to-body="false" :visible.sync="chongzhiVisible" title="采购页面" width="50%" center top="5vh" modal="true">
+    <el-dialog :modal-append-to-body="false" :visible.sync="chongzhiVisible" title="采购页面" width="70%" center top="2vh" modal="true">
       <div v-if="chongzhiVisible">
         <purchase :serviceRate="bussiness.serviceRate" v-if="chongzhiVisible" @finishSubmit="finishSubmit"></purchase>
       </div>
@@ -378,214 +378,6 @@
           ]
         },
 
-        /*optionMusic: {
-          span: 6,
-          data: [{
-              title: '用户总数',
-              count: 0,
-              icon: 'el-icon-user',
-              color: 'rgb(56, 161, 242)',
-              click: () => {
-                this.$router.push("/loginuser/loginuser");
-              },
-            },
-            {
-              click: () => {
-                this.$router.push("/guosen/agenter");
-              },
-              title: '代理总数',
-              count: 0,
-              icon: 'el-icon-s-custom',
-              color: 'rgb(3,180,144)',
-            },
-            {
-              title: '活动总数',
-              count: 0,
-              icon: 'el-icon-s-flag',
-              color: 'rgb(105,184,242)',
-              click: () => {
-                this.$router.push("/activity/activity");
-              },
-            },
-            {
-              title: '商品总数',
-              count: 0,
-              icon: 'el-icon-shopping-cart-full',
-              color: 'rgb(49, 180, 141)',
-              click: () => {
-                this.$router.push("/userpointsgoods/userpointsgoods");
-              },
-            },
-
-          ]
-        },*/
-
-        /*optionTodayOut: {
-          title: {
-            text: '今日提现去向',
-
-            left: 'center'
-          },
-          tooltip: {
-            trigger: 'item'
-          },
-
-          series: [{
-            name: '今日提现去向',
-            type: 'pie',
-            radius: '70%',
-            data: [{
-                value: 0,
-                name: '用户'
-              },
-              {
-                value: 0,
-                name: '代理'
-              },
-              {
-                value: 0,
-                name: '采购商'
-              },
-              {
-                value: 0,
-                name: '运营商'
-              },
-              {
-                value: 0,
-                name: '主办方'
-              },
-
-            ],
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }]
-        },
-        optionHistoryOut: {
-          title: {
-            text: '历史提现去向',
-
-            left: 'center'
-          },
-          tooltip: {
-            trigger: 'item'
-          },
-
-          series: [{
-            name: '历史提现去向',
-            type: 'pie',
-            radius: '70%',
-            data: [{
-                value: 0,
-                name: '用户'
-              },
-              {
-                value: 0,
-                name: '代理'
-              },
-              {
-                value: 0,
-                name: '采购商'
-              },
-              {
-                value: 0,
-                name: '运营商'
-              },
-              {
-                value: 0,
-                name: '主办方'
-              },
-
-            ],
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }]
-        },
-        optionTodayIn: {
-          title: {
-            text: '今日收入来源',
-
-            left: 'center'
-          },
-          tooltip: {
-            trigger: 'item'
-          },
-
-          series: [{
-            name: '今日收入来源',
-            type: 'pie',
-            radius: '70%',
-            data: [{
-                value: 0,
-                name: '用户'
-              },
-              {
-                value: 0,
-                name: '代理'
-              },
-              {
-                value: 0,
-                name: '采购商'
-              },
-
-            ],
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }]
-        },
-        optionHistoryIn: {
-          title: {
-            text: '历史收入来源',
-
-            left: 'center'
-          },
-          tooltip: {
-            trigger: 'item'
-          },
-
-          series: [{
-            name: '历史收入来源',
-            type: 'pie',
-            radius: '70%',
-            data: [{
-                value: 40.06,
-                name: '用户'
-              },
-              {
-                value: 0,
-                name: '代理'
-              },
-              {
-                value: 0,
-                name: '采购商'
-              },
-
-            ],
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }]
-        },*/
-
-
       }
     },
     computed: {

src/views/wel/purchase.vue

@@ -27,6 +27,13 @@
             </table>
           </div>
         </div>
+        <div align="center" style="margin: 20px;">
+          <el-span style="font-weight: bold">银行卡：</el-span>
+          <el-select v-model="billrecord.bankCode" placeholder="请选择银行" clearable="true" filterable="true">
+            <el-option v-for="item in bankCodeList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+            </el-option>
+          </el-select>
+        </div>
         <div align="center" style="margin: 20px;">
           <el-button type="success" size="mini" @click="purchaseConfirm">确认采购</el-button>
         </div>
@@ -37,6 +44,7 @@
 
 <script>
   import {getList} from "@/api/bussiness/bussinessgoods";
+  import {getDictionary} from "@/api/system/dictbiz";
   import {mapGetters} from "vuex";
   import {
     detail as getParamDetail
@@ -53,6 +61,7 @@
       return {
         form: {},
         query: {},
+        bankCodeList: [],
         loading: true,
         chongzhiVisible:true,
         money: 0.00,
@@ -60,7 +69,8 @@
         moneyChina: "",
         billrecord: {
           payStatus: 0,
-          type: 5
+          type: 5,
+          bankCode: null
         },
         yibaoOrder: {
 
@@ -138,6 +148,9 @@
         data: []
       };
     },
+    created(){
+      this.loadBizDict("b2b_bank_code");
+    },
     computed: {
       ...mapGetters(["permission"]),
       permissionList() {
@@ -157,6 +170,12 @@
       }
     },
     methods: {
+      loadBizDict(code){
+        let that = this;
+        getDictionary({"code":code}).then(res =>{
+          that.bankCodeList = res.data.data;
+        })
+      },
       channelInputLimit (e) {
         let key = e.key
         // 不允许输入'e'和'.'
@@ -189,9 +208,15 @@
       purchaseConfirm() {
         this.billrecord.price = this.money;
         this.billrecord.bussinessFee = this.statDatas[1].value;
-        this.yibaoOrder.orderAmount = this.money;
-        this.yibaoOrder.goodsName = "采购"
         this.billrecord.purchaseList = Array.from(this.purchaseMap.values());
+        this.billrecord.returnUrl = "https://music.nanyue6688.com/cyzhtest/#/";
+        if(this.billrecord.bankCode == null){
+          this.$message({
+            type: "error",
+            message: "请选择银行卡"
+          })
+          return;
+        }
         getParamDetail({"paramKey":"maintain"}).then(res => {
           let systemParam = res.data.data;
           let paramValue = systemParam.paramValue;
@@ -202,13 +227,10 @@
             });
             this.$emit('finishSubmit', null);
           }else{
-            addBillrecord(this.billrecord).then(() => {
+            addBillrecord(this.billrecord).then((res) => {
               this.chongzhiVisible = false;
               this.$emit('finishSubmit', null);
-              this.$message({
-                type: "success",
-                message: "操作成功"
-              });
+              window.open(res.data.data);
             })
           }
         })