优化

src/views/contract/limitPrice/index.vue

@@ -35,7 +35,13 @@
           </el-form-item>
 
           <el-form-item>
-            <el-button type="primary" v-if="reviewStatus && reviewStatus == 'draft'" @click="clickApprovalSheet()">审核</el-button>
+            <el-button
+              type="primary"
+              v-if="reviewStatus && reviewStatus == 'draft'"
+              @click="clickApprovalSheet()"
+              v-hasPermi="['tender:tenderPlanLimitList:getVersionDetail']"
+              >审核</el-button
+            >
           </el-form-item>
           <el-form-item>
             <el-button

src/views/cory/workMessage/components/notice.vue

@@ -5,7 +5,7 @@
       <el-table-column label="序号" type="index" width="60" align="center" />
       <el-table-column label="处理状态" align="center" prop="status">
         <template #default="scope">
-          <dict-tag :options="safety_inspection_type" :value="scope.row.status" />
+          <dict-tag :options="wf_business_status" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column label="检查人" align="center" prop="correctorName" />
@@ -46,13 +46,16 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="220">
         <template #default="scope">
           <el-space>
-            <el-button link type="primary" icon="View" @click="handleDetail(scope.row)" v-hasPermi="['safety:safetyInspection:query']">
+            <el-button link type="primary" icon="View" @click="handleDetail(scope.row)"> 详情 </el-button>
-              详情
+            <el-button link type="primary" icon="Edit" @click="handleAddApp(scope.row)" v-if="scope.row.status && scope.row.status == 'draft'"
+              >审批
             </el-button>
-            <!-- <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['safety:safetyInspection:edit']">修改 </el-button> -->
+            <el-button link type="primary" icon="View" @click="handleAddApp(scope.row)" v-if="scope.row.status && scope.row.status != 'draft'"
-            <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['safety:safetyInspection:remove']">
+              >查看流程
+            </el-button>
+            <!-- <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['safety:safetyInspection:remove']">
               删除
-            </el-button>
+            </el-button> -->
           </el-space>
         </template>
       </el-table-column>
@@ -191,9 +194,10 @@ const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
 
