Merge branch 'dev_hxz' into test

src/api/module/bankcard.js

@@ -71,6 +71,15 @@ export function addBankcardData(data) {
     })
 }
 
+// 编辑 银行卡 信息
+export function editBankcardData(data) {
+  return request({
+    url: '/system/bank/update',
+    method: 'post',
+    data: data
+  })
+}
+
 // 获取 银行卡 详情
 export function getBankDetailsData(data) {
   return request({

src/views/system/asset/myAsset/index.vue

@@ -78,6 +78,7 @@
     <el-dialog
       :title="bankcardTitle"
       :visible.sync="addBankcardInfoDialog"
+      :before-close="cancelSubmitBankcard"
       center
     >
         <el-form ref="bankcardForm" :model="bankcardForm" :rules="bankcardRule" size="small" label-width="180px">
@@ -89,7 +90,7 @@
           </el-form-item>
 
           <el-form-item label="银行名称：" prop="bank_name" >
-            <el-select v-model="bankcardForm.bank_name" placeholder="请选择" style="width: 70%;">
+            <el-select v-model="bankcardForm.bank_name" placeholder="请选择" style="width: 70%;" ref="bankSelect">
               <el-option
                 v-for="item in bankOptions"
                 :key="item.code"
@@ -99,7 +100,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="对公账户名称：" style="width:100%">
+          <el-form-item label="对公账户名称：" style="width:100%" prop="bankAccountName">
             <el-input v-model="bankcardForm.bankAccountName" placeholder="对公账户名称，不能输入和修改" :disabled="true" style="width: 70%"></el-input>
             <p class="withdraw-tip">
               银行卡必须为对公账户，且与提交的公司名称相一致，不允许修改
@@ -129,7 +130,7 @@
 </template>
 
 <script>
-  import { getMyAssetListData,getOrganizationData, getBankDetailsData,getBankcardListData, addBankcardData ,delBankcardData } from '@/api/module/bankcard'
+  import { getMyAssetListData,getOrganizationData, getBankDetailsData,getBankcardListData, addBankcardData,editBankcardData ,delBankcardData } from '@/api/module/bankcard'
   export default {
     name: "Index",
     data() {
@@ -141,6 +142,7 @@
         bankcardList: [],
         addBankcardInfoDialog: false,
         bankcardTitle: '',
+        bankAccountName: '', // 主体信息 公司名称
         bankcardForm: {
           bank_name: '',
           bankAccountName: '',
@@ -149,10 +151,12 @@
         },
         bankcardRule: {
           bank_name: [{required: true,message: '银行名称不能为空',trigger: 'change'}],
+          bankAccountName: [{required: true,message: '对公账户不能为空',trigger: 'change'}],
           bank_branch_name: [{required: true,message: '开户行支行不能为空',trigger: 'blur'}],
           bank_account_sn: [{ required: true,message: '银行账号不能为空',trigger: 'blur'}]
         },
         bankOptions: [], // 银行卡列表
+        indexId: 0,
       } // return end
     },// data end
     created() {
@@ -163,10 +167,10 @@
       /** 获取 银行卡列表 */
       this.getBankcardList()
       /** 获取主体信息 */
-      //this.getOrganization();
+      this.getOrganization();
     },
     methods: {
-      /** 获取 账户银行卡列表 */
+      /** 我的资产 所有数据 */
       getMyAssetList() {
         getMyAssetListData( {seller_id:this.seller_id} ).then(res=> {
           if(res.code == 1 && res.data) {
@@ -190,17 +194,23 @@
       /** 获取主体信息 */
       getOrganization() {
         getOrganizationData().then(res=> {
-
+          if(res.code == 1 && res.data) {
+            this.bankAccountName = res.data.organization_name;
+          }
         });
       },
 
       /** 编辑 银行卡信息 */
       editBankcard(id) {
         this.bankcardTitle = '编辑账户'
-        // console.log("编辑",id);
+        this.indexId = id;
         getBankDetailsData({ id: id }).then(res=> {
           if(res.code == 1 && res.data) {
             this.addBankcardInfoDialog = true;
+            this.bankcardForm.bank_name = res.data.bank_name;
+            this.bankcardForm.bankAccountName = res.data.corporate_account_name;
+            this.bankcardForm.bank_branch_name = res.data.bank_branch_name;
+            this.bankcardForm.bank_account_sn = res.data.bank_account_sn;
           }else {
             let msg = res.message ? res.message : '获取银行卡信息失败'
             this.$message({type:'error',message: msg});
@@ -231,41 +241,57 @@
 
       /** 添加 银行卡信息 */
       addBankcard() {
+        // this.resetAddBankcardForm();
         this.bankcardTitle = '添加账户'
+        this.bankcardForm.bankAccountName = this.bankAccountName
         this.addBankcardInfoDialog = true;
+        this.indexId = 0;
       },
 
       /** 提交 添加银行卡信息 */
       submitBankcard() {
         let params = {
-          seller_id: '',
           bank_name: '',
-          bank_branch_name: '',
-          bank_account_sn: ''
+          bank_branch_name: this.bankcardForm.bank_branch_name,
+          bank_account_sn: this.bankcardForm.bank_account_sn
         }
-        this.$refs.bankcardForm.validate((valid)=> {
-          if (valid) {
-            params.seller_id = this.seller_id;
-
-            // params.bank_name = this.bankcardForm.express_name;
-            // params.bank_branch_name = this.bankcardForm.express_sn;
-            // params.bank_account_sn = this.bankcardForm
-
-            addBankcardData(params).then(res=> {
-              if(res.code == 1) {
-                this.$message({type:'success',message: '新增成功'});
-                this.addBankcardInfoDialog = false;
-
-                this.resetAddInvoiceForm();
-                this.getMyAssetList(); // 更新数据
-
-              }else {
-                this.$message({type:'success',message:  res.message ? res.message : '新增失败' });
-              }
-            });
-
 
+        for (let i = 0; i < this.bankOptions.length; i++) {
+          if (this.bankcardForm.bank_name == this.bankOptions[i].code) {
+            params.bank_name = this.bankOptions[i].name
+            break
           }
+        }
+
+        this.$refs.bankcardForm.validate((valid)=> {
+          if (valid) {
+            // 新增
+            if (this.indexId == 0) {
+              params['seller_id'] = this.seller_id;
+              addBankcardData(params).then(res=> {
+                if(res.code == 1) {
+                  this.$message({type:'success',message: '新增成功'});
+                  this.addBankcardInfoDialog = false;
+                  this.resetAddBankcardForm();
+                  this.getMyAssetList(); // 更新数据
+                }else {
+                  this.$message({type:'error',message:  res.message ? res.message : '新增失败' });
+                }
+              });
+            }else {
+              params['id'] = this.indexId
+              editBankcardData(params).then(res=> {
+                if(res.code == 1) {
+                  this.$message({type:'success',message: '修改成功'});
+                  this.addBankcardInfoDialog = false;
+                  this.resetAddBankcardForm();
+                  this.getMyAssetList(); // 更新数据
+                }else {
+                  this.$message({type:'error',message:  res.message ? res.message : '修改失败' });
+                }
+              });
+            }
+          } // valid end
         });
 
       },
@@ -273,6 +299,12 @@
       /** 取消 提交 添加银行卡信息*/
       cancelSubmitBankcard() {
         this.addBankcardInfoDialog = false;
+        this.resetAddBankcardForm();
+      },
+
+      /** 初始化 添加 银行卡 数据 */
+      resetAddBankcardForm() {
+        this.$refs['bankcardForm'].resetFields();
       },
 
       /** 提现 操作 */

src/views/system/retreat/retreat/index.vue

@@ -46,9 +46,9 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="订单号" prop="goods_order_sn">
+        <el-form-item label="订单号" prop="refund_sn">
           <el-input
-            v-model="queryParams.goods_order_sn"
+            v-model="queryParams.refund_sn"
             placeholder="请输入订单号"
             clearable
             @keyup.enter.native="handleQuery"
@@ -70,7 +70,7 @@
       <el-table class="after-sale-table" :data="afterSaleList" :height="afterSaleHeight">
         <el-table-column label="商品ID" align="center" width="150" prop="goodsId"></el-table-column>
         <el-table-column label="商品名称" align="center" width="180" prop="title"></el-table-column>
-        <el-table-column label="订单号" align="center" width="240" prop="goods_order_sn"></el-table-column>
+        <el-table-column label="订单号" align="center" width="240" prop="refund_sn"></el-table-column>
         <el-table-column label="退换货类型" align="center" width="180">
           <template slot-scope="scope">
             <span v-if="scope.row.refund_type == 1">仅退款</span>
@@ -131,7 +131,7 @@
           goods_id: '',
           goods_title: '',
           refund_type: '',
-          goods_order_sn: '',
+          refund_sn: '',
           reason: '',
         },
         pickerOptions: {
@@ -241,7 +241,7 @@
           goods_id: this.queryParams.goods_id,
           goods_title: this.queryParams.goods_title,
           refund_type: '',
-          goods_order_sn: '',
+          refund_sn: '',
           reason: ''
         }
         // console.log('queryParams：',this.queryParams);
@@ -308,7 +308,7 @@
           goods_id: '',
           goods_title: '',
           refund_type: '',
-          goods_order_sn: '',
+          refund_sn: '',
           reason: '',
         }
       },