diff --git a/src/components/jeecg/JDate.vue b/src/components/jeecg/JDate.vue index dd55e49..6e09838 100644 --- a/src/components/jeecg/JDate.vue +++ b/src/components/jeecg/JDate.vue @@ -29,6 +29,11 @@ default: 'YYYY-MM-DD', required: false }, + createTime :{ + type: String, + default: 'YYYY-MM-DD', + required: false + }, //此属性可以被废弃了 triggerChange:{ type: Boolean, diff --git a/src/components/jeecgbiz/JSelectCompany.vue b/src/components/jeecgbiz/JSelectCompany.vue index ec4afca..2582b5f 100644 --- a/src/components/jeecgbiz/JSelectCompany.vue +++ b/src/components/jeecgbiz/JSelectCompany.vue @@ -3,7 +3,7 @@ - + - + { if (!err) { formData.procDefId = this.processData.id; diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue index 820479e..fa1afdd 100644 --- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue +++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue @@ -425,6 +425,22 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany' throw this.throwNotFunction('classifyIntoFormData') } let formData = this.classifyIntoFormData(allValues) + if (formData.materialType === null || formData.materialType ==='' || formData.materialType === undefined){ + this.$message.error("物资类型不能为空") + return; + } + if (formData.targetLibrary === null || formData.targetLibrary ==='' || formData.targetLibrary === undefined){ + this.$message.error("入库目标库不能为空") + return; + } + if (formData.processUdgetPlanId === null || formData.processUdgetPlanId ==='' || formData.processUdgetPlanId === undefined){ + this.$message.error("关联预算流程不能为空") + return; + } + if (formData.warehousingBatch === null || formData.warehousingBatch ==='' || formData.warehousingBatch === undefined){ + this.$message.error("入库总批次不能为空") + return; + } this.form.validateFields((err, values) => { if (!err) { formData.procDefId = this.processData.id; diff --git a/src/views/activiti/form/ProcessMaterialsAllotForm.vue b/src/views/activiti/form/ProcessMaterialsAllotForm.vue index 31d4568..835af80 100644 --- a/src/views/activiti/form/ProcessMaterialsAllotForm.vue +++ b/src/views/activiti/form/ProcessMaterialsAllotForm.vue @@ -343,6 +343,14 @@ } let formData = this.classifyIntoFormData(allValues) + if (formData.materialType === null || formData.materialType ==='' || formData.materialType === undefined){ + this.$message.error("物资类型不能为空") + return; + } + if (formData.beAllotDepartment === null || formData.beAllotDepartment ==='' || formData.beAllotDepartment === undefined){ + this.$message.error("被调拨部门不能为空") + return; + } this.form.validateFields((err, values) => { if (!err) { formData.procDefId = this.processData.id; diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue index d6c73be..2779b1d 100644 --- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue +++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue @@ -36,7 +36,7 @@ - + @@ -349,6 +349,18 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany' throw this.throwNotFunction('classifyIntoFormData') } let formData = this.classifyIntoFormData(allValues) + if (new Date(formData.createTime).getTime()/100>new Date(formData.deliveryTime).getTime()/100){ + this.$message.error("出库时间不能小于当前流程发起时间") + return; + } + if (formData.materialType === null || formData.materialType ==='' || formData.materialType === undefined){ + this.$message.error("物资类型不能为空") + return; + } + if (formData.deliveryTime === null || formData.deliveryTime ==='' || formData.deliveryTime === undefined){ + this.$message.error("出库时间不能为空") + return; + } this.form.validateFields((err, values) => { if (!err) { diff --git a/src/views/activiti/form/ProcessMaterialsReturnForm.vue b/src/views/activiti/form/ProcessMaterialsReturnForm.vue index f328647..b7bae8a 100644 --- a/src/views/activiti/form/ProcessMaterialsReturnForm.vue +++ b/src/views/activiti/form/ProcessMaterialsReturnForm.vue @@ -26,7 +26,7 @@ - + @@ -342,6 +342,14 @@ throw this.throwNotFunction('classifyIntoFormData') } let formData = this.classifyIntoFormData(allValues) + if (formData.materialType === null || formData.materialType ==='' || formData.materialType === undefined){ + this.$message.error("物资类型不能为空") + return; + } + if (formData.processBorrowId === null || formData.processBorrowId ==='' || formData.processBorrowId === undefined){ + this.$message.error("关联借用流程不能为空") + return; + } this.form.validateFields((err, values) => { if (!err) { diff --git a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue index 43a85a3..afc2c6e 100644 --- a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue +++ b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue @@ -340,7 +340,14 @@ throw this.throwNotFunction('classifyIntoFormData') } let formData = this.classifyIntoFormData(allValues) - + if (formData.materialType === null || formData.materialType ==='' || formData.materialType === undefined){ + this.$message.error("物资类型不能为空") + return; + } + if (formData.processOutflowId === null || formData.processOutflowId ==='' || formData.processOutflowId === undefined){ + this.$message.error("关联的出库流程不能为空") + return; + } this.form.validateFields((err, values) => { if (!err) { formData.procDefId = this.processData.id; diff --git a/src/views/activiti/form/ProcessSpecialMaterialsForm.vue b/src/views/activiti/form/ProcessSpecialMaterialsForm.vue index 4c1651f..a288c28 100644 --- a/src/views/activiti/form/ProcessSpecialMaterialsForm.vue +++ b/src/views/activiti/form/ProcessSpecialMaterialsForm.vue @@ -336,6 +336,14 @@ } let formData = this.classifyIntoFormData(allValues) + if (formData.materialType === null || formData.materialType ==='' || formData.materialType === undefined){ + this.$message.error("物资类型不能为空") + return; + } + if (formData.processReturnId === null || formData.processReturnId ==='' || formData.processReturnId === undefined){ + this.$message.error("关联的归还流程不能为空") + return; + } this.form.validateFields((err, values) => { if (!err) { formData.procDefId = this.processData.id; diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue index 5b1d8c5..2661e7a 100644 --- a/src/views/activiti/form/ProcessUdgetPlanForm.vue +++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue @@ -1,9 +1,9 @@