-
+
diff --git a/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addForm.vue b/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addForm.vue
index d84e41d..87b20c0 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addForm.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addForm.vue
@@ -3,53 +3,59 @@
{{ title }}情报信息流转
- 保存
+ 保存
关闭
-
@@ -61,7 +67,8 @@ import AddPeo from '@/components/addPerson/index.vue'
import MyTable from "@/components/aboutTable/MyTable.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 { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick,watch } from "vue";
+import ApprovalEcho from "@/components/flowPath/ApprovalEcho.vue";
const emit = defineEmits(["change"]);
const props = defineProps({
dic: Object
@@ -74,17 +81,17 @@ const rules = reactive({
qbLy: [{ required: true, message: "请选择情报来源", trigger: "change" }],
});
const formData = ref([
- { prop: "gapdive", type: "slot",width:'100%' },
+ { prop: "gapdive", type: "slot", width: '100%' },
{ label: "线索名称", prop: "xsMc", type: "input" },
- { label: "线索类型", prop: "xlLx", type: "select", options:props.dic.D_GS_XS_LX },
- { label: "情报来源", prop: "qbLy", type: "select", options:props.dic.D_GS_XS_LY},
- { label: "指向开始时间", prop: "zxkssj", type: "datetime"},
- { label: "指向结束时间", prop: "zxjssj", type: "datetime"},
- { label: "指向地点", prop: "zxdz", type: "input"},
- { label: "所属专题", prop: "sszt", type: "select",options:props.dic.D_BZ_SSZT},
- { prop: "gapline", type: "slot",width:'100%' },
- { prop: "scfj", type: "slot",width:'100%'},
- { label: "线索内容", prop: "xsNr", type: "textarea",width:'100%'},
+ { label: "线索类型", prop: "xlLx", type: "select", options: props.dic.D_GS_XS_LX },
+ { label: "情报来源", prop: "qbLy", type: "select", options: props.dic.D_GS_XS_LY },
+ { label: "指向开始时间", prop: "zxkssj", type: "datetime" },
+ { label: "指向结束时间", prop: "zxjssj", type: "datetime" },
+ { label: "指向地点", prop: "zxdz", type: "input" },
+ { label: "所属专题", prop: "sszt", type: "select", options: props.dic.D_BZ_SSZT },
+ { prop: "gapline", type: "slot", width: '100%' },
+ { prop: "scfj", type: "slot", width: '100%' },
+ { label: "线索内容", prop: "xsNr", type: "textarea", width: '100%' },
]);
const fjdz = ref()
const listQuery = ref({}); //表单
@@ -97,21 +104,22 @@ const pageForm = reactive({
tableConfiger: {
rowHieght: 61,
showSelectType: "checkBox",
- loading: false
+ loading: false,
+ haveControls: !title.value == '详情'
},
controlsWidth: 220,
tableColumn: [
{ label: "姓名", prop: "xm" },
- { label: "性别", prop: "xb",showSolt:true },
+ { label: "性别", prop: "xb", showSolt: true },
{ label: "身份证号", prop: "sfzh" },
{ label: "户籍地", prop: "hjdz" },
{ label: "户籍地派出所", prop: "hjdpcs" },
- { label: "标签", prop: "bqList",showSolt:true }
+ { label: "标签", prop: "bqList", showSolt: true }
]
});
const showAdd = ref()
const showPeo = ref(false)
-onMounted(()=>{
+onMounted(() => {
tabHeightFn()
})
@@ -125,50 +133,61 @@ const init = (type, row) => {
// 初始化表单数据，并根据详情页设置禁用状态
if (row) getDataById(row.id);
};
+
+
+
// 根据id查询详情
const getDataById = (id) => {
- qcckGet({id}, "/mosty-gsxt/qbcj/selectByid").then((res) => {
+ qcckGet({ id }, "/mosty-gsxt/qbcj/selectByid").then((res) => {
fjdz.value = res.ossList || [];
listQuery.value = res;
pageForm.tableData = res.ryList || [];
});
};
+const approvalEcho = ref()
+watch(() => approvalEcho.value, (val) => {
+ if (val) {
+ console.log(approvalEcho.value);
+ approvalEcho.value.getWorkflow(listQuery.value.gzlid)
+ }
+
+},{deep:true})
// 打开弹窗
-const addEdit = (type,row,index) =>{
+const addEdit = (type, row, index) => {
showPeo.value = true;
- nextTick(()=>{
- showAdd.value.init(type,row,index)
+ nextTick(() => {
+ showAdd.value.init(type, row, index)
})
}
// 新增人员
-const getPeo = (val) =>{
- if(val.type == '新增'){
+const getPeo = (val) => {
+ if (val.type == '新增') {
pageForm.tableData.push(val.data);
- }else{
+ } else {
pageForm.tableData.splice(val.index, 1, val.data); // 在索引2的位置删除一个元素，并插入newValue
}
}
-const deleteRow = (index) =>{
- pageForm.tableData.splice(index,1)
+const deleteRow = (index) => {
+ pageForm.tableData.splice(index, 1)
}
// 提交
const submit = () => {
elform.value.submit((data) => {
- let url = title.value == "新增" ? "/mosty-gsxt/qbcj/add" : "/mosty-gsxt/qbcj/update";
- let params = { ...data ,ryList:pageForm.tableData,cjLx:'0'};
+ let url = title.value == "新增" ? "/mosty-gsxt/qbcj/add" : "/mosty-gsxt/qbcj/update";
+ let params = { ...data, ryList: pageForm.tableData, cjLx: '0' };
let fjids = [];
- fjdz.value.forEach(item=>{
- if(Object.prototype.toString.call(item) === '[object Object]'){
+ fjdz.value.forEach(item => {
+ if (Object.prototype.toString.call(item) === '[object Object]') {
fjids.push(item.id)
- }else{
+ } else {
fjids.push(item)
}
})
- params.fjdz = fjids.length > 0 ? fjids.join(','):'';
+ params.fjdz = fjids.length > 0 ? fjids.join(',') : '';
loading.value = true;
qcckPost(params, url).then((res) => {
loading.value = false;
@@ -191,7 +210,7 @@ const close = () => {
// 表格高度计算
const tabHeightFn = () => {
- pageForm.tableHeight = window.innerHeight - 720;
+ pageForm.tableHeight = window.innerHeight - 720;
window.onresize = function () {
tabHeightFn();
};
@@ -203,10 +222,12 @@ defineExpose({ init });
diff --git a/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue b/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue
index 4572664..89073d5 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue
@@ -36,7 +36,7 @@
{{ row.zxkssj }} 至
- {{ row.zxjssj }}
+ {{ row.zxjssj }}
@@ -44,9 +44,10 @@
- 编辑
-
-
+
+
+
+
+
+ 编辑
+ 审核
删除
+
+ 详情
- 续报
+ 续报
