Merge branch 'feature/pyh_进销存' into develop

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

@@ -489,9 +489,9 @@
 															}
 														}" @change="(e)=>{
 															scope.row.materialName = e.name
-															scope.row.stockQty = e.stockQty
+															scope.row.stockQty = (e.uniqueCode=='YES'?1:null)
 															scope.row.uniqueCode = e.uniqueCode
-															scope.row.itemId = e.itemId
+															scope.row.goodsMaterialItemId = e.itemId
 														}" value-key="name" :disabled="isEdit2 != scope.$index || formType == 2" placeholder="请选择" style="width: 100%;">
 														    <el-option
 														      v-for="(item,ind) in scope.row.materialList"
@@ -520,7 +520,7 @@
 											<el-table-column prop="" align="center" label="数量">
 												<template slot-scope="scope">
 													<el-form-item :prop="'list.' + scope.$index + '.stockQty'" :rules="[{ required: true, message: `请输入数量`, trigger: 'blur' }]">
-														<el-input type="number" v-model="scope.row.stockQty" :disabled="isEdit2 != scope.$index || formType == 2" placeholder="请输入"></el-input>
+														<el-input type="number" v-model="scope.row.stockQty" :disabled="isEdit2 != scope.$index || formType == 2 || scope.row.uniqueCode=='YES'" placeholder="请输入"></el-input>
 													</el-form-item>
 												</template>
 											</el-table-column>
@@ -922,7 +922,7 @@ export default {
 					material: null,
 					materialList: [],
 					orderDetailId: '',
-					itemId: ''
+					goodsMaterialItemId: ''
 				})
 			}
 		});

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

@@ -396,9 +396,10 @@
 															}
 														}" @change="(e)=>{
 															scope.row.materialName = e.name
-															scope.row.stockQty = e.stockQty
+															scope.row.stockQty = (e.uniqueCode=='YES'?1:null)
 															scope.row.uniqueCode = e.uniqueCode
-															scope.row.itemId = e.itemId
+															scope.row.goodsMaterialItemId = e.itemId
+															
 														}" value-key="name" :disabled="isEdit2 != scope.$index || formType == 2 || activeKey == 'REFUND_GOODS_DETAIL'" placeholder="请选择" style="width: 100%;">
 														    <el-option
 														      v-for="(item,ind) in scope.row.materialList"
@@ -427,7 +428,7 @@
 											<el-table-column prop="" align="center" label="数量">
 												<template slot-scope="scope">
 													<el-form-item :prop="'list.' + scope.$index + '.stockQty'" :rules="[{ required: true, message: `请输入数量`, trigger: 'blur' }]">
-														<el-input type="number" v-model="scope.row.stockQty" :disabled="isEdit2 != scope.$index || formType == 2 || activeKey == 'REFUND_GOODS_DETAIL'" placeholder="请输入"></el-input>
+														<el-input type="number" v-model="scope.row.stockQty" :disabled="isEdit2 != scope.$index || formType == 2 || activeKey == 'REFUND_GOODS_DETAIL' || scope.row.uniqueCode=='YES'" placeholder="请输入"></el-input>
 													</el-form-item>
 												</template>
 											</el-table-column>
@@ -638,7 +639,7 @@ export default {
 						material: null,
 						materialList: [],
 						orderDetailId: '',
-						itemId: ''
+						goodsMaterialItemId: ''
 					})
 				}
 			});