|
@@ -145,12 +145,12 @@
|
|
|
<HcIcon name="send-plane-2"/>
|
|
|
<span>上报</span>
|
|
|
</el-button>
|
|
|
-
|
|
|
+
|
|
|
<el-button hc-btn @click="abolishOneClick" v-if="NodeStatus === '3'">
|
|
|
<HcIcon name="arrow-go-back"/>
|
|
|
<span>撤回上报流程</span>
|
|
|
</el-button>
|
|
|
-
|
|
|
+
|
|
|
<el-button hc-btn @click="FirstReportDrawerClose">
|
|
|
<HcIcon name="close"/>
|
|
|
<span>返回</span>
|
|
@@ -281,7 +281,7 @@ const queryNodeStatus = async () => {
|
|
|
primaryKeyId:info.primaryKeyId,
|
|
|
classify: authBtnTabKey.value,
|
|
|
id:queryNodeStatusId.value
|
|
|
-
|
|
|
+
|
|
|
})
|
|
|
//1 未填报,2待上报,3已上报
|
|
|
if (!error && code === 200) {
|
|
@@ -461,15 +461,14 @@ const abolishOneClick = () => {
|
|
|
//撤回请求
|
|
|
const abolishOneSave = async () => {
|
|
|
const info = treeItem.value;
|
|
|
- const {error, code} = await wbsApi.abolishOne({
|
|
|
+ const {error, code} = await wbsApi.abolishOneSJ({
|
|
|
primaryKeyId: info?.primaryKeyId || '',
|
|
|
- classify: authBtnTabKey.value
|
|
|
+ id:queryNodeStatusId.value
|
|
|
})
|
|
|
if (!error && code === 200) {
|
|
|
window.$message?.success('撤回成功')
|
|
|
getTableDataAll()
|
|
|
window?.location?.reload() //刷新页面
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -603,9 +602,9 @@ const saveBussData = async () => {
|
|
|
queryNodeStatusId.value=res
|
|
|
queryNodeStatus()
|
|
|
await getBussPdfInfo(res)
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -646,7 +645,7 @@ const bussPdfInfo = () => {
|
|
|
const { id } = treeItem.value
|
|
|
// getBussPdfInfo(id + '')
|
|
|
getBussPdfInfo(pdfId.value)
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
|
|
|
//预览PDF请求
|
|
@@ -732,7 +731,7 @@ const toreportModalClick = async (type) => {
|
|
|
}
|
|
|
}else{
|
|
|
window.$message?.warning('当前工序资料还未审批,待审批完成才能进行首件模板上报')
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
const reportModalClick = async (type) => {
|
|
@@ -742,7 +741,7 @@ const reportModalClick = async (type) => {
|
|
|
toreportModalClick(iscanReport.value)
|
|
|
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
else{
|
|
|
const rows = deepClone(tableSelectionKeys.value)
|
|
|
let result=false
|
|
@@ -762,11 +761,11 @@ const reportModalClick = async (type) => {
|
|
|
window.$message?.warning('已上报的数据不能重复上报')
|
|
|
iscanReport.value=false
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
|
|
|
//上报的审批内容移除
|