|
|
@@ -179,10 +179,10 @@
|
|
|
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="规格/型号" prop="prescribeSpec">
|
|
|
+ <el-form-item label="包装规格/型号" prop="prescribeSpec">
|
|
|
<el-input
|
|
|
v-model="queryParams.prescribeSpec"
|
|
|
- placeholder="请输入规格"
|
|
|
+ placeholder="请输入包装规格"
|
|
|
clearable
|
|
|
size="small"
|
|
|
/>
|
|
|
@@ -566,8 +566,8 @@
|
|
|
<!-- </el-form-item>-->
|
|
|
<!-- </el-col>-->
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="规格/型号" prop="prescribeSpec">
|
|
|
- <el-input v-model="form.prescribeSpec" placeholder="请输入规格"/>
|
|
|
+ <el-form-item label="包装规格/型号" prop="prescribeSpec">
|
|
|
+ <el-input v-model="form.prescribeSpec" placeholder="请输入规格/型号"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -666,17 +666,17 @@
|
|
|
</el-form-item>
|
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
|
- <el-form-item label="商品规格：" props="specType">
|
|
|
+ <el-form-item label="商品包装规格：" props="specType">
|
|
|
<el-radio-group v-model="form.specType">
|
|
|
- <el-radio :label="0" class="radio">单规格</el-radio>
|
|
|
- <el-radio :label="1">多规格</el-radio>
|
|
|
+ <el-radio :label="0" class="radio">单包装规格</el-radio>
|
|
|
+ <el-radio :label="1">多包装规格</el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<!-- 多规格添加-->
|
|
|
<el-col :span="24" v-if="form.specType === 1" class="noForm">
|
|
|
<el-col :span="24">
|
|
|
- <el-form-item label="选择规格：" prop="">
|
|
|
+ <el-form-item label="选择包装规格：" prop="">
|
|
|
<div class="acea-row row-middle">
|
|
|
<el-select v-model="form.selectRule" style="width: 23%;">
|
|
|
<el-option v-for="(item, index) in ruleList" :value="item.ruleName" :key="index">{{
|
|
|
@@ -711,19 +711,19 @@
|
|
|
|
|
|
<el-col :span="24" v-if="createBnt">
|
|
|
<el-form-item>
|
|
|
- <el-button type="primary" size="small" icon="md-add" @click="addBtn" class="mr15">添加新规格</el-button>
|
|
|
+ <el-button type="primary" size="small" icon="md-add" @click="addBtn" class="mr15">添加新包装规格</el-button>
|
|
|
<el-button type="success" size="small" @click="generate">立即生成</el-button>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="24" v-if="showIput">
|
|
|
<el-col :xl="6" :lg="9" :md="10" :sm="24" :xs="24">
|
|
|
- <el-form-item label="规格/型号：">
|
|
|
- <el-input placeholder="请输入规格" v-model="formDynamic.attrsName"/>
|
|
|
+ <el-form-item label="包装规格/型号：">
|
|
|
+ <el-input placeholder="请输入包装规格/型号" v-model="formDynamic.attrsName"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xl="6" :lg="9" :md="10" :sm="24" :xs="24">
|
|
|
- <el-form-item label="规格值：">
|
|
|
- <el-input v-model="formDynamic.attrsVal" placeholder="请输入规格值"/>
|
|
|
+ <el-form-item label="包装规格值：">
|
|
|
+ <el-input v-model="formDynamic.attrsVal" placeholder="请输入包装规格值"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xl="6" :lg="5" :md="10" :sm="24" :xs="24">
|
|
|
@@ -1025,8 +1025,8 @@
|
|
|
<el-form-item label="国药准字" v-if="form.productType==2" prop="prescribeCode">
|
|
|
<el-input v-model="form.prescribeCode" placeholder="请输入国药准字"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="规格/型号" v-if="form.productType==2" prop="prescribeSpec">
|
|
|
- <el-input v-model="form.prescribeSpec" placeholder="请输入规格"/>
|
|
|
+ <el-form-item label="包装规格/型号" v-if="form.productType==2" prop="prescribeSpec">
|
|
|
+ <el-input v-model="form.prescribeSpec" placeholder="请输入包装规格/型号"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="生产厂家" v-if="form.productType==2" prop="prescribeFactory">
|
|
|
<el-input v-model="form.prescribeFactory" placeholder="请输入生产厂家"/>
|
|
|
@@ -1638,7 +1638,7 @@ export default {
|
|
|
{required: true, message: "国药准字不能为空", trigger: "blur"}
|
|
|
],
|
|
|
prescribeSpec: [
|
|
|
- {required: true, message: "规格不能为空", trigger: "blur"}
|
|
|
+ {required: true, message: "包装规格不能为空", trigger: "blur"}
|
|
|
],
|
|
|
prescribeFactory: [
|
|
|
{required: true, message: "生产厂家不能为空", trigger: "blur"}
|
|
|
@@ -2004,7 +2004,7 @@ export default {
|
|
|
this.showIput = false;
|
|
|
this.createBnt = true;
|
|
|
} else {
|
|
|
- this.$message.warning('请添加完整的规格！');
|
|
|
+ this.$message.warning('请添加完整的包装规格！');
|
|
|
}
|
|
|
},
|
|
|
// 添加属性
|
|
|
@@ -2498,19 +2498,19 @@ export default {
|
|
|
//验证是否填写商品编码
|
|
|
this.form.values.forEach(item => {
|
|
|
if (item.barCode == null || item.barCode === '') {
|
|
|
- itemErrMsg = "规格/型号，商品条码不能为空！";
|
|
|
+ itemErrMsg = "包装规格/型号，商品条码不能为空！";
|
|
|
return checkBoolean = true;
|
|
|
}
|
|
|
if(item.price == null || item.price === '' || item.price === 0){
|
|
|
- itemErrMsg = "规格/型号，商品售价不能为空且不能为0！";
|
|
|
+ itemErrMsg = "包装规格/型号，商品售价不能为空且不能为0！";
|
|
|
return checkBoolean = true;
|
|
|
}
|
|
|
if(item.cost == null || item.cost === ''){
|
|
|
- itemErrMsg = "规格/型号，商品成本价不能为空！";
|
|
|
+ itemErrMsg = "包装规格/型号，商品成本价不能为空！";
|
|
|
return checkBoolean = true;
|
|
|
}
|
|
|
if(item.otPrice == null || item.otPrice === ''){
|
|
|
- itemErrMsg = "规格/型号，商品原价不能为空！";
|
|
|
+ itemErrMsg = "包装规格/型号，商品原价不能为空！";
|
|
|
return checkBoolean = true;
|
|
|
}
|
|
|
})
|
|
|
@@ -2518,7 +2518,7 @@ export default {
|
|
|
return this.$message.warning(itemErrMsg);
|
|
|
}
|
|
|
if (this.form.specType === 1 && this.manyFormValidate.length === 0) {
|
|
|
- return this.$message.warning('请点击生成规格！');
|
|
|
+ return this.$message.warning('请点击生成包装规格！');
|
|
|
}
|
|
|
if (this.form.qualificationExpire && this.form.qualificationExpire.length === 2) {
|
|
|
this.form.qualificationCertificateStart = this.form.qualificationExpire[0];
|
