pengyh 1 vuosi sitten
vanhempi
commit
18ba7cb7fe

+ 5 - 4
src/views/auxiliaryFittings/salesManagement/components/attachmentNewReturnDetail.vue

@@ -26,7 +26,7 @@
 						</el-col>
 						<el-col :span="12">
 							<el-form-item label="网点名称" prop="websitId" :required="true">
-								<el-select v-model="formData.websit" value-key="websitId" :disabled="formType == 2" @change="changeWebsit" placeholder="请选择" style="width: 100%;">
+								<el-select v-model="formData.websit" value-key="websitId" disabled @change="changeWebsit" placeholder="请选择" style="width: 100%;">
 								    <el-option
 								      v-for="item in websitList"
 								      :key="item.websitId"
@@ -38,7 +38,7 @@
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="师傅姓名" prop="worker" :required="true">
-								<el-select v-model="formData.worker" :disabled="formType == 2" value-key="nickName" @focus="()=>{
+								<el-select v-model="formData.worker" disabled value-key="nickName" @focus="()=>{
 									if(!this.formData.websitId){return this.$message.warning('请先选择网点名称!');}
 								}" filterable @change="changeWorker" @blur="workerBlur" placeholder="请选择" style="width: 100%;">
 								    <el-option
@@ -52,12 +52,12 @@
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="师傅身份证" prop="identity" :required="true">
-								<el-input type="text" v-model="formData.identity" :disabled="formType == 2" placeholder="请输入"></el-input>
+								<el-input type="text" v-model="formData.identity" disabled placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="师傅联系电话" prop="workerMobile" :required="true">
-								<el-input type="text" v-model="formData.workerMobile" :disabled="formType == 2" placeholder="请输入"></el-input>
+								<el-input type="text" v-model="formData.workerMobile" disabled placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
@@ -253,6 +253,7 @@
 						var ress = await that.getGoods(item.goodsName, 1)
 						item.goods = {...ress.data,oldPrice:ress.data.price}
 						item.goodsList = ress.data ? [{...ress.data,oldPrice:ress.data.price}] : []
+						item.newRefundQty = 1
 					}
 					this.dataList = res.data.items
 				})

+ 7 - 6
src/views/auxiliaryFittings/salesManagement/components/attachmentOldReturnDetail.vue

@@ -26,7 +26,7 @@
 						</el-col>
 						<el-col :span="12">
 							<el-form-item label="网点名称" prop="websitId" :required="true">
-								<el-select v-model="formData.websit" :disabled="formType == 2" value-key="websitId" @change="changeWebsit" placeholder="请选择" style="width: 100%;">
+								<el-select v-model="formData.websit" disabled value-key="websitId" @change="changeWebsit" placeholder="请选择" style="width: 100%;">
 								    <el-option
 								      v-for="item in websitList"
 								      :key="item.websitId"
@@ -38,7 +38,7 @@
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="师傅姓名" prop="worker" :required="true">
-								<el-select v-model="formData.worker" :disabled="formType == 2" value-key="nickName" @focus="()=>{
+								<el-select v-model="formData.worker" disabled value-key="nickName" @focus="()=>{
 									if(!this.formData.websitId){return this.$message.warning('请先选择网点名称!');}
 								}" filterable @change="changeWorker" @blur="workerBlur" placeholder="请选择" style="width: 100%;">
 								    <el-option
@@ -52,12 +52,12 @@
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="师傅身份证" prop="identity" :required="true">
-								<el-input type="text" v-model="formData.identity" :disabled="formType == 2" placeholder="请输入"></el-input>
+								<el-input type="text" v-model="formData.identity" disabled placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="师傅联系电话" prop="workerMobile" :required="true">
-								<el-input type="text" v-model="formData.workerMobile" :disabled="formType == 2" placeholder="请输入"></el-input>
+								<el-input type="text" v-model="formData.workerMobile" disabled placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
@@ -260,6 +260,7 @@
 						var ress = await that.getGoods(item.goodsName, 1)
 						item.goods = {...ress.data,oldPrice:ress.data.price}
 						item.goodsList = ress.data ? [{...ress.data,oldPrice:ress.data.price}] : []
