Merge branch 'develop' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin into develop

* 'develop' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin:
  根据是否关联条码限制按钮
  no message
  维权去除导入条码

src/api/order.js

@@ -166,7 +166,7 @@ export function saveRefundRemark(params) {
 // 变更维权处理状态
 export function changeExamineStatus(params) {
   return request({
-    url: '/order/refund/examine',
+    url: '/jx/goods/goods/refundV2',
     method: 'post',
     params
   })

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

@@ -303,11 +303,11 @@
 					<el-card class="box-card">
 						<el-tabs v-model="typeIndex">
 						    <el-tab-pane label="发货数量" name="1"></el-tab-pane>
-						    <el-tab-pane label="发货条码" name="2"></el-tab-pane>
+						    <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">

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

@@ -386,11 +386,11 @@
 							<el-card class="box-card">
 								<el-tabs v-model="typeIndex" @tab-click="changeType">
 								    <el-tab-pane label="发货数量" name="1"></el-tab-pane>
-								    <el-tab-pane label="发货条码" name="2"></el-tab-pane>
+								    <el-tab-pane v-if="joinCode" label="发货条码" name="2"></el-tab-pane>
 								</el-tabs>
 								<br/>
-								<el-button size="small" v-show="typeIndex == 2 && logisticsType == 'add'" type="primary" @click="addCode()">新增</el-button>
-								<el-button size="small" v-show="typeIndex == 1 && logisticsType == 'add'" type="primary" @click="handleDownload('导入条码模板')">导入条码模板下载</el-button>
+								<el-button size="small" v-show="typeIndex == 2 && logisticsType == 'add' && joinCode" type="primary" @click="addCode()">新增</el-button>
+								<el-button size="small" v-show="typeIndex == 1 && logisticsType == 'add' && 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">

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

@@ -278,13 +278,13 @@
               <el-card class="box-card">
                 <el-tabs v-model=" typeIndex " @tab-click=" changeType ">
                   <el-tab-pane label="发货数量" name="1"></el-tab-pane>
-                  <el-tab-pane label="发货条码" name="2"></el-tab-pane>
+                  <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' " type="primary"
                   @click="addCode()">新增</el-button>
                 <el-button size="small" v-show=" typeIndex == 1 && activeKey == 'REFUND_GOODS' " type="primary"
-                  @click="handleDownload('导入条码模板')">导入条码模板下载</el-button>
+                  @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>
                   <!-- 发货条码 -->

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

@@ -192,11 +192,11 @@
 					<el-card class="box-card">
 						<el-tabs v-model="typeIndex" @tab-click="changeType">
 						    <el-tab-pane label="发货数量" name="1"></el-tab-pane>
-						    <el-tab-pane label="发货条码" name="2"></el-tab-pane>
+						    <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" type="primary" @click="addCode()">新增</el-button>
+						<el-button size="small" v-show="typeIndex == 1" 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>
 							<!-- 发货条码 -->
@@ -480,7 +480,7 @@ export default {
 			this.getCodeDetail2()
 		},
 		async getCodeDetail2(){
-			getCodeDetail2({orderId: this.orderDetail.orderId}).then(async res => {
+			getCodeDetail2({orderId: this.orderRefundId}).then(async res => {
 				for(var item of res.data){
 					item.specs = {goodsMaterialSpecsName: item.specsName}
 					item.material = {name: item.materialName}

src/views/salesPurchasing/goodsPurchasedStored/index.vue

@@ -187,6 +187,7 @@ export default {
     },
     // 打开创建弹窗
     openForm() {
+      this.isEditIndex = -1
       this.getGysList()
       this.getBaseList()
     },

src/views/salesPurchasing/merchandisePurchaseReturn/index.vue

@@ -184,6 +184,7 @@ export default {
     },
     // 打开创建弹窗
     openForm() {
+      this.isEditIndex = -1
       this.getGysList()
       this.getCgrkOrder()
     },