合并

2025-09-06 19:18:50 +08:00
parent 4f21a81706 5101dc7657
commit 38cf536f1b
5 changed files with 116 additions and 120 deletions
--- a/.env.development
+++ b/.env.development
@ -7,8 +7,12 @@ VITE_APP_ENV = 'development'
 # 开发环境
 VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 # 李陈杰 209
+<<<<<<< HEAD
+VITE_APP_BASE_API = 'http://192.168.110.210:8899'
+=======

 # VITE_APP_BASE_API = 'http://192.168.110.209:8899'
+>>>>>>> 3e4b85fc48f6514704aee4b444285b90935b0cd2
 # 曾涛

 # 罗成
--- a/src/views/ctr/index.vue
+++ b/src/views/ctr/index.vue
@ -24,7 +24,8 @@
            </el-form-item>
            <el-form-item label="合同类型" prop="contractType">
              <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-form-item>
            <el-form-item label="业主单位" prop="contractOwner">
@ -37,17 +38,15 @@
              <editor v-model="form.contractedContent" :min-height="192" />
            </el-form-item>
            <el-form-item label="合同金额" prop="amount">
-              <el-input
-                v-model="form.amount"
-                placeholder="请输入合同金额"
-                oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-              />
+              <el-input v-model="form.amount" placeholder="请输入合同金额"
+                oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
            </el-form-item>
            <el-form-item label="备注" prop="remark">
              <el-input v-model="form.remark" placeholder="请输入备注" />
            </el-form-item>
            <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>
        </template>
@ -61,35 +60,36 @@
            </el-form-item>
            <el-form-item label="合同类型" prop="contractType">
              <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-form-item>
            <el-form-item label="招标计划" prop="tenderId">
              <!-- <el-input v-model="form.tenderId" placeholder="请输入招标Id" /> -->
              <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 label="供应商" prop="contractSupplier">
              <el-input v-model="form.contractSupplier" placeholder="请输入供应商" disabled />
            </el-form-item>
            <el-form-item label="分包内容">
              <!-- <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 label="合同金额" prop="amount">
              <el-input
                oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
-                v-model="form.amount"
-                placeholder="请输入合同金额"
-                disabled
-              />
+                v-model="form.amount" placeholder="请输入合同金额" disabled />
            </el-form-item>

            <el-form-item label="备注" prop="remark">
              <el-input v-model="form.remark" placeholder="请输入备注" />
            </el-form-item>
            <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>
        </template>
@ -280,7 +280,6 @@ const resetForm = () => {
  };
  fileList.value = [];
  tempFileList.value = [];
-  contract_type.value = '';
  setTimeout(() => {
    localStorage.removeItem('tempContractForm');
  }, 0);
