提交 d434f006 编写于 作者: tao.wu's avatar tao.wu

修改bug

上级 0c66ffde
...@@ -553,25 +553,17 @@ ...@@ -553,25 +553,17 @@
format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="有效期" prop="expiredTime"> <!-- <el-form-item label="商品使用日期" prop="endTime">
<el-col :span="13"> <el-col :span="13">
<el-input <el-input
size="small" size="small"
v-model="formData1.expiredTime" v-model="formData2.endTime"
placeholder="请输入有效期" placeholder="请输入商品使用日期"
style="width:70%;" style="width:70%;"
></el-input> ></el-input>
<!-- <el-date-picker
v-model="formData.expiredTime"
size="small"
format="yyyy-MM-dd HH:mm:ss"
type="date"
placeholder="选择日期">
</el-date-picker> -->
<span class="word-num"></span> <span class="word-num"></span>
</el-col> </el-col>
</el-form-item> </el-form-item> -->
<el-form-item label="检测说明" class="required-label"> <el-form-item label="检测说明" class="required-label">
<el-upload <el-upload
...@@ -649,9 +641,10 @@ ...@@ -649,9 +641,10 @@
<el-form-item label="零售价" prop="optPrice"> <el-form-item label="零售价" prop="optPrice">
<el-col :span="20"> <el-col :span="20">
<el-input <el-input
size="small" @input="$forceUpdate();"
v-model="formData.optPrice" size="small"
placeholder="请输入零售价" v-model="formData.optPrice"
placeholder="请输入零售价"
></el-input> ></el-input>
<!-- <span class="word-num">{{(formData.name).replace(/\s+/g,"").length}}/60</span> --> <!-- <span class="word-num">{{(formData.name).replace(/\s+/g,"").length}}/60</span> -->
...@@ -851,7 +844,7 @@ ...@@ -851,7 +844,7 @@
this.rules = originRules; this.rules = originRules;
this.rules1 = originRules1; this.rules1 = originRules1;
this.rules2 = originRules2; this.rules2 = originRules2;
this.jumPathThird = '/goods-manage?storeId='+storeId this.jumPathThird = '/goods-manage?storeId='+storeId
//this.jumPathThird = '/create-good?id=add&storeId=46' //this.jumPathThird = '/create-good?id=add&storeId=46'
this.title = id == 'add' ? '新增商品' : '编辑商品'; this.title = id == 'add' ? '新增商品' : '编辑商品';
...@@ -1051,6 +1044,7 @@ ...@@ -1051,6 +1044,7 @@
}); });
}, },
getGoodsTypes(goodsType,type){ getGoodsTypes(goodsType,type){
this.goodsType = goodsType;
if(goodsType == 5){ if(goodsType == 5){
this.isMedic = true; this.isMedic = true;
this.isCheckServe = false; this.isCheckServe = false;
...@@ -1169,6 +1163,8 @@ ...@@ -1169,6 +1163,8 @@
if(this.goodsType == 337 ){ if(this.goodsType == 337 ){
this.formData = { ...this.formData, ...this.formData2 }; this.formData = { ...this.formData, ...this.formData2 };
}else{
this.formData = { ...this.formData, ...this.formData1 };
} }
for(let i=0;i<this.fileGoodsList.length;i++){ for(let i=0;i<this.fileGoodsList.length;i++){
this.fileGoodsList[i].imageSort = i+1 this.fileGoodsList[i].imageSort = i+1
...@@ -1195,8 +1191,8 @@ ...@@ -1195,8 +1191,8 @@
// 如果是【检测服务】类型的商品 // 如果是【检测服务】类型的商品
if(this.isCheckServe){ if(this.isCheckServe){
this.formData.goodsCheckImages = this.goodsCheckList; this.formData.goodsCheckImages = this.goodsCheckList;
const { suitableArr } = this.formData; const { suitableArr } = this.formData2;
this.formData.suitable = suitableArr.join(','); this.formData2.suitable = this.formData.suitable = suitableArr.join(',');
this.formData.medicalServiceId = this.formData.medicationId; this.formData.medicalServiceId = this.formData.medicationId;
} }
......
...@@ -33,10 +33,10 @@ const form2 = { ...@@ -33,10 +33,10 @@ const form2 = {
useCount: 1, useCount: 1,
checkType: '', checkType: '',
suitable: '', suitable: '',
suitableStr: '', suitableArr: '',
accessorialService: '', accessorialService: '',
endTime: '', endTime: '',
medicalServiceId: '' // medicalServiceId: ''
} }
const form = { const form = {
......
...@@ -99,7 +99,6 @@ const rules = { ...@@ -99,7 +99,6 @@ const rules = {
goodsType:[ goodsType:[
{ required: true, message: "请选择商品类型", trigger: "change" } { required: true, message: "请选择商品类型", trigger: "change" }
], ],
optPrice: [ optPrice: [
{ required: true, message: "请输入零售价", trigger: "blur" }, { required: true, message: "请输入零售价", trigger: "blur" },
], ],
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册