-const { safety_inspection_violation_type, safety_inspection_check_type, review_type, safety_inspection_type } = toRefs<any>(
+const { safety_inspection_violation_type, safety_inspection_check_type, review_type, safety_inspection_type, wf_business_status } = toRefs<any>(
-  useDict('safety_inspection_violation_type', 'safety_inspection_check_type', 'review_type', 'safety_inspection_type')
+  useDict('safety_inspection_violation_type', 'safety_inspection_check_type', 'review_type', 'safety_inspection_type', 'wf_business_status')
 );
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const safetyInspectionDetail = ref<SafetyInspectionVO>();
 
 const form = reactive({
@@ -236,6 +240,18 @@ const handleDetail = async (row) => {
     rectificationFileList.value = rectificationFileRes.data;
   }
 };
+const handleAddApp = (row) => {
+  // 添加审批
+  proxy.$tab.closePage(proxy.$route);
+  proxy.$router.push({
+    path: `/approval/workMessage/indexEdit`,
+    query: {
+      id: row.id,
+
+      type: 'update'
+    }
+  });
+};
 const getList = (row) => {};
 const handleDelete = (row) => {};
 </script>

src/views/cory/workMessage/index.vue

@@ -1,15 +1,12 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="模板类型" prop="projectType">
-              <el-select v-model="queryParams.projectType" placeholder="请选择模板类型" clearable filterable
+              <el-select v-model="queryParams.projectType" placeholder="请选择模板类型" clearable filterable @change="selectType">
-                @change="selectType">
+                <el-option v-for="item in projectTypeOptions" :key="item.name" :label="item.name" :value="item.name"> </el-option>
-                <el-option v-for="item in projectTypeOptions" :key="item.name" :label="item.name" :value="item.name">
-                </el-option>
               </el-select>
             </el-form-item>
             <!-- <el-form-item>
@@ -24,8 +21,9 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" :disabled="addSingle" @click="handleAdd"
+            <el-button type="primary" plain icon="Plus" :disabled="addSingle" @click="handleAdd" v-hasPermi="['cory:contactnotice:add']"
-              v-hasPermi="['quality:qualityInspection:add']">新增</el-button>
+              >新增</el-button
+            >
           </el-col>
           <!-- <el-col :span="1.5">
             <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['quality:qualityInspection:edit']"
@@ -33,8 +31,9 @@
             >
           </el-col> -->
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['cory:contactnotice:remove']"
-              v-hasPermi="['quality:qualityInspection:remove']">删除</el-button>
+              >删除</el-button
+            >
           </el-col>
           <!-- <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['quality:qualityInspection:export']">导出</el-button>
@@ -44,8 +43,7 @@
       </template>
       <!-- card body -->
       <Notice @selection-change="handleSelectionChange" :data="tableData"></Notice>
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
 
     <el-dialog title="新增模板" v-model="dialogVisible" width="800">
@@ -56,14 +54,12 @@
           <div>
             <el-form-item label="检查类型" prop="checkType">
               <el-select v-model="form.checkType" placeholder="请选择检查类型">
-                <el-option v-for="dict in safety_inspection_check_type" :key="dict.value" :label="dict.label"
+                <el-option v-for="dict in safety_inspection_check_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="违章类型" prop="violationType">
               <el-select v-model="form.violationType" placeholder="请选择违章类型">
-                <el-option v-for="dict in safety_inspection_violation_type" :key="dict.value" :label="dict.label"
+                <el-option v-for="dict in safety_inspection_violation_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="巡检结果" prop="inspectionResult">
@@ -71,8 +67,7 @@
             </el-form-item>
             <el-form-item label="整改班组" prop="teamId">
               <el-select v-model="form.teamId" placeholder="请选择整改班组">
-                <el-option v-for="item in teamOpt" :key="item.value" :label="item.label" :value="item.value"
+                <el-option v-for="item in teamOpt" :key="item.value" :label="item.label" :value="item.value" @click="changeForeman(item.value)" />
-                  @click="changeForeman(item.value)" />
               </el-select>
             </el-form-item>
             <el-form-item label="整改人" prop="correctorId">
@@ -87,16 +82,13 @@
               <el-input v-model="form.measure" type="textarea" placeholder="请输入内容" />
             </el-form-item>
             <el-form-item label="要求整改期限" prop="rectificationDeadline">
-              <el-date-picker clearable v-model="form.rectificationDeadline" type="date" value-format="YYYY-MM-DD"
+              <el-date-picker clearable v-model="form.rectificationDeadline" type="date" value-format="YYYY-MM-DD" placeholder="选择要求整改期限" />
-                placeholder="选择要求整改期限" />
             </el-form-item>
             <el-form-item label="检查附件" prop="checkFile">
-              <file-upload v-model="form.checkFile" :file-size="20"
+              <file-upload v-model="form.checkFile" :file-size="20" :file-type="['doc', 'docx', 'pdf', 'png', 'jpg', 'jpeg']" />
-                :file-type="['doc', 'docx', 'pdf', 'png', 'jpg', 'jpeg']" />
             </el-form-item>
             <el-form-item label="整改附件" prop="rectificationFile">
-              <file-upload v-model="form.rectificationFile" :file-size="20"
+              <file-upload v-model="form.rectificationFile" :file-size="20" :file-type="['doc', 'docx', 'pdf', 'png', 'jpg', 'jpeg']" />
-                :file-type="['doc', 'docx', 'pdf', 'png', 'jpg', 'jpeg']" />
             </el-form-item>
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -253,8 +245,8 @@ const changeForeman = (value: string | number) => {
   form.value.correctorId = '';
 };
 
-const handleQuery = () => { };
+const handleQuery = () => {};
-const resetQuery = () => { };
+const resetQuery = () => {};
 const getList = async () => {
   if (!queryParams.value.projectType) {
     const res = await listContactTypeformtemplate(queryParams.value);
@@ -289,7 +281,7 @@ const handleDelete = async (id?: string) => {
     getList();
   }
 };
-const handleUpdate = () => { };
+const handleUpdate = () => {};
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: any) => {
@@ -308,6 +300,7 @@ const selectType = (value: string) => {
 const resetForm = () => {
   formRef.value?.resetFields();
 };
+
 //监听项目id刷新数据
 const listeningProject = watch(
   () => currentProject.value?.id,

src/views/cory/workMessage/indexEdit.vue

@@ -0,0 +1,482 @@
+<template>
+  <div class="p-4 bg-gray-50">
+    <div class="max-w-4xl mx-auto">
+      <!-- 顶部按钮区域 -->
+      <el-card class="mb-4 rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md">
+        <approvalButton
+          @submitForm="submitForm"
+          @approvalVerifyOpen="approvalVerifyOpen"
+          @handleApprovalRecord="handleApprovalRecord"
+          :buttonLoading="buttonLoading"
+          :id="form.id"
+          :status="form.status"
+          :pageType="routeParams.type"
+        />
+      </el-card>
+
+      <!-- 表单区域 -->
+      <el-card class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
+        <div class="p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border-b border-gray-100">
+          <h3 class="text-lg font-semibold text-gray-800">工作联系单审批</h3>
+        </div>
+        <div class="p-6">
+          <div class="w80% ma">
+            <h2 style="text-align: center; margin-top: 5px; font-weight: bold">通知单</h2>
+            <el-row>
+              <el-col :span="12" style="text-align: left">填报人：{{ safetyInspectionDetail?.creatorName }}</el-col>
+              <el-col :span="12" style="text-align: right">填报时间：{{ safetyInspectionDetail?.createTime }}</el-col>
+            </el-row>
+            <el-descriptions :column="2" border style="margin-top: 8px" label-width="160px" size="large">
+              <el-descriptions-item label-align="center" label="检查项目" :span="2" class-name="zebra"
+                >{{ currentProject?.name }}
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="检查类型" label-class-name="white">
+                <dict-tag :options="safety_inspection_check_type" :value="safetyInspectionDetail?.checkType" />
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="违章类型" label-class-name="white">
+                <dict-tag :options="safety_inspection_violation_type" :value="safetyInspectionDetail?.violationType" />
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="检查时间" class-name="zebra"
+                >{{ safetyInspectionDetail?.checkTime }}
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="检查人" class-name="zebra"
+                >{{ safetyInspectionDetail?.creatorName }}
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="整改人" label-class-name="white"
+                >{{ safetyInspectionDetail?.correctorName }}
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="要求整改期限" label-class-name="white">
+                {{ dayjs(safetyInspectionDetail?.rectificationDeadline).format('YYYY 年 MM 月 DD 日') }}
+              </el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions border direction="vertical" size="large">
+              <el-descriptions-item label-align="center" label="巡检结果" class-name="none"></el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions :column="2" border label-width="160px" size="large">
+              <el-descriptions-item label-align="center" label="内容" :span="2" label-class-name="white"
+                >{{ safetyInspectionDetail?.hiddenDanger }}
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="检查附件" :span="2" label-class-name="white">
+                <el-space wrap>
+                  <div v-for="item in checkFileList" :key="item.ossId">
+                    <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
+                      <image-preview :src="item.url" width="200px" />
+                    </span>
+                    <span v-else>
+                      <el-link :href="`${item.url}`" type="primary" :underline="false" target="_blank">
+                        <span> {{ item.originalName }} </span>
+                      </el-link>
+                    </span>
+                  </div>
+                </el-space>
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="检查状态" :span="2" label-class-name="white">
+                <el-steps style="max-width: 200px" :active="Number(safetyInspectionDetail?.status)" finish-status="finish">
+                  <el-step v-for="item in safety_inspection_type" :key="item.value" :title="item.label" />
+                </el-steps>
+              </el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions border direction="vertical" size="large">
+              <el-descriptions-item label-align="center" label="整改情况" class-name="none"></el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions :column="2" border label-width="160px" size="large">
+              <el-descriptions-item label-align="center" label="班组" label-class-name="white"
+                >{{ safetyInspectionDetail?.teamName }}
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="整改日期" label-class-name="white"
+                >{{ safetyInspectionDetail?.rectificationTime }}
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="整改措施及完成情况" :span="2" label-class-name="white">
+                {{ safetyInspectionDetail?.measure }}
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="整改附件" :span="2" label-class-name="white">
+                <el-space wrap>
+                  <div v-for="item in rectificationFileList" :key="item.ossId">
+                    <span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
+                      <image-preview :src="item.url" width="200px" />
+                    </span>
+                    <span v-else>
+                      <el-link :href="`${item.url}`" :underline="false" target="_blank">
+                        <span> {{ item.originalName }} </span>
+                      </el-link>
+                    </span>
+                  </div>
+                </el-space>
+              </el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions border direction="vertical" size="large">
+              <el-descriptions-item label-align="center" label="复查结果" class-name="none"></el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions :column="2" border label-width="160px" size="large">
+              <el-descriptions-item label-align="center" label="复查人" label-class-name="white"
+                >{{ safetyInspectionDetail?.creatorName }}
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="复查日期" label-class-name="white"
+                >{{ safetyInspectionDetail?.reviewTime }}
+              </el-descriptions-item>
+              <el-descriptions-item label-align="center" label="复查情况" :span="2" label-class-name="white"
+                >{{ safetyInspectionDetail?.review }}
+              </el-descriptions-item>
+            </el-descriptions>
+          </div>
+        </div>
+      </el-card>
+      <!-- 提交组件 -->
+      <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
+      <approvalRecord ref="approvalRecordRef"></approvalRecord>
+      <!-- 流程选择对话框 -->
+      <el-dialog
+        draggable
+        v-model="dialogVisible.visible"
+        :title="dialogVisible.title"
+        :before-close="handleClose"
+        width="500"
+        class="rounded-lg shadow-lg"
+      >
+        <div class="p-4">
+          <p class="text-gray-600 mb-4">请选择要启动的流程：</p>
+          <el-select v-model="flowCode" placeholder="请选择流程" style="width: 100%">
+            <el-option v-for="item in flowCodeOptions" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </div>
+        <template #footer>
+          <div class="dialog-footer p-4 border-t border-gray-100 flex justify-end space-x-3">
+            <el-button @click="handleClose" class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors"
+              >取消</el-button
+            >
+            <el-button type="primary" @click="submitFlow()" class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors"
+              >确认</el-button
+            >
+          </div>
+        </template>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script setup name="Leave" lang="ts">
+import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
+import { startWorkFlow } from '@/api/workflow/task';
+import SubmitVerify from '@/components/Process/submitVerify.vue';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+import ApprovalButton from '@/components/Process/approvalButton.vue';
+import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+import { useUserStoreHook } from '@/store/modules/user';
+import { listByIds } from '@/api/system/oss';
+import { dayjs } from 'element-plus';
+import { useDict } from '@/utils/dict';
+import { SafetyInspectionVO } from '@/api/safety/safetyInspection/types';
+// const { des_user_major } = toRefs(proxy?.useDict('des_user_major'));
+import { getContactnotice } from '@/api/cory/contactnotice';
+const { safety_inspection_violation_type, safety_inspection_check_type, review_type, safety_inspection_type, wf_business_status } = toRefs<any>(
+  useDict('safety_inspection_violation_type', 'safety_inspection_check_type', 'review_type', 'safety_inspection_type', 'wf_business_status')
+);
+
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const thumbnailUrl = ref('');
+//路由参数
+const routeParams = ref<Record<string, any>>({});
+const flowCodeOptions = [
+  {
+    value: currentProject.value?.id + '_contactForm',
+    label: '工作联系单审批'
+  }
+];
+
+const flowCode = ref<string>('');
+const status = ref<string>('');
+const dialogVisible = reactive<DialogOption>({
+  visible: false,
+  title: '流程定义'
+});
+//提交组件
+const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+//审批记录组件
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+const leaveFormRef = ref<ElFormInstance>();
+const dialog = reactive({
+  visible: false,
+  title: '',
+  isEdit: false
+});
+const submitFormData = ref<StartProcessBo>({
+  businessId: '',
+  flowCode: '',
+  variables: {}
+});
+const taskVariables = ref<Record<string, any>>({});
+
+const initFormData = {
+  id: undefined,
+  projectId: currentProject.value?.id,
+  projectType: '',
+  projectName: '',
+  serialNumber: '',
+  to: '',
+  subject: '',
+  costEstimation: '',
+  content: '',
+  attachments: '',
+  contractorLeader: '',
+  contractorDate: '',
+  supervisorLeader: '',
+  supervisorDate: '',
+  ownerRep: '',
+  ownerDate: '',
+  unitName: '',
+  profession: '',
+  applyDate: '',
+  bookName: '',
+  bookNo: '',
+  hasAttachment: '',
+  changeReasons: [],
+  changeContent: '',
+  costEstimate: '',
+  status: ''
+};
+const data = reactive({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    projectId: currentProject.value?.id,
+    fileName: undefined,
+    fileType: undefined,
+    fileSuffix: undefined,
+    fileStatus: undefined,
+    originalName: undefined,
+    newest: undefined,
+    params: {}
+  }
+});
+const safetyInspectionDetail = ref<SafetyInspectionVO>();
+const handleClose = () => {
+  dialogVisible.visible = false;
+  flowCode.value = '';
+  buttonLoading.value = false;
+};
+const { form } = toRefs(data);
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  leaveFormRef.value?.resetFields();
+};
+
+const checkFileList: any = ref([]);
+const rectificationFileList: any = ref([]);
+/** 获取详情 */
+const getInfo = () => {
+  loading.value = true;
+  buttonLoading.value = false;
+  nextTick(async () => {
+    const res = await getContactnotice(routeParams.value.id);
+    console.log(res.data);
+    const detail = res.data.detail ? JSON.parse(res.data.detail) : {};
+    safetyInspectionDetail.value = { ...res.data, ...detail };
+    if (safetyInspectionDetail.value.checkFile) {
+      const checkFileRes = await listByIds(safetyInspectionDetail.value.checkFile.split(','));
+      checkFileList.value = checkFileRes.data;
+    }
+    if (safetyInspectionDetail.value.rectificationFile) {
+      const rectificationFileRes = await listByIds(safetyInspectionDetail.value.rectificationFile.split(','));
+      rectificationFileList.value = rectificationFileRes.data;
+    }
+
+    Object.assign(form.value, safetyInspectionDetail.value);
+    loading.value = false;
+    buttonLoading.value = false;
+  });
+};
+
+const submitFlow = async () => {
+  console.log('form.value', form.value);
+
+  handleStartWorkFlow(form.value);
+  dialogVisible.visible = false;
+};
+//提交申请
+const handleStartWorkFlow = async (data: LeaveForm) => {
+  console.log('data', data);
+
+  try {
+    submitFormData.value.flowCode = flowCode.value;
+    submitFormData.value.businessId = data.id;
+    //流程变量
+    taskVariables.value = {
+      // leave4/5 使用的流程变量
+      userList: ['1', '3', '4']
+    };
+    submitFormData.value.variables = taskVariables.value;
+    const resp = await startWorkFlow(submitFormData.value);
+    if (submitVerifyRef.value) {
+      buttonLoading.value = false;
+      submitVerifyRef.value.openDialog(resp.data.taskId);
+    }
+  } finally {
+    buttonLoading.value = false;
+  }
+};
+/** 提交按钮 */
+const submitForm = (status1: string) => {
+  status.value = status1;
+  submit(status.value, form.value);
+};
+//审批记录
+const handleApprovalRecord = () => {
+  approvalRecordRef.value.init(form.value.id);
+};
+//提交回调
+const submitCallback = async () => {
+  await proxy.$tab.closePage(proxy.$route);
+  proxy.$router.go(-1);
+};
+
+//审批
+const approvalVerifyOpen = async () => {
+  submitVerifyRef.value.openDialog(routeParams.value.taskId);
+};
+// 图纸上传成功之后 开始提交
+const submit = async (status, data) => {
+  form.value = data;
+  if (status === 'draft') {
+    buttonLoading.value = false;
+    proxy?.$modal.msgSuccess('暂存成功');
+    proxy.$tab.closePage(proxy.$route);
+    proxy.$router.go(-1);
+  } else {
+    if ((form.value.status === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
+      flowCode.value = flowCodeOptions[0].value;
+      dialogVisible.visible = true;
+      return;
+    }
+    //说明启动过先随意穿个参数
+    if (flowCode.value === '' || flowCode.value === null) {
+      flowCode.value = 'xx';
+    }
+    console.log('data', data);
+    await handleStartWorkFlow(data);
+  }
+};
+
+onMounted(() => {
+  nextTick(async () => {
+    routeParams.value = proxy.$route.query;
+    reset();
+    loading.value = false;
+    if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
+      getInfo();
+    }
+  });
+});
+</script>
+<style scoped lang="scss">
+/* 全局样式 */
+:root {
+  --primary: #409eff;
+  --primary-light: #66b1ff;
+  --primary-dark: #3a8ee6;
+  --success: #67c23a;
+  --warning: #e6a23c;
+  --danger: #f56c6c;
+  --info: #909399;
+}
+
+/* 表单样式优化 */
+.el-form-item {
+  .el-form-item__label {
+    color: #606266;
+    font-weight: 500;
+  }
+
+  .el-input__inner,
+  .el-select .el-input__inner {
+    border-radius: 4px;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
+
+    &:focus {
+      border-color: var(--primary-light);
+      box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+    }
+  }
+
+  .el-textarea__inner {
+    border-radius: 4px;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
+
+    &:focus {
+      border-color: var(--primary-light);
+      box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+    }
+  }
+}
+
+/* 按钮样式优化 */
+.el-button {
+  border-radius: 4px;
+  transition: all 0.2s;
+
+  &.is-primary {
+    background-color: var(--primary);
+    border-color: var(--primary);
+
+    &:hover {
+      background-color: var(--primary-light);
+      border-color: var(--primary-light);
+    }
+
+    &:active {
+      background-color: var(--primary-dark);
+      border-color: var(--primary-dark);
+    }
+  }
+
+  &.is-text {
+    color: var(--primary);
+
+    &:hover {
+      color: var(--primary-light);
+      background-color: rgba(64, 158, 255, 0.05);
+    }
+  }
+}
+
+/* 卡片样式优化 */
+.el-card {
+  transition: all 0.3s ease;
+
+  &:hover {
+    /* transform: translateY(-2px); */
+  }
+}
+
+/* 对话框样式优化 */
+.el-dialog {
+  .el-dialog__header {
+    background-color: #f5f7fa;
+    border-bottom: 1px solid #ebeef5;
+    padding: 15px 20px;
+  }
+
+  .el-dialog__title {
+    font-size: 16px;
+    font-weight: 600;
+    color: #303133;
+  }
+
+  .el-dialog__footer {
+    padding: 15px 20px;
+    border-top: 1px solid #ebeef5;
+  }
+}
+</style>

src/views/design/Professional/index.vue

@@ -37,7 +37,15 @@
         </el-table-column>
         <el-table-column label="操作" align="center">
           <template #default="scope">
-            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['design:extract:query']">审核</el-button>
+            <el-button
+              link
+              type="primary"
+              v-if="scope.row.status == 'draft'"
+              icon="Edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['design:extract:query']"
+              >审核</el-button
+            >
             <el-button
               link
               type="primary"

src/views/design/drawing/index.vue

@@ -159,7 +159,7 @@ const histroyList = ref([]);
 const getList = async () => {
   loading.value = true;
   try {
-    const res = await joinList({ type: catalogueId.value, ...queryParams.value });
+    const res = await joinList({ type: catalogueId.value, ...queryParams.value, auditStatus: 'finish' });
     volumeCatalogList.value = res.rows;
     total.value = res.total;
   } finally {

src/views/tender/plan/index.vue

@@ -161,7 +161,7 @@
                   <el-option v-for="item in options" :key="item.versions" :label="item.versions" :value="item.versions" />
                 </el-select>
               </el-form-item>
-              <el-form-item label="表名" prop="sheet">
+              <el-form-item label="表名" prop="sheet" v-if="planType == '2'">
                 <el-select v-model="treeForm.sheet" placeholder="选择表名" @change="changeSheet">
                   <el-option v-for="item in sheets" :key="item" :label="item" :value="item" />
                 </el-select>
@@ -187,6 +187,16 @@
             <el-table-column prop="unit" label="单位" />
             <!-- <el-table-column prop="quantity" label="数量" /> -->
             <el-table-column prop="quantity" label="计划量" align="center" />
+
+            <el-table-column prop="useQuantity" label="剩余量" align="center">
+              <template #default="scope">
+                {{
+                  (scope.row.quantity ? Number(scope.row.quantity) : 0) - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) == 0
+                    ? ''
+                    : (scope.row.quantity ? Number(scope.row.quantity) : 0) - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0)
+                }}
+              </template>
+            </el-table-column>
             <el-table-column prop="selectNum" label="设计量" align="center">
               <template #default="scope">
                 <el-input-number
@@ -205,17 +215,6 @@
                 />
               </template>
             </el-table-column>
-
-            <el-table-column prop="useQuantity" label="剩余量" align="center">
-              <template #default="scope">
-                {{
-                  (scope.row.quantity ? Number(scope.row.quantity) : 0) - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) == 0
-                    ? ''
-                    : (scope.row.quantity ? Number(scope.row.quantity) : 0) - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0)
-                }}
-              </template>
-            </el-table-column>
-
             <el-table-column prop="unitPrice" label="单价" align="center" />
             <el-table-column prop="price" label="总价" align="center">
               <template #default="scope">
@@ -431,9 +430,12 @@ const getVersionNums = async () => {
       options.value = res.data;
       if (res.data.length > 0) {
         console.log(11111);
-
         treeForm.value.versions = res.data[0].versions;
-        getSheetName();
+        if (planType.value == '2') {
+          getSheetName();
+        } else {
+          getTreeList();
+        }
       } else {
         treeForm.value.versions = '';
         // getSheetName();