工程清单审批

.env.development

@@ -5,7 +5,7 @@ VITE_APP_TITLE = 新能源项目管理平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.159:8898'
+VITE_APP_BASE_API = 'http://192.168.110.180:8898'
 
 # 无人机接口地址
 

src/views/design/designChange/index.vue

@@ -44,8 +44,7 @@
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
-      <el-table v-loading="loading" :data="designChangeList" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" :data="designChangeList">
-        <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="申请单编号" align="center" prop="formNo" />
         <el-table-column label="工程名称" align="center" prop="projectName" />
         <el-table-column label="提出单位" align="center" prop="submitUnit" />
@@ -77,20 +76,14 @@
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" fixed="right" width="300">
           <template #default="scope">
-            <el-tooltip content="查看流程" placement="top">
+            <el-button type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['design:designChange:edit']">审核</el-button>
-              <el-button link type="primary" icon="View" @click="handleViewInfo(scope.row)"></el-button>
+            <el-button type="success" icon="View" @click="handleViewInfo(scope.row)">查看</el-button>
-            </el-tooltip>
+            <!-- <el-tooltip content="查看文档" placement="top">
-            <el-tooltip content="查看文档" placement="top">
               <el-button link type="primary" icon="Document" @click="handleView(scope.row)"></el-button>
-            </el-tooltip>
+            </el-tooltip> -->
-            <el-tooltip content="修改" placement="top">
+            <el-button type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['design:designChange:remove']">删除</el-button>
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['design:designChange:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['design:designChange:remove']"></el-button>
-            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -162,14 +155,6 @@ const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
 };
-
-/** 多选框选中数据 */
-const handleSelectionChange = (selection: DesignChangeVO[]) => {
-  ids.value = selection.map((item) => item.id);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-};
-
 /** 新增按钮操作 */
 const handleAdd = () => {
   proxy.$tab.closePage(proxy.$route);

src/views/design/designChange/indexEdit.vue

@@ -58,7 +58,45 @@
                   <el-form-item label="卷册名称" prop="volumeName"> <el-input v-model="form.volumeName" placeholder="请输入卷册名称" /> </el-form-item
                 ></el-col>
                 <el-col :span="12">
-                  <el-form-item label="卷册号" prop="volumeNo"> <el-input v-model="form.volumeNo" placeholder="请输入卷册号" /> </el-form-item
+                  <el-form-item label="原卷册号" prop="volumeNo"> <el-input v-model="form.volumeNo" placeholder="请输入卷册号" /> </el-form-item
+                ></el-col>
+                <el-col :span="12">
+                  <el-form-item label="子项名称" prop="subName">
+                    <el-input v-model="form.extendDetail.subName" placeholder="请输入子项名称" /> </el-form-item
+                ></el-col>
+                <el-col :span="24">
+                  <el-form-item label="原设计处置" prop="designDisposal">
+                    <el-radio-group v-model="form.extendDetail.designDisposal">
+                      <el-radio value="1" size="large">原图作废</el-radio>
+                      <el-radio value="2" size="large">原图保留，部分修改</el-radio>
+                      <el-radio value="3" size="large">原图保留，补充设计</el-radio>
+                    </el-radio-group>
+                  </el-form-item></el-col
+                >
+                <el-col :span="12">
+                  <el-form-item label="设计阶段" prop="designPhase">
+                    <el-input v-model="form.extendDetail.designPhase" placeholder="请输入设计阶段" /> </el-form-item
+                ></el-col>
+                <el-col :span="24">
+                  <el-form-item label="变更类别" prop="changeCategory">
+                    <el-radio-group v-model="form.extendDetail.changeCategory">
+                      <el-radio value="1" size="large">重大设计变更</el-radio>
+                      <el-radio value="2" size="large">一般设计变更</el-radio>
+                    </el-radio-group>
+                  </el-form-item></el-col
+                >
+                <el-col :span="24">
+                  <el-form-item label="实施程序" prop="ImpProcedure">
+                    <el-radio-group v-model="form.extendDetail.ImpProcedure">
+                      <el-radio value="1" size="large">建设单位重新申报初步设计审批</el-radio>
+                      <el-radio value="2" size="large">建设单位送原施工图审查机构审查、建设主管部分备案后交付实施</el-radio>
+                      <el-radio value="3" size="large">建设单位确认后交付实施</el-radio>
+                    </el-radio-group>
+                  </el-form-item></el-col
+                >
+                <el-col :span="12">
+                  <el-form-item label="更改相关专业" prop="involvingProfessions">
+                    <el-input v-model="form.extendDetail.involvingProfessions" placeholder="请输入更改相关专业" /> </el-form-item
                 ></el-col>
                 <el-col :span="24">
                   <el-form-item label="附图" prop="attachmentPic"> <image-upload v-model="form.attachmentPic" :fileSize="100" /> </el-form-item
@@ -76,13 +114,17 @@
                   <el-form-item label="变更内容" prop="changeContent">
                     <el-input v-model="form.changeContent" type="textarea" placeholder="请输入内容" /> </el-form-item
                 ></el-col>
+                <el-col :span="12">
+                  <el-form-item label="费用" prop="costEstimation">
+                    <el-input v-model="form.costEstimation" type="number" placeholder="请输入费用" /> </el-form-item
+                ></el-col>
                 <el-col :span="24">
                   <el-form-item label="变更费用估算表" label-width="110px" prop="costEstimationFile">
                     <file-upload v-model="form.costEstimationFile" :fileSize="100" /> </el-form-item
                 ></el-col>
-                <el-col :span="24">
+                <!-- <el-col :span="24">
                   <el-form-item label="变更文件" prop="fileId"> <file-upload v-model="form.fileId" :fileSize="100" /> </el-form-item
-                ></el-col>
+                ></el-col> -->
                 <el-col :span="24"
                   ><el-form-item label="备注" prop="remark">
                     <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> </el-form-item
@@ -151,7 +193,6 @@ const flowCodeOptions = [
     label: '设计变更审批'
   }
 ];