@ -399,6 +398,7 @@ const getInfoByProjectIdList = async () => {
  form.value.contractOwner = res.data.planDuration;
 };
 onMounted(() => {
+  contract_type.value = '';
  getInfoByProjectIdList();

  const tempForm = localStorage.getItem('tempContractForm');
--- a/src/views/design/volumeCatalog/index.vue
+++ b/src/views/design/volumeCatalog/index.vue
@ -68,6 +68,7 @@
            <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['design:volumeCatalog:listFile']"
              >查看文件</el-button
            >
+            <el-badge v-if="scope.row.fileCount" :value="scope.row.fileCount" class="item" type="danger"> </el-badge>
          </template>
        </el-table-column>
        <el-table-column label="外部意见" align="center">
@ -171,8 +172,8 @@
    <!-- 查看文件列表 -->
    <el-dialog draggable title="图纸列表" v-model="viewVisible" width="1000px">
      <el-tabs type="border-card" v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane label="蓝图" name="3"
-          ><TableContent :data="fileList" :wf-business-status="wf_business_status">
+        <el-tab-pane label="蓝图" name="3">
+          <TableContent :data="fileList" :wf-business-status="wf_business_status">
            <template #operation="{ row }">
              <el-button
                link
@ -195,10 +196,10 @@
                >查看单据</el-button
              >
            </template>
-          </TableContent></el-tab-pane
-        >
-        <el-tab-pane label="过程图纸 " name="1"
-          ><TableContent :data="fileList" :wf-business-status="wf_business_status">
+          </TableContent>
+        </el-tab-pane>
+        <el-tab-pane label="过程图纸 " name="1">
+          <TableContent :data="fileList" :wf-business-status="wf_business_status">
            <template #operation="{ row }">
              <el-button link type="primary" icon="edit" @click="handleAudit(row)" v-if="row.auditStatus == 'draft' || row.auditStatus == 'back'"
                >审核</el-button
@ -216,15 +217,15 @@
                >查看单据</el-button
              >
            </template>
-          </TableContent></el-tab-pane
-        >
-        <el-tab-pane label="作废 " name="4"
-          ><TableContent :data="fileList" :wf-business-status="wf_business_status">
+          </TableContent>
+        </el-tab-pane>
+        <el-tab-pane label="作废 " name="4">
+          <TableContent :data="fileList" :wf-business-status="wf_business_status">
            <template #operation="{ row }">
              <el-button type="danger" link icon="Download" @click="handleDownload(row)"> 下载 </el-button>
            </template>
-          </TableContent></el-tab-pane
-        >
+          </TableContent>
+        </el-tab-pane>
      </el-tabs>
      <template #footer>
        <span>
@ -699,6 +700,7 @@ onUnmounted(() => {
    border-collapse: collapse; //合并为一个单一的边框
    border-color: rgba(199, 199, 199, 1); //边框颜色按实际自定义即可
  }
+
  thead {
    tr {
      th {
@ -708,16 +710,19 @@ onUnmounted(() => {
        letter-spacing: 5px;
        padding: 15px;
      }
+
      td {
        text-align: left;
        height: 35px; //设置单元格最小高度
        padding: 15px;
      }
+
      .th-bg {
        background-color: rgba(247, 247, 247, 1);
      }
    }
  }
+
  tbody {
    tr {
      td {
@ -725,6 +730,7 @@ onUnmounted(() => {
        height: 40px; //设置单元格最小高度
        padding: 15px;
      }
+
      th {
        height: 35px; //设置单元格最小高度
        text-align: center;
@ -733,6 +739,7 @@ onUnmounted(() => {
      }
    }
  }
+
  .table-content {
    box-shadow: 0px 0px 10px #ddd;
    padding: 20px;
--- a/src/views/formalities/formalitiesAreConsolidated/index.vue
+++ b/src/views/formalities/formalitiesAreConsolidated/index.vue
@ -1,6 +1,7 @@
 <template>
  <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]">
        <el-card shadow="hover">
          <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-form-item> -->
            <el-form-item label="计划开始时间" prop="planTheStartTime">
-              <el-date-picker
-                clearable
-                v-model="queryParams.planTheStartTime"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择计划开始时间"
-              />
+              <el-date-picker clearable v-model="queryParams.planTheStartTime" type="date" value-format="YYYY-MM-DD"
+                placeholder="请选择计划开始时间" />
            </el-form-item>
            <el-form-item label="负责人" prop="head">
              <el-input v-model="queryParams.head" placeholder="请输入负责人" clearable @keyup.enter="handleQuery" />
            </el-form-item>
            <el-form-item label="实际完成时间" prop="actualCompletionTime">
-              <el-date-picker
-                clearable
-                v-model="queryParams.actualCompletionTime"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择实际完成时间"
-              />
+              <el-date-picker clearable v-model="queryParams.actualCompletionTime" type="date" value-format="YYYY-MM-DD"
+                placeholder="请选择实际完成时间" />
            </el-form-item>
            <!-- <el-form-item label="手续材料" prop="formalitiesUrl">
              <el-input v-model="queryParams.formalitiesUrl" placeholder="请输入手续材料" clearable @keyup.enter="handleQuery" />
@ -47,19 +38,21 @@
      <template #header>
        <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['formalities:formalitiesAreConsolidated:getTree']"
-              >新增</el-button
-            >
-            <span style="margin-left: 10px"
-              ><el-tooltip class="box-item" effect="dark" content="从原有模板列表选择新增" placement="top">
-                <el-icon color="#409efc"><WarningFilled /></el-icon> </el-tooltip
-            ></span>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd()"
+              v-hasPermi="['formalities:formalitiesAreConsolidated:getTree']">新增</el-button>
+            <span style="margin-left: 10px"><el-tooltip class="box-item" effect="dark" content="从原有模板列表选择新增"
+                placement="top">
+                <el-icon color="#409efc">
+                  <WarningFilled />
+                </el-icon> </el-tooltip></span>
          </el-col>
          <el-col :span="1.5" v-hasPermi="['formalities:listOfFormalities:list']">
            <el-button type="primary" plain icon="Plus" @click="addTemplate()">新增数据</el-button>
            <span style="margin-left: 10px">
              <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>
            </span>
          </el-col>
@ -78,7 +71,8 @@
        </el-row>
      </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 label="手续办理清单模板父级" align="center" prop="formalitiesPname" /> -->
        <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="formalitiesUrl" width="180">
          <template #default="scope">
-            <el-link type="primary" :underline="false" @click="handlePreview(scope.row)" target="_blank" v-if="scope.row.formalitiesPid"
-              >查看</el-link
-            >
+            <div style="display: flex; justify-content: center; align-items: center;">
+
+
+              <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>
        </el-table-column>
        <el-table-column label="备注" align="center" prop="remark" />
        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
          <template #default="scope">
            <div v-if="scope.row.formalitiesPid">
-              <el-button
-                link
-                type="primary"
-                icon="Edit"
-                v-if="scope.row.processingStatus != '已完成'"
+              <el-button link type="primary" icon="Edit" v-if="scope.row.processingStatus != '已完成'"
                @click="handleUpdate(scope.row)"
-                v-hasPermi="['formalities:formalitiesAreConsolidated:edit']"
-                >修改</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="EditPen"
-                @click="handleUpdateStatus(scope.row)"
-                v-hasPermi="['formalities:formalitiesAreConsolidated:edit']"
-                >修改状态</el-button
-              >
+                v-hasPermi="['formalities:formalitiesAreConsolidated:edit']">修改</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="EditPen" @click="handleUpdateStatus(scope.row)"
+                v-hasPermi="['formalities:formalitiesAreConsolidated:edit']">修改状态</el-button>
            </div>
          </template>
        </el-table-column>
      </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-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-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-form-item>
        <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-form-item>
        <el-form-item label="负责人" prop="head">
@ -167,7 +162,8 @@
      <el-table :data="fileList" style="width: 100%" border v-loading="fileLoading">
        <el-table-column prop="fileName" label="文件" align="center">
          <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 || '查看文件' }}
            </el-link>
          </template>
@ -178,13 +174,8 @@
          </template>
        </el-table-column>
      </el-table>
-      <pagination
-        v-show="fileTotal > 0"
-        :total="fileTotal"
-        v-model:page="fileParams.pageNum"
-        v-model:limit="fileParams.pageSize"
-        @pagination="getFileList"
-      />
+      <pagination v-show="fileTotal > 0" :total="fileTotal" v-model:page="fileParams.pageNum"
+        v-model:limit="fileParams.pageSize" @pagination="getFileList" />
      <template #footer>
        <span>
          <el-button type="primary" @click="viewVisible = false">关闭</el-button>
@ -194,18 +185,9 @@
    <!-- 上传文件对话框 -->
    <el-dialog draggable title="上传文件" v-model="fileVisible" width="450">
      <el-form-item label="上传文件" prop="processingStatus">
-        <file-upload
-          v-model="file"
-          ref="uploadRef"
-          uploadUrl="/formalities/formalitiesAnnex"
-          v-hasPermi="['formalities:formalitiesAnnex:add']"
-          :data="{ formalitiesId: form.id }"
-          :fileType="['pdf']"
-          :auto-upload="false"
-          showFileList
-          method="put"
-          :onUploadSuccess="handleUploadSuccess"
-        />
+        <file-upload v-model="file" ref="uploadRef" 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>
      <template #footer>
        <span>
@ -233,21 +215,19 @@
    </el-dialog>
    <el-dialog title="新增合规性手续合账" v-model="templateVisbile" width="450">
      <el-form-item label="合规性手续模板">
-        <el-cascader
-          v-model="tempValue"
-          :options="tempTreeList"
-          :props="{
+        <el-cascader v-model="tempValue" :options="tempTreeList" :props="{
          multiple: true,
          value: 'id',
          label: 'name',
          disabled: (node: any) => {
            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">
          <el-tooltip class="box-item" effect="dark" content="列表上已选择得模版不可再选" placement="top">
-            <el-icon><WarningFilled /></el-icon>
+            <el-icon>
+              <WarningFilled />
+            </el-icon>
          </el-tooltip>
        </div>
      </el-form-item>
@ -268,7 +248,8 @@
            <el-option v-for="item in listOfFormalitiesList" :label="item.name" :value="item.id" />
          </el-select>
        </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-form-item>
      </el-form>
--- a/src/views/formalities/listOfFormalities/index.vue
+++ b/src/views/formalities/listOfFormalities/index.vue
@ -1,7 +1,9 @@
 <template>
-  <formalitiesAreConsolidated ref="formalitiesAreConsolidatedRef" class="overlay" v-if="showFormalitiesAreConsolidated" />
+  <formalitiesAreConsolidated ref="formalitiesAreConsolidatedRef" class="overlay"
+    v-if="showFormalitiesAreConsolidated" />
  <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]">
        <el-card shadow="hover">
          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@ -21,22 +23,24 @@
      <template #header>
        <el-row :gutter="10" class="mb8">
          <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 :span="1.5">
-            <el-button type="primary" :disabled="multiple" plain icon="Plus" @click="handleOk" v-hasPermi="['formalities:listOfFormalities:add']"
-              >确认</el-button
-            >
+            <el-button type="primary" :disabled="multiple" plain icon="Plus" @click="handleOk"
+              v-hasPermi="['formalities:listOfFormalities:add']">确认</el-button>
          </el-col>
          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
        </el-row>
      </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 label="名称" prop="name" />
      </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-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>