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

适用人群

上级 18b723dd
...@@ -310,6 +310,9 @@ export default [{ ...@@ -310,6 +310,9 @@ export default [{
{ {
path: '/create-good', path: '/create-good',
component: createGood, component: createGood,
meta: {
keepAlive: false //页面不需要缓存
},
}, },
{ {
path: '/order-detail', path: '/order-detail',
......
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<el-col :span="18"> <el-col :span="18">
<el-input <el-input
size="small" size="small"
v-model="formData.barCode" v-model="formData1.barCode"
placeholder="请输入条形码" placeholder="请输入条形码"
></el-input> ></el-input>
<span class="fast-opt" @click="fastInput(1)">快速录入</span> <span class="fast-opt" @click="fastInput(1)">快速录入</span>
...@@ -405,7 +405,7 @@ ...@@ -405,7 +405,7 @@
<el-col :span="18"> <el-col :span="18">
<el-input <el-input
size="small" size="small"
v-model="formData.barCode" v-model="formData2.barCode"
placeholder="请输入条形码" placeholder="请输入条形码"
></el-input> ></el-input>
<!-- <span class="fast-opt" @click="fastInput(2)">快速录入</span> <!-- <span class="fast-opt" @click="fastInput(2)">快速录入</span>
...@@ -787,7 +787,7 @@ ...@@ -787,7 +787,7 @@
checkPackageList: [], // 检测登记表 checkPackageList: [], // 检测登记表
hospitalTypeList: [{label:'村卫生室',value:1},{label:'乡镇卫生院/中心',value:2}], // 医疗机构类型 hospitalTypeList: [{label:'村卫生室',value:1},{label:'乡镇卫生院/中心',value:2}], // 医疗机构类型
checkTypeList: [{label:'常规检测',value:1}], // 检测类型 checkTypeList: [{label:'常规检测',value:1}], // 检测类型
suitableList: [{label:'儿童',value:'1'},{label:'青年',value:'2'},{label:'中年',value:'3'},{label:'老年',value:'4'}], // 适用人群 suitableList: [{label:'儿童',value:'1'},{label:'青年',value:'2'},{label:'中年',value:'4'},{label:'老年',value:'8'}], // 适用人群
// 不同类型服务的表单通用字段 // 不同类型服务的表单通用字段
// 不同类型服务的表单通用字段 // 不同类型服务的表单通用字段
...@@ -890,7 +890,8 @@ ...@@ -890,7 +890,8 @@
this.formData2 = medicalService; this.formData2 = medicalService;
this.formData = { ...this.formData, ...this.formData2 }; this.formData = { ...this.formData, ...this.formData2 };
this.formData2.suitableArr = this.formData.suitableArr = this.formData.suitable.split(','); this.$set(this.formData2, 'suitableArr', this.formData.suitable.split(','));
this.$set(this.formData, 'suitableArr', this.formData.suitable.split(','));
this.formData.optPrice = this.formData.costPrice/100; this.formData.optPrice = this.formData.costPrice/100;
this.formData.stock = this.formData.goodsStock; this.formData.stock = this.formData.goodsStock;
this.fileGoodsList = this.getImges(goodsInfo.goodsHeaderImages,1); this.fileGoodsList = this.getImges(goodsInfo.goodsHeaderImages,1);
...@@ -1162,16 +1163,12 @@ ...@@ -1162,16 +1163,12 @@
}, },
complete() { complete() {
let formNameList = ['formData', 'formData1', 'formData2']; let formNameList = ['formData', 'formData1', 'formData2'];
if(this.goodsType == 337){
formNameList = ['formData', 'formData2'];
}else{
formNameList = ['formData', 'formData1'];
}
// let formName = "formData"; // let formName = "formData";
if(this.goodsType == 337 ){ if(this.goodsType == 337 ){
formNameList = ['formData', 'formData2'];
this.formData = { ...this.formData, ...this.formData2 }; this.formData = { ...this.formData, ...this.formData2 };
}else{ }else{
formNameList = ['formData', 'formData1'];
this.formData = { ...this.formData, ...this.formData1 }; this.formData = { ...this.formData, ...this.formData1 };
} }
for(let i=0;i<this.fileGoodsList.length;i++){ for(let i=0;i<this.fileGoodsList.length;i++){
...@@ -1212,6 +1209,7 @@ ...@@ -1212,6 +1209,7 @@
formNameList.map(item=>{ formNameList.map(item=>{
this.$refs[item].validate((valid) => { this.$refs[item].validate((valid) => {
isTrue = valid; isTrue = valid;
if (!valid) return false;
}); });
}); });
......
const form1 = { const form1 = {
// barCode: '',
categoryIdLevel2: '', categoryIdLevel2: '',
categoryIdLevel3: '', categoryIdLevel3: '',
categoryIdLevel4: '', categoryIdLevel4: '',
...@@ -16,16 +15,15 @@ const form1 = { ...@@ -16,16 +15,15 @@ const form1 = {
expiredTime:'', expiredTime:'',
specification_url:'', specification_url:'',
treatDisease:'', treatDisease:'',
barCode: '',
} }
const form2 = { const form2 = {
checkPackageId: '', // 检测登记表,暂无,先隐藏!!!!!!!!!!! checkPackageId: '', // 检测登记表,暂无,先隐藏!!!!!!!!!!!
// barCode: '',
checkName: '', checkName: '',
hospitalName: '', hospitalName: '',
hospitalType: '', hospitalType: '',
hospitalId: 0, hospitalId: 0,
medicalServiceId: 0, // 新增时传0,更新时必需>0 medicalServiceId: 0, // 新增时传0,更新时必需>0
goodsCheckImages: [], goodsCheckImages: [],
checkItem: '', checkItem: '',
...@@ -36,6 +34,7 @@ const form2 = { ...@@ -36,6 +34,7 @@ const form2 = {
suitableArr: '', suitableArr: '',
accessorialService: '', accessorialService: '',
endTime: '', endTime: '',
barCode: '',
// medicalServiceId: '' // medicalServiceId: ''
} }
......
...@@ -23,10 +23,10 @@ const checkProjectStr = (rule, value, callback) => { ...@@ -23,10 +23,10 @@ const checkProjectStr = (rule, value, callback) => {
}; };
const rules1 = { const rules1 = {
// barCode: [ barCode: [
// { required: true, message: "请输入条形码", trigger: "submit" }, { required: true, message: "请输入条形码", trigger: "submit" },
// { validator: checkBarcode, trigger: "submit" } { validator: checkBarcode, trigger: "submit" }
// ], ],
medicCommonName:[ medicCommonName:[
{ required: true, message: "请输入商品通用名称", trigger: "blur" } { required: true, message: "请输入商品通用名称", trigger: "blur" }
], ],
...@@ -66,10 +66,10 @@ const rules1 = { ...@@ -66,10 +66,10 @@ const rules1 = {
} }
const rules2 = { const rules2 = {
// barCode: [ barCode: [
// { required: true, message: "请输入条形码", trigger: "submit" }, { required: true, message: "请输入条形码", trigger: "submit" },
// { validator: checkBarcode, trigger: "submit" } { validator: checkBarcode, trigger: "submit" }
// ], ],
checkName: [{ required: true, message: "请输入检测名称", trigger: "blur" }], checkName: [{ required: true, message: "请输入检测名称", trigger: "blur" }],
hospitalName: [{ required: true, message: "请输入医疗机构名称", trigger: "blur" }], hospitalName: [{ required: true, message: "请输入医疗机构名称", trigger: "blur" }],
hospitalType: [{ required: true, message: "请选择医疗机构类型", trigger: "blur" }], hospitalType: [{ required: true, message: "请选择医疗机构类型", trigger: "blur" }],
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册