From 06bed84d6836d70d142254d452330fca6b8aeebe Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Wed, 5 Jul 2023 09:23:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../globalPlanManagement/index.vue | 87 ++++++++++++------- 1 file changed, 57 insertions(+), 30 deletions(-) diff --git a/src/views/hz-project/progressManagement/globalPlanManagement/index.vue b/src/views/hz-project/progressManagement/globalPlanManagement/index.vue index efec9b0..b728e76 100644 --- a/src/views/hz-project/progressManagement/globalPlanManagement/index.vue +++ b/src/views/hz-project/progressManagement/globalPlanManagement/index.vue @@ -105,7 +105,7 @@ const formConfig = { }, { label: "状态", - prop: "engineeringSn", + prop: "state", type: "select", data: [], clearable: true @@ -206,7 +206,18 @@ const drawerVisible = ref(false); const title = ref(""); const newTitle = ref("新增"); const formData = ref({ - name: "" + nodeNumber: "", + nodeName: "", + type: "", + standardCompleteTime: "", + planCompleteTime: "", + expectCompleteTime: "", + realCompleteTime: "", + state: null, + actualDeviation: "", + phaseName: "", + chargerNumber: "", + chargerName: "" }); const statusList: any = ref([]); const DicMainList = ref([]); @@ -268,8 +279,22 @@ const columns: ColumnProps[] = [ { prop: "phaseName", label: "智能条线", width: 150 }, { prop: "chargerNumber", label: "节点责任人编号", width: 150 }, { prop: "chargerName", label: "节点责任人", width: 150 }, - { prop: "isDeleted", label: "节点失效标记", width: 150 }, - { prop: "isSendBack", label: "是否退回", width: 150 }, + { + prop: "isDeleted", + label: "节点失效标记", + width: 150, + render: scoped => { + return scoped.row.isDeleted == 0 ? "有效" : "失效"; + } + }, + { + prop: "isSendBack", + label: "是否退回", + width: 150, + render: scoped => { + return scoped.row.isSendBack == 1 ? "是" : "否"; + } + }, { prop: "operation", label: "操作", fixed: "right" } ]; const getDicMainList = async () => { @@ -358,26 +383,28 @@ const transfrom = (arr: Array) => { // 默认不做操作就直接在 ProTable 组件上绑定 :requestApi="getUserList" const getTableList = (params: any) => { let newParams = JSON.parse(JSON.stringify(params)); - if (newParams.createTime) { - newParams.realCompleteTime_begin = newParams.createTime[0]; - newParams.realCompleteTime_end = newParams.createTime[1]; - delete newParams.createTime; + if (newParams.realCompleteTime) { + newParams.realCompleteTime_begin = newParams.realCompleteTime[0]; + newParams.realCompleteTime_end = newParams.realCompleteTime[1]; + delete newParams.realCompleteTime; } return globalPlanList(newParams); }; const handleAddItem = () => { formData.value = reactive({ - name: "", - buildAddress: "", - workload: "", - unit: "", - taskDesc: "", - planStartTime: "", - planEndTime: "", - importance: "", - commander: "", - annexFile: "" + nodeNumber: "", + nodeName: "", + type: "", + standardCompleteTime: "", + planCompleteTime: "", + expectCompleteTime: "", + realCompleteTime: "", + state: null, + actualDeviation: "", + phaseName: "", + chargerNumber: "", + chargerName: "" }); newTitle.value = "新增"; // fileList.value = reactive([]); @@ -386,18 +413,10 @@ const handleAddItem = () => { // 修改数据按钮 const handleEditItem = async (row: any) => { - getId.value = row.roleId; - - drawerVisible.value = true; - const { result = [] } = await getTreemRoleList(); - // console.log("test", result); - datas.push(...result); - - const res = await getTreeByIdList({ roleId: row.roleId }); - - nextTick(() => { - treeRef.value.setCheckedKeys(res.result.map(item => item.authorityId)); - }); + console.log(row); + formData.value = reactive({ ...row }); + newTitle.value = "编辑"; + visible.value = true; }; onMounted(() => { getDicMainList(); @@ -416,4 +435,12 @@ onMounted(() => { } } } +:deep() { + .el-form .el-form-item__content .el-range-editor { + width: 300px; + } + .el-range-separator { + color: var(--el-menu-text-color); + } +}