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:
  修改
  修改
  商品库存条码明细筛选修改
  维权订单退货调整
  退货接口调整
  维权订单修改
  商品条码台账增加导入

src/api/order.js

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

src/api/salesPurchasing/goodsCodeMachineAccount.js

@@ -16,4 +16,8 @@ export function pageExport(data, name) {
     data,
     name
   })
+}
+
+export function listImport(data) {
+	return handleImport('/jx/goods/importCode', data.formdata, data.id || '')
 }

src/components/Mall/Member/member-browse.vue

@@ -13,7 +13,7 @@
         <el-table-column align="center" label="商品价格" prop="goodsPrice"></el-table-column>
         <el-table-column align="center" label="商品状态" prop="defaultAddr">
           <template slot-scope="scope">
-            {{ scope.row.status ? '上架' : '下架' }}
+            {{ scope.row.goodsStatus ? '上架' : '下架' }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="浏览时间" prop="createTime"></el-table-column>

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

@@ -376,7 +376,7 @@
 									<el-table-column label="规格型号" align="center">
 										<template slot-scope="scope">
 											<el-form-item :prop="'list.' + scope.$index + '.specs'" :rules="[{ required: true, message: `请选择规格型号`, trigger: 'blur' }]">
-												<el-select v-model="scope.row.specs" @change="(e)=>{changeSpecs(e,scope.row)}" value-key="goodsMaterialSpecsName" :disabled="isEdit2 != scope.$index" placeholder="请选择" style="width: 100%;">
+												<el-select v-model="scope.row.specs" @change="(e)=>{changeSpecs(e,scope.row)}" value-key="orderDetailId" :disabled="isEdit2 != scope.$index" placeholder="请选择" style="width: 100%;">
 												    <el-option
 												      v-for="(item,ind) in formData1.list"
 												      :key="ind"
@@ -919,7 +919,7 @@ export default {
 	async getCodeDetail(){
 		getCodeDetail({orderId: this.orderId}).then(async res => {
 			for(var item of res.data){
-				item.specs = {goodsMaterialSpecsName: item.specsName}
+				item.specs = {goodsMaterialSpecsName: item.specsName,orderDetailId: item.orderDetailId}
 				item.material = {name: item.materialName}
 				item.materialList = await this.getMaterialList(item.specsName,item.goodsMaterialItemType)
 			}

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

@@ -253,7 +253,7 @@
                         <el-button type="text" size="small" v-if="order.orderStatus === 'DFH' && $restrict('changeShippingaddress')"
                           @click="openAddressForm(order)">修改收货地址</el-button>
                         <el-button type="text" size="small"
-                          v-if="order.orderStatus === 'YFH' && $restrict('changeDeliverynumber') && order.orderDetails.some(i => i.workOrderType === 'INSTALL')"
+				                v-if="order.orderStatus === 'YFH' && $restrict('changeDeliverynumber') && order.orderDetails.some(i => i.workOrderType === 'INSTALL') && order.pickType == 'NO'"
                           @click="showLogistics(order, 'edit')">
                           修改快递单号
                         </el-button>
@@ -459,7 +459,7 @@
 											<el-table-column label="规格型号" align="center">
 												<template slot-scope="scope">
 													<el-form-item :prop="'list.' + scope.$index + '.specs'" :rules="[{ required: true, message: `请选择规格型号`, trigger: 'blur' }]">
-														<el-select v-model="scope.row.specs" @change="(e)=>{changeSpecs(e,scope.row)}" value-key="goodsMaterialSpecsName" :disabled="isEdit2 != scope.$index || formType == 2 || logisticsType == 'detail'" placeholder="请选择" style="width: 100%;">
+														<el-select v-model="scope.row.specs" @change="(e)=>{changeSpecs(e,scope.row)}" value-key="orderDetailId" :disabled="isEdit2 != scope.$index || formType == 2 || logisticsType == 'detail'" placeholder="请选择" style="width: 100%;">
 														    <el-option
 														      v-for="(item,ind) in formData1.list"
 														      :key="ind"
@@ -864,7 +864,7 @@ export default {
 	async getCodeDetail(){
 		getCodeDetail({orderId: this.editOrderId}).then(async res => {
 			for(var item of res.data){
-				item.specs = {goodsMaterialSpecsName: item.specsName}
+				item.specs = {goodsMaterialSpecsName: item.specsName,orderDetailId: item.orderDetailId}
 				item.material = {name: item.materialName}
 				item.materialList = await this.getMaterialList(item.specsName,item.goodsMaterialItemType)
 			}

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 v-if="joinCode" 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' && 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>
                   <!-- 发货条码 -->
@@ -362,7 +362,7 @@
                           <el-form-item :prop=" 'list.' + scope.$index + '.specs' "
                             :rules=" [{ required: true, message: `请选择规格型号`, trigger: 'blur' }] ">
                             <el-select v-model=" scope.row.specs " @change=" (e) => { changeSpecs(e, scope.row) } "
-                              value-key="goodsMaterialSpecsName"
+                              value-key="orderDetailId"
                               :disabled=" isEdit2 != scope.$index || formType == 2 || activeKey == 'REFUND_GOODS_DETAIL' "
                               placeholder="请选择" style="width: 100%;">
                               <el-option v-for="(      item, ind      ) in       formData1.list      " :key=" ind "
@@ -589,7 +589,7 @@ export default {
     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.specs = { goodsMaterialSpecsName: item.specsName,orderDetailId: item.orderDetailId }
           item.material = { name: item.materialName }
           item.materialList = await this.getMaterialList(item.specsName, item.goodsMaterialItemType)
         }
@@ -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

@@ -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 v-if="joinCode" 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">
@@ -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>
 							<!-- 发货条码 -->
@@ -265,7 +265,7 @@
 									<el-table-column label="规格型号" align="center">
 										<template slot-scope="scope">
 											<el-form-item :prop="'list.' + scope.$index + '.specs'" :rules="[{ required: true, message: `请选择规格型号`, trigger: 'blur' }]">
-												<el-select v-model="scope.row.specs" @change="(e)=>{changeSpecs(e,scope.row)}" value-key="goodsMaterialSpecsName" :disabled="isEdit2 != scope.$index" placeholder="请选择" style="width: 100%;">
+												<el-select v-model="scope.row.specs" @change="(e)=>{changeSpecs(e,scope.row)}" value-key="orderDetailId" :disabled="isEdit2 != scope.$index" placeholder="请选择" style="width: 100%;">
 												    <el-option
 												      v-for="(item,ind) in formData1.list"
 												      :key="ind"
@@ -482,7 +482,7 @@ export default {
 		async getCodeDetail2(){
 			getCodeDetail2({orderId: this.orderRefundId}).then(async res => {
 				for(var item of res.data){
-					item.specs = {goodsMaterialSpecsName: item.specsName}
+					item.specs = {goodsMaterialSpecsName: item.specsName,orderDetailId: item.orderDetailId}
 					item.material = {name: item.materialName}
 					item.materialList = await this.getMaterialList(item.specsName,item.goodsMaterialItemType)
 				}
@@ -617,7 +617,7 @@ export default {
 			listImport2({ formdata })
 			  .then(res => {
 			    this.getOrderDetail()
-				this.getCodeDetail()
+				this.getCodeDetail2()
 			    loading.close()
 			    this.$message({
 			      type: 'success',

src/views/salesPurchasing/goodsCodeMachineAccount/index.vue

@@ -3,7 +3,7 @@
 		<template slot-scope="{activeKey, data}">
 			<template-page v-if="activeKey == 'list'" ref="pageRef" :get-list="getList" :table-attributes="tableAttributes" :table-events="tableEvents"
 			  :options-evens-group="optionsEvensGroup" :moreParameters="moreParameters" :column-parsing="columnParsing" :operationColumnWidth="80"
-			  :operation="operation()" :exportList="exportList">
+			  :operation="operation()" :exportList="exportList" :defaultSearchData="defaultSearchData">
 			</template-page>
 		</template>
 	</zj-tab-page>
@@ -41,13 +41,32 @@ export default {
 			formData: {},
 			formType: 'add',
 			formVisible: false,
-			id: ''
+			id: '',
+			defaultSearchData: []
 		}
 	},
 	computed: {
 		// 事件组合
 		optionsEvensGroup() {
-			return []
+			return [
+				[
+					[
+						this.optionsEvensAuth("imp", {
+							name: '下载导入模板',
+							click: () => {
+								this.handleDownload()
+							}
+						})
+					],
+					[
+						this.optionsEvensAuth("imp", {
+							render: () => {
+							  return this.importButton(listImport, '导入模板')
+							}
+						})
+					]
+				],
+			]
 		},
 		// 更多参数
 		moreParameters() {
@@ -59,8 +78,8 @@ export default {
 		}
 	},
 	created(){
-		if(this.$route.query.id){
-			this.id = this.$route.query.id
+		if(this.pageCode){
+			 this.defaultSearchData = [{ "param": "a.goods_material_id", "compare": "=", "value": this.pageCode, label: "商品编号" }]
 		}
 	},
 	methods: {
@@ -68,9 +87,6 @@ export default {
 		getList(p, cb) {
 			try {
 				var pam = JSON.parse(JSON.stringify(p))
-				if(this.id){
-					pam.params.push({ "param": "a.goods_material_id", "compare": "=", "value": this.id })
-				}
 				cb && cb(pam)
 				return listPageV2(pam)
 			} catch (error) {
@@ -96,7 +112,18 @@ export default {
 			this.formVisible = false
 			this.$refs?.formRef?.resetFields()
 			this.$data.formData = this.$options.data().formData
-		}
+		},
+		// 下载导入模版
+		handleDownload() {
+		  commonTemplateDownload({ name: '初始化条码.xlsx' }, `${this.$route.meta.title}`).then(res => {
+		  	this.$message({
+		  		message: '下载成功',
+		  		type: 'success'
+		  	})
+		  }).catch(err => {
+		  	this.$message.error('下载失败')
+		  })
+		},
 	}
 }
 </script>

src/views/salesPurchasing/goodsInventory/index.vue

@@ -90,10 +90,9 @@ export default {
 							name: 'goodsCodeMachineAccount',
 							params: {
 								pageName: row.id,
+								pageType: '-',
+								pageCode: row.id
 							},
-							query: {
-								id: row.id,
-							}
 						})
 					}
 				},