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

修改必填bg

上级 25d7acc2
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
</el-form> </el-form>
<el-form <el-form
ref="formData" ref="formData1"
:model="formData1" :model="formData1"
:rules="rules1" :rules="rules1"
label-width="150px" label-width="150px"
...@@ -392,7 +392,7 @@ ...@@ -392,7 +392,7 @@
<el-form <el-form
ref="formData" ref="formData2"
:model="formData2" :model="formData2"
:rules="rules2" :rules="rules2"
label-width="150px" label-width="150px"
...@@ -565,7 +565,7 @@ ...@@ -565,7 +565,7 @@
</el-col> </el-col>
</el-form-item> --> </el-form-item> -->
<el-form-item label="检测说明" class="required-label"> <el-form-item label="检测说明" >
<el-upload <el-upload
:file-list="goodsCheckList" :file-list="goodsCheckList"
class="bg-uploader" class="bg-uploader"
...@@ -725,7 +725,6 @@ ...@@ -725,7 +725,6 @@
import { doUpload, getFilePath } from "../../utils/qiniu-util"; import { doUpload, getFilePath } from "../../utils/qiniu-util";
import { updateGoods ,updateStock,dosageAll,getDeparts,getGoodsList, getGoodDetails, updateGoodsV2} from '@/utils/goods'; import { updateGoods ,updateStock,dosageAll,getDeparts,getGoodsList, getGoodDetails, updateGoodsV2} from '@/utils/goods';
import Cropper from '@/components/common/cropper.vue' import Cropper from '@/components/common/cropper.vue'
import { mapGetters } from "vuex";
import { originRules1, originRules2, originRules } from './rules'; import { originRules1, originRules2, originRules } from './rules';
import { originForm1, originForm2, originForm } from './forms'; import { originForm1, originForm2, originForm } from './forms';
...@@ -831,9 +830,6 @@ ...@@ -831,9 +830,6 @@
isCheckServe: false, // 商品类型选择【检测服务】时!!!!!!!!!!!!!!!!!!!!!!!!!!!!! isCheckServe: false, // 商品类型选择【检测服务】时!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
} }
}, },
computed: {
...mapGetters(["goodsInfo"])
},
created() { created() {
vm = this; vm = this;
const { id, storeId, goodsType } = this.$route.query; const { id, storeId, goodsType } = this.$route.query;
...@@ -1159,7 +1155,13 @@ ...@@ -1159,7 +1155,13 @@
this.stockDio = true this.stockDio = true
}, },
complete() { complete() {
let formName = "formData"; let formNameList = ['formData', 'formData1', 'formData2'];
if(this.goodsType == 337){
formNameList = ['formData', 'formData2'];
}else{
formNameList = ['formData', 'formData1'];
}
// let formName = "formData";
if(this.goodsType == 337 ){ if(this.goodsType == 337 ){
this.formData = { ...this.formData, ...this.formData2 }; this.formData = { ...this.formData, ...this.formData2 };
...@@ -1199,17 +1201,33 @@ ...@@ -1199,17 +1201,33 @@
if(!this.isgoodStock){ if(!this.isgoodStock){
return; return;
} }
this.$refs[formName].validate((valid) => {
if (valid) { let isTrue = false;
//alert('submit!'); formNameList.map(item=>{
this.formData.costPrice = this.formData.optPrice*100 this.$refs[item].validate((valid) => {
this.formData.hasChanged = true; isTrue = valid;
this.updateGoodsInfo(); });
} else {
console.log('error submit!!');
return false;
}
}); });
if(!isTrue){
return false;
}else{
this.formData.costPrice = this.formData.optPrice*100
this.formData.hasChanged = true;
this.updateGoodsInfo();
}
// this.$refs[formName].validate((valid) => {
// if (valid) {
// //alert('submit!');
// this.formData.costPrice = this.formData.optPrice*100
// this.formData.hasChanged = true;
// this.updateGoodsInfo();
// } else {
// console.log('error submit!!');
// return false;
// }
// });
}, },
//更新商品 //更新商品
updateGoodsInfo(){ updateGoodsInfo(){
......
...@@ -423,7 +423,7 @@ ...@@ -423,7 +423,7 @@
}else{ }else{
url = `/create-good?id=${row.goodsId}&storeId=${this.searchForm.storeId}&goodsType=${goodsType}` url = `/create-good?id=${row.goodsId}&storeId=${this.searchForm.storeId}&goodsType=${goodsType}`
} }
this.$store.dispatch('goodsManage/changeGoodsInfo', {...row}); // this.$store.dispatch('goodsManage/changeGoodsInfo', {...row});
this.$router.push({ this.$router.push({
path: url path: url
}) })
......
...@@ -77,7 +77,7 @@ const rules2 = { ...@@ -77,7 +77,7 @@ const rules2 = {
checkStandard: [{ required: true, message: "请输入检测指标", trigger: "blur" }], checkStandard: [{ required: true, message: "请输入检测指标", trigger: "blur" }],
useCount: [{ required: true, message: "请输入使用人数", trigger: "submit" },{validator: checkNumber, trigger: "submit"}], useCount: [{ required: true, message: "请输入使用人数", trigger: "submit" },{validator: checkNumber, trigger: "submit"}],
checkType: [{ required: true, message: "请选择检测类型", trigger: "blur" }], checkType: [{ required: true, message: "请选择检测类型", trigger: "blur" }],
suitableStr: [{ required: true, message: "请选择适用人群", trigger: "blur" }], suitableArr: [{ required: true, message: "请选择适用人群", trigger: "blur" }],
endTime: [{ required: true, message: "请选择商品使用日期", trigger: "blur" }], endTime: [{ required: true, message: "请选择商品使用日期", trigger: "blur" }],
// goodsCheckImages: [ // goodsCheckImages: [
// { required: true, message: "请上传检测说明图", trigger: "blur" } // { required: true, message: "请上传检测说明图", trigger: "blur" }
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册