-
 const flowCode = ref<string>('');
 const status = ref<string>('');
 const dialogVisible = reactive<DialogOption>({
@@ -177,7 +218,6 @@ const submitFormData = ref<StartProcessBo>({
   variables: {}
 });
 const taskVariables = ref<Record<string, any>>({});
-
 const initFormData = {
   id: undefined,
   projectId: currentProject.value?.id,
@@ -195,7 +235,15 @@ const initFormData = {
   costEstimationFile: undefined,
   fileId: undefined,
   status: undefined,
-  remark: undefined
+  remark: undefined,
+  extendDetail: {
+    changeCategory: undefined,
+    ImpProcedure: undefined,
+    involvingProfessions: undefined,
+    subName: undefined,
+    designDisposal: undefined,
+    designPhase: undefined
+  }
 };
 const data = reactive({
   form: { ...initFormData },
@@ -260,6 +308,16 @@ const submitForm = (status1: string) => {
       }
       if (res.code == 200) {
         dialog.visible = false;
+        if (res.data.extendDetail == null) {
+          res.data.extendDetail = {
+            'changeCategory': '',
+            'ImpProcedure': '',
+            'involvingProfessions': '',
+            'subName': '',
+            'designDisposal': '',
+            'designPhase': ''
+          };
+        }
         submit(status.value, res.data);
       }
     }
@@ -278,7 +336,8 @@ const handleStartWorkFlow = async (data: LeaveForm) => {
     //流程变量
     taskVariables.value = {
       // leave4/5 使用的流程变量
-      userList: ['1', '3', '4']
+      userList: ['1', '3', '4'],
+      costEstimation: form.value.costEstimation
     };
     submitFormData.value.variables = taskVariables.value;
     const resp = await startWorkFlow(submitFormData.value);
@@ -303,7 +362,6 @@ const submitCallback = async () => {
 const approvalVerifyOpen = async () => {
   submitVerifyRef.value.openDialog(routeParams.value.taskId);
 };
-// 图纸上传成功之后 开始提交
 const submit = async (status, data) => {
   form.value = data;
   if (status === 'draft') {