修改冀北现场问题
This commit is contained in:
@@ -308,6 +308,7 @@ tableStore.table.params.projectName = ''
|
|||||||
tableStore.table.params.loadType = ''
|
tableStore.table.params.loadType = ''
|
||||||
tableStore.table.params.userName = ''
|
tableStore.table.params.userName = ''
|
||||||
tableStore.table.params.relationUserName = ''
|
tableStore.table.params.relationUserName = ''
|
||||||
|
tableStore.table.params.orgId = adminInfo.$state.deptId
|
||||||
tableStore.table.params.aisFileUpload = ''
|
tableStore.table.params.aisFileUpload = ''
|
||||||
const dialogVisible = ref(false)
|
const dialogVisible = ref(false)
|
||||||
const interId = ref()
|
const interId = ref()
|
||||||
|
|||||||
@@ -234,6 +234,7 @@ tableStore.table.params.projectName = ''
|
|||||||
tableStore.table.params.loadType = ''
|
tableStore.table.params.loadType = ''
|
||||||
tableStore.table.params.userName = ''
|
tableStore.table.params.userName = ''
|
||||||
tableStore.table.params.fileUploadflag = ''
|
tableStore.table.params.fileUploadflag = ''
|
||||||
|
tableStore.table.params.orgId = adminInfo.$state.deptId
|
||||||
tableStore.table.params.status = ''
|
tableStore.table.params.status = ''
|
||||||
|
|
||||||
provide('tableStore', tableStore)
|
provide('tableStore', tableStore)
|
||||||
|
|||||||
@@ -605,7 +605,7 @@
|
|||||||
<div class="dialog-footer">
|
<div class="dialog-footer">
|
||||||
<el-button @click="close()">取消</el-button>
|
<el-button @click="close()">取消</el-button>
|
||||||
<el-button type="primary" @click="confirmForm(true)">保存</el-button>
|
<el-button type="primary" @click="confirmForm(true)">保存</el-button>
|
||||||
<el-button type="primary" @click="confirmForm(false)">提交审批</el-button>
|
<el-button type="primary" @click="confirmForm(false)" v-if="importType != 1">提交审批</el-button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
@@ -803,8 +803,6 @@ getFrontEndMachineList()
|
|||||||
const powerCompanyList: any = ref([])
|
const powerCompanyList: any = ref([])
|
||||||
//获取所属供电公司,区域列表第三层数据
|
//获取所属供电公司,区域列表第三层数据
|
||||||
const getPowerCompanyList = async (flag: any) => {
|
const getPowerCompanyList = async (flag: any) => {
|
||||||
|
|
||||||
|
|
||||||
getAllDeptList().then(res => {
|
getAllDeptList().then(res => {
|
||||||
powerCompanyList.value = res.data[0].children[0].children
|
powerCompanyList.value = res.data[0].children[0].children
|
||||||
if (flag) {
|
if (flag) {
|
||||||
@@ -1356,9 +1354,8 @@ watch(
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
|
|
||||||
//初始化数据
|
//初始化数据
|
||||||
resetForm()
|
resetForm()
|
||||||
console.log()
|
console.log()
|
||||||
})
|
})
|
||||||
// 上传报告
|
// 上传报告
|
||||||
@@ -1434,15 +1431,18 @@ const choose = (e: any) => {
|
|||||||
const disabledDate = time => {
|
const disabledDate = time => {
|
||||||
return time.getTime() < Date.now() - 8.64e7 // 8.64e7 毫秒数代表一天
|
return time.getTime() < Date.now() - 8.64e7 // 8.64e7 毫秒数代表一天
|
||||||
}
|
}
|
||||||
const activeName = ref('0')
|
const importType = ref(0)
|
||||||
const resendId = ref('')
|
const resendId = ref('')
|
||||||
const open = async (row: any) => {
|
const open = async (row: any) => {
|
||||||
|
console.log("🚀 ~ open ~ row:", row.row)
|
||||||
let flag = row.row ? true : false
|
let flag = row.row ? true : false
|
||||||
|
importType.value = 0
|
||||||
if (!flag) await getPowerCompanyList(false)
|
if (!flag) await getPowerCompanyList(false)
|
||||||
title.value = row.title
|
title.value = row.title
|
||||||
dialogFormVisible.value = true
|
dialogFormVisible.value = true
|
||||||
if (row.row) {
|
if (row.row) {
|
||||||
resendId.value = row.row.id
|
resendId.value = row.row.id
|
||||||
|
importType.value = row.row.importType
|
||||||
await getTerminalDetailsById({ id: row.row.id }).then((res: any) => {
|
await getTerminalDetailsById({ id: row.row.id }).then((res: any) => {
|
||||||
form.value = { customSubstationFlag: 0, ...res.data, ...res.data.supervisionTempDeviceReport }
|
form.value = { customSubstationFlag: 0, ...res.data, ...res.data.supervisionTempDeviceReport }
|
||||||
getPowerCompanyList(true)
|
getPowerCompanyList(true)
|
||||||
@@ -1463,17 +1463,19 @@ const open = async (row: any) => {
|
|||||||
name: res.data[k].split('/')[2]
|
name: res.data[k].split('/')[2]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
} else {
|
||||||
|
form.value[k] = []
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
form.value.id = row.row.id
|
form.value.id = row.row.id
|
||||||
deviceFilePath.value = res.data.deviceFilePath
|
deviceFilePath.value = res.data.deviceFilePath || ''
|
||||||
// acceptanceInspectionReportSingle.value = res.data.acceptanceInspectionReportSingle
|
// acceptanceInspectionReportSingle.value = res.data.acceptanceInspectionReportSingle
|
||||||
acceptanceInspectionReport.value = res.data.acceptanceInspectionReport
|
acceptanceInspectionReport.value = res.data.acceptanceInspectionReport || ''
|
||||||
typeExperimentReport.value = res.data.typeExperimentReport
|
typeExperimentReport.value = res.data.typeExperimentReport || ''
|
||||||
factoryInspectionReport.value = res.data.factoryInspectionReport
|
factoryInspectionReport.value = res.data.factoryInspectionReport || ''
|
||||||
performanceTestReport.value = res.data.performanceTestReport
|
performanceTestReport.value = res.data.performanceTestReport || ''
|
||||||
informationSecurityTestReport.value = res.data.informationSecurityTestReport
|
informationSecurityTestReport.value = res.data.informationSecurityTestReport || ''
|
||||||
otherAttachments.value = res.data.otherAttachments
|
otherAttachments.value = res.data.otherAttachments || ''
|
||||||
form.value.reporter = adminInfo.$state.name
|
form.value.reporter = adminInfo.$state.name
|
||||||
form.value.orgId = adminInfo.$state.deptName
|
form.value.orgId = adminInfo.$state.deptName
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ const tableStore = new TableStore({
|
|||||||
icon: 'el-icon-EditPen',
|
icon: 'el-icon-EditPen',
|
||||||
render: 'basicButton',
|
render: 'basicButton',
|
||||||
disabled: row => {
|
disabled: row => {
|
||||||
return !row.processInstanceId
|
return row.importType == 1 ? false : !row.processInstanceId
|
||||||
},
|
},
|
||||||
click: row => {
|
click: row => {
|
||||||
flag.value = true
|
flag.value = true
|
||||||
@@ -178,10 +178,10 @@ const tableStore = new TableStore({
|
|||||||
icon: 'el-icon-Open',
|
icon: 'el-icon-Open',
|
||||||
render: 'basicButton',
|
render: 'basicButton',
|
||||||
showDisabled: row => {
|
showDisabled: row => {
|
||||||
return row.createBy != adminInfo.$state.id || !(row.status == 0)
|
return row.importType == 1 ? false : row.createBy != adminInfo.$state.id || !(row.status == 0)
|
||||||
},
|
},
|
||||||
disabled: row => {
|
disabled: row => {
|
||||||
return !(row.status == 0)
|
return row.importType == 1 ? false : !(row.status == 0)
|
||||||
},
|
},
|
||||||
click: row => {
|
click: row => {
|
||||||
addForms.value.open({
|
addForms.value.open({
|
||||||
|
|||||||
Reference in New Issue
Block a user