维权订单退货调整

src/views/mallManagement/order/order_refund/index.vue

@@ -281,10 +281,10 @@
                   <el-tab-pane v-if="joinCode" label="退货条码" name="2"></el-tab-pane>
                 </el-tabs>
                 <br />
-               <!-- <el-button size="small" v-show=" typeIndex == 2 && activeKey == 'REFUND_GOODS' " type="primary"
+				<el-button size="small" v-show=" typeIndex == 2 && activeKey == 'REFUND_GOODS' && joinCode" type="primary"
                   @click="addCode()">新增</el-button>
-                <el-button size="small" v-show=" typeIndex == 1 && activeKey == 'REFUND_GOODS' " type="primary"
-                  @click="handleDownload('导入条码模板')">导入条码模板下载</el-button> -->
+                <el-button size="small" v-show=" typeIndex == 1 && activeKey == 'REFUND_GOODS' && joinCode" type="primary"
+                  @click="handleDownload('导入条码模板')">导入条码模板下载</el-button>
                 <div class="table">
                   <!-- 发货数量 -->
                   <el-form v-show=" typeIndex == 1 " ref="formData1" :model=" formData1 " label-width="0" size="small"
@@ -311,14 +311,14 @@
                         width="140"></el-table-column>
                       <el-table-column prop="refundPartsCodeQty" align="center" label="导入配件条码数量"
                         width="140"></el-table-column>
-                      <!-- <el-table-column label="操作" align="center" width="140" fixed="right">
+                      <el-table-column label="操作" align="center" width="140" fixed="right">
                         <template slot-scope="scope" v-if=" formType != 2 && joinCode && activeKey == 'REFUND_GOODS' ">
                           <el-upload action='_' :show-file-list=' false ' :http-request=" importCode ">
                             <el-button @click="orderDetailId = scope.row.orderDetailId" size="mini"
                               type="text">导入条码</el-button>
                           </el-upload>
                         </template>
-                      </el-table-column> -->
+                      </el-table-column>
                     </el-table>
                   </el-form>
                   <!-- 发货条码 -->
@@ -471,7 +471,7 @@
 </template>
 
 <script>
-import { getRefundList, saveRefundRemark, changeExamineStatus, receiveProd, getWebsiteList, getOrderDetail, getCodeDetail, getMaterialList, listImport2, saveCode2, delCode2 } from "@/api/order"
+import { getRefundList, saveRefundRemark, changeExamineStatus, receiveProd, getWebsiteList, getOrderDetail, getCodeDetail2, getMaterialList, listImport2, saveCode2, delCode2 } from "@/api/order"
 import { getExpress } from "@/api/common"
 import { downloadFiles } from '@/utils/util'
 import { commonTemplateDownload } from '@/api/common.js'
@@ -584,10 +584,10 @@ export default {
     },
     changeType() {
       this.getOrderDetail()
-      this.getCodeDetail()
+      this.getCodeDetail2()
     },
