From f19edc96af3261347f48cb8f66f1f5b2feb6071e Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 17 十一月 2023 16:43:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before
---
src/views/plan/outsourcingorder/outsourcingorder-form.vue | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/views/plan/outsourcingorder/outsourcingorder-form.vue b/src/views/plan/outsourcingorder/outsourcingorder-form.vue
index 1f39da7..de15f2b 100644
--- a/src/views/plan/outsourcingorder/outsourcingorder-form.vue
+++ b/src/views/plan/outsourcingorder/outsourcingorder-form.vue
@@ -9,7 +9,7 @@
:rules="dataRule"
:disabled="editable"
ref="dataForm"
- label-width="100px"
+ label-width="110px"
class="l-mes"
>
<el-row :gutter="10">
@@ -37,6 +37,7 @@
<el-col :span="12">
<el-form-item label="闇�姹傛暟閲�" prop="qtyRequired">
<el-input
+ style="width:100%"
v-model="dataForm.qtyRequired"
@change="checkNumber()"
></el-input>
@@ -61,6 +62,18 @@
<el-input v-model="dataForm.remark"></el-input>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="鏄惁澶栧崗鐩村彂" prop="foreignState">
+ <el-switch
+ v-model="dataForm.foreignState"
+ active-text="鏄�"
+ inactive-text="鍚�"
+ active-value="0"
+ inactive-value="1"
+ active-color="#13ce66">
+ </el-switch>
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -82,7 +95,8 @@
addOutsourcingOrder,
putOutsourcingOrder
} from '@/api/plan/outsourcingorder'
-import { validateSixDecimalNotNull } from '@/util/validate'
+import { getObj } from '@/api/plan/masterproductionschedule'
+import { validatePositiveInteger } from '@/util/validate'
import partDialog from '@/views/common/part.vue'
export default {
@@ -102,13 +116,14 @@
qtyRequired: '',
requiredDate: '',
remark: '',
- mpsId: null
+ mpsId: null,
+ foreignState: null,
},
dataRule: {
partId: [{ required: true, message: '闆朵欢涓嶈兘涓虹┖', trigger: 'blur' }],
qtyRequired: [
{ required: true, message: '闇�姹傛暟閲忎笉鑳戒负绌�', trigger: 'blur' },
- { validator: validateSixDecimalNotNull, trigger: 'blur' }
+ { validator: validatePositiveInteger, trigger: 'blur' },
],
requiredDate: [
{ required: true, message: '闇�姹傛棩鏈熶笉鑳戒负绌�', trigger: 'blur' }
@@ -119,7 +134,7 @@
},
created() {},
methods: {
- init(id, masterProductionSchedule) {
+ init(id, masterProductionSchedule,mpsId) {
this.dataForm.id = id || 0
this.visible = true
this.$nextTick(() => {
@@ -129,13 +144,14 @@
this.dataForm = response.data.data
})
}
+
// 浠庝富鐢熶骇璁″垝杩囨潵鐨勶紝甯︿笂闆朵欢
if (masterProductionSchedule) {
+ this.dataForm.qtyRequired = masterProductionSchedule.qtyRequired
this.dataForm.partNo = masterProductionSchedule.partNo
this.dataForm.partName = masterProductionSchedule.partName
this.dataForm.partId = masterProductionSchedule.partId
this.dataForm.mpsId = masterProductionSchedule.id
- this.dataForm.qtyRequired = masterProductionSchedule.qtyRequired
this.dataForm.requiredDate = masterProductionSchedule.requiredDate
}
})
@@ -179,7 +195,8 @@
}
},
// 妫�楠岄渶姹傛暟閲�
- checkNumber() {},
+ checkNumber() {
+ },
// 妫�楠岄渶姹傛棩鏈�
checkDate() {}
},
--
Gitblit v1.9.3