+
@@ -131,31 +168,40 @@
import { JVxeTable } from '/@/components/jeecg/JVxeTable';
import { dqInspectProgressColumns } from '../DqInspectTask.data';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
- import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
+ import DeptRoleUserSelectRadioGroup from '/@/components/semri/userComponent/DeptRoleUserSelectRadioGroup.vue';
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
import { Form } from 'ant-design-vue';
+ import DeptRoleUserSelectDropDown from '@/components/semri/userComponent/DeptRoleUserSelectDropDown.vue';
const useForm = Form.useForm;
export default defineComponent({
- name: "DqInspectTaskForm",
- components:{
+ name: 'DqInspectTaskForm',
+ components: {
+ DeptRoleUserSelectDropDown,
JDictSelectTag,
+ JSwitch,
JSelectDept,
- JSelectUser,
+ DeptRoleUserSelectRadioGroup,
JVxeTable,
JFormContainer,
},
- props:{
- formDisabled:{
+ props: {
+ formDisabled: {
type: Boolean,
- default: false
+ default: false,
},
- formData: { type: Object, default: ()=>{} },
- formBpm: { type: Boolean, default: true }
+ formData: { type: Object, default: () => {} },
+ formBpm: { type: Boolean, default: true },
},
- emits:['success'],
- setup(props, {emit}) {
+ emits: ['success'],
+ setup(props, { emit }) {
+ const CHARGE_LEADER_DEPT_ID = '2044677562460508161';
+ const CHARGE_LEADER_ROLE_ID = '2062794430936240130';
+ const PARTY_MASSES_DEPT_ID = '2044677628281720834';
+ const MEASURE_RES_LEADER_ROLE_ID = '2044680793306591234';
+
const loading = ref(false);
const formRef = ref();
const dqInspectProgressTableRef = ref();
@@ -164,7 +210,7 @@
const dqInspectProgressTable = reactive
>({
loading: false,
columns: dqInspectProgressColumns,
- dataSource: []
+ dataSource: [],
});
const activeKey = ref('dqInspectProgress');
const formData = reactive>({
@@ -198,34 +244,41 @@
//表单验证
const validatorRules = reactive({
problemId: [{ required: true, message: '请选择具体问题' }],
+ secretLevel: [{ required: true, message: '请选择密级' }],
+ improveMeasure: [{ required: true, message: '请输入整改措施' }],
+ deadline: [{ required: true, message: '请选择完成时限' }],
+ measureResDept: [{ required: true, message: '请选择措施责任部门' }],
+ measureResLeader: [{ required: true, message: '请选择措施责任领导' }],
+ chargeLeaderId: [{ required: true, message: '请选择分管所领导' }],
+ isNeedAppro: [{ required: true, message: '请选择是否需要党群领导审批' }],
});
- const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});
+ const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
const dbData = {};
// 表单禁用
- const disabled = computed(()=>{
- if(props.formBpm === true){
- if(props.formData.disabled === false){
+ const disabled = computed(() => {
+ if (props.formBpm === true) {
+ if (props.formData.disabled === false) {
return false;
- }else{
+ } else {
return true;
}
}
return props.formDisabled;
});
- onMounted(()=>{
+ onMounted(() => {
loadSpecificProblemOptions();
initFormData();
});
//渲染流程表单数据
const queryByIdUrl = '/dqinspecttask/dqInspectTask/queryById';
- async function initFormData(){
- if(props.formBpm === true){
- let params = {id: props.formData.dataId};
- const row = await defHttp.get({url: queryByIdUrl, params});
+ async function initFormData() {
+ if (props.formBpm === true) {
+ let params = { id: props.formData.dataId };
+ const row = await defHttp.get({ url: queryByIdUrl, params });
//设置表单的值
- Object.keys(row).map(k => {
+ Object.keys(row).map((k) => {
formData[k] = row[k];
});
//子表数据
@@ -234,15 +287,23 @@
}
}
// 是否显示提交按钮
- const showFlowSubmitButton = computed(()=>{
- if(props.formBpm === true){
- if(props.formData.disabled === false){
- return true
+ const showFlowSubmitButton = computed(() => {
+ if (props.formBpm === true) {
+ if (props.formData.disabled === false) {
+ return true;
}
}
- return false
+ return false;
});
+ const measureResDeptId = computed(() => {
+ const val = formData.measureResDept;
+ if (!val) return '';
+ return String(val).split(',')[0];
+ });
+
+ const measureResLeaderDisabled = computed(() => !measureResDeptId.value);
+
/**
* 整改任务只能选择具体问题，分类和面上问题由后端置灰用于分组展示。
*/
@@ -276,16 +337,16 @@
resetFields();
const tmpData = {};
Object.keys(formData).forEach((key) => {
- if(row.hasOwnProperty(key)){
- tmpData[key] = row[key]
+ if (row.hasOwnProperty(key)) {
+ tmpData[key] = row[key];
}
- })
+ });
//赋值
- Object.assign(formData,tmpData);
+ Object.assign(formData, tmpData);
}
- const {getSubFormAndTableData, transformData} = useValidateAntFormAndTable(activeKey, {
- 'dqInspectProgress': dqInspectProgressTableRef,
+ const { getSubFormAndTableData, transformData } = useValidateAntFormAndTable(activeKey, {
+ dqInspectProgress: dqInspectProgressTableRef,
});
async function getFormData() {
@@ -301,7 +362,7 @@
}
return Promise.reject(errorFields);
}
- return transformData(toRaw(formData))
+ return transformData(toRaw(formData));
}
async function submitForm() {
@@ -320,16 +381,16 @@
} catch {}
}
const values = Object.assign({}, dbData, mainData, subData);
- console.log('表单提交数据', values)
- const isUpdate = values.id ? true : false
+ console.log('表单提交数据', values);
+ const isUpdate = values.id ? true : false;
await saveOrUpdate(values, isUpdate);
//关闭弹窗
emit('success');
}
function setFieldsValue(values) {
- if(values){
- Object.keys(values).map(k=>{
+ if (values) {
+ Object.keys(values).map((k) => {
formData[k] = values[k];
});
}
@@ -344,7 +405,6 @@
formData[key] = value;
}
-
return {
dqInspectProgressTableRef,
dqInspectProgressTable,
@@ -361,13 +421,19 @@
wrapperCol,
disabled,
showFlowSubmitButton,
+ CHARGE_LEADER_DEPT_ID,
+ CHARGE_LEADER_ROLE_ID,
+ PARTY_MASSES_DEPT_ID,
+ MEASURE_RES_LEADER_ROLE_ID,
+ measureResDeptId,
+ measureResLeaderDisabled,
getFormData,
submitForm,
add,
edit,
formRef,
- }
- }
+ };
+ },
});