haozq
/
ah_jjzhgd_webservice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整工序计划和边带管理

This commit is contained in:
cool 2024-03-30 14:02:40 +08:00
parent 74e23774b7
commit 1af9b8d018
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ah-jjzhgd-web/src/views/basic/progress/components/ProcessTable2.vue
View File

@ -41,7 +41,8 @@
<el-table-column label="计划结束时间" align="center" prop="planEndTime" />
<el-table-column label="实际开始时间" align="center" prop="startTime" />
<el-table-column label="实际结束时间" align="center" prop="endTime" />
<el-table-column label="进度占比" align="center" prop="gxWeight" />
<el-table-column label="权重" align="center" prop="gxWeight" />
<el-table-column label="当前进度" align="center" prop="planProgress" />
<el-table-column label="延迟原因" align="center" prop="delaReason" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
<template slot-scope="{ row, $index }">
@ -102,6 +103,7 @@
</el-table-column>
<el-table-column :label="`${title}名称`" align="center" prop="gxName" />
<el-table-column label="工序进度" align="center" prop="gxProgress" />
<el-table-column v-if="title === '杆塔'" label="工序名称" align="center" prop="gxName" />
<el-table-column label="填报时间" align="center" prop="createTime" />
</el-table>
@ -122,7 +124,7 @@
label-width="120px"
>
<el-form-item label="当前工序" prop="nowGxId">
<el-select v-model="temp.nowGxId" placeholder="当前工序" style="width: 100%">
<el-select v-model="temp.nowGxId" :disabled="processType === '变电'" placeholder="当前工序" style="width: 100%">
<el-option v-for="item in typeList" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
</el-form-item>
@ -288,6 +290,9 @@ export default {
// 新增
handleCreateProcess() {
this.dialogStatus = 'create'
if (this.processType === '变电' && this.temp.gxId) {
this.temp.nowGxId = this.temp.gxId
}
this.dialogFormVisible = true
},
createData() {
@ -303,8 +308,6 @@ export default {
})
this.dialogFormVisible = false
this.getList2()
}).finally(() => {
// this.dialogFormVisible = false
})
}
})

18
ah-jjzhgd-web/src/views/device/sideband/index.vue
View File

@ -41,7 +41,7 @@
<el-table-column label="边带名称" align="center" prop="bdName" />
<el-table-column label="边带编码" align="center" prop="bdCode" />
<el-table-column label="边带IP" align="center" prop="bdIp" />
<el-table-column label="边带类型名称" align="center" prop="bdTypeName" />
<!-- <el-table-column label="边带类型名称" align="center" prop="bdTypeName" />-->
<el-table-column label="杆塔名称" align="center" prop="gtName" />
<el-table-column label="工程名称" align="center" prop="proName" />
<el-table-column label="绑定时间" align="center" prop="bindTime" />
@ -80,12 +80,12 @@
<el-form-item label="边带IP：" prop="bdIp">
<el-input v-model="temp.bdIp" placeholder="边带IP" :maxlength="50" />
</el-form-item>
<el-form-item label="边带类型：" prop="bdType">
<SidebandTypeSelect :bind-value.sync="temp.bdType" />
</el-form-item>
<el-form-item label="设备类型：" prop="typeCode">
<DeviceSelect :bind-value.sync="temp.typeCode" />
</el-form-item>
<!-- <el-form-item label="边带类型：" prop="bdType">-->
<!-- <SidebandTypeSelect :bind-value.sync="temp.bdType" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="设备类型：" prop="typeCode">-->
<!-- <DeviceSelect :bind-value.sync="temp.typeCode" />-->
<!-- </el-form-item>-->
<el-form-item label="标段编码：" prop="bidCode">
<ProjectSelect :bind-type.sync="currentProjectType" :bind-value.sync="temp.bidCode" @change="handleProjectChange" />
</el-form-item>
@ -173,8 +173,8 @@ export default {
bdName: [{ required: true, message: '不能为空', trigger: 'blur' }],
bdCode: [{ required: true, message: '不能为空', trigger: 'blur' }],
bdIp: [{ required: true, message: '不能为空', trigger: 'blur' }],
bdType: [{ required: true, message: '不能为空', trigger: 'change' }],
typeCode: [{ required: true, message: '不能为空', trigger: 'change' }],
// bdType: [{ required: true, message: '不能为空', trigger: 'change' }],
// typeCode: [{ required: true, message: '不能为空', trigger: 'change' }],
gtId: [{ required: false, message: '不能为空', trigger: 'change' }],
bidCode: [{ required: false, message: '不能为空', trigger: 'change' }]
}