add

src/api/financial_collection_plan.ts

@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 财务管理--合同收款计划列表
+export function apiFinancialCollectionPlanLists(params: any) {
+    return request.get({ url: '/financial.financial_collection_plan/lists', params })
+}
+
+// 添加财务管理--合同收款计划
+export function apiFinancialCollectionPlanAdd(params: any) {
+    return request.post({ url: '/financial.financial_collection_plan/add', params })
+}
+
+// 编辑财务管理--合同收款计划
+export function apiFinancialCollectionPlanEdit(params: any) {
+    return request.post({ url: '/financial.financial_collection_plan/edit', params })
+}
+
+// 删除财务管理--合同收款计划
+export function apiFinancialCollectionPlanDelete(params: any) {
+    return request.post({ url: '/financial.financial_collection_plan/delete', params })
+}
+
+// 财务管理--合同收款计划详情
+export function apiFinancialCollectionPlanDetail(params: any) {
+    return request.get({ url: '/financial.financial_collection_plan/detail', params })
+}

src/api/marketing_contract_change.ts

@@ -1,41 +1,26 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
-// 市场经营--投标管理--竞争对手列表
+// 市场经营--合同信息--合同变更列表
 export function apiMarketingContractChangeLists(params: any) {
-  return request.get({
-    url: "/marketing.marketing_contract_change/lists",
-    params,
-  });
+    return request.get({ url: '/marketing.marketing_contract_change/lists', params })
 }
 
-// 添加市场经营--投标管理--竞争对手
+// 添加市场经营--合同信息--合同变更
 export function apiMarketingContractChangeAdd(params: any) {
-  return request.post({
-    url: "/marketing.marketing_contract_change/add",
-    params,
-  });
+    return request.post({ url: '/marketing.marketing_contract_change/add', params })
 }
 
-// 编辑市场经营--投标管理--竞争对手
+// 编辑市场经营--合同信息--合同变更
 export function apiMarketingContractChangeEdit(params: any) {
-  return request.post({
-    url: "/marketing.marketing_contract_change/edit",
-    params,
-  });
+    return request.post({ url: '/marketing.marketing_contract_change/edit', params })
 }
 
-// 删除市场经营--投标管理--竞争对手
+// 删除市场经营--合同信息--合同变更
 export function apiMarketingContractChangeDelete(params: any) {
-  return request.post({
-    url: "/marketing.marketing_contract_change/delete",
-    params,
-  });
+    return request.post({ url: '/marketing.marketing_contract_change/delete', params })
 }
 
-// 市场经营--投标管理--竞争对手详情
+// 市场经营--合同信息--合同变更详情
 export function apiMarketingContractChangeDetail(params: any) {
-  return request.get({
-    url: "/marketing.marketing_contract_change/detail",
-    params,
-  });
-}
+    return request.get({ url: '/marketing.marketing_contract_change/detail', params })
+}

src/views/financial_collection_plan/edit.vue

@@ -0,0 +1,149 @@
+<template>
+    <div class="edit-popup">
+        <popup
+            ref="popupRef"
+            :title="popupTitle"
+            :async="true"
+            width="550px"
+            @confirm="handleSubmit"
+            @close="handleClose"
+        >
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+                <el-form-item label="合同id" prop="contract_id">
+                    <el-input v-model="formData.contract_id" clearable placeholder="请输入合同id" />
+                </el-form-item>
+                <el-form-item label="计划收款金额" prop="collection_amount">
+                    <el-input v-model="formData.collection_amount" clearable placeholder="请输入计划收款金额" />
+                </el-form-item>
+                <el-form-item label="计划日期" prop="collection_date">
+                    <el-input v-model="formData.collection_date" clearable placeholder="请输入计划日期" />
+                </el-form-item>
+                <el-form-item label="计划人" prop="collection_user">
+                    <el-input v-model="formData.collection_user" clearable placeholder="请输入计划人" />
+                </el-form-item>
+                <el-form-item label="备注" prop="remark">
+                    <el-input v-model="formData.remark" clearable placeholder="请输入备注" />
+                </el-form-item>
+                <el-form-item label="附件" prop="annex">
+                    <el-input v-model="formData.annex" clearable placeholder="请输入附件" />
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="financialCollectionPlanEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiFinancialCollectionPlanAdd, apiFinancialCollectionPlanEdit, apiFinancialCollectionPlanDetail } from '@/api/financial_collection_plan'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑财务管理--合同收款计划' : '新增财务管理--合同收款计划'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    contract_id: '',
+    collection_amount: '',
+    collection_date: '',
+    collection_user: '',
+    remark: '',
+    annex: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    contract_id: [{
+        required: true,
+        message: '请输入合同id',
+        trigger: ['blur']
+    }],
+    collection_amount: [{
+        required: true,
+        message: '请输入计划收款金额',
+        trigger: ['blur']
+    }],
+    collection_date: [{
+        required: true,
+        message: '请输入计划日期',
+        trigger: ['blur']
+    }],
+    collection_user: [{
+        required: true,
+        message: '请输入计划人',
+        trigger: ['blur']
+    }],
+    remark: [{
+        required: true,
+        message: '请输入备注',
+        trigger: ['blur']
+    }]
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    
+    
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiFinancialCollectionPlanDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData,  }
+    mode.value == 'edit' 
+        ? await apiFinancialCollectionPlanEdit(data) 
+        : await apiFinancialCollectionPlanAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>