-    getCodeDetail(orderRefundId) {
-      getCodeDetail({ orderId: this?.order_cp?.orderId || orderRefundId || this.editOrderId || this?.order_cp?.orderRefundId || "" }).then(async res => {
+    getCodeDetail2(orderRefundId) {
+      getCodeDetail2({ orderId: orderRefundId || this.editOrderId || this?.order_cp?.orderRefundId || "" }).then(async res => {
         for (var item of res.data) {
           item.specs = { goodsMaterialSpecsName: item.specsName }
           item.material = { name: item.materialName }
@@ -673,7 +673,7 @@ export default {
           if (res.code == 200) {
             this.$message({ type: 'success', message: '删除成功!' })
             this.getOrderDetail()
-            this.getCodeDetail()
+            this.getCodeDetail2()
           } else {
             this.$message.error(res.msg);
           }
@@ -696,7 +696,7 @@ export default {
             if (res.code == 200) {
               that.$message.success('保存成功!')
               this.getOrderDetail()
-              this.getCodeDetail()
+              this.getCodeDetail2()
             }
           })
         }
@@ -815,7 +815,7 @@ export default {
     changeExamineStatus(orderRefundId, examineStatus, refundType, orderId, type) {
       if (refundType == 'REFUND_GOODS' || refundType == 'REFUND_GOODS_DETAIL') {
         this.getOrderDetail(orderId)
-        this.getCodeDetail(orderRefundId)
+        this.getCodeDetail2(orderRefundId)
         this.openForm(refundType, { orderRefundId })
       } else {
         this.$prompt('请输入卖家留言', examineStatus == 'OK' ? '同意' : '拒绝', {
@@ -909,7 +909,7 @@ export default {
       listImport2({ formdata })
         .then(res => {
           this.getOrderDetail()
-          this.getCodeDetail()
+          this.getCodeDetail2()
           loading.close()
           this.$message({
             type: 'success',

src/views/mallManagement/order/order_refund_detail/index.vue

@@ -195,8 +195,8 @@
 						    <el-tab-pane v-if="joinCode" label="退货条码" name="2"></el-tab-pane>
 						</el-tabs>
 						<br/>
-						<!-- <el-button size="small" v-show="typeIndex == 2" type="primary" @click="addCode()">新增</el-button>
-						<el-button size="small" v-show="typeIndex == 1" type="primary" @click="handleDownload('导入条码模板')">导入条码模板下载</el-button> -->
+						<el-button size="small" v-show="typeIndex == 2 && joinCode" type="primary" @click="addCode()">新增</el-button>
+						<el-button size="small" v-show="typeIndex == 1 && joinCode" type="primary" @click="handleDownload('导入条码模板')">导入条码模板下载</el-button>
 						<div class="table">
 							<!-- 发货数量 -->
 							<el-form v-show="typeIndex == 1" ref="formData1" :model="formData1" label-width="0" size="small" label-position="left">
@@ -218,7 +218,7 @@
 									<el-table-column prop="refundInsideCodeQty" align="center" label="导入内机条码数量" width="140"></el-table-column>
 									<el-table-column prop="refundOutCodeQty" align="center" label="导入外机条码数量" width="140"></el-table-column>
 									<el-table-column prop="refundPartsCodeQty" align="center" label="导入配件条码数量" width="140"></el-table-column>
-									<!-- <el-table-column label="操作" align="center" width="140" fixed="right">
+									<el-table-column label="操作" align="center" width="140" fixed="right">
 										<template slot-scope="scope" v-if="joinCode">
 											<el-upload
 											  action='_'
@@ -228,7 +228,7 @@
 												<el-button @click="orderDetailId = scope.row.orderDetailId" size="mini" type="text">导入条码</el-button>
 											</el-upload>
 										</template>
-									</el-table-column> -->
+									</el-table-column>
 								</el-table>
 							</el-form>
 							<!-- 发货条码 -->
@@ -361,7 +361,7 @@
 </template>
 
 <script>
-import {changeExamineStatus, getOrderRefundDetail, receiveProd, saveRefundRemark, getOrderDetail, getCodeDetail, getMaterialList, listImport2, saveCode2,delCode2} from "@/api/order";
+import {changeExamineStatus, getOrderRefundDetail, receiveProd, saveRefundRemark, getOrderDetail, getCodeDetail2, getMaterialList, listImport2, saveCode2,delCode2} from "@/api/order";
 import {getExpress} from "@/api/common";
 
 export default {
@@ -435,7 +435,7 @@ export default {
       const orderRefundId = this.orderRefundId
 		if(refundType == 'REFUND_GOODS'){
 			this.getOrderDetail()
-			this.getCodeDetail()
+			this.getCodeDetail2()
 			this.returnGoodsVisible = true
 		}else{
 			changeExamineStatus({orderRefundId, examineStatus}).then(() => {
@@ -477,10 +477,10 @@ export default {
 		},
 		changeType(){
 			this.getOrderDetail()
-			this.getCodeDetail()
+			this.getCodeDetail2()
 		},
-		async getCodeDetail(){
-			getCodeDetail({orderId: this.orderDetail.orderId || this.orderRefundId}).then(async res => {
+		async getCodeDetail2(){
+			getCodeDetail2({orderId: this.orderRefundId}).then(async res => {
 				for(var item of res.data){
 					item.specs = {goodsMaterialSpecsName: item.specsName}
 					item.material = {name: item.materialName}
@@ -566,7 +566,7 @@ export default {
 				  if (res.code == 200) {
 				    this.$message({ type: 'success', message: '删除成功!' })
 				    this.getOrderDetail()
-				    this.getCodeDetail()
+				    this.getCodeDetail2()
 				  } else {
 				    this.$message.error(res.msg);
 				  }
@@ -589,7 +589,7 @@ export default {
 						if(res.code == 200){
 							that.$message.success('保存成功!')
 							this.getOrderDetail()
-							this.getCodeDetail()
+							this.getCodeDetail2()
 						}
 					})
 				}
@@ -617,7 +617,7 @@ export default {
 			listImport2({ formdata })
 			  .then(res => {
 			    this.getOrderDetail()
-				this.getCodeDetail()
+				this.getCodeDetail2()
 			    loading.close()
 			    this.$message({
 			      type: 'success',