+						item.oldRefundQty = 1
 					}
 					this.dataList = res.data.items
 				})
@@ -274,8 +275,8 @@
 					this.getWorker()
 					for(var item of res.data.websitPartsRetItemList){
 						var ress = await that.getGoods(item.goodsName, 1)
-						item.goods = {...ress.data,oldPrice:ress.data.price,oldRefundQty: 1}
-						item.goodsList = ress.data ? [{...ress.data,oldPrice:ress.data.price,oldRefundQty: 1}] : []
+						item.goods = {...ress.data,oldPrice:ress.data.price}
+						item.goodsList = ress.data ? [{...ress.data,oldPrice:ress.data.price}] : []
 					}
 					this.dataList = res.data.websitPartsRetItemList
 				})

+ 1 - 1
src/views/auxiliaryFittings/salesManagement/components/auxiliarySalesOrderDetail.vue

@@ -87,7 +87,7 @@
 						</el-col>
 						<el-col :span="12">
 							<el-form-item label="订单来源" prop="source" :required="true">
-								<el-select v-model="formData.source" :disabled="formData.flag != 'SAVE' && formType!=0" placeholder="请选择" style="width: 100%;">
+								<el-select v-model="formData.source" :disabled="true" placeholder="请选择" style="width: 100%;">
 								    <el-option
 									  v-for="item in [{name: '在线订单',id: 'ONLINE'},{name: '自建订单',id: 'SELF'}]"
 								      :key="item.id"

+ 6 - 5
src/views/auxiliaryFittings/salesManagement/components/auxiliarySalesReturnOrderDetail.vue

@@ -26,7 +26,7 @@
 						</el-col>
 						<el-col :span="12">
 							<el-form-item label="网点名称" prop="websitId" :required="true">
-								<el-select v-model="formData.websit" value-key="websitId" @change="changeWebsit" placeholder="请选择" style="width: 100%;">
+								<el-select v-model="formData.websit" disabled value-key="websitId" @change="changeWebsit" placeholder="请选择" style="width: 100%;">
 								    <el-option
 								      v-for="item in websitList"
 								      :key="item.websitId"
@@ -38,7 +38,7 @@
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="师傅姓名" prop="worker" :required="true">
-								<el-select v-model="formData.worker" value-key="nickName" @focus="()=>{
+								<el-select v-model="formData.worker" disabled value-key="nickName" @focus="()=>{
 									if(!this.formData.websitId){return this.$message.warning('请先选择网点名称!');}
 								}" filterable @change="changeWorker" @blur="workerBlur" placeholder="请选择" style="width: 100%;">
 								    <el-option
@@ -52,12 +52,12 @@
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="师傅身份证" prop="identity" :required="true">
-								<el-input type="text" v-model="formData.identity" placeholder="请输入"></el-input>
+								<el-input type="text" v-model="formData.identity" disabled placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="师傅联系电话" prop="workerMobile" :required="true">
-								<el-input type="text" v-model="formData.workerMobile" placeholder="请输入"></el-input>
+								<el-input type="text" v-model="formData.workerMobile" disabled placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
@@ -280,7 +280,8 @@
 						item.goodsCategory = {categoryId: item.goodsCategoryId,categoryName: item.goodsCategoryName}
 						var ress = await that.getGoods(item.goodsCategoryId,item.goodsName, 1)
 						item.goods = {...ress.data,oldPrice:ress.data.price}
-						item.goodsList = ress.data ? [{...ress.data,oldPrice:ress.data.price}] : []
+						item.goodsList = ress.data ? [{...ress.data,oldPrice:ress.data.price}] : [],
+						item.retQty = 1
 					}
 					this.dataList = res.data.items
 				})