新需求修改

src/components/TableModel/index.vue

@@ -183,8 +183,9 @@
             <el-table-column
                 align="center"
                 label="操作"
-                :min-width="dynamicWidth"
+                :width="dynamicWidth"
                 :show-overflow-tooltip="false"
+                class-name="operation-column"
                 v-if="handleShow && showOperation"
             >
                 <template slot-scope="{ row }">
@@ -431,9 +432,17 @@ export default {
                     this.total = res.total
                 }
                 this.loading = false
+                // 数据加载完成后，等待DOM更新后重新计算操作列宽度
+                this.$nextTick(() => {
+                    this.dynamicWidth = this.getOperatorWidth()
+                })
             } catch (error) {
                 this.loading = false
                 this.tableList = this.testTableList
+                // 即使出错，也尝试计算宽度
+                this.$nextTick(() => {
+                    this.dynamicWidth = this.getOperatorWidth()
+                })
             }
         },
         /** 查询按钮 */
@@ -513,25 +522,48 @@ export default {
                 document.getElementsByClassName('optionDivRef')
 
             // 默认宽度
-            let width = 100
+            let maxWidth = 100
-            // 内间距
-            let paddingSpacing = 0
-            // 按钮数量
-            let buttonCount = 0
 
             if (operatorColumn.length > 0) {
                 Array.prototype.forEach.call(operatorColumn, function (item) {
-                    // 最宽的宽度
-                    width = width > item.offsetWidth ? width : item.offsetWidth
                     const buttons = item.getElementsByClassName('el-button')
-                    buttonCount = buttons.length
+
-                    buttonCount =
+                    if (buttons.length > 0) {
-                        buttonCount > buttons.length
+                        // 方法1：使用第一个按钮到最后一个按钮的距离（最精确）
-                            ? buttonCount
+                        const firstButton = buttons[0]
-                            : buttons.length
+                        const lastButton = buttons[buttons.length - 1]
+
+                        const firstRect = firstButton.getBoundingClientRect()
+                        const lastRect = lastButton.getBoundingClientRect()
+
+                        // 计算从第一个按钮左边缘到最后一个按钮右边缘的总宽度
+                        const buttonGroupWidth = lastRect.right - firstRect.left
+
+                        // 方法2：使用容器的 scrollWidth（备选方案）
+                        const containerWidth = item.scrollWidth || 0
+
+                        // 取两者中的较大值，确保能容纳所有内容
+                        const contentWidth = Math.max(
+                            buttonGroupWidth,
+                            containerWidth,
+                        )
+
+                        maxWidth = Math.max(maxWidth, contentWidth)
+                    } else {
+                        // 如果没有按钮，使用 scrollWidth
+                        const contentWidth = item.scrollWidth || 0
+                        if (contentWidth > 0) {
+                            maxWidth = Math.max(maxWidth, contentWidth)
+                        }
+                    }
                 })
-                return width + 10
+
+                // 由于已经通过 CSS 将操作列的 padding 减少为左右各8px（共16px）
+                // 这里只添加必要的 padding，使按钮组正好容纳
+                return Math.ceil(maxWidth) + 16
             }
+
+            return maxWidth
         },
 
         queryTableList(params) {
@@ -623,6 +655,16 @@ export default {
     }
 }
 
+// 优化操作列的 padding，减少留白
+::v-deep .el-table {
+    .operation-column {
+        .cell {
+            padding-left: 8px !important;
+            padding-right: 8px !important;
+        }
+    }
+}
+
 .query-form {
     position: relative;
 }

src/views/basic-manage/project-manage/all-project/index.vue

@@ -53,6 +53,15 @@
             </template>
 
             <template slot="handle" slot-scope="{ data }">
+                <el-button
+                    plain
+                    size="mini"
+                    type="primary"
+                    icon="el-icon-document-copy"
+                    @click="onHandleHistoryRecord(data)"
+                >
+                    历史记录
+                </el-button>
                 <el-button
                     plain
                     size="mini"
@@ -86,7 +95,10 @@
             <template slot="outerContent">
                 <!-- 新增或修改表单 -->
                 <template
-                    v-if="dialogConfig.outerTitle !== '子项目(标段工程)概况'"
+                    v-if="
+                        dialogConfig.outerTitle !== '子项目(标段工程)概况' &&
+                        dialogConfig.outerTitle !== '历史记录'
+                    "
                 >
                     <el-form
                         label-width="100px"
