Merge branch 'feature/pyh_发货退货规格型号回显调整'

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

@@ -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

@@ -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)
         }

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

@@ -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)
 				}