跟新

2026-03-06 18:34:55 +08:00
parent 9fe1acb177
commit 81c5665094
6 changed files with 873 additions and 6 deletions
--- a/src/views/purchase/purchasingrequisition/add.vue
+++ b/src/views/purchase/purchasingrequisition/add.vue
@@ -182,7 +182,7 @@
 											</el-select>
 										</el-form-item>
 									</el-col>
-									<el-col :span="8" class="mb12">
+									<el-col :span="8" class="mb12" v-if="!isEntrustCenterChannel">
 										<el-form-item label="采购方式" prop="purchaseType" :required="!isEntrustCenterChannel">
 											<el-select
 												v-model="dataForm.purchaseType"
@@ -201,7 +201,7 @@
 										</el-form-item>
 									</el-col>

-									<el-col :span="24" class="mb12" v-if="isPurchaseType(DEPT_PURCHASE_TYPE.BUSINESS_NEGOTIATION)">
+									<el-col :span="24" class="mb12" v-if="isPurchaseType(DEPT_PURCHASE_TYPE.BUSINESS_NEGOTIATION) && isEntrustCenterChannel">
 										<el-form-item label="洽谈理由" prop="negotiationReason" required>
 											<el-input
 												v-model="dataForm.negotiationReason"
@@ -215,7 +215,7 @@
 											/>
 										</el-form-item>
 									</el-col>
-									<el-col :span="8" class="mb12" v-if="isPurchaseType(DEPT_PURCHASE_TYPE.BUSINESS_NEGOTIATION)">
+									<el-col :span="8" class="mb12" v-if="isPurchaseType(DEPT_PURCHASE_TYPE.BUSINESS_NEGOTIATION) && isEntrustCenterChannel">
 										<el-form-item label="商务洽谈表" prop="businessNegotiationTable" required>
 											<upload-file
 												v-model="dataForm.businessNegotiationTable"
@@ -236,7 +236,7 @@
 											</el-button>
 										</el-form-item>
 									</el-col>
-									<el-col :span="8" class="mb12" v-if="isPurchaseType(DEPT_PURCHASE_TYPE.MARKET_PURCHASE)">
+									<el-col :span="8" class="mb12" v-if="isPurchaseType(DEPT_PURCHASE_TYPE.MARKET_PURCHASE) && isEntrustCenterChannel">
 										<el-form-item label="市场采购纪要" prop="marketPurchaseMinutes" required>
 											<upload-file
 												v-model="dataForm.marketPurchaseMinutes"
@@ -257,7 +257,7 @@
 											</el-button>
 										</el-form-item>
 									</el-col>
-									<el-col :span="8" class="mb12" v-if="isPurchaseType(DEPT_PURCHASE_TYPE.ONLINE_MALL)">
+									<el-col :span="8" class="mb12" v-if="isPurchaseType(DEPT_PURCHASE_TYPE.ONLINE_MALL) && isEntrustCenterChannel">
 										<el-form-item label="网上商城采购相关材料" prop="onlineMallMaterials" required>
 											<upload-file
 												v-model="dataForm.onlineMallMaterials"
@@ -269,7 +269,7 @@
 											/>
 										</el-form-item>
 									</el-col>
-									<el-col :span="8" class="mb12" v-if="isInquiryPurchaseType">
+									<el-col :span="8" class="mb12" v-if="isInquiryPurchaseType && isEntrustCenterChannel">
 										<el-form-item label="询价模板" prop="inquiryTemplate" required>
 											<upload-file
 												v-model="dataForm.inquiryTemplate"