@@ -155,6 +167,30 @@
                     </el-row>
                 </template>
 
+                <template v-else-if="dialogConfig.outerTitle === '历史记录'">
+                    <el-table :data="historyRecordList" style="width: 100%">
+                        <el-table-column label="序号" type="index" width="80" />
+                        <el-table-column
+                            show-overflow-tooltip
+                            align="center"
+                            prop="name"
+                            label="修改人"
+                        />
+                        <el-table-column
+                            show-overflow-tooltip
+                            align="center"
+                            prop="name"
+                            label="修改内容"
+                        />
+                        <el-table-column
+                            show-overflow-tooltip
+                            align="center"
+                            prop="createTime"
+                            label="创建时间"
+                        />
+                    </el-table>
+                </template>
+
                 <!-- 子项目(标段工程)概况 -->
                 <template v-else>
                     <el-table :data="lotProjectList">
@@ -239,6 +275,7 @@ export default {
             subIsDisabled: false, // 所属分公司是否禁用
             lotProjectList: [], // 子项目(标段工程)概况
             branchCompanyOptions: [], // 分公司下拉列表
+            historyRecordList: [], // 历史记录
             // 新增或修改表单
             addOrEditForm: {
                 subComId: '', // 所属分公司id
@@ -296,6 +333,9 @@ export default {
 
         // 新增或修改
         onHandleAddOrEditAllProject(type, data) {
+            this.dialogConfig.outerWidth = '40%'
+            this.dialogConfig.minHeight = ''
+            this.dialogConfig.maxHeight = ''
             this.getCurrentCompanyIdAndLevel() // 获取当前用户的公司id和公司级别
             this.dialogConfig.outerTitle =
                 type === 1 ? '新增总工程' : '修改总工程'
@@ -390,7 +430,10 @@ export default {
 
         // 关闭弹框
         handleCloseDialogOuter() {
-            if (this.dialogConfig.outerTitle !== '子项目(标段工程)概况') {
+            if (
+                this.dialogConfig.outerTitle !== '子项目(标段工程)概况' &&
+                this.dialogConfig.outerTitle !== '历史记录'
+            ) {
                 this.$refs.addOrEditFormRef.resetFields()
                 this.addOrEditForm = {
                     id: '',
@@ -440,6 +483,16 @@ export default {
 
             this.subIsDisabled = companyLevel === '分公司级'
         },
+
+        // 历史记录
+        onHandleHistoryRecord(data) {
+            console.log(data)
+            this.dialogConfig.outerWidth = '60%'
+            this.dialogConfig.minHeight = '60vh'
+            this.dialogConfig.maxHeight = '90vh'
+            this.dialogConfig.outerTitle = '历史记录'
+            this.dialogConfig.outerVisible = true
+        },
     },
 }
 </script>

src/views/basic-manage/project-manage/dept-project/index.vue

@@ -53,6 +53,15 @@
             </template>
 
             <template slot="handle" slot-scope="{ data }">
+                <el-button
+                    plain
+                    size="mini"
+                    type="primary"
+                    icon="el-icon-document-copy"
+                    @click="onHandleHistoryRecord(data)"
+                >
+                    历史记录
+                </el-button>
                 <el-button
                     plain
                     size="mini"
@@ -86,7 +95,10 @@
             <template slot="outerContent">
                 <!-- 新增或修改表单 -->
                 <template
-                    v-if="dialogConfig.outerTitle !== '子项目(标段工程)概况'"
+                    v-if="
+                        dialogConfig.outerTitle !== '子项目(标段工程)概况' &&
+                        dialogConfig.outerTitle !== '历史记录'
+                    "
                 >
                     <el-form
                         label-width="100px"
@@ -157,6 +169,30 @@
                     </el-row>
                 </template>
 
+                <template v-else-if="dialogConfig.outerTitle === '历史记录'">
+                    <el-table :data="historyRecordList" style="width: 100%">
+                        <el-table-column label="序号" type="index" width="80" />
+                        <el-table-column
+                            show-overflow-tooltip
+                            align="center"
+                            prop="name"
+                            label="修改人"
+                        />
+                        <el-table-column
+                            show-overflow-tooltip
+                            align="center"
+                            prop="name"
+                            label="修改内容"
+                        />
+                        <el-table-column
+                            show-overflow-tooltip
+                            align="center"
+                            prop="createTime"
+                            label="创建时间"
+                        />
+                    </el-table>
+                </template>
+
                 <!-- 子项目(标段工程)概况 -->
                 <template v-else>
                     <el-table :data="lotProjectList">
@@ -239,6 +275,7 @@ export default {
             getDeptProjectListAPI,
             subIsDisabled: false, // 所属分公司是否禁用
             lotProjectList: [], // 子项目(标段工程)概况
+            historyRecordList: [], // 历史记录
             branchCompanyOptions: [], // 所属分公司
 
             // 新增或修改表单
@@ -377,7 +414,10 @@ export default {
 
         // 关闭弹框
         handleCloseDialogOuter() {
-            if (this.dialogConfig.outerTitle !== '子项目(标段工程)概况') {
+            if (
+                this.dialogConfig.outerTitle !== '子项目(标段工程)概况' &&
+                this.dialogConfig.outerTitle !== '历史记录'
+            ) {
                 this.addOrEditForm = {
                     subComId: '',
                     orgName: '',
@@ -422,6 +462,16 @@ export default {
 
             this.subIsDisabled = companyLevel === '分公司级'
         },
+
+        // 历史记录
+        onHandleHistoryRecord(data) {
+            console.log(data)
+            this.dialogConfig.outerWidth = '60%'
+            this.dialogConfig.minHeight = '60vh'
+            this.dialogConfig.maxHeight = '90vh'
+            this.dialogConfig.outerTitle = '历史记录'
+            this.dialogConfig.outerVisible = true
+        },
     },
 
     async created() {

src/views/basic-manage/project-manage/lot-project/add-or-edit-form.vue

@@ -126,11 +126,13 @@
                             style="width: 100%"
                             placeholder="请选择"
                             v-model="addOrEditForm.isShanghai"
+                            @change="onHandleChangeIsShanghai"
                         >
                             <el-option
                                 :key="item.value"
                                 :label="item.label"
-                                :value="item.value"
+                                :value="item.value * 1"
+                                :disabled="isOptionDisabled(item.value)"
                                 v-for="item in dict.type.project_action"
                             />
                         </el-select>
@@ -286,6 +288,8 @@ export default {
                 simpleName: '', // 标段工程简称
             },
             isShanghaiOptions: [],
+            // 保存编辑时的原始工程所在地值，用于判断是否可以修改
+            originalIsShanghai: null,
             addOrEditFormRules: {
                 mainProId: [
                     {
@@ -478,6 +482,25 @@ export default {
             this.addOrEditForm.subComId = node.parentId
             this.addOrEditForm.orgId = node.id
         },
+
+        // 选择工程所在地
+        onHandleChangeIsShanghai(val) {
+            console.log(val)
+        },
+
+        // 判断选项是否应该被禁用
+
+        isOptionDisabled(optionValue) {
+            if (this.formType === 1) {
+                return false
+            }
+            const originalValue = Number(this.originalIsShanghai)
+            const currentOptionValue = Number(optionValue)
+            if (originalValue === 1 || originalValue === 2) {
+                return currentOptionValue === 3
+            }
+            return false
+        },
     },
 
     watch: {
@@ -502,6 +525,9 @@ export default {
                         simpleName,
                     } = newVal
 
+                    // 保存原始工程所在地值，用于判断是否可以修改
+                    this.originalIsShanghai = isShanghai
+
                     this.addOrEditForm = {
                         id,
                         lon,
@@ -519,6 +545,9 @@ export default {
                         isShanghai,
                         simpleName,
                     }
+                } else {
+                    // 新增时，重置原始值
+                    this.originalIsShanghai = null
                 }
             },
             deep: true,

src/views/basic-manage/project-manage/lot-project/index.vue

@@ -46,6 +46,15 @@
             </template>
 
             <template slot="handle" slot-scope="{ data }">
+                <el-button
+                    plain
+                    size="mini"
+                    type="primary"
+                    icon="el-icon-document-copy"
+                    @click="onHandleHistoryRecord(data)"
+                >
+                    历史记录
+                </el-button>
                 <el-button
                     plain
                     size="mini"
@@ -84,12 +93,37 @@
             @closeDialogOuter="handleCloseDialogOuter"
         >
             <template slot="outerContent">
-                <AddOrEditForm
+                <template v-if="dialogConfig.outerTitle !== '历史记录'">
-                    :formType="formType"
+                    <AddOrEditForm
-                    :editFormData="editFormData"
+                        :formType="formType"
-                    ref="addOrEditLotProjectFormRef"
+                        :editFormData="editFormData"
-                />
+                        ref="addOrEditLotProjectFormRef"
+                    />
+                </template>
 
+                <template v-else-if="dialogConfig.outerTitle === '历史记录'">
+                    <el-table :data="historyRecordList" style="width: 100%">
+                        <el-table-column label="序号" type="index" width="80" />
+                        <el-table-column
+                            show-overflow-tooltip
+                            align="center"
+                            prop="name"
+                            label="修改人"
+                        />
+                        <el-table-column
+                            show-overflow-tooltip
+                            align="center"
+                            prop="name"
+                            label="修改内容"
+                        />
+                        <el-table-column
+                            show-overflow-tooltip
+                            align="center"
+                            prop="createTime"
+                            label="创建时间"
+                        />
+                    </el-table>
+                </template>
                 <el-row class="dialog-footer-btn">
                     <el-button size="medium" @click="handleCloseDialogOuter">
                         取消
@@ -143,6 +177,7 @@ export default {
             dialogConfig,
             editFormData: {}, // 编辑表单数据
             getLotLotProjectListAPI, // 获取标段工程列表
+            historyRecordList: [], // 历史记录
         }
     },
     methods: {
@@ -160,6 +195,7 @@ export default {
         // 新增或修改
         onHandleAddOrEditLotProject(type, data, title) {
             this.formType = type
+            this.dialogConfig.outerWidth = '70%'
             this.dialogConfig.outerTitle = `${title}标段工程`
             if (type === 2) {
                 Object.assign(this.editFormData, data)
@@ -303,9 +339,20 @@ export default {
 
         // 关闭弹框
         handleCloseDialogOuter() {
-            this.$refs.addOrEditLotProjectFormRef.resetForm()
+            if (this.dialogConfig.outerTitle !== '历史记录') {
+                this.$refs.addOrEditLotProjectFormRef.resetForm()
+            }
             this.dialogConfig.outerVisible = false
         },
+        // 历史记录
+        onHandleHistoryRecord(data) {
+            console.log(data)
+            this.dialogConfig.outerTitle = '历史记录'
+            this.dialogConfig.outerWidth = '60%'
+            this.dialogConfig.minHeight = '60vh'
+            this.dialogConfig.maxHeight = '90vh'
+            this.dialogConfig.outerVisible = true
+        },
     },
 
     async created() {

src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue

@@ -268,7 +268,6 @@
                             placeholder="请选择工种"
                             @change="onChangePostId"
                             v-model="keyInfoForm.postId"
-                            :disabled="formType === 2 && einStatus == 1"
                         >
                             <el-option
                                 :key="item.value"

src/views/system/basic-type-config/divide-company-manage/index.vue

@@ -35,6 +35,15 @@
             </template>
 
             <template slot="handle" slot-scope="{ data }">
+                <el-button
+                    plain
+                    size="mini"
+                    type="primary"
+                    icon="el-icon-document-copy"
+                    @click="onHandleHistoryRecord(data)"
+                >
+                    历史记录
+                </el-button>
                 <el-button
                     plain
                     size="mini"
@@ -62,66 +71,101 @@
             @closeDialogOuter="handleCloseDialogOuter"
         >
             <template slot="outerContent">
-                <el-form
+                <template
-                    label-width="140px"
+                    v-if="
-                    ref="addOrEditFormRef"
+                        dialogConfig.outerTitle === '新增' ||
-                    :model="addOrEditForm"
+                        dialogConfig.outerTitle === '修改'
-                    :rules="addOrEditFormRules"
+                    "
                 >
-                    <el-form-item label="所属公司" prop="comId">
+                    <el-form
-                        <el-select
+                        label-width="140px"
-                            clearable
+                        ref="addOrEditFormRef"
-                            filterable
+                        :model="addOrEditForm"
-                            style="width: 100%"
+                        :rules="addOrEditFormRules"
-                            placeholder="请选择所属公司"
+                    >
-                            v-model="addOrEditForm.comId"
+                        <el-form-item label="所属公司" prop="comId">
-                            :disabled="dialogConfig.outerTitle === '修改'"
+                            <el-select
-                        >
+                                clearable
-                            <el-option
+                                filterable
-                                :key="item.id"
+                                style="width: 100%"
-                                :value="item.id"
+                                placeholder="请选择所属公司"
-                                :label="item.companyName"
+                                v-model="addOrEditForm.comId"
-                                v-for="item in companySelectList"
+                                :disabled="dialogConfig.outerTitle === '修改'"
+                            >
+                                <el-option
+                                    :key="item.id"
+                                    :value="item.id"
+                                    :label="item.companyName"
+                                    v-for="item in companySelectList"
+                                />
+                            </el-select>
+                        </el-form-item>
+
+                        <el-form-item label="分公司名称" prop="subCompanyName">
+                            <el-input
+                                clearable
+                                maxlength="60"
+                                show-word-limit
+                                placeholder="请输入分公司名称"
+                                v-model="addOrEditForm.subCompanyName"
                             />
-                        </el-select>
+                        </el-form-item>
-                    </el-form-item>
 
-                    <el-form-item label="分公司名称" prop="subCompanyName">
+                        <el-form-item label="状态" prop="isEnable">
-                        <el-input
+                            <el-radio-group
-                            clearable
+                                size="mini"
-                            maxlength="60"
+                                v-model="addOrEditForm.isEnable"
-                            show-word-limit
+                            >
-                            placeholder="请输入分公司名称"
+                                <el-radio-button :label="1">
-                            v-model="addOrEditForm.subCompanyName"
+                                    启用
+                                </el-radio-button>
+                                <el-radio-button :label="0">
+                                    禁用
+                                </el-radio-button>
+                            </el-radio-group>
+                        </el-form-item>
+
+                        <el-row class="dialog-footer-btn">
+                            <el-button
+                                size="medium"
+                                @click="handleCloseDialogOuter"
+                            >
+                                取消
+                            </el-button>
+                            <el-button
+                                size="medium"
+                                type="primary"
+                                @click="onHandleConfirmAddOrEdit"
+                            >
+                                确定
+                            </el-button>
+                        </el-row>
+                    </el-form>
+                </template>
+
+                <template v-if="dialogConfig.outerTitle === '历史记录'">
+                    <el-table :data="historyRecordList" style="width: 100%">
+                        <el-table-column label="序号" type="index" width="80" />
+                        <el-table-column
+                            show-overflow-tooltip
+                            align="center"
+                            prop="name"
+                            label="修改人"
                         />
-                    </el-form-item>
+                        <el-table-column
-
+                            show-overflow-tooltip
-                    <el-form-item label="状态" prop="isEnable">
+                            align="center"
-                        <el-radio-group
+                            prop="name"
-                            size="mini"
+                            label="修改内容"
-                            v-model="addOrEditForm.isEnable"
+                        />
-                        >
+                        <el-table-column
-                            <el-radio-button :label="1"> 启用 </el-radio-button>
+                            show-overflow-tooltip
-                            <el-radio-button :label="0"> 禁用 </el-radio-button>
+                            align="center"
-                        </el-radio-group>
+                            prop="createTime"
-                    </el-form-item>
+                            label="创建时间"
-
+                        />
-                    <el-row class="dialog-footer-btn">
+                    </el-table>
-                        <el-button
+                </template>
-                            size="medium"
-                            @click="handleCloseDialogOuter"
-                        >
-                            取消
-                        </el-button>
-                        <el-button
-                            size="medium"
-                            type="primary"
-                            @click="onHandleConfirmAddOrEdit"
-                        >
-                            确定
-                        </el-button>
-                    </el-row>
-                </el-form>
             </template>
         </DialogModel>
     </div>
@@ -194,7 +238,9 @@ export default {
         // 新增或修改
         onHandleAddOrEditJobType(type, data) {
             this.dialogConfig.outerTitle = type === 1 ? '新增' : '修改'
-
+            this.dialogConfig.outerWidth = '40%'
+            this.dialogConfig.minHeight = ''
+            this.dialogConfig.maxHeight = ''
             if (type === 2) {
                 const { comId, subCompanyName, isEnable, id } = data
                 this.addOrEditForm = { comId, subCompanyName, isEnable, id }
@@ -278,6 +324,16 @@ export default {
                 }
             })
         },
+
+        // 历史记录
+        onHandleHistoryRecord(data) {
+            console.log(data)
+            this.dialogConfig.outerWidth = '60%'
+            this.dialogConfig.minHeight = '60vh'
+            this.dialogConfig.maxHeight = '90vh'
+            this.dialogConfig.outerTitle = '历史记录'
+            this.dialogConfig.outerVisible = true
+        },
     },
 
     created() {