This commit is contained in:
lcw
2026-02-07 10:24:29 +08:00
parent 323fcd25fe
commit c0ba4c7c49
22 changed files with 598 additions and 91 deletions

View File

@ -3,27 +3,58 @@
<div class="head_box">
<span class="title">工作考核{{ title }} </span>
<div>
<el-button type="primary" size="small" :loading="loading" @click="submit" v-if="title !='详情'">保存</el-button>
<el-button type="primary" size="small" :loading="loading" @click="submit" v-if="title != '详情'">保存</el-button>
<el-button size="small" @click="close">关闭</el-button>
</div>
</div>
<div class="form_cnt">
<FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules" :disabled="title =='详情'"></FormMessage>
<FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules" :disabled="title == '详情'">
<template #bkyj>
<el-divider content-position="left"><span style="color: blue;">布控预警</span></el-divider>
</template>
<template #clyj>
<el-divider content-position="left"><span style="color: blue;">车辆预警</span></el-divider>
</template>
<template #qlry>
<el-divider content-position="left"><span style="color: blue;">7类重点人员预警</span></el-divider>
</template>
<template #rxyj>
<el-divider content-position="left"><span style="color: blue;">人像预警</span></el-divider>
</template>
<template #zbyj>
<el-divider content-position="left"><span style="color: blue;">政保预警</span></el-divider>
</template>
<template #fs>
<el-divider content-position="left"><span style="color: blue;">考核分数</span></el-divider>
</template>
</FormMessage>
</div>
</div>
</template>
<script setup>
import { IdCard } from "@/utils/validate.js";
import FormMessage from "@/components/aboutTable/FormMessage.vue";
import { qcckGet, qcckPost } from "@/api/qcckApi.js";
import * as rule from "@/utils/rules.js";
import { qcckGet, qcckPost,qcckPut } from "@/api/qcckApi.js";
import { ref, defineExpose, reactive, defineEmits, getCurrentInstance, } from "vue";
const emit = defineEmits(["updateDate"]);
const props = defineProps({
dic: Object
});
const listQuery = ref({
cjfs: 0,
ypfs: 0,
bkyjFkl: 0,
bkyjQsl: 0,
clyjFkl: 0,
clyjQsl: 0,
qlryFkl: 0,
qlryQsl: 0,
rxyjFkl: 0,
rxyjQsl: 0,
zbyjFkl: 0,
zbyjQsl: 0,
}); //表单
const { proxy } = getCurrentInstance();
const dialogForm = ref(false); //弹窗
const formData = ref([
@ -31,10 +62,27 @@ const formData = ref([
{ label: "考核开始日期", prop: "ksrq", type: "date" },
{ label: "考核结束日期", prop: "jsrq", type: "date" },
{ label: "考核描述", prop: "khzbms", type: "textarea", width: "100%" },
{ prop: "fs", type: "slot", width: "100%" },
{ label: "采集分数", prop: "cjfs", type: "number", min: 0, max: 100, step: 1 },
{ label: "研判分数", prop: "ypfs", type: "number", min: 0, max: 100, step: 1 },
{ prop: "bkyj", type: "slot", width: "100%" },
{ label: "布控预警反馈率", prop: "bkyjFkl", type: "number", min: 0, max: 100, step: 0.01 },
{ label: "布控预警签收率", prop: "bkyjQsl", type: "number", min: 0, max: 100, step: 0.01 },
{ prop: "clyj", type: "slot", width: "100%" },
{ label: "车辆预警反馈率", prop: "clyjFkl", type: "number", min: 0, max: 100, step: 0.01 },
{ label: "车辆预警签收率", prop: "clyjQsl", type: "number", min: 0, max: 100, step: 0.01 },
{ prop: "qlry", type: "slot", width: "100%" },
{ label: "7类重点人员反馈率", prop: "qlryFkl", type: "number", min: 0, max: 100, step: 0.01 },
{ label: "7类重点人员签收率", prop: "qlryQsl", type: "number", min: 0, max: 100, step: 0.01 },
{ prop: "rxyj", type: "slot", width: "100%" },
{ label: "人像预警反馈率", prop: "rxyjFkl", type: "number", min: 0, max: 100, step: 0.01 },
{ label: "人像预警签收率", prop: "rxyjQsl", type: "number", min: 0, max: 100, step: 0.01 },
{ prop: "zbyj", type: "slot", width: "100%" },
{ label: "政保预警反馈率", prop: "zbyjFkl", type: "number", min: 0, max: 100, step: 0.01 },
{ label: "政保预警签收率", prop: "zbyjQsl", type: "number", min: 0, max: 100, step: 0.01 },
]);
const listQuery = ref({}); //表单
const loading = ref(false);
const elform = ref();
const title = ref("");
@ -66,12 +114,22 @@ const submit = () => {
let params = { ...data };
console.log(params);
loading.value = true;
qcckPost(params, url).then(() => {
if (title.value == "新增") {
qcckPost(params, url).then(() => {
loading.value = false;
proxy.$message({ type: "success", message: title.value + "成功" });
emit("updateDate");
close();
}).catch(() => { loading.value = false; });
} else {
qcckPut(params, url).then(() => {
loading.value = false;
proxy.$message({ type: "success", message: title.value + "成功" });
emit("updateDate");
close();
}).catch(() => { loading.value = false; });
}
});
};
@ -90,6 +148,6 @@ defineExpose({ init });
@import "~@/assets/css/element-plus.scss";
::v-deep .el-textarea__inner {
height: 38.5em !important;
height: 18.5em !important;
}
</style>

View File

@ -106,7 +106,11 @@ onMounted(() => {
// 搜索
const onSearch = (val) => {
queryFrom.value = { ...val };
queryFrom.value = {
...val,
startTime: val.startTime ? val.startTime[0] : "",
endTime: val.startTime ? val.startTime[0] : ""
};
pageData.pageConfiger.pageCurrent = 1;
getList();
};

View File

@ -60,8 +60,10 @@ const pageData = reactive({
tableColumn: [
{ label: "申请人姓名", prop: "xm" },
{ label: "申请人身份证", prop: "sfzh"},
{ label: "申请人联系电话", prop: "lxdh"},
{ label: "权限说明", prop: "qxsm" },
{ label: "申请人联系电话", prop: "lxdh" },
{ label: "提交人姓名", prop: "tjrxm"},
{ label: "提交人身份证号", prop: "tjrsfzh"},
{ label: "权限说明", prop: "qxsm", showOverflowTooltip: true },
]
});

View File

@ -11,7 +11,6 @@
<FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules">
</FormMessage>
</div>
</div>
</template>
@ -21,11 +20,12 @@ import FormMessage from "@/components/aboutTable/FormMessage.vue";
import { ref, defineExpose, reactive, defineEmits, getCurrentInstance, watch, computed } from "vue";
import { addJudgmentCommandList, editJudgmentCommand, getJudgmentCommandDetail } from "@/api/huiShangyp/judgmentCommand.js"
// import { getItem } from '@//utils/storage.js'
import { useRouter } from 'vue-router'
const emit = defineEmits(["updateDate", "getList"]);
const props = defineProps({
dict: Object
});
const router = useRouter()
const imgMsg = ref([])
const { proxy } = getCurrentInstance();
const dialogForm = ref(false); //弹窗
@ -118,6 +118,7 @@ const close = () => {
listQuery.value = {};
dialogForm.value = false;
loading.value = false;
router.replace({ path: '/judgmentCommand' })// 移除id 避免刷新一直带参数
};
defineExpose({ init });

View File

@ -61,18 +61,11 @@ import FeedbackDialog from "./components/FeedbackDialog.vue";
import { getItem } from '@//utils/storage.js'
const { proxy } = getCurrentInstance();
const { D_BZ_YPFS, D_BZ_YPLX } = proxy.$dict("D_BZ_YPFS", "D_BZ_YPLX")
const detailDiloag = ref();
const searchBox = ref(); //搜索框
const userInfo = ref()
onMounted(() => {
userInfo.value = getItem('deptId')[0]
tabHeightFn()
if (route.query.id) {
detailDiloag.value.init('edit', {
id: route.query.id
});
return
}
getList()
});
@ -149,8 +142,13 @@ const tabHeightFn = () => {
};
};
const route = useRoute()
const addForm = ref(null)
watch(() => route.query.id, (val) => {
console.log('val: ', val);
if (val) {
addForm.value.init('detail', {id:val}, '01');
}
},{deep:true});
const feedbackDialog = ref(false)
const currentFeedbackRow = ref({})
const getDataById = (type, row) => {

View File

@ -98,7 +98,7 @@
* @property {Array} fj - 附件数组
* @property {string} wcqk - 完成情况01 准备中、02 已完成)
*/
import { qcckGet } from "@/api/qcckApi.js";
import FormMessage from "@/components/aboutTable/FormMessage.vue";
import UploadFile from "@/components/MyComponents/Upload/index.vue";
// import ChooseUser from "@/components/ChooseList/ChooseUser/index.vue"
@ -214,12 +214,13 @@ watch(() => listQuery.value.jsdxBmDm, (val) => {
})
})
// 初始化数据
const init = (type, row, wjlb) => {
dialogForm.value = true;
title.value = type == "add" ? "新增" : type == "edit" ? "编辑" : "详情";
outRow.value = row
if (row) {
getDataById(row.id)
getDataById(row.id )
} else {
listQuery.value = {
bglx: props.bglx, // 报告类型 01 战术研判 02战略研判
@ -232,7 +233,7 @@ const init = (type, row, wjlb) => {
};
// 根据id查询详情
const getDataById = (id) => {
sjzlGetInfo(id).then((res) => {
qcckGet({},'/mosty-gsxt/gsxtYpbg/'+id).then((res) => {
listQuery.value = res || {};
/** @type {Array<JudgmentDept>} 参与研判部门数据数组 */
const cyypList = Array.isArray(res.cyypList) ? res.cyypList : []

View File

@ -13,19 +13,19 @@
</FormMessage>
<div class="cntBox">
<!-- 工具栏 -->
<Toolbar
style="border-bottom: 1px solid #ccc"
<Toolbar
style="border-bottom: 1px solid #ccc"
:editor="editorRef"
:defaultConfig="toolbarConfig"
:mode="mode" />
<!-- 编辑器 -->
<Editor
:style="`height: 480px; overflow-y: hidden`"
v-model="textContent"
<Editor
:style="`height: 480px; overflow-y: hidden`"
v-model="textContent"
:defaultConfig="editorConfig"
:mode="mode"
@onCreated="handleCreated"
@onChange="handChange"
:mode="mode"
@onCreated="handleCreated"
@onChange="handChange"
/>
</div>
<div v-if="listQuery.id" style="display: flex; justify-content: center;">
@ -47,6 +47,7 @@ import ExtractionText from "@/components/ExtractionText/index.vue";
import FormMessage from "@/components/aboutTable/FormMessage.vue";
import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
import "@wangeditor/editor/dist/css/style.css";
import { useRoute, useRouter } from 'vue-router'
// import Consultation from './consultation.vue'
import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
import { ref, defineExpose, reactive, defineEmits, getCurrentInstance, shallowRef, onBeforeUnmount, watch } from "vue";
@ -117,12 +118,33 @@ const elform = ref();
const title = ref("");
// 初始化数据
const init = (type, row) => {
if(row) listQuery.value = JSON.parse(JSON.stringify(row));
const init = (type, row) => {
dialogForm.value = true;
title.value = type == "add" ? "新增" :type == "edit"? "编辑" : "详情";
if (row) {
getDataById(row.id)
}
// listQuery.value = JSON.parse(JSON.stringify(row));
setEditorTextContent()
};
// 根据id查询详情
const getDataById = (id) => {
qcckGet({},'/mosty-gsxt/gsxtYpbg/'+id).then((res) => {
listQuery.value = res || {};
// /** @type {Array<JudgmentDept>} 参与研判部门数据数组 */
// const cyypList = Array.isArray(res.cyypList) ? res.cyypList : []
// listQuery.value.jsdxBmDm = cyypList.map(item => {
// return item.ypbmdm
// })
// listQuery.value.jsdxBmMc = cyypList.map(item => {
// return item.ypbmmc
// })
});
};
const getText = (val) => {
listQuery.value.fj = val.text;
setEditorTextContent()
@ -175,7 +197,7 @@ const handleCreated = (editor) => {
};
//内容发生变化
const handChange = (editor) => {
// 判断是否是一个空段落,是空就传空文本
};
onBeforeUnmount(() => {
@ -183,12 +205,13 @@ onBeforeUnmount(() => {
if (editor) editor.destroy();
});
const router = useRouter();
// 关闭
const close = () => {
loading.value = false;
dialogForm.value = false;
listQuery.value = {}
router.replace({ path: '/strategicResearchs' })// 移除id 避免刷新一直带参数
};

View File

@ -65,28 +65,25 @@ import AddForm from "./addForm.vue";
import addMeeting from "./addMeeting.vue";
const { proxy } = getCurrentInstance();
const { D_BZ_YPFS, D_BZ_YPLX, D_GS_BQ_LX } = proxy.$dict("D_BZ_YPFS", "D_BZ_YPLX", "D_GS_BQ_LX")
/** 报告弹框 */
const reportTc = ref();
/** 会议弹框 */
const meetingTc = ref();
const searchBox = ref(); //搜索框
const router = useRouter();
const route = useRoute();
onMounted(() => {
tabHeightFn()
if (route.query.id) {
nextTick(() => {
addForm.value && addForm.value.init('edit', {
id: route.query.id
});
router.replace({ path: '/tacticalResearch' })// 移除id 避免刷新一直带参数
})
}
getList()
});
watch(() => route.query.id, (val) => {
if (val) {
nextTick(() => {
reportTc.value && reportTc.value.init('edit', {
id: val
});
})
}
},{deep:true});
// 提交审核

View File

@ -19,7 +19,7 @@
</FormMessage>
</div>
<div v-if="title == '详情'" class="timeline-container">
<el-timeline class="timeline-wrapper" v-if="listQuery.czlcLis&&listQuery.czlcList.length > 0">
<el-timeline class="timeline-wrapper" v-if="listQuery.czlcLis && listQuery.czlcList.length > 0">
<el-timeline-item placement="top" v-for="(activity, index) in listQuery.czlcList" :key="index"
:timestamp="activity.czsj" :color="activity.czlx == '01' ? '#409eff' : '#67c23a'" size="large">
<div class="timeline-content" :class="activity.czlx == '01' ? 'sign-type' : 'feedback-type'">
@ -50,28 +50,40 @@
import Xslist from '@/components/ChooseList/ChooseXs/index.vue'
import FormMessage from '@/components/aboutTable/FormMessage.vue'
import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
import { useRouter } from 'vue-router'
import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick ,watch} from "vue";
const emit = defineEmits(["updateDate"]);
const props = defineProps({
dic: Object
dic: {
type: Object,
default: () => ({})
}
});
const chooseVisible = ref(false)
const roleIds = ref([])
const { proxy } = getCurrentInstance();
const dialogForm = ref(false); //弹窗
const formData = ref([
{ label: "指令标题", prop: "zlbt", type: "input", },
{ label: "指令类型", prop: "zllx", type: "select", options: props.dic.D_GS_XS_ZLLX },
{ label: "指令等级", prop: "zldj", type: "select", options: props.dic.D_GS_ZDQT_FXDJ },
{ label: "反馈结束时间", prop: "jssj", type: "datetime" },
{ label: "联系人", prop: "zllxr", type: "input" },
{ label: "联系电话", prop: "zllxdh", type: "input" },
{ label: "关联线索", prop: "glxsid", type: "slot" },
{ label: "主送单位", prop: "zsdw", type: "department" },
{ label: "抄送单位", prop: "csdw", type: "department" },
{ label: "指令内容", prop: "zlnr", type: "textarea", width: '100%' },
{ label: "附件", prop: "fjzd", type: "upload", width: '100%' },
]);
const formData = ref()
watch(() => props.dic, (newVal) => {
if (newVal) {
formData.value = [
{ label: "指令标题", prop: "zlbt", type: "input", },
{ label: "指令类型", prop: "zllx", type: "select", options: props.dic.D_GS_XS_ZLLX },
{ label: "指令等级", prop: "zldj", type: "select", options: props.dic.D_GS_ZDQT_FXDJ },
{ label: "反馈结束时间", prop: "jssj", type: "datetime" },
{ label: "联系人", prop: "zllxr", type: "input" },
{ label: "联系电话", prop: "zllxdh", type: "input" },
{ label: "关联线索", prop: "glxsid", type: "slot" },
{ label: "主送单位", prop: "zsdw", type: "department" },
{ label: "抄送单位", prop: "csdw", type: "department" },
{ label: "指令内容", prop: "zlnr", type: "textarea", width: '100%' },
{ label: "附件", prop: "fjzd", type: "upload", width: '100%' },
]
}
},{deep: true})
const listQuery = ref({}); //表单
const loading = ref(false);
const elform = ref();
@ -129,12 +141,13 @@ const submit = () => {
}).catch(() => { loading.value = false; });
});
};
const router = useRouter()
// 关闭
const close = () => {
listQuery.value = {};
dialogForm.value = false;
loading.value = false;
router.replace({ path: '/InstructionInformation' })// 移除id 避免刷新一直带参数
};
defineExpose({ init });
</script>

View File

@ -58,8 +58,8 @@
></Pages>
</div>
<!-- 详情 -->
<DetailForm ref="detailDiloag" v-if="isShow" @updateDate="getList" :dic="{D_GS_XS_ZLLX,D_GS_ZDQT_FXDJ}" />
</div>
<DetailForm ref="detailDiloag" @updateDate="getList" :dic="{D_GS_XS_ZLLX,D_GS_ZDQT_FXDJ}" />
<Fk v-model="isShowFk" :dataList="dataList" @getList="getList"/>
</template>
@ -71,7 +71,8 @@ import Search from "@/components/aboutTable/Search.vue";
import DetailForm from "./components/detailForm.vue";
import Fk from "./components/fk.vue";
import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
import { useRoute } from "vue-router";
import { reactive, ref, onMounted, getCurrentInstance, nextTick, watch } from "vue";
import { getItem } from '@/utils/storage'
const { proxy } = getCurrentInstance();
const {D_GS_XS_SJLY,D_GS_XS_ZLLX,D_GS_ZDQT_FXDJ,D_GS_XS_CZZT} = proxy.$dict('D_GS_XS_SJLY','D_GS_XS_ZLLX','D_GS_ZDQT_FXDJ','D_GS_XS_CZZT')
@ -110,14 +111,20 @@ const pageData = reactive({
{ label: '是否反馈', prop: 'sffk', showSolt: true },
{ label: '是否签收', prop: 'sfqs', showSolt: true },
]
});
});
const route=useRoute()
const userInfo=ref();
onMounted(() => {
if (route.query.id) {
addEdit('detail', {id:route.query.id});
}
userInfo.value=getItem('deptId')[0]
getList()
tabHeightFn();
});
// 搜索
const onSearch = (val) =>{
queryFrom.value = {...val}
@ -166,6 +173,12 @@ const addEdit = (type, row) => {
detailDiloag.value.init(type, row);
})
};
watch(() => route.query.id, (val) => {
if (val) {
addEdit('detail', {id:route.query.id});
}
},{deep:true})
// 签收
const signRow = (row) =>{
proxy.$confirm("确定要签收", "警告", {type: "warning"}).then(() => {
@ -189,8 +202,6 @@ const fkRow = (row) => {
}
const showBtn = (row) => {
let item = row.xfbmList.find(v => v.ssbmdm == userInfo.value.deptCode)
console.log(item);
return item?true:false
// // if (item) {
// // return item.zlzt == '01' ? 'sign' : item.zlzt == '02' ? 'feedback' : ''