--- a/src/views/purchase/purchasingrequisition/contract/ContractDialog.vue
+++ b/src/views/purchase/purchasingrequisition/contract/ContractDialog.vue
@@ -0,0 +1,229 @@
+<template>
+  <el-dialog 
+    v-model="state.visible" 
+    :title="state.title"
+    width="700px"
+    append-to-body
+    destroy-on-close
+    :close-on-click-modal="false"
+    @close="handleClose">
+    <el-form 
+      ref="formRef"
+      :model="state.formData"
+      :rules="rules"
+      label-width="140px">
+      <el-form-item label="合同编号" prop="contractNo">
+        <el-input 
+          v-model="state.formData.contractNo" 
+          placeholder="请输入合同编号"
+          :disabled="state.operation === 'view'" />
+      </el-form-item>
+      <el-form-item label="合同名称" prop="contractName">
+        <el-input 
+          v-model="state.formData.contractName" 
+          placeholder="请输入合同名称"
+          :disabled="state.operation === 'view'" />
+      </el-form-item>
+      <el-form-item label="合同金额(元)" prop="money">
+        <el-input-number 
+          v-model="state.formData.money" 
+          :min="0"
+          :precision="2"
+          :controls="false"
+          placeholder="请输入合同金额"
+          style="width: 100%"
+          :disabled="state.operation === 'view'" />
+      </el-form-item>
+      <el-form-item label="是否需要招标" prop="isBidding">
+        <el-radio-group 
+          v-model="state.formData.isBidding"
+          :disabled="state.operation === 'view'">
+          <el-radio value="0">否</el-radio>
+          <el-radio value="1">是</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="是否需要法律顾问" prop="isLegalAdviser">
+        <el-radio-group 
+          v-model="state.formData.isLegalAdviser"
+          :disabled="state.operation === 'view'">
+          <el-radio value="0">否</el-radio>
+          <el-radio value="1">是</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item 
+        v-if="state.formData.isLegalAdviser === '1'"
+        label="法律顾问意见" 
+        prop="legalAdviserOpinion">
+        <el-input 
+          v-model="state.formData.legalAdviserOpinion" 
+          type="textarea"
+          :rows="3"
+          placeholder="请输入法律顾问意见"
+          :disabled="state.operation === 'view'" />
+      </el-form-item>
+      <el-form-item label="是否涉及多个部门" prop="isDepts">
+        <el-radio-group 
+          v-model="state.formData.isDepts"
+          :disabled="state.operation === 'view'">
+          <el-radio value="0">否</el-radio>
+          <el-radio value="1">是</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="是否全校合同" prop="isSchool">
+        <el-radio-group 
+          v-model="state.formData.isSchool"
+          :disabled="state.operation === 'view'">
+          <el-radio value="0">否</el-radio>
+          <el-radio value="1">是</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="备注" prop="remarks">
+        <el-input 
+          v-model="state.formData.remarks" 
+          type="textarea"
+          :rows="2"
+          placeholder="请输入备注"
+          :disabled="state.operation === 'view'" />
+      </el-form-item>
+    </el-form>
+    <template #footer v-if="state.operation !== 'view'">
+      <el-button @click="handleClose">取消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="state.loading">确定</el-button>
+    </template>
+    <template #footer v-else>
+      <el-button @click="handleClose">关闭</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts" name="ContractDialog">
+import { ref, reactive, computed } from 'vue'
+import { addObj, editObj } from "/@/api/purchase/purchasingcontract";
+import { useMessage } from "/@/hooks/message";
+
+const emit = defineEmits(['refresh']);
+
+const formRef = ref()
+
+const state = reactive({
+  visible: false,
+  loading: false,
+  operation: 'add' as 'add' | 'edit' | 'view',
+  title: computed(() => {
+    return state.operation === 'add' ? '新增合同' : state.operation === 'edit' ? '编辑合同' : '合同详情';
+  }),
+  formData: {
+    id: '',
+    contractNo: '',
+    contractName: '',
+    money: 0,
+    purchaseId: '',
+    isBidding: '0',
+    isLegalAdviser: '0',
+    legalAdviserOpinion: '',
+    isDepts: '0',
+    isSchool: '0',
+    remarks: ''
+  },
+  purchaseNo: ''
+});
+
+const rules = {
+  contractNo: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
+  contractName: [{ required: true, message: '请输入合同名称', trigger: 'blur' }],
+  money: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
+  isBidding: [{ required: true, message: '请选择是否需要招标', trigger: 'change' }],
+  isLegalAdviser: [{ required: true, message: '请选择是否需要法律顾问', trigger: 'change' }],
+  isDepts: [{ required: true, message: '请选择是否涉及多部门', trigger: 'change' }],
+  isSchool: [{ required: true, message: '请选择是否全校合同', trigger: 'change' }]
+};
+
+const openDialog = (purchaseApply: any, contract: any) => {
+  state.visible = true;
+  state.loading = false;
+  state.purchaseNo = purchaseApply?.purchaseNo || '';
+  state.formData.purchaseId = purchaseApply?.id || purchaseApply?.purchaseId || '';
+  
+  if (contract && contract.id) {
+    state.operation = 'edit';
+    state.formData = {
+      id: contract.id,
+      contractNo: contract.contractNo || '',
+      contractName: contract.contractName || '',
+      money: contract.money || 0,
+      purchaseId: contract.purchaseId || state.formData.purchaseId,
+      isBidding: contract.isBidding || '0',
+      isLegalAdviser: contract.isLegalAdviser || '0',
+      legalAdviserOpinion: contract.legalAdviserOpinion || '',
+      isDepts: contract.isDepts || '0',
+      isSchool: contract.isSchool || '0',
+      remarks: contract.remarks || ''
+    };
+  } else {
+    state.operation = 'add';
+    state.formData = {
+      id: '',
+      contractNo: '',
+      contractName: '',
+      money: 0,
+      purchaseId: state.formData.purchaseId,
+      isBidding: '0',
+      isLegalAdviser: '0',
+      legalAdviserOpinion: '',
+      isDepts: '0',
+      isSchool: '0',
+      remarks: ''
+    };
+  }
+};
+
+const handleSubmit = async () => {
+  const valid = await formRef.value?.validate().catch(() => false);
+  if (!valid) return;
+
+  try {
+    state.loading = true;
+    if (state.operation === 'add') {
+      await addObj(state.formData);
+      useMessage().success('新增成功');
+    } else {
+      await editObj(state.formData);
+      useMessage().success('修改成功');
+    }
+    handleClose();
+    emit('refresh');
+  } catch (err: any) {
+    useMessage().error(err.msg || '操作失败');
+  } finally {
+    state.loading = false;
+  }
+};
+
+const handleClose = () => {
+  state.visible = false;
+  formRef.value?.resetFields();
+  state.formData = {
+    id: '',
+    contractNo: '',
+    contractName: '',
+    money: 0,
+    purchaseId: '',
+    isBidding: '0',
+    isLegalAdviser: '0',
+    legalAdviserOpinion: '',
+    isDepts: '0',
+    isSchool: '0',
+    remarks: ''
+  };
+};
+
+defineExpose({
+  openDialog
+});
+</script>
+
+<style scoped>
+:deep(.el-dialog__body) {
+  padding: 20px;
+}
+</style>
--- a/src/views/purchase/purchasingrequisition/index.vue
+++ b/src/views/purchase/purchasingrequisition/index.vue
@@ -332,6 +332,9 @@
    <!-- 更新材料弹窗 -->
    <UpdateFilesDialog ref="updateFilesDialogRef" @refresh="getDataList" />

