合并
This commit is contained in:
		| @ -7,8 +7,12 @@ VITE_APP_ENV = 'development' | |||||||
| # 开发环境 | # 开发环境 | ||||||
| VITE_APP_BASE_API = 'http://192.168.110.180:8899' | VITE_APP_BASE_API = 'http://192.168.110.180:8899' | ||||||
| # 李陈杰 209 | # 李陈杰 209 | ||||||
|  | <<<<<<< HEAD | ||||||
|  | VITE_APP_BASE_API = 'http://192.168.110.210:8899' | ||||||
|  | ======= | ||||||
|  |  | ||||||
| # VITE_APP_BASE_API = 'http://192.168.110.209:8899' | # VITE_APP_BASE_API = 'http://192.168.110.209:8899' | ||||||
|  | >>>>>>> 3e4b85fc48f6514704aee4b444285b90935b0cd2 | ||||||
| # 曾涛 | # 曾涛 | ||||||
|  |  | ||||||
| # 罗成 | # 罗成 | ||||||
|  | |||||||
| @ -24,7 +24,8 @@ | |||||||
|             </el-form-item> |             </el-form-item> | ||||||
|             <el-form-item label="合同类型" prop="contractType"> |             <el-form-item label="合同类型" prop="contractType"> | ||||||
|               <el-select v-model="form.contractType" placeholder="请选择合同类型"> |               <el-select v-model="form.contractType" placeholder="请选择合同类型"> | ||||||
|                 <el-option v-for="item in income_contract_type" :key="item.value" :label="item.label" :value="item.value" /> |                 <el-option v-for="item in income_contract_type" :key="item.value" :label="item.label" | ||||||
|  |                   :value="item.value" /> | ||||||
|               </el-select> |               </el-select> | ||||||
|             </el-form-item> |             </el-form-item> | ||||||
|             <el-form-item label="业主单位" prop="contractOwner"> |             <el-form-item label="业主单位" prop="contractOwner"> | ||||||
| @ -37,17 +38,15 @@ | |||||||
|               <editor v-model="form.contractedContent" :min-height="192" /> |               <editor v-model="form.contractedContent" :min-height="192" /> | ||||||
|             </el-form-item> |             </el-form-item> | ||||||
|             <el-form-item label="合同金额" prop="amount"> |             <el-form-item label="合同金额" prop="amount"> | ||||||
|               <el-input |               <el-input v-model="form.amount" placeholder="请输入合同金额" | ||||||
|                 v-model="form.amount" |                 oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" /> | ||||||
|                 placeholder="请输入合同金额" |  | ||||||
|                 oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" |  | ||||||
|               /> |  | ||||||
|             </el-form-item> |             </el-form-item> | ||||||
|             <el-form-item label="备注" prop="remark"> |             <el-form-item label="备注" prop="remark"> | ||||||
|               <el-input v-model="form.remark" placeholder="请输入备注" /> |               <el-input v-model="form.remark" placeholder="请输入备注" /> | ||||||
|             </el-form-item> |             </el-form-item> | ||||||
|             <el-form-item label="附件"> |             <el-form-item label="附件"> | ||||||
|               <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess" :ref="fileRef" :defaultFileList="tempFileList" /> |               <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess" :ref="fileRef" | ||||||
|  |                 :defaultFileList="tempFileList" /> | ||||||
|             </el-form-item> |             </el-form-item> | ||||||
|           </el-form> |           </el-form> | ||||||
|         </template> |         </template> | ||||||
| @ -61,35 +60,36 @@ | |||||||
|             </el-form-item> |             </el-form-item> | ||||||
|             <el-form-item label="合同类型" prop="contractType"> |             <el-form-item label="合同类型" prop="contractType"> | ||||||
|               <el-select v-model="form.contractType" placeholder="请选择合同类型"> |               <el-select v-model="form.contractType" placeholder="请选择合同类型"> | ||||||
|                 <el-option v-for="item in expenses_contract_type" :key="item.value" :label="item.label" :value="item.value" /> |                 <el-option v-for="item in expenses_contract_type" :key="item.value" :label="item.label" | ||||||
|  |                   :value="item.value" /> | ||||||
|               </el-select> |               </el-select> | ||||||
|             </el-form-item> |             </el-form-item> | ||||||
|             <el-form-item label="招标计划" prop="tenderId"> |             <el-form-item label="招标计划" prop="tenderId"> | ||||||
|               <!-- <el-input v-model="form.tenderId" placeholder="请输入招标Id" /> --> |               <!-- <el-input v-model="form.tenderId" placeholder="请输入招标Id" /> --> | ||||||
|               <el-input v-model="form.name" placeholder="请选择招标计划" disabled /> |               <el-input v-model="form.name" placeholder="请选择招标计划" disabled /> | ||||||
|               <el-button type="primary" @click="handleChoose" v-hasPermi="['ctr:expensesContract:tenderList']">选择招标</el-button> |               <el-button type="primary" @click="handleChoose" | ||||||
|  |                 v-hasPermi="['ctr:expensesContract:tenderList']">选择招标</el-button> | ||||||
|             </el-form-item> |             </el-form-item> | ||||||
|             <el-form-item label="供应商" prop="contractSupplier"> |             <el-form-item label="供应商" prop="contractSupplier"> | ||||||
|               <el-input v-model="form.contractSupplier" placeholder="请输入供应商" disabled /> |               <el-input v-model="form.contractSupplier" placeholder="请输入供应商" disabled /> | ||||||
|             </el-form-item> |             </el-form-item> | ||||||
|             <el-form-item label="分包内容"> |             <el-form-item label="分包内容"> | ||||||
|               <!-- <editor v-model="form.contractedContent" :min-height="192" disabled /> --> |               <!-- <editor v-model="form.contractedContent" :min-height="192" disabled /> --> | ||||||
|               <el-input v-model="form.contractedContent" style="width: 300px" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" disabled /> |               <el-input v-model="form.contractedContent" style="width: 300px" :autosize="{ minRows: 2, maxRows: 4 }" | ||||||
|  |                 type="textarea" disabled /> | ||||||
|             </el-form-item> |             </el-form-item> | ||||||
|             <el-form-item label="合同金额" prop="amount"> |             <el-form-item label="合同金额" prop="amount"> | ||||||
|               <el-input |               <el-input | ||||||
|                 oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" |                 oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" | ||||||
|                 v-model="form.amount" |                 v-model="form.amount" placeholder="请输入合同金额" disabled /> | ||||||
|                 placeholder="请输入合同金额" |  | ||||||
|                 disabled |  | ||||||
|               /> |  | ||||||
|             </el-form-item> |             </el-form-item> | ||||||
|  |  | ||||||
|             <el-form-item label="备注" prop="remark"> |             <el-form-item label="备注" prop="remark"> | ||||||
|               <el-input v-model="form.remark" placeholder="请输入备注" /> |               <el-input v-model="form.remark" placeholder="请输入备注" /> | ||||||
|             </el-form-item> |             </el-form-item> | ||||||
|             <el-form-item label="合同附件"> |             <el-form-item label="合同附件"> | ||||||
|               <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess" :ref="fileRef" :defaultFileList="tempFileList" /> |               <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess" :ref="fileRef" | ||||||
|  |                 :defaultFileList="tempFileList" /> | ||||||
|             </el-form-item> |             </el-form-item> | ||||||
|           </el-form> |           </el-form> | ||||||
|         </template> |         </template> | ||||||
| @ -280,7 +280,6 @@ const resetForm = () => { | |||||||
|   }; |   }; | ||||||
|   fileList.value = []; |   fileList.value = []; | ||||||
|   tempFileList.value = []; |   tempFileList.value = []; | ||||||
|   contract_type.value = ''; |  | ||||||
|   setTimeout(() => { |   setTimeout(() => { | ||||||
|     localStorage.removeItem('tempContractForm'); |     localStorage.removeItem('tempContractForm'); | ||||||
|   }, 0); |   }, 0); | ||||||
| @ -399,6 +398,7 @@ const getInfoByProjectIdList = async () => { | |||||||
|   form.value.contractOwner = res.data.planDuration; |   form.value.contractOwner = res.data.planDuration; | ||||||
| }; | }; | ||||||
| onMounted(() => { | onMounted(() => { | ||||||
|  |   contract_type.value = ''; | ||||||
|   getInfoByProjectIdList(); |   getInfoByProjectIdList(); | ||||||
|  |  | ||||||
|   const tempForm = localStorage.getItem('tempContractForm'); |   const tempForm = localStorage.getItem('tempContractForm'); | ||||||
|  | |||||||
| @ -68,6 +68,7 @@ | |||||||
|             <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['design:volumeCatalog:listFile']" |             <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['design:volumeCatalog:listFile']" | ||||||
|               >查看文件</el-button |               >查看文件</el-button | ||||||
|             > |             > | ||||||
|  |             <el-badge v-if="scope.row.fileCount" :value="scope.row.fileCount" class="item" type="danger"> </el-badge> | ||||||
|           </template> |           </template> | ||||||
|         </el-table-column> |         </el-table-column> | ||||||
|         <el-table-column label="外部意见" align="center"> |         <el-table-column label="外部意见" align="center"> | ||||||
| @ -171,8 +172,8 @@ | |||||||
|     <!-- 查看文件列表 --> |     <!-- 查看文件列表 --> | ||||||
|     <el-dialog draggable title="图纸列表" v-model="viewVisible" width="1000px"> |     <el-dialog draggable title="图纸列表" v-model="viewVisible" width="1000px"> | ||||||
|       <el-tabs type="border-card" v-model="activeName" class="demo-tabs" @tab-click="handleClick"> |       <el-tabs type="border-card" v-model="activeName" class="demo-tabs" @tab-click="handleClick"> | ||||||
|         <el-tab-pane label="蓝图" name="3" |         <el-tab-pane label="蓝图" name="3"> | ||||||
|           ><TableContent :data="fileList" :wf-business-status="wf_business_status"> |           <TableContent :data="fileList" :wf-business-status="wf_business_status"> | ||||||
|             <template #operation="{ row }"> |             <template #operation="{ row }"> | ||||||
|               <el-button |               <el-button | ||||||
|                 link |                 link | ||||||
| @ -195,10 +196,10 @@ | |||||||
|                 >查看单据</el-button |                 >查看单据</el-button | ||||||
|               > |               > | ||||||
|             </template> |             </template> | ||||||
|           </TableContent></el-tab-pane |           </TableContent> | ||||||
|         > |         </el-tab-pane> | ||||||
|         <el-tab-pane label="过程图纸 " name="1" |         <el-tab-pane label="过程图纸 " name="1"> | ||||||
|           ><TableContent :data="fileList" :wf-business-status="wf_business_status"> |           <TableContent :data="fileList" :wf-business-status="wf_business_status"> | ||||||
|             <template #operation="{ row }"> |             <template #operation="{ row }"> | ||||||
|               <el-button link type="primary" icon="edit" @click="handleAudit(row)" v-if="row.auditStatus == 'draft' || row.auditStatus == 'back'" |               <el-button link type="primary" icon="edit" @click="handleAudit(row)" v-if="row.auditStatus == 'draft' || row.auditStatus == 'back'" | ||||||
|                 >审核</el-button |                 >审核</el-button | ||||||
| @ -216,15 +217,15 @@ | |||||||
|                 >查看单据</el-button |                 >查看单据</el-button | ||||||
|               > |               > | ||||||
|             </template> |             </template> | ||||||
|           </TableContent></el-tab-pane |           </TableContent> | ||||||
|         > |         </el-tab-pane> | ||||||
|         <el-tab-pane label="作废 " name="4" |         <el-tab-pane label="作废 " name="4"> | ||||||
|           ><TableContent :data="fileList" :wf-business-status="wf_business_status"> |           <TableContent :data="fileList" :wf-business-status="wf_business_status"> | ||||||
|             <template #operation="{ row }"> |             <template #operation="{ row }"> | ||||||
|               <el-button type="danger" link icon="Download" @click="handleDownload(row)"> 下载 </el-button> |               <el-button type="danger" link icon="Download" @click="handleDownload(row)"> 下载 </el-button> | ||||||
|             </template> |             </template> | ||||||
|           </TableContent></el-tab-pane |           </TableContent> | ||||||
|         > |         </el-tab-pane> | ||||||
|       </el-tabs> |       </el-tabs> | ||||||
|       <template #footer> |       <template #footer> | ||||||
|         <span> |         <span> | ||||||
| @ -699,6 +700,7 @@ onUnmounted(() => { | |||||||
|     border-collapse: collapse; //合并为一个单一的边框 |     border-collapse: collapse; //合并为一个单一的边框 | ||||||
|     border-color: rgba(199, 199, 199, 1); //边框颜色按实际自定义即可 |     border-color: rgba(199, 199, 199, 1); //边框颜色按实际自定义即可 | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   thead { |   thead { | ||||||
|     tr { |     tr { | ||||||
|       th { |       th { | ||||||
| @ -708,16 +710,19 @@ onUnmounted(() => { | |||||||
|         letter-spacing: 5px; |         letter-spacing: 5px; | ||||||
|         padding: 15px; |         padding: 15px; | ||||||
|       } |       } | ||||||
|  |  | ||||||
|       td { |       td { | ||||||
|         text-align: left; |         text-align: left; | ||||||
|         height: 35px; //设置单元格最小高度 |         height: 35px; //设置单元格最小高度 | ||||||
|         padding: 15px; |         padding: 15px; | ||||||
|       } |       } | ||||||
|  |  | ||||||
|       .th-bg { |       .th-bg { | ||||||
|         background-color: rgba(247, 247, 247, 1); |         background-color: rgba(247, 247, 247, 1); | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   tbody { |   tbody { | ||||||
|     tr { |     tr { | ||||||
|       td { |       td { | ||||||
| @ -725,6 +730,7 @@ onUnmounted(() => { | |||||||
|         height: 40px; //设置单元格最小高度 |         height: 40px; //设置单元格最小高度 | ||||||
|         padding: 15px; |         padding: 15px; | ||||||
|       } |       } | ||||||
|  |  | ||||||
|       th { |       th { | ||||||
|         height: 35px; //设置单元格最小高度 |         height: 35px; //设置单元格最小高度 | ||||||
|         text-align: center; |         text-align: center; | ||||||
| @ -733,6 +739,7 @@ onUnmounted(() => { | |||||||
|       } |       } | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   .table-content { |   .table-content { | ||||||
|     box-shadow: 0px 0px 10px #ddd; |     box-shadow: 0px 0px 10px #ddd; | ||||||
|     padding: 20px; |     padding: 20px; | ||||||
|  | |||||||
| @ -1,6 +1,7 @@ | |||||||
| <template> | <template> | ||||||
|   <div class="p-2"> |   <div class="p-2"> | ||||||
|     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave"> |     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" | ||||||
|  |       :leave-active-class="proxy?.animate.searchAnimate.leave"> | ||||||
|       <div v-show="showSearch" class="mb-[10px]"> |       <div v-show="showSearch" class="mb-[10px]"> | ||||||
|         <el-card shadow="hover"> |         <el-card shadow="hover"> | ||||||
|           <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px"> |           <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px"> | ||||||
| @ -11,25 +12,15 @@ | |||||||
|               <el-input v-model="queryParams.formalitiesId" placeholder="请输入手续办理清单模板id" clearable @keyup.enter="handleQuery" /> |               <el-input v-model="queryParams.formalitiesId" placeholder="请输入手续办理清单模板id" clearable @keyup.enter="handleQuery" /> | ||||||
|             </el-form-item> --> |             </el-form-item> --> | ||||||
|             <el-form-item label="计划开始时间" prop="planTheStartTime"> |             <el-form-item label="计划开始时间" prop="planTheStartTime"> | ||||||
|               <el-date-picker |               <el-date-picker clearable v-model="queryParams.planTheStartTime" type="date" value-format="YYYY-MM-DD" | ||||||
|                 clearable |                 placeholder="请选择计划开始时间" /> | ||||||
|                 v-model="queryParams.planTheStartTime" |  | ||||||
|                 type="date" |  | ||||||
|                 value-format="YYYY-MM-DD" |  | ||||||
|                 placeholder="请选择计划开始时间" |  | ||||||
|               /> |  | ||||||
|             </el-form-item> |             </el-form-item> | ||||||
|             <el-form-item label="负责人" prop="head"> |             <el-form-item label="负责人" prop="head"> | ||||||
|               <el-input v-model="queryParams.head" placeholder="请输入负责人" clearable @keyup.enter="handleQuery" /> |               <el-input v-model="queryParams.head" placeholder="请输入负责人" clearable @keyup.enter="handleQuery" /> | ||||||
|             </el-form-item> |             </el-form-item> | ||||||
|             <el-form-item label="实际完成时间" prop="actualCompletionTime"> |             <el-form-item label="实际完成时间" prop="actualCompletionTime"> | ||||||
|               <el-date-picker |               <el-date-picker clearable v-model="queryParams.actualCompletionTime" type="date" value-format="YYYY-MM-DD" | ||||||
|                 clearable |                 placeholder="请选择实际完成时间" /> | ||||||
|                 v-model="queryParams.actualCompletionTime" |  | ||||||
|                 type="date" |  | ||||||
|                 value-format="YYYY-MM-DD" |  | ||||||
|                 placeholder="请选择实际完成时间" |  | ||||||
|               /> |  | ||||||
|             </el-form-item> |             </el-form-item> | ||||||
|             <!-- <el-form-item label="手续材料" prop="formalitiesUrl"> |             <!-- <el-form-item label="手续材料" prop="formalitiesUrl"> | ||||||
|               <el-input v-model="queryParams.formalitiesUrl" placeholder="请输入手续材料" clearable @keyup.enter="handleQuery" /> |               <el-input v-model="queryParams.formalitiesUrl" placeholder="请输入手续材料" clearable @keyup.enter="handleQuery" /> | ||||||
| @ -47,19 +38,21 @@ | |||||||
|       <template #header> |       <template #header> | ||||||
|         <el-row :gutter="10" class="mb8"> |         <el-row :gutter="10" class="mb8"> | ||||||
|           <el-col :span="1.5"> |           <el-col :span="1.5"> | ||||||
|             <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['formalities:formalitiesAreConsolidated:getTree']" |             <el-button type="primary" plain icon="Plus" @click="handleAdd()" | ||||||
|               >新增</el-button |               v-hasPermi="['formalities:formalitiesAreConsolidated:getTree']">新增</el-button> | ||||||
|             > |             <span style="margin-left: 10px"><el-tooltip class="box-item" effect="dark" content="从原有模板列表选择新增" | ||||||
|             <span style="margin-left: 10px" |                 placement="top"> | ||||||
|               ><el-tooltip class="box-item" effect="dark" content="从原有模板列表选择新增" placement="top"> |                 <el-icon color="#409efc"> | ||||||
|                 <el-icon color="#409efc"><WarningFilled /></el-icon> </el-tooltip |                   <WarningFilled /> | ||||||
|             ></span> |                 </el-icon> </el-tooltip></span> | ||||||
|           </el-col> |           </el-col> | ||||||
|           <el-col :span="1.5" v-hasPermi="['formalities:listOfFormalities:list']"> |           <el-col :span="1.5" v-hasPermi="['formalities:listOfFormalities:list']"> | ||||||
|             <el-button type="primary" plain icon="Plus" @click="addTemplate()">新增数据</el-button> |             <el-button type="primary" plain icon="Plus" @click="addTemplate()">新增数据</el-button> | ||||||
|             <span style="margin-left: 10px"> |             <span style="margin-left: 10px"> | ||||||
|               <el-tooltip class="box-item" effect="dark" content="创建新模板并添加数据" placement="top"> |               <el-tooltip class="box-item" effect="dark" content="创建新模板并添加数据" placement="top"> | ||||||
|                 <el-icon color="#409efc"><WarningFilled /></el-icon> |                 <el-icon color="#409efc"> | ||||||
|  |                   <WarningFilled /> | ||||||
|  |                 </el-icon> | ||||||
|               </el-tooltip> |               </el-tooltip> | ||||||
|             </span> |             </span> | ||||||
|           </el-col> |           </el-col> | ||||||
| @ -78,7 +71,8 @@ | |||||||
|         </el-row> |         </el-row> | ||||||
|       </template> |       </template> | ||||||
|  |  | ||||||
|       <el-table v-loading="loading" :data="formalitiesAreConsolidatedList" @selection-change="handleSelectionChange" row-key="id" default-expand-all> |       <el-table v-loading="loading" :data="formalitiesAreConsolidatedList" @selection-change="handleSelectionChange" | ||||||
|  |         row-key="id" default-expand-all> | ||||||
|         <el-table-column type="selection" width="55" align="center" /> |         <el-table-column type="selection" width="55" align="center" /> | ||||||
|         <!-- <el-table-column label="手续办理清单模板父级" align="center" prop="formalitiesPname" /> --> |         <!-- <el-table-column label="手续办理清单模板父级" align="center" prop="formalitiesPname" /> --> | ||||||
|         <el-table-column label="手续办理清单" align="left" prop="formalitiesName" /> |         <el-table-column label="手续办理清单" align="left" prop="formalitiesName" /> | ||||||
| @ -101,51 +95,52 @@ | |||||||
|         <el-table-column label="办理状态" align="center" prop="processingStatus" /> |         <el-table-column label="办理状态" align="center" prop="processingStatus" /> | ||||||
|         <el-table-column label="手续材料" align="center" prop="formalitiesUrl" width="180"> |         <el-table-column label="手续材料" align="center" prop="formalitiesUrl" width="180"> | ||||||
|           <template #default="scope"> |           <template #default="scope"> | ||||||
|             <el-link type="primary" :underline="false" @click="handlePreview(scope.row)" target="_blank" v-if="scope.row.formalitiesPid" |             <div style="display: flex; justify-content: center; align-items: center;"> | ||||||
|               >查看</el-link |  | ||||||
|             > |  | ||||||
|  |               <div> | ||||||
|  |                 <el-link type="primary" :underline="false" @click="handlePreview(scope.row)" target="_blank" | ||||||
|  |                   v-if="scope.row.formalitiesPid">查看</el-link> | ||||||
|  |               </div> | ||||||
|  |               <div> | ||||||
|  |                 <el-badge v-if="scope.row.fileCount" :value="scope.row.fileCount" class="item" type="danger"> | ||||||
|  |                 </el-badge> | ||||||
|  |               </div> | ||||||
|  |             </div> | ||||||
|  |  | ||||||
|  |  | ||||||
|           </template> |           </template> | ||||||
|         </el-table-column> |         </el-table-column> | ||||||
|         <el-table-column label="备注" align="center" prop="remark" /> |         <el-table-column label="备注" align="center" prop="remark" /> | ||||||
|         <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> |         <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | ||||||
|           <template #default="scope"> |           <template #default="scope"> | ||||||
|             <div v-if="scope.row.formalitiesPid"> |             <div v-if="scope.row.formalitiesPid"> | ||||||
|               <el-button |               <el-button link type="primary" icon="Edit" v-if="scope.row.processingStatus != '已完成'" | ||||||
|                 link |  | ||||||
|                 type="primary" |  | ||||||
|                 icon="Edit" |  | ||||||
|                 v-if="scope.row.processingStatus != '已完成'" |  | ||||||
|                 @click="handleUpdate(scope.row)" |                 @click="handleUpdate(scope.row)" | ||||||
|                 v-hasPermi="['formalities:formalitiesAreConsolidated:edit']" |                 v-hasPermi="['formalities:formalitiesAreConsolidated:edit']">修改</el-button> | ||||||
|                 >修改</el-button |               <el-button link type="primary" icon="Upload" v-if="scope.row.processingStatus != '已完成'" | ||||||
|               > |                 @click="handleUpload(scope.row)">上传</el-button> | ||||||
|               <el-button link type="primary" icon="Upload" v-if="scope.row.processingStatus != '已完成'" @click="handleUpload(scope.row)" |               <el-button link type="primary" icon="EditPen" @click="handleUpdateStatus(scope.row)" | ||||||
|                 >上传</el-button |                 v-hasPermi="['formalities:formalitiesAreConsolidated:edit']">修改状态</el-button> | ||||||
|               > |  | ||||||
|               <el-button |  | ||||||
|                 link |  | ||||||
|                 type="primary" |  | ||||||
|                 icon="EditPen" |  | ||||||
|                 @click="handleUpdateStatus(scope.row)" |  | ||||||
|                 v-hasPermi="['formalities:formalitiesAreConsolidated:edit']" |  | ||||||
|                 >修改状态</el-button |  | ||||||
|               > |  | ||||||
|             </div> |             </div> | ||||||
|           </template> |           </template> | ||||||
|         </el-table-column> |         </el-table-column> | ||||||
|       </el-table> |       </el-table> | ||||||
|  |  | ||||||
|       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" /> |       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" | ||||||
|  |         v-model:limit="queryParams.pageSize" @pagination="getList" /> | ||||||
|     </el-card> |     </el-card> | ||||||
|     <!-- 添加或修改合规性手续合账对话框 --> |     <!-- 添加或修改合规性手续合账对话框 --> | ||||||
|     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body> |     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body> | ||||||
|       <el-form ref="formalitiesAreConsolidatedFormRef" :model="form" :rules="rules" label-width="160px"> |       <el-form ref="formalitiesAreConsolidatedFormRef" :model="form" :rules="rules" label-width="160px"> | ||||||
|         <el-form-item label="计划开始时间" prop="planTheStartTime"> |         <el-form-item label="计划开始时间" prop="planTheStartTime"> | ||||||
|           <el-date-picker clearable v-model="form.planTheStartTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择计划开始时间"> |           <el-date-picker clearable v-model="form.planTheStartTime" type="date" value-format="YYYY-MM-DD" | ||||||
|  |             placeholder="请选择计划开始时间"> | ||||||
|           </el-date-picker> |           </el-date-picker> | ||||||
|         </el-form-item> |         </el-form-item> | ||||||
|         <el-form-item label="计划完成时间" prop="planTheStartTime"> |         <el-form-item label="计划完成时间" prop="planTheStartTime"> | ||||||
|           <el-date-picker clearable v-model="form.planTheEndTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择计划完成时间"> |           <el-date-picker clearable v-model="form.planTheEndTime" type="date" value-format="YYYY-MM-DD" | ||||||
|  |             placeholder="请选择计划完成时间"> | ||||||
|           </el-date-picker> |           </el-date-picker> | ||||||
|         </el-form-item> |         </el-form-item> | ||||||
|         <el-form-item label="负责人" prop="head"> |         <el-form-item label="负责人" prop="head"> | ||||||
| @ -167,7 +162,8 @@ | |||||||
|       <el-table :data="fileList" style="width: 100%" border v-loading="fileLoading"> |       <el-table :data="fileList" style="width: 100%" border v-loading="fileLoading"> | ||||||
|         <el-table-column prop="fileName" label="文件" align="center"> |         <el-table-column prop="fileName" label="文件" align="center"> | ||||||
|           <template #default="scope"> |           <template #default="scope"> | ||||||
|             <el-link :key="scope.row.annexUrl" :href="scope.row.annexUrl" target="_blank" type="primary" :underline="false"> |             <el-link :key="scope.row.annexUrl" :href="scope.row.annexUrl" target="_blank" type="primary" | ||||||
|  |               :underline="false"> | ||||||
|               {{ scope.row.fileName || '查看文件' }} |               {{ scope.row.fileName || '查看文件' }} | ||||||
|             </el-link> |             </el-link> | ||||||
|           </template> |           </template> | ||||||
| @ -178,13 +174,8 @@ | |||||||
|           </template> |           </template> | ||||||
|         </el-table-column> |         </el-table-column> | ||||||
|       </el-table> |       </el-table> | ||||||
|       <pagination |       <pagination v-show="fileTotal > 0" :total="fileTotal" v-model:page="fileParams.pageNum" | ||||||
|         v-show="fileTotal > 0" |         v-model:limit="fileParams.pageSize" @pagination="getFileList" /> | ||||||
|         :total="fileTotal" |  | ||||||
|         v-model:page="fileParams.pageNum" |  | ||||||
|         v-model:limit="fileParams.pageSize" |  | ||||||
|         @pagination="getFileList" |  | ||||||
|       /> |  | ||||||
|       <template #footer> |       <template #footer> | ||||||
|         <span> |         <span> | ||||||
|           <el-button type="primary" @click="viewVisible = false">关闭</el-button> |           <el-button type="primary" @click="viewVisible = false">关闭</el-button> | ||||||
| @ -194,18 +185,9 @@ | |||||||
|     <!-- 上传文件对话框 --> |     <!-- 上传文件对话框 --> | ||||||
|     <el-dialog draggable title="上传文件" v-model="fileVisible" width="450"> |     <el-dialog draggable title="上传文件" v-model="fileVisible" width="450"> | ||||||
|       <el-form-item label="上传文件" prop="processingStatus"> |       <el-form-item label="上传文件" prop="processingStatus"> | ||||||
|         <file-upload |         <file-upload v-model="file" ref="uploadRef" uploadUrl="/formalities/formalitiesAnnex" | ||||||
|           v-model="file" |           v-hasPermi="['formalities:formalitiesAnnex:add']" :data="{ formalitiesId: form.id }" :fileType="['pdf']" | ||||||
|           ref="uploadRef" |           :auto-upload="false" showFileList method="put" :onUploadSuccess="handleUploadSuccess" /> | ||||||
|           uploadUrl="/formalities/formalitiesAnnex" |  | ||||||
|           v-hasPermi="['formalities:formalitiesAnnex:add']" |  | ||||||
|           :data="{ formalitiesId: form.id }" |  | ||||||
|           :fileType="['pdf']" |  | ||||||
|           :auto-upload="false" |  | ||||||
|           showFileList |  | ||||||
|           method="put" |  | ||||||
|           :onUploadSuccess="handleUploadSuccess" |  | ||||||
|         /> |  | ||||||
|       </el-form-item> |       </el-form-item> | ||||||
|       <template #footer> |       <template #footer> | ||||||
|         <span> |         <span> | ||||||
| @ -233,21 +215,19 @@ | |||||||
|     </el-dialog> |     </el-dialog> | ||||||
|     <el-dialog title="新增合规性手续合账" v-model="templateVisbile" width="450"> |     <el-dialog title="新增合规性手续合账" v-model="templateVisbile" width="450"> | ||||||
|       <el-form-item label="合规性手续模板"> |       <el-form-item label="合规性手续模板"> | ||||||
|         <el-cascader |         <el-cascader v-model="tempValue" :options="tempTreeList" :props="{ | ||||||
|           v-model="tempValue" |  | ||||||
|           :options="tempTreeList" |  | ||||||
|           :props="{ |  | ||||||
|           multiple: true, |           multiple: true, | ||||||
|           value: 'id', |           value: 'id', | ||||||
|           label: 'name', |           label: 'name', | ||||||
|           disabled: (node: any) => { |           disabled: (node: any) => { | ||||||
|             return (node.pid == 0 && !node.children.length) || node.status == 1; // 有 parent 的是二级,没有 parent 的是一级,禁用一级 |             return (node.pid == 0 && !node.children.length) || node.status == 1; // 有 parent 的是二级,没有 parent 的是一级,禁用一级 | ||||||
|           } |           } | ||||||
|           }" |         }" /> | ||||||
|         /> |  | ||||||
|         <div style="margin-left: 10px; display: flex; justify-content: center; align-items: center"> |         <div style="margin-left: 10px; display: flex; justify-content: center; align-items: center"> | ||||||
|           <el-tooltip class="box-item" effect="dark" content="列表上已选择得模版不可再选" placement="top"> |           <el-tooltip class="box-item" effect="dark" content="列表上已选择得模版不可再选" placement="top"> | ||||||
|             <el-icon><WarningFilled /></el-icon> |             <el-icon> | ||||||
|  |               <WarningFilled /> | ||||||
|  |             </el-icon> | ||||||
|           </el-tooltip> |           </el-tooltip> | ||||||
|         </div> |         </div> | ||||||
|       </el-form-item> |       </el-form-item> | ||||||
| @ -268,7 +248,8 @@ | |||||||
|             <el-option v-for="item in listOfFormalitiesList" :label="item.name" :value="item.id" /> |             <el-option v-for="item in listOfFormalitiesList" :label="item.name" :value="item.id" /> | ||||||
|           </el-select> |           </el-select> | ||||||
|         </el-form-item> |         </el-form-item> | ||||||
|         <el-form-item label="名称" prop="formalitiesName" :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]"> |         <el-form-item label="名称" prop="formalitiesName" | ||||||
|  |           :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]"> | ||||||
|           <el-input v-model="formTemplate.formalitiesName" placeholder="请输入名称" /> |           <el-input v-model="formTemplate.formalitiesName" placeholder="请输入名称" /> | ||||||
|         </el-form-item> |         </el-form-item> | ||||||
|       </el-form> |       </el-form> | ||||||
|  | |||||||
| @ -1,7 +1,9 @@ | |||||||
| <template> | <template> | ||||||
|   <formalitiesAreConsolidated ref="formalitiesAreConsolidatedRef" class="overlay" v-if="showFormalitiesAreConsolidated" /> |   <formalitiesAreConsolidated ref="formalitiesAreConsolidatedRef" class="overlay" | ||||||
|  |     v-if="showFormalitiesAreConsolidated" /> | ||||||
|   <div class="p-2" v-else> |   <div class="p-2" v-else> | ||||||
|     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave"> |     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" | ||||||
|  |       :leave-active-class="proxy?.animate.searchAnimate.leave"> | ||||||
|       <div v-show="showSearch" class="mb-[10px]"> |       <div v-show="showSearch" class="mb-[10px]"> | ||||||
|         <el-card shadow="hover"> |         <el-card shadow="hover"> | ||||||
|           <el-form ref="queryFormRef" :model="queryParams" :inline="true"> |           <el-form ref="queryFormRef" :model="queryParams" :inline="true"> | ||||||
| @ -21,22 +23,24 @@ | |||||||
|       <template #header> |       <template #header> | ||||||
|         <el-row :gutter="10" class="mb8"> |         <el-row :gutter="10" class="mb8"> | ||||||
|           <el-col :span="1.5"> |           <el-col :span="1.5"> | ||||||
|             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['formalities:listOfFormalities:add']">新增</el-button> |             <el-button type="primary" plain icon="Plus" @click="handleAdd" | ||||||
|  |               v-hasPermi="['formalities:listOfFormalities:add']">新增</el-button> | ||||||
|           </el-col> |           </el-col> | ||||||
|           <el-col :span="1.5"> |           <el-col :span="1.5"> | ||||||
|             <el-button type="primary" :disabled="multiple" plain icon="Plus" @click="handleOk" v-hasPermi="['formalities:listOfFormalities:add']" |             <el-button type="primary" :disabled="multiple" plain icon="Plus" @click="handleOk" | ||||||
|               >确认</el-button |               v-hasPermi="['formalities:listOfFormalities:add']">确认</el-button> | ||||||
|             > |  | ||||||
|           </el-col> |           </el-col> | ||||||
|           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> |           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> | ||||||
|         </el-row> |         </el-row> | ||||||
|       </template> |       </template> | ||||||
|  |  | ||||||
|       <el-table v-loading="loading" :data="listOfFormalitiesList" @selection-change="handleSelectionChange" row-key="id" default-expand-all> |       <el-table v-loading="loading" :data="listOfFormalitiesList" @selection-change="handleSelectionChange" row-key="id" | ||||||
|  |         default-expand-all> | ||||||
|         <el-table-column type="selection" width="55" align="center" /> |         <el-table-column type="selection" width="55" align="center" /> | ||||||
|         <el-table-column label="名称" prop="name" /> |         <el-table-column label="名称" prop="name" /> | ||||||
|       </el-table> |       </el-table> | ||||||
|       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" /> |       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" | ||||||
|  |         v-model:limit="queryParams.pageSize" @pagination="getList" /> | ||||||
|     </el-card> |     </el-card> | ||||||
|     <!-- 添加或修改手续办理清单模板对话框 --> |     <!-- 添加或修改手续办理清单模板对话框 --> | ||||||
|     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body> |     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body> | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user