diff --git a/src/components/jeecg/HPlan.vue b/src/components/jeecg/HPlan.vue
index e7f4387..7df2aed 100644
--- a/src/components/jeecg/HPlan.vue
+++ b/src/components/jeecg/HPlan.vue
@@ -193,16 +193,18 @@
this.showText =rows[0].id
// update--end--autor:lvdandan-----date:20200630------for：多选时未带回多个值------
}
+ console.log("传过来的值>>>>>>>>>>>",rows[0].materialType)
if (this.triggerChange) {
//v-dec时即triggerChange为true时 将整个对象给form页面 让他自己setFieldsValue
this.$emit('callback', rows[0].id)
this.$emit('mounted', rows[0].id)
+ this.$emit('callType', rows[0].materialType)
} else {
//v-model时 需要传一个参数field 表示当前这个字段 从而根据这个字段的顺序找到原始值
// this.$emit("input",row[orgFieldsArr[destFieldsArr.indexOf(this.field)]])
this.$emit('input', this.showText, rows[0])
this.$emit('mounted', rows[0].id)
- console.log(rows[0].id)
+ this.$emit('callType', rows[0].materialType)
}
}
}
diff --git a/src/components/jeecg/modal/ProcessPlan.vue b/src/components/jeecg/modal/ProcessPlan.vue
index c7e2b44..7ab23ba 100644
--- a/src/components/jeecg/modal/ProcessPlan.vue
+++ b/src/components/jeecg/modal/ProcessPlan.vue
@@ -366,8 +366,6 @@
this.$message.warning('请选择一条记录')
return false
}
- console.log(this.selectionRows)
-
this.$emit('ok', this.selectionRows)
this.close()
},
diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
index ee4556b..7aec639 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
@@ -27,7 +27,7 @@
-
+
@@ -40,7 +40,7 @@
+ placeholder="物资类型" disabled/>
@@ -539,6 +539,23 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
// }
// })
},
+ getcallType(type){
+ console.log("传过来的类型>>>>>>>>>>>>",type)
+ let param={}
+ param.materialType = type;
+ this.data=param;
+ let fieldval =pick(this.data,'materialType')
+ this.$nextTick(() => {
+ this.form.setFieldsValue(fieldval)
+ })
+ // params.id=id;
+ // this.requestSubTableData(this.url.list, params, this.processMaterialWarehousingListTable)
+ // getAction(this.url.list,params).then((res)=>{
+ // if(res.success){
+ // console.log('将要回填的数据',res.result)
+ // }
+ // })
+ },
popupCallback(company,row) {
let res=JSON.parse(row);
console.log('获取我的数据',res.id)
diff --git a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
index e7da8a3..4279bf3 100644
--- a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
+++ b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
@@ -10,7 +10,7 @@
-
+
@@ -34,28 +34,28 @@
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
@@ -259,7 +259,6 @@
// 触发表单验证
this.form.validateFields((err, values) => {
if (!err) {
- that.confirmLoading = true;
let httpurl = '';
let method = '';
if(!this.model.id){
@@ -270,16 +269,26 @@
method = 'put';
}
let formData = Object.assign(this.model, values);
+ formData.procDefId = this.processData.id;
+ formData.procDeTitle = this.processData.name;
+ formData.title=this.processData.description;
+ if (!formData.tableName)formData.tableName = this.processData.businessTable;
+ console.log('格式化后的数据',formData)
console.log("表单提交数据",formData)
+ if (new Date(formData.privilegedTimeStart).getTime()/100>=new Date(formData.privilegedTimeEnd).getTime()/100){
+ this.$message.error("授权开始时间不能大于授权结束时间")
+ return;
+ }
+ this.btndisabled = true;
httpAction(httpurl,formData,method).then((res)=>{
if(res.success){
that.$message.success(res.message);
- that.$emit('ok');
+ that.$emit('afterSubmit',formData);
}else{
that.$message.warning(res.message);
}
}).finally(() => {
- that.confirmLoading = false;
+ this.btndisabled = false;
})
}
@@ -300,6 +309,57 @@
this.form.setFieldsValue(fieldval)
})
},
+ dateback(data){
+ if (this.form.getFieldsValue().privilegedTimeEnd !== undefined){
+ let date = new Date(this.form.getFieldsValue().privilegedTimeEnd).getTime();
+ let time = new Date(data).getTime();
+ if (time >= date){
+ let param={}
+ param.authorizationNumberDays = Number(0);
+ this.data=param;
+ let fieldval =pick(this.data,'authorizationNumberDays')
+ this.$nextTick(() => {
+ this.form.setFieldsValue(fieldval)
+ })
+ this.$message.warning('开始时间不能大于等于结束时间');
+ }else {
+ let day = (date - time)/(1000*3600*24)
+ let param={}
+ param.authorizationNumberDays = Number(day);
+ this.data=param;
+ let fieldval =pick(this.data,'authorizationNumberDays')
+ this.$nextTick(() => {
+ this.form.setFieldsValue(fieldval)
+ })
+ }
+ }
+ },
+ dateback2(data){
+ if (this.form.getFieldsValue().privilegedTimeStart !== undefined){
+ let date = new Date(this.form.getFieldsValue().privilegedTimeStart).getTime();
+ let time = new Date(data).getTime();
+ if (time <= date){
+ let param={}
+ param.authorizationNumberDays = Number(0);
+ this.data=param;
+ let fieldval =pick(this.data,'authorizationNumberDays')
+ this.$nextTick(() => {
+ this.form.setFieldsValue(fieldval)
+ })
+ this.$message.warning('结束时间不能小于等于结束时间');
+ }else {
+ let day = ( time- date)/(1000*3600*24)
+ let param={}
+ param.authorizationNumberDays = Number(day);
+ this.data=param;
+ let fieldval =pick(this.data,'authorizationNumberDays')
+ this.$nextTick(() => {
+ this.form.setFieldsValue(fieldval)
+ })
+ }
+ }
+
+ },
}
}
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 93b9968..5369a1a 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -649,9 +649,9 @@
processUdgetPlanMaterialList: allValues.tablesValue[0].values
}
},
- orgCodeTxt(a){
- console.log("当前选中用户部门",a)
- },
+ // orgCodeTxt(a){
+ // console.log("当前选中用户部门",a)
+ // },
//渲染流程表单数据
showFlowData() {
if (this.formBpm === true) {
@@ -671,7 +671,6 @@
let res=JSON.parse(row);
console.log('获取我的数据',res.id)
let param={}
-
param.createBy=res.username;
param.company=company;
param.sysOrgCode=res.departIds;