src/views/financial_collection_plan/index.vue

@@ -0,0 +1,134 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form
+                class="mb-[-16px]"
+                :model="queryParams"
+                inline
+            >
+                <el-form-item label="合同id" prop="contract_id">
+                    <el-input class="w-[280px]" v-model="queryParams.contract_id" clearable placeholder="请输入合同id" />
+                </el-form-item>
+                <el-form-item label="计划人" prop="collection_user">
+                    <el-input class="w-[280px]" v-model="queryParams.collection_user" clearable placeholder="请输入计划人" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['financial.financial_collection_plan/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button
+                v-perms="['financial.financial_collection_plan/delete']"
+                :disabled="!selectData.length"
+                @click="handleDelete(selectData)"
+            >
+                删除
+            </el-button>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="合同id" prop="contract_id" show-overflow-tooltip />
+                    <el-table-column label="计划收款金额" prop="collection_amount" show-overflow-tooltip />
+                    <el-table-column label="计划日期" prop="collection_date" show-overflow-tooltip />
+                    <el-table-column label="计划人" prop="collection_user" show-overflow-tooltip />
+                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
+                    <el-table-column label="附件" prop="annex" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                             <el-button
+                                v-perms="['financial.financial_collection_plan/edit']"
+                                type="primary"
+                                link
+                                @click="handleEdit(row)"
+                            >
+                                编辑
+                            </el-button>
+                            <el-button
+                                v-perms="['financial.financial_collection_plan/delete']"
+                                type="danger"
+                                link
+                                @click="handleDelete(row.id)"
+                            >
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="financialCollectionPlanLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiFinancialCollectionPlanLists, apiFinancialCollectionPlanDelete } from '@/api/financial_collection_plan'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    contract_id: '',
+    collection_user: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiFinancialCollectionPlanLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiFinancialCollectionPlanDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+

src/views/marketing_contract_change/detail.js

@@ -0,0 +1,52 @@
+
+import { apiMarketingCustomContactsLists } from '@/api/marketing_custom'
+
+const detailConfig = {
+    title: "市场经营--合同信息--合同变更",
+    config: [
+        {
+            label: "合同名称",
+            value: "contract_name"
+        },
+        {
+            label: "合同类型",
+            value: "contract_type"
+        },
+        {
+            label: "业务性质",
+            value: "business_nature"
+        },
+        {
+            label: "合同签订金额",
+            value: "signed_amount"
+        },
+        {
+            label: "签证变更后金额",
+            value: "change_amount"
+        },
+        {
+            label: "签证变更人员",
+            value: "change_user_name",
+        },
+        {
+            label: "变更日期",
+            value: "change_date"
+        },
+
+        {
+            label: "变更事项",
+            value: "change_content",
+        },
+
+        {
+            label: "附件",
+            value: "annex",
+            column: 1
+        },
+
+    ]
+
+
+
+}
+export default detailConfig;

src/views/marketing_contract_change/edit.vue

@@ -0,0 +1,190 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="160px" :rules="formRules">
+                <el-form-item label="合同名称" prop="contract_name">
+                    <el-input v-model="formData.contract_name" clearable placeholder="点击选择" @click="showDialog1 = true"
+                        readonly />
+                </el-form-item>
+                <el-form-item label="合同类型">
+                    <el-input v-model="formData.contract_type" clearable placeholder="请输入合同id" />
+                </el-form-item>
+                <el-form-item label="业务性质">
+                    <el-input v-model="formData.business_nature" clearable placeholder="请输入合同id" />
+                </el-form-item>
+                <el-form-item label="合同签订金额">
+                    <el-input v-model="formData.signed_amount" clearable placeholder="请输入合同id" />
+                </el-form-item>
+                <el-form-item label="签证变更后金额" prop="change_amount">
+                    <el-input v-model="formData.change_amount" clearable placeholder="请输入签证变更后金额" type="number" />
+                </el-form-item>
+                <el-form-item label="签证变更人员" prop="change_user_name">
+                    <el-input v-model="formData.change_user_name" clearable placeholder="点击选择签证变更人员" readonly
+                        @click="userclick" />
+                </el-form-item>
+                <el-form-item label="变更日期" prop="change_date">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.change_date" clearable type="date"
+                        value-format="YYYY-MM-DD" placeholder="选择变更日期">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="变更事项">
+                    <el-input v-model="formData.change_content" clearable placeholder="请输入变更事项" type="textarea" />
+                </el-form-item>
+                <el-form-item label="附件" prop="annex">
+                    <upload-annex :form-data="formData"></upload-annex>
+                </el-form-item>
+            </el-form>
+            <div v-if="showDialog">
+                <personnelselector ref="personnel" @confirm="submituser" type="1">
+                </personnelselector>
+            </div>
+            <el-dialog v-model="showDialog1" title="选择合同" width="70%">
+                <dialogTable :config="marketing_contract" @customEvent="customEvent">
+                </dialogTable>
+            </el-dialog>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="marketingContractChangeEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiMarketingContractChangeAdd, apiMarketingContractChangeEdit, apiMarketingContractChangeDetail } from '@/api/marketing_contract_change'
+import type { PropType } from 'vue'
+import { marketing_contract } from "@/components/dialogTable/dialogTableConfig";
+
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+const showDialog = ref(false)
+const showDialog1 = ref(false)
+const personnel = ref(null)
+
+const userclick = async (val) => {
+    showDialog.value = true
+    await nextTick()
+    personnel.value.open()
+
+}
+
+//确认
+const submituser = (e: any) => {
+    formData['change_user_name'] = e.name
+    formData['change_user'] = e.id
+    showDialog.value = false
+}
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑市场经营--合同信息--合同变更' : '新增市场经营--合同信息--合同变更'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    contract_id: '',
+    contract_name: '',
+    contract_type: "",
+    business_nature: "",
+    signed_amount: "",
+    change_amount: '',
+    change_user: '',
+    change_user_name: '',
+    change_date: '',
+    change_content: '',
+    annex: '',
+})
+
+
+const customEvent = (e) => {
+    formData.contract_id = e.id
+    formData.contract_name = e.contract_name
+    formData.contract_type_text = e.contract_type_text
+    formData.business_nature_text = e.business_nature_text
+    formData.signed_amount = e.signed_amount
+    showDialog1.value = false
+}
+
+// 表单验证
+const formRules = reactive<any>({
+    contract_name: [{
+        required: true,
+        message: '请选择合同',
+        trigger: ['blur']
+    }],
+    change_amount: [{
+        required: true,
+        message: '请输入签证变更后金额',
+        trigger: ['blur']
+    }],
+    change_user_name: [{
+        required: true,
+        message: '请输入签证变更人员',
+        trigger: ['blur']
+    }],
+    change_date: [{
+        required: true,
+        message: '请输入变更日期',
+        trigger: ['blur']
+    }],
+
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiMarketingContractChangeDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiMarketingContractChangeEdit(data)
+        : await apiMarketingContractChangeAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>

src/views/marketing_contract_change/index.vue

@@ -0,0 +1,136 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="变更日期">
+                    <el-date-picker class="flex-1 !flex" v-model="queryParams.change_date" clearable type="date"
+                        value-format="YYYY-MM-DD" placeholder="选择变更日期">
+                    </el-date-picker>
+                </el-form-item>
+
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['marketing.marketing_contract_change/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['marketing.marketing_contract_change/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
+                删除
+            </el-button>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="合同名称" prop="contract_name" show-overflow-tooltip />
+                    <el-table-column label="合同类型" prop="contract_type" show-overflow-tooltip />
+                    <el-table-column label="合同签订金额" prop="signed_amount" show-overflow-tooltip />
+                    <el-table-column label="签证变更后金额" prop="change_amount" show-overflow-tooltip />
+                    <el-table-column label="签证变更人员" prop="change_user_name" show-overflow-tooltip />
+                    <el-table-column label="变更日期" prop="change_date" show-overflow-tooltip />
+                    <el-table-column label="操作" width="170" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['marketing.marketing_contract_change/edit']" type="primary" link
+                                @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['marketing.marketing_contract_change/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                            <el-button v-perms="['marketing.marketing_contract_change/detail']" link
+                                @click="handleDetail(row)">
+                                详情
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showDetail = false" :detailConfig="detailConfig" width="550px"
+            :column="1" />
+
+    </div>
+</template>
+
+<script lang="ts" setup name="marketingContractChangeLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiMarketingContractChangeLists, apiMarketingContractChangeDelete, apiMarketingContractChangeDetail } from '@/api/marketing_contract_change'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+import detailConfig from './detail'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
+// 是否显示编辑框
+const showEdit = ref(false)
+const showDetail = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    contract_id: '',
+    change_user: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiMarketingContractChangeLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    let res = await apiMarketingContractChangeDetail({ id: data.id })
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(res)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiMarketingContractChangeDelete({ id })
+    getLists()
+}
+
+
+// 详情
+const handleDetail = async (row) => {
+    let res = await apiMarketingContractChangeDetail({ id: row.id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+getLists()
+</script>
+

src/views/marketing_reflux_contract/index.vue

@@ -2,17 +2,21 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="协议名称">
+                <el-form-item label="合同名称">
                     <el-input class="w-[280px]" v-model="queryParams.contract_name" clearable placeholder="请输入合同名称" />
                 </el-form-item>
-                <el-form-item label="业务性质">
-                    <el-input class="w-[280px]" v-model="queryParams.business_nature" clearable placeholder="请输入合同编号" />
+                <el-form-item label="合同编号">
+                    <el-input class="w-[280px]" v-model="queryParams.contract_code" clearable placeholder="请输入合同编号" />
                 </el-form-item>
-                <el-form-item label="签订部门">
-                    <el-input class="w-[280px]" v-model="queryParams.signed_dept" clearable placeholder="请输入业务性质" />
+                <el-form-item label="甲方单位">
+                    <el-input class="w-[280px]" v-model="queryParams.part_b" clearable placeholder="请输入业务性质" />
                 </el-form-item>
-                <el-form-item label="甲方签约单位">
-                    <el-input class="w-[280px]" v-model="queryParams.part_a" clearable placeholder="请输入行业性质" />
+                <el-form-item label="合同类型">
+                    <el-select v-model="queryParams.contract_type" class="flex-1">
+                        <el-option label="主合同" :value="0"></el-option>
+                        <el-option label="框架协议" :value="1"></el-option>
+                        <el-option label="补充协议" :value="2"></el-option>
+                    </el-select>
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
@@ -24,35 +28,25 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange" border>
                     <el-table-column type="selection" width="55" />
-                    <el-table-column label="协议名称" :render-header="pager.calcWidth" prop="contract_name"
-                        show-overflow-tooltip />
-                    <el-table-column label="协议编号" :render-header="pager.calcWidth" prop="contract_code"
-                        show-overflow-tooltip />
-                    <el-table-column label="关联主合同" :render-header="pager.calcWidth" prop="supplementary_agreement_name"
-                        show-overflow-tooltip />
-                    <el-table-column label="甲方单位" :render-header="pager.calcWidth" prop="part_a_name"
-                        show-overflow-tooltip />
-                    <el-table-column label="签订部门" :render-header="pager.calcWidth" prop="signed_dept_name"
-                        show-overflow-tooltip />
-                    <el-table-column label="乙方单位" :render-header="pager.calcWidth" prop="part_b" show-overflow-tooltip />
-                    <el-table-column label="签订金额" :render-header="pager.calcWidth" prop="signed_amount"
-                        show-overflow-tooltip />
-                    <el-table-column label="签订负责人" :render-header="pager.calcWidth" prop="signed_head_name"
-                        show-overflow-tooltip />
-                    <el-table-column label="业务性质" :render-header="pager.calcWidth" prop="business_nature_text"
-                        show-overflow-tooltip />
-                    <el-table-column label="签订时间" :render-header="pager.calcWidth" prop="create_time"
-                        show-overflow-tooltip />
-                    <el-table-column label="审核状态" :render-header="pager.calcWidth" prop="approve_status_text"
-                        show-overflow-tooltip />
-                    <el-table-column label="移交状态" :render-header="pager.calcWidth" prop="review_status_text"
+                    <el-table-column label="标识" prop="contract_name" show-overflow-tooltip />
+                    <el-table-column label="合同编号" prop="contract_code" show-overflow-tooltip />
+                    <el-table-column label="合同名称" prop="contract_name" show-overflow-tooltip />
+                    <el-table-column label="甲方单位" prop="part_a_name" show-overflow-tooltip />
+                    <el-table-column label="合同类型" prop="contract_type_text" show-overflow-tooltip />
+                    <el-table-column label="签订部门" prop="signed_dept_name" show-overflow-tooltip />
+                    <el-table-column label="合同签订金额" prop="signed_amount" show-overflow-tooltip />
+                    <!-- <el-table-column label="签订负责人"  prop="signed_head_name"
+                        show-overflow-tooltip /> -->
+                    <!-- <el-table-column label="发出日期"  prop="business_nature_text"
                         show-overflow-tooltip />
+                    <el-table-column label="签订日期"  prop="create_time"
+                        show-overflow-tooltip /> -->
                     <el-table-column label="操作" width="170" fixed="right">
                         <template #default="{ row }">
-                            <!-- <el-button v-perms="['marketing.marketing_supplementary_agreement/edit']" type="primary" link
-                                @click="handleEdit(row)">
-                                编辑
-                            </el-button> -->
+                            <el-button v-perms="['marketing.marketing_supplementary_agreement/edit']" type="primary" link
+                                @click="showDialog = true; regForm.contract_id = row.id; regForm.contract_name = row.contract_name; regForm.contract_code = row.contract_code">
+                                登记回流日期
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -61,6 +55,40 @@
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
+        <div v-if="showDialog">
+            <el-dialog v-model="showDialog" title="登记回流日期" width="550px" close-on-click-modal>
+                <el-form :model="regForm">
+
+                    <el-form-item label="合同名称" prop="project_name">
+                        <el-input v-model="regForm.contract_name" disabled></el-input>
+                    </el-form-item>
+                    <el-form-item label="合同编号" prop="project_name">
+                        <el-input v-model="regForm.contract_code" disabled></el-input>
+                    </el-form-item>
+
+                    <el-form-item label="回流日期" prop="reg_date">
+                        <el-date-picker class="flex-1 !flex" v-model="regForm.reflux_date" clearable type="date"
+                            value-format="YYYY-MM-DD" placeholder="选择报名时间">
+                        </el-date-picker>
+                    </el-form-item>
+
+                    <el-form-item label="附件" prop="reg_result">
+                        <upload-annex :form-data="regForm"></upload-annex>
+                    </el-form-item>
+                </el-form>
+
+                <template #footer>
+                    <div class="dialog-footer">
+                        <el-button @click="showDialog = false">Cancel</el-button>
+                        <el-button type="primary" @click="handleRegister">
+                            Confirm
+                        </el-button>
+                    </div>
+                </template>
+
+            </el-dialog>
+
+        </div>
 
     </div>
 </template>
@@ -70,15 +98,12 @@ import { usePaging } from '@/hooks/usePaging'
 import { apiMarketingRefluxContractLists, apiMarketingRefluxContractReflux } from '@/api/marketing_reflux_contract'
 import feedback from '@/utils/feedback'
 
-
-
-
 // 查询条件
 const queryParams = reactive({
-    // contract_name: '',
-    // business_nature: '',
-    // signed_dept: '',
-    // part_a: '',
+    contract_name: '',
+    contract_code: '',
+    part_b: '',
+    contract_type: '',
 })
 
 // 选中数据
@@ -96,23 +121,30 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
     params: queryParams
 })
 
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
+// 报名
+const showDialog = ref(false)
+const regForm = reactive({
+    contract_name: "",
+    contract_code: "",
+    contract_id: "",
+    reflux_date: '',
+    annex: [],
+
+})
+
+const handleRegister = async () => {
+    await apiMarketingRefluxContractReflux({ ...regForm })
+    feedback.msgSuccess('操作成功')
+    getLists()
+    showDialog.value = false
+
 }
 
 // 编辑
 
 
-const deptList = ref([])
-const getDeptList = async () => {
-    let res = await deptLists()
-    deptList.value = res.lists
-}
+
 
 getLists()
-getDeptList()
 </script>