xiaozhiyong/refinery-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '提货单信息' (#10) from caolc into master

Browse Source 
Reviewed-on: #10
This commit was merged in pull request #10.
This commit is contained in:
曹连存
2023-04-04 03:16:47 +00:00
parent bac5da12a8 f56dc7bde9
commit 2834cfc639
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/order/components/billOfLading.vue
View File

@@ -110,7 +110,7 @@
<el-dialog :close-on-click-modal="false" :append-to-body="true" title="提货单信息" width="400px" :visible.sync="dialogBillAdd">
<el-form v-if="dialogBillAdd" :model="billAddData" ref="form" :rules="rules">
<el-form-item label="预约提货量" prop="preDeliveryQuantity">
<el-input v-model="billAddData.preDeliveryQuantity"></el-input>元/吨
<el-input v-model="billAddData.preDeliveryQuantity"></el-input>吨
</el-form-item>
<el-form-item label="提货人" prop="driverName">
<el-input v-model="billAddData.driverName"></el-input>

12
src/views/product/components/create.vue
View File

@@ -87,7 +87,7 @@
></el-input>
元/吨
</el-form-item>
<el-form-item label="预约提货量">
<el-form-item prop="preQuantity" label="预约提货量">
<el-input
maxlength="50"
v-model="form.preQuantity"
@@ -155,6 +155,13 @@ export default {
if (this.form.refineryId) callback();
else callback("请选择炼厂");
};
var validatePass = (rule, value, callback) => {
if (!Boolean(Number(value))) {
callback(new Error('预约提货量不能为空或零'));
} else {
callback();
}
};
return {
customList: [],
form: {
@@ -191,6 +198,9 @@ export default {
enableMark: [
{ required: true, message: "请选择启用状态", trigger: "change" },
],
preQuantity:[
{ required: true, validator:validatePass, trigger: "blur" }
],
productType: [
{ required: true, message: "请选择产品类型", trigger: "change" },
],

2
src/views/product/index.vue
View File

@@ -174,7 +174,7 @@
<!--新增产品 -->
<add :controlWindows="controlWindows" @closeWindow="search" />
<!-- 下单 -->
<create :controlWindows="controlWindows" @closeWindow="search" />
<create :controlWindows="controlWindows" @closeWindow="search" />
<!-- 调价记录 -->
<record :controlWindows="controlWindows" />
<!-- 批量 -->

2
src/views/refineryCenter/components/billOfLading.vue
View File

@@ -110,7 +110,7 @@
<el-dialog :close-on-click-modal="false" :append-to-body="true" title="提货单信息" width="400px" :visible.sync="dialogBillAdd">
<el-form v-if="dialogBillAdd" :model="billAddData" ref="form" :rules="rules">
<el-form-item label="预约提货量" prop="preDeliveryQuantity">
<el-input v-model="billAddData.preDeliveryQuantity"></el-input>元/吨
<el-input v-model="billAddData.preDeliveryQuantity"></el-input>吨
</el-form-item>
<el-form-item label="提货人" prop="driverName">
<el-input v-model="billAddData.driverName"></el-input>