dev2 #1

Open
panjunjie wants to merge 174 commits from dev2 into main
Showing only changes of commit 3d12b5e827 - Show all commits

View File

@ -108,12 +108,21 @@
<el-radio :label="'2'">自动</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="允许负库存售卖" prop="isNegativeAllowed">
<el-radio-group v-model="innerFormData.isNegativeAllowed">
<el-form-item label="是否同步活动" prop="isSyncActive">
<el-radio-group v-model="innerFormData.isSyncActive">
<el-radio :label="'1'"></el-radio>
<el-radio :label="'0'"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否同步会员" prop="isSyncMember">
<el-radio-group v-model="innerFormData.isSyncMember">
<el-radio :label="'1'"></el-radio>
<el-radio :label="'0'"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="营业员账号" prop="saleAccount">
<el-input v-model="innerFormData.saleAccount" type="text"/>
</el-form-item>
<el-form-item label="备注信息" prop="remark">
<el-input v-model="innerFormData.remark" type="textarea" />
</el-form-item>
@ -217,6 +226,20 @@
trigger: 'change',
},
],
isSyncActive: [
{
required: true,
message: '请选择是否同步活动',
trigger: 'change',
},
],
isSyncMember: [
{
required: true,
message: '请选择是否同步会员',
trigger: 'change',
},
],
cronExpression: [
{
required: true,
@ -268,6 +291,9 @@
isTowSync: '0',
priorityMode: '1',
isNegativeAllowed:'0',
saleAccount:'',
isSyncActive:'0',
isSyncMember:'0',
}
},