+    <!-- 合同弹窗 -->
+    <ContractDialog ref="contractDialogRef" @refresh="getDataList" />
+
    <!-- 招标文件审核弹窗 -->
 <!--    <DocAuditDialog ref="docAuditDialogRef" @refresh="getDataList" />-->

@@ -399,6 +402,7 @@ import { getTree } from '/@/api/purchase/purchasingcategory';
 import { List, Document, DocumentCopy, Search, Money, CircleCheck, InfoFilled, Calendar, OfficeBuilding, Warning, DocumentChecked, Edit, Delete, Upload, FolderOpened, Download, User, RefreshRight, Shop, CopyDocument } from '@element-plus/icons-vue'
 import other from '/@/utils/other'
 import { Session } from '/@/utils/storage'
+import { getByPurchaseId } from "/@/api/purchase/purchasingcontract";

 // 角色常量
 const PURCHASE_DEPT_AUDIT_ROLE_CODE = 'PURCHASE_DEPT_AUDIT'
@@ -413,6 +417,7 @@ const PurchasingAcceptModal = defineAsyncComponent(() => import('./accept/Purcha
 const FlowCommentTimeline = defineAsyncComponent(() => import('/@/views/jsonflow/comment/timeline.vue'));
 const FileArchiveDialog = defineAsyncComponent(() => import('./FileArchiveDialog.vue'));
 const UpdateFilesDialog = defineAsyncComponent(() => import('./UpdateFilesDialog.vue'));
+const ContractDialog = defineAsyncComponent(() => import('./contract/ContractDialog.vue'));
 // const DocAuditDialog = defineAsyncComponent(() => import('./docAudit/DocAuditDialog.vue'));

 // 字典数据和品目树数据
@@ -443,6 +448,7 @@ const currFlowCommentType = ref<'apply' | 'file'>('apply')
 const implementFormRef = ref()
 const fileArchiveDialogRef = ref()
 const updateFilesDialogRef = ref()
+const contractDialogRef = ref()

 /** 采购代表弹窗 */
 const representorDialogVisible = ref(false)
@@ -708,6 +714,12 @@ const getActionMenuItems = (row: any) => {
      icon: RefreshRight,
      visible: () => (isCompleted || isRunning) && hasAuth('purchase_purchasingapply_edit'),
    },
+    {
+      command: 'contract',
+      label: '采购合同',
+      icon: DocumentChecked,
+      visible: () => isCompleted,
+    },
    // {
    //   command: 'downloadFileApply',
    //   label: '下载文件审批表',
@@ -766,6 +778,9 @@ const handleMoreCommand = (command: string, row: any) => {
    case 'updateFiles':
      handleUpdateFiles(row);
      break;
+    case 'contract':
+      handleContract(row);
+      break;
  }
 };

@@ -779,6 +794,21 @@ const handleUpdateFiles = (row: any) => {
  updateFilesDialogRef.value?.open(id, row.purchaseNo);
 };

+/** 采购合同 */
+const handleContract = async (row: any) => {
+  const id = row?.id ?? row?.purchaseId;
+  if (!id) {
+    useMessage().warning('无法获取采购申请ID');
+    return;
+  }
+  try {
+    const res = await getByPurchaseId(id);
+    contractDialogRef.value?.open(row, res?.data || null);
+  } catch (e) {
+    useMessage().error('获取合同信息失败');
+  }
+};
+
 /** 下载审批表 */
 const handleDownloadApply = (row: any) => {
  const id = row?.id ?? row?.purchaseId;