From 62633a3dab1f6c4b5ac0cc8d9e4a3d120593a6f3 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期二, 02 八月 2022 11:07:43 +0800
Subject: [PATCH] 对接
---
src/components/equipmentDailog/standardDailog.vue | 3
src/views/goalManagement/processForms/processForms.vue | 2
src/views/goalManagement/targetDecompositionYear/component/Dailog.vue | 4
src/views/goalManagement/targetEscalation/index.vue | 16 +-
src/views/goalManagement/performanceAppraisal/component/DailogKhS.vue | 13 +
.env.development | 2
vite.config.ts | 2
src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue | 38 +++---
src/components/equipmentDailog/maintenanceDailog.vue | 3
src/components/equipmentDailog/repairDailog.vue | 3
src/views/goalManagement/targetEscalation/component/Dailog.vue | 15 +-
src/components/equipmentDailog/detectDailog.vue | 3
src/components/equipmentDailog/Dailog.vue | 234 ++++++++++++++++++++++++--------------
src/views/goalManagement/performanceAppraisal/component/DailogKh.vue | 18 ++
14 files changed, 225 insertions(+), 131 deletions(-)
diff --git a/.env.development b/.env.development
index c1f8b28..d94ce93 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,6 @@
#VITE_API_URL = 'http://192.168.0.76:8009'
# VITE_API_URL = 'http://192.168.0.8:8008'
- VITE_API_URL = 'http://192.168.0.76:8009'
+ VITE_API_URL = 'http://192.168.0.76:8010'
# VITE_API_URL = 'http://192.168.0.10:8008'
# VITE_API_URL = 'http://192.168.0.62:8008'
diff --git a/src/components/equipmentDailog/Dailog.vue b/src/components/equipmentDailog/Dailog.vue
index d9a3a93..5135ac7 100644
--- a/src/components/equipmentDailog/Dailog.vue
+++ b/src/components/equipmentDailog/Dailog.vue
@@ -21,13 +21,13 @@
</template>
</el-input>
</el-form-item>
- <el-form-item label="区域名称" size="default">
+ <!-- <el-form-item label="区域名称" size="default">
<el-input v-model="form.name" placeholder="请选择">
<template #append>
<el-button :icon="Search" @click="openRegion"></el-button>
</template>
</el-input>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="单位部门" size="default">
<el-select v-model="form.departmentId" placeholder="请选择" style="width: 100%">
<el-option label="Zone one" value="shanghai" />
@@ -40,7 +40,6 @@
<el-form-item label="生产日期" size="default">
<el-date-picker
v-model="form.produceTime"
- :size="large"
format="YYYY-MM-DD HH:mm:ss"
type="datetime"
placeholder="选择日期时间"
@@ -67,8 +66,8 @@
</el-form-item>
<el-form-item label="停用状态" size="default">
<el-select v-model="form.stopStatus" placeholder="请选择" style="width: 100%">
- <el-option label="Zone one" value="shanghai" />
- <el-option label="Zone two" value="beijing" />
+ <el-option label="Zone one" value="0" />
+ <el-option label="Zone two" value="1" />
</el-select>
</el-form-item>
<el-form-item label="上次检查日期" size="default">
@@ -241,6 +240,8 @@
<el-table-column align="center" label="操作">
<template #default="scope">
<el-button link type="primary" @click="openMaintenance('查看', scope.row)" size="small">查看</el-button>
+ <el-button link type="primary" @click="openMaintenance('修改', scope.row)" size="small">修改</el-button>
+ <el-button link type="primary" @click="deleteA(scope.row)" size="small">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -257,6 +258,8 @@
<el-table-column align="center" label="操作">
<template #default="scope">
<el-button link type="primary" @click="openDetect('查看', scope.row)" size="small">查看</el-button>
+ <el-button link type="primary" @click="openDetect('修改', scope.row)" size="small">修改</el-button>
+ <el-button link type="primary" @click="deleteB(scope.row)" size="small">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -272,9 +275,10 @@
<el-table-column align="center" prop="repairStartDate" label="维修开始日期" />
<el-table-column align="center" prop="repairEndDate" label="维修结束日期" />
<el-table-column align="center" label="操作">
- <template #default="scope"
- >
+ <template #default="scope">
<el-button link type="primary" @click="openRepair('查看', scope.row)" size="small">查看</el-button>
+ <el-button link type="primary" @click="openRepair('修改', scope.row)" size="small">修改</el-button>
+ <el-button link type="primary" @click="deleteC(scope.row)" size="small">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -291,6 +295,8 @@
<el-table-column align="center" label="操作">
<template #default="scope">
<el-button link type="primary" @click="openStandard('查看', scope.row)" size="small">查看</el-button>
+ <el-button link type="primary" @click="openStandard('修改', scope.row)" size="small">修改</el-button>
+ <el-button link type="primary" @click="deleteD(scope.row)" size="small">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -353,54 +359,55 @@
import { ElMessage, ElMessageBox } from 'element-plus';
import type { UploadProps, UploadUserFile } from 'element-plus';
import { facilityManagementApi } from '/@/api/facilityManagement';
+import { number } from 'echarts';
export default defineComponent({
components: { categoryDailog, regionDailog, DailogSearchUser, maintenanceDailog, detectDailog, repairDailog, standardDailog },
setup(props, { emit }) {
const dialogVisible = ref(false);
const form = ref({
- supplyName: 'name1',
+ supplyName: '',
- nextTestDate: 1658279204173,
+ nextTestDate: "",
- qUsage: '23',
+ qUsage: '',
- departmentId: 1,
+ departmentId: "",
- produceTime: 1658279204173,
+ produceTime: "",
- actualStopDate: 1658279204173,
+ actualStopDate: "",
takecareDetailList: [
{
- leadingPersonDepartmentId: 2,
+ leadingPersonDepartmentId: "",
- takecareDate: 1658279204172,
+ takecareDate: "",
- leadingPersonId: 4,
+ leadingPersonId: "",
takecareMemo: '',
},
],
- infoType: 2,
+ infoType: "",
- leadingDepartmentId: 2,
+ leadingDepartmentId: "",
- useEndDay: '1234',
+ useEndDay: '',
- previousTakecareDate: 1658279204173,
+ previousTakecareDate: "",
- previousCheckDate: 1658279204173,
+ previousCheckDate: "",
model: '',
- stopStatus: 0,
+ stopStatus: "",
testWarn: '',
- stopSubmitDate: 1658279204173,
+ stopSubmitDate: "",
- repairStatus: 0,
+ repairStatus: "",
takecareStardardeDetailList: [
{
@@ -408,83 +415,83 @@
},
],
- nextCheckDate: 1658279204173,
+ nextCheckDate: "",
- checkCycle: '发多少',
+ checkCycle: '',
- checkPoint: '发多少',
+ checkPoint: '',
- leadingPersonId: 0,
+ leadingPersonId: "",
- qName: '发顺丰',
+ qName: '',
- nextTakecareDate: 1658279204173,
+ nextTakecareDate: "",
- setPart: '改好',
+ setPart: '',
checkStandardeDetailList: [
{
- checkTarget: '3',
+ checkTarget: '',
- checkPart: '5',
+ checkPart: '',
- checkContent: '2',
+ checkContent: '',
- indexNum: '1',
+ indexNum: '',
- unit: '4',
+ unit: '',
- rate: '6',
+ rate: '',
},
],
- actualDestoryDate: 1658279204173,
+ actualDestoryDate: "",
- isNeedTest: 0,
+ isNeedTest: "",
- alertNum: '321',
+ alertNum: '',
- checkContent: '312',
+ checkContent: '',
- useMemo: '312',
+ useMemo: '',
- previousTestDate: 1658279204173,
+ previousTestDate: "",
- isNeedTakecare: 1,
+ isNeedTakecare: "",
- destoryReason: '312',
+ destoryReason: '',
checkDetailList: [],
- positionNum: '34',
+ positionNum: '',
- testCycle: '566',
+ testCycle: '',
- recoveryReason: '89',
+ recoveryReason: '',
- isNeedCheck: 0,
+ isNeedCheck: "",
- actualRecoveryDate: 1658279204173,
+ actualRecoveryDate: "",
- leadingPersonDepartmentId: 3,
+ leadingPersonDepartmentId: "",
- stopReason: 'fdf',
+ stopReason: '',
- destorySubmitDate: 1658279204173,
+ destorySubmitDate: "",
testDetailList: [
{
testMemo: '',
- testPersonDepartmentId: 0,
+ testPersonDepartmentId: "",
testStatus: '',
- testPersonId: 0,
+ testPersonId: "",
- testResult: 0,
+ testResult: "",
- testDate: 1658279204171,
+ testDate: "",
},
],
@@ -492,45 +499,45 @@
repaireDetailList: [
{
- repairStatus: 0,
+ repairStatus: "",
- repairPersonDepartmentId: 0,
+ repairPersonDepartmentId: "",
- repairMemo: '发生的',
+ repairMemo: '',
- repairPersonId: 0,
+ repairPersonId: "",
- repairEndDate: 1658279204171,
+ repairEndDate: "",
- repairStartDate: 1658279204171,
+ repairStartDate: "",
- exceptionInfo: 'ddd对对对',
+ exceptionInfo: '',
},
],
- equipmentTypeId: 4,
+ equipmentTypeId: "",
- useDate: 1658279204173,
+ useDate: "",
- recoverySubmitDate: 1658279204173,
+ recoverySubmitDate: "",
- lockNum: '94',
+ lockNum: '',
- stopSubmitPersonId: 2,
+ stopSubmitPersonId: "",
- afterStopStep: '32',
+ afterStopStep: '',
- lifeCycle: 1,
+ lifeCycle: "",
- delCheckStandardeDetails: '1,2',
+ delCheckStandardeDetails: '',
- delTakecareStardardeDetails: '1,2',
+ delTakecareStardardeDetails: '',
- delTakecareDetails: '1,2',
+ delTakecareDetails: '',
- delRepaireDetails: '1,2',
+ delRepaireDetails: '',
- delTestDetails: '1,2',
+ delTestDetails: '',
});
const titles = ref();
const disabled = ref(false);
@@ -540,10 +547,13 @@
Dailogtype.value = type;
if (num == 0) {
titles.value = `${title}仪表信息`;
+ form.value.infoType = num;
} else if (num == 1) {
titles.value = `${title}设备设施`;
+ form.value.infoType = num;
} else if (num == 2) {
titles.value = `${title}设备设施`;
+ form.value.infoType = num;
}
disabled.value = title == '查看' ? true : false;
@@ -560,6 +570,10 @@
};
// 提交
const submitForm = () => {
+ form.value.delTakecareDetails =deleteAId.value.toString()
+ form.value.delTestDetails =deleteBId.value.toString()
+ form.value.delRepaireDetails =deleteCId.value.toString()
+ form.value.delCheckStandardeDetails =deleteDId.value.toString()
dialogVisible.value = false;
facilityManagementApi()
.getequipmentInfoAddOrUpdate(form.value)
@@ -582,7 +596,7 @@
// form.value = null;
};
const activeName = ref('first');
-
+ const index = ref<any>();
const categoryShow = ref();
const opencategory = () => {
categoryShow.value.openDailog();
@@ -597,18 +611,22 @@
};
const maintenanceShow = ref();
const openMaintenance = (title: string, data: any) => {
+ index.value = form.value.takecareDetailList.indexOf(data);
maintenanceShow.value.openDailog(title, data);
};
const detectShow = ref();
const openDetect = (title: string, data: any) => {
+ index.value = form.value.testDetailList.indexOf(data);
detectShow.value.openDailog(title, data);
};
const repairShow = ref();
const openRepair = (title: string, data: any) => {
+ index.value = form.value.repaireDetailList.indexOf(data);
repairShow.value.openDailog(title, data);
};
const standardShow = ref();
const openStandard = (title: string, data: any) => {
+ index.value = form.value.checkStandardeDetailList.indexOf(data);
standardShow.value.openDailog(title, data);
};
// 上传
@@ -641,19 +659,56 @@
() => false
);
};
+ const deleteAId = ref([]);
+ const deleteBId = ref([]);
+ const deleteCId = ref([]);
+ const deleteDId = ref([]);
+ // 删除
+ const deleteA = (tag: any) => {
+ form.value.takecareDetailList.splice(form.value.takecareDetailList.indexOf(tag), 1);
+ deleteAId.value.push(tag.id);
+ };
+ const deleteB = (tag: any) => {
+ form.value.testDetailList.splice(form.value.testDetailList.indexOf(tag), 1);
+ deleteBId.value.push(tag.id);
+ };
+ const deleteC = (tag: any) => {
+ form.value.repaireDetailList.splice(form.value.repaireDetailList.indexOf(tag), 1);
+ deleteCId.value.push(tag.id);
+ };
+ const deleteD = (tag: any) => {
+ form.value.checkStandardeDetailList.splice(form.value.checkStandardeDetailList.indexOf(tag), 1);
+ deleteDId.value.push(tag.id);
+ };
// 回传
const main = (val: any) => {
- form.value.takecareDetailList.push(val);
+ if (index.value == -1) {
+ form.value.takecareDetailList.push(val);
+ } else {
+ form.value.takecareDetailList[index.value] = val;
+ }
};
const delect = (val: any) => {
- form.value.testDetailList.push(val);
+ if (index.value == -1) {
+ form.value.testDetailList.push(val);
+ } else {
+ form.value.testDetailList[index.value] = val;
+ }
};
- const Repair= (val:any)=>{
- form.value.repaireDetailList.push(val);
- }
- const Stand=(val:any)=>{
- form.value.checkStandardeDetailList.push(val);
- }
+ const Repair = (val: any) => {
+ if (index.value == -1) {
+ form.value.repaireDetailList.push(val);
+ } else {
+ form.value.repaireDetailList[index.value] = val;
+ }
+ };
+ const Stand = (val: any) => {
+ if (index.value == -1) {
+ form.value.checkStandardeDetailList.push(val);
+ } else {
+ form.value.checkStandardeDetailList[index.value] = val;
+ }
+ };
//全屏
const full = ref(false);
const toggleFullscreen = () => {
@@ -664,7 +719,16 @@
}
};
return {
+ deleteAId,
+ deleteBId,
+ deleteCId,
+ deleteDId,
+ deleteA,
+ deleteB,
+ deleteC,
+ deleteD,
main,
+ index,
delect,
Repair,
Stand,
diff --git a/src/components/equipmentDailog/detectDailog.vue b/src/components/equipmentDailog/detectDailog.vue
index 6bb0615..96a8f76 100644
--- a/src/components/equipmentDailog/detectDailog.vue
+++ b/src/components/equipmentDailog/detectDailog.vue
@@ -82,8 +82,9 @@
if (title == '查看') {
disabled.value = true;
form.value = data;
- } else {
+ } else if(title == '修改'){
disabled.value = false;
+ form.value = data;
}
};
// 开启用户弹窗
diff --git a/src/components/equipmentDailog/maintenanceDailog.vue b/src/components/equipmentDailog/maintenanceDailog.vue
index 2a6c90d..6e82992 100644
--- a/src/components/equipmentDailog/maintenanceDailog.vue
+++ b/src/components/equipmentDailog/maintenanceDailog.vue
@@ -65,8 +65,9 @@
if(title=='查看'){
disabled.value=true
form.value=data
- }else{
+ }else if(title == '修改'){
disabled.value=false
+ form.value=data
}
};
// 开启用户弹窗
diff --git a/src/components/equipmentDailog/repairDailog.vue b/src/components/equipmentDailog/repairDailog.vue
index edc6513..52fd407 100644
--- a/src/components/equipmentDailog/repairDailog.vue
+++ b/src/components/equipmentDailog/repairDailog.vue
@@ -90,8 +90,9 @@
if (title == '查看') {
disabled.value = true;
form.value = data;
- } else {
+ } else if(title == '修改') {
disabled.value = false;
+ form.value = data;
}
};
// 开启用户弹窗
diff --git a/src/components/equipmentDailog/standardDailog.vue b/src/components/equipmentDailog/standardDailog.vue
index c3b4e7c..3228ae5 100644
--- a/src/components/equipmentDailog/standardDailog.vue
+++ b/src/components/equipmentDailog/standardDailog.vue
@@ -74,8 +74,9 @@
if (title == '查看') {
disabled.value = true;
form.value = data;
- } else {
+ } else if(title=='修改'){
disabled.value = false;
+ form.value = data;
}
};
// 开启用户弹窗
diff --git a/src/views/goalManagement/performanceAppraisal/component/DailogKh.vue b/src/views/goalManagement/performanceAppraisal/component/DailogKh.vue
index c76c1fd..2c51d4a 100644
--- a/src/views/goalManagement/performanceAppraisal/component/DailogKh.vue
+++ b/src/views/goalManagement/performanceAppraisal/component/DailogKh.vue
@@ -63,7 +63,7 @@
</el-form>
<el-tabs v-model="activeName" class="demo-tabs">
<el-tab-pane label="目标指标分解" name="1">
- <el-button type="primary" size="default" @click="daiAdd('新增', '')">新增</el-button>
+ <el-button type="primary" size="default" @click="daiAdd('新增','')">新增</el-button>
</el-tab-pane>
</el-tabs>
<el-table :data="form.examineItemList" style="width: 100%">
@@ -75,6 +75,8 @@
<el-table-column align="center" label="操作">
<template #default="scope">
<el-button link type="primary" @click="daiAdd('查看', scope.row)">查看</el-button>
+ <el-button link type="primary" @click="daiAdd('修改', scope.row)">修改</el-button>
+ <el-button link type="primary" @click="deleteA(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -132,7 +134,15 @@
};
// 接受传值
const AddObj = (val: any) => {
- form.value.examineItemList.push(val);
+ if (index.value == -1) {
+ form.value.examineItemList.push(val);
+ } else {
+ form.value.examineItemList[index.value] = val;
+ }
+ };
+ // 删除
+ const deleteA = (tag: any) => {
+ form.value.examineItemList.splice(form.value.examineItemList.indexOf(tag), 1);
};
// 提交
const submitForm = () => {
@@ -179,8 +189,10 @@
};
const activeName = ref('1');
// 新增弹窗
+ const index = ref<any>();
const Show = ref();
const daiAdd = (title: string, data: any) => {
+ index.value = form.value.examineItemList.indexOf(data);
Show.value.openDailog(title, data);
};
// 安全目标指标弹窗
@@ -198,8 +210,10 @@
}
};
return {
+ index,
form,
dialogVisible,
+ deleteA,
AddObj,
openDailog,
activeName,
diff --git a/src/views/goalManagement/performanceAppraisal/component/DailogKhS.vue b/src/views/goalManagement/performanceAppraisal/component/DailogKhS.vue
index 3a44989..98b6f83 100644
--- a/src/views/goalManagement/performanceAppraisal/component/DailogKhS.vue
+++ b/src/views/goalManagement/performanceAppraisal/component/DailogKhS.vue
@@ -1,7 +1,7 @@
<template>
- <el-dialog v-model="dialogVisible" :before-close="resetForm" :fullscreen="full" title="新建考核项目" width="50%" draggable>
+ <el-dialog v-model="dialogVisible" :before-close="resetForm" :fullscreen="full" :title="titles" width="50%" draggable>
<el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
- <el-form :model="form" label-width="120px">
+ <el-form :model="form" :disabled="disabled" label-width="120px">
<el-row>
<el-col :span="24">
<el-form-item label="类型">
@@ -65,9 +65,16 @@
content: '', ////考核内容
judgeStandard: '', ////评定标准
});
+ const disabled=ref(false)
+ const titles=ref()
const openDailog = (title: string, value: any) => {
dialogVisible.value = true;
+ titles.value=`${title}考核项目`
if (title == '查看') {
+ form.value = value;
+ disabled.value=true
+ }else if(title == '修改'){
+ disabled.value=false
form.value = value;
}
};
@@ -105,6 +112,8 @@
};
return {
form,
+ disabled,
+ titles,
dialogVisible,
openDailog,
submitForm,
diff --git a/src/views/goalManagement/processForms/processForms.vue b/src/views/goalManagement/processForms/processForms.vue
index 809bef8..331337a 100644
--- a/src/views/goalManagement/processForms/processForms.vue
+++ b/src/views/goalManagement/processForms/processForms.vue
@@ -56,7 +56,7 @@
const router=useRouter()
const Type=onMounted(()=>{
- // console.log("xxxxxxx",router)
+ console.log("xxxxxxx",router)
})
return {
diff --git a/src/views/goalManagement/targetDecompositionYear/component/Dailog.vue b/src/views/goalManagement/targetDecompositionYear/component/Dailog.vue
index 6f5190d..f49da8a 100644
--- a/src/views/goalManagement/targetDecompositionYear/component/Dailog.vue
+++ b/src/views/goalManagement/targetDecompositionYear/component/Dailog.vue
@@ -113,6 +113,9 @@
const add = (e: any) => {
formUp.targetDivideDetailList.push(e);
// let obj=JSON.parse(JSON.stringify(form.value))
+ };
+ // 新增
+ const submitForm = () => {
formUp.targetId = form.value.id;
goalManagementApi()
.gettargetDivideDetail(formUp)
@@ -128,7 +131,6 @@
}
});
};
- const submitForm = () => {};
// 删除
const Delete = (data: any) => {
formUp.targetId= data.targetId
diff --git a/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue b/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
index d5c2080..1f15d99 100644
--- a/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
+++ b/src/views/goalManagement/targetDecompositionYear/component/DailogAdd.vue
@@ -5,7 +5,7 @@
<el-row>
<el-col :span="11">
<el-form-item label="责任部门" prop="dutyDepartmentId" size="default">
- <el-tree-select v-model="form.dutyDepartmentId" :data="data" class="w100" :props="propse" placeholder="请选择" />
+ <el-tree-select v-model="form.dutyDepartmentId" check-strictly="true" :data="data" class="w100" :props="propse" placeholder="请选择" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
@@ -17,7 +17,7 @@
<el-row>
<el-col :span="11">
<el-form-item label="制定人部门" prop="makerDepartmentId" size="default">
- <el-tree-select v-model="form.makerDepartmentId" :data="data" class="w100" :props="propse" placeholder="请选择" />
+ <el-tree-select v-model="form.makerDepartmentId" :data="data" check-strictly="true" class="w100" :props="propse" placeholder="请选择" />
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
@@ -39,7 +39,7 @@
</el-form>
<template #footer>
<span class="dialog-footer">
- <el-button type="primary" @click="dialogVisible = false" size="default">继续添加</el-button>
+ <!-- <el-button type="primary" @click="dialogVisible = false" size="default">继续添加</el-button> -->
<el-button @click="resetForm(ruleFormRef)" size="default">关闭</el-button>
<el-button type="primary" @click="submitForm(ruleFormRef)" size="default">确定</el-button>
</span>
@@ -116,9 +116,9 @@
};
const resetForm = (formEl: FormInstance | undefined) => {
- if (!formEl) return;
- formEl.resetFields();
dialogVisible.value = false;
+ if (!formEl) return
+ formEl.resetFields();
};
//部门
const department = () => {
@@ -135,23 +135,23 @@
const propse = {
label: 'depName',
children: 'children',
- value:"depId"
+ value: 'depId',
};
onMounted(() => {
- department()
+ department();
});
- const disabled=ref(false)
+ const disabled = ref(false);
// 开启弹窗
const dialogVisible = ref(false);
- const openDailog = (title:string,data:any) => {
- if(title=='查看'){
- disabled.value=true
- form.value=data
- }else if(title=='修改'){
- disabled.value=true
- disabled.value=false
- }else{
- disabled.value=false
+ const openDailog = (title: string, data: any) => {
+ if (title == '查看') {
+ disabled.value = true;
+ form.value = data;
+ } else if (title == '修改') {
+ disabled.value = false;
+ form.value = data;
+ } else {
+ disabled.value = false;
}
dialogVisible.value = true;
};
@@ -170,10 +170,10 @@
}
};
const data = ref();
- const nameC=ref()
+ const nameC = ref();
const onUser = (e: any) => {
form.value.commitPersonId = e.uid;
- nameC.value = e.realName
+ nameC.value = e.realName;
};
return {
disabled,
diff --git a/src/views/goalManagement/targetEscalation/component/Dailog.vue b/src/views/goalManagement/targetEscalation/component/Dailog.vue
index 7c461ba..b998c9b 100644
--- a/src/views/goalManagement/targetEscalation/component/Dailog.vue
+++ b/src/views/goalManagement/targetEscalation/component/Dailog.vue
@@ -3,13 +3,13 @@
<el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
<el-table :data="tableData" style="width: 100%">
<el-table-column align="center" label="序号" type="index" width="80" />
- <el-table-column align="center" prop="date" label="责任部门" />
- <el-table-column align="center" prop="name" label="考核指标" />
- <el-table-column align="center" prop="address" label="制定部门" />
- <el-table-column align="center" prop="date" label="制定日期" />
- <el-table-column align="center" prop="name" label="检查值" />
- <el-table-column align="center" prop="name" label="检查人" />
- <el-table-column align="center" prop="address" label="检查时间" />
+ <el-table-column align="center" prop="dutyDepartmentId" label="责任部门" />
+ <el-table-column align="center" prop="value" label="考核指标" />
+ <el-table-column align="center" prop="makerDepartmentId" label="制定部门" />
+ <el-table-column align="center" prop="makeDate" label="制定日期" />
+ <el-table-column align="center" prop="value" label="检查值" />
+ <el-table-column align="center" prop="commitPersonId" label="检查人" />
+ <el-table-column align="center" prop="makeDate" label="检查时间" />
</el-table>
<template #footer>
<span class="dialog-footer">
@@ -28,6 +28,7 @@
const tableData = ref();
const openDailog = (data: any) => {
dialogVisible.value = true;
+ // console.log(data)
tableData.value = data;
};
//全屏
diff --git a/src/views/goalManagement/targetEscalation/index.vue b/src/views/goalManagement/targetEscalation/index.vue
index 2865285..d39c1f4 100644
--- a/src/views/goalManagement/targetEscalation/index.vue
+++ b/src/views/goalManagement/targetEscalation/index.vue
@@ -32,9 +32,9 @@
<el-table-column property="year" label="年度" align="center" sortable show-overflow-tooltip />
<el-table-column property="value" label="指标值" align="center" sortable show-overflow-tooltip />
<el-table-column v-if="activeName == 1" label="操作" align="center" show-overflow-tooltip>
- <template #default>
+ <template #default="scope">
<el-button link type="primary" size="default" :icon="EditPen" @click="jumpFrom(0)">检查</el-button>
- <el-button link type="primary" size="default" :icon="View" @click="openDai(tableData)">记录</el-button>
+ <el-button link type="primary" size="default" :icon="View" @click="openDai(scope.row.targetDivideDetailList)">记录</el-button>
</template>
</el-table-column>
<el-table-column v-if="activeName == 2" label="操作" align="center" show-overflow-tooltip>
@@ -44,7 +44,7 @@
</el-table-column>
<el-table-column v-if="activeName == 3" label="操作" align="center" show-overflow-tooltip>
<template #default>
- <el-button link type="primary" size="default" :icon="EditPen" @click="jumpFrom()">待审批</el-button>
+ <el-button link type="primary" size="default" :icon="EditPen" @click="jumpFrom">待审批</el-button>
</template>
</el-table-column>
</el-table>
@@ -52,7 +52,7 @@
<el-pagination
v-model:currentPage="currentPage4"
v-model:page-size="pageSize4"
- :page-sizes="[100, 200, 300, 400]"
+ :page-sizes="[10, 20, 30, 40]"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
@size-change="handleSizeChange"
@@ -105,8 +105,8 @@
};
//
const handleClick = (val: any) => {
- let targetType = JSON.parse(JSON.stringify(val));
- ruleForm.searchParams.targetType = targetType.paneName;
+ // let targetType = JSON.parse(JSON.stringify(val));
+ ruleForm.searchParams.targetType = val.paneName;
listApi();
};
onMounted(() => {
@@ -130,7 +130,7 @@
ruleForm.pageIndex = val;
listApi();
};
- const activeName = ref('1');
+ const activeName = ref<any>('1');
// 记录弹窗
const Show = ref();
const openDai = (data: any) => {
@@ -138,7 +138,7 @@
};
// 流程表单
const router = useRouter();
- const jumpFrom = (data: string) => {
+ const jumpFrom = (data: any) => {
router.push({
path: '/processForms',
query: {
diff --git a/vite.config.ts b/vite.config.ts
index ddc2da1..506f200 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -28,7 +28,7 @@
open: env.VITE_OPEN,
proxy: {
'/gitee': {
- target: 'https://192.168.0.76:8009',
+ target: 'https://192.168.0.76:8010',
ws: true,
changeOrigin: true,
rewrite: (path) => path.replace(/^\/gitee/, ''),
--
Gitblit v1.9.2