|
@@ -19,8 +19,8 @@
|
|
|
|
|
|
</el-form-item>
|
|
|
<el-form-item class="section-title" label="工艺版本:">
|
|
|
- <el-select-v2 v-model="currentTechnological.id" :options="technologicalProcessList" placeholder="请选择版本"
|
|
|
- @change="handelTechnological" style="width: 200px" />
|
|
|
+ <el-select-v2 v-model="currentTechnological.productVersion" :options="technologicalProcessList"
|
|
|
+ placeholder="请选择版本" @change="handelTechnological" style="width: 200px" />
|
|
|
</el-form-item>
|
|
|
<el-form-item class="section-title" label="当前工序:">
|
|
|
<el-select-v2 v-model="technologicalDetailId" clearable :options="technologicalProcessDetailsList"
|
|
@@ -44,7 +44,7 @@
|
|
|
<!-- 列表区 -->
|
|
|
<div class="el-table-container">
|
|
|
<el-table ref="equipmentTable" v-loading="loading" row-key="id"
|
|
|
- @current-change="handleSelectionChange" :data="drawingList" height="600px">
|
|
|
+ @row-click="handleSelectionChange" :data="drawingList" height="600px">
|
|
|
<!-- <el-table-column type="selection" width="40" align="center" /> -->
|
|
|
<el-table-column type="index" label="行号" width="50" align="center" />
|
|
|
|
|
@@ -114,7 +114,7 @@
|
|
|
style="margin-right: 0px">
|
|
|
<el-form-item class="section-title" label="预览" />
|
|
|
<el-form-item style="float: inline-end;margin-top: 8px;">
|
|
|
- <el-button link type="primary" v-hasPermi="['business:product:remove']"
|
|
|
+ <el-button :disabled="!drawingUrl" link type="primary" v-hasPermi="['business:product:remove']"
|
|
|
@click="openDrawing">全屏预览</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
@@ -201,7 +201,8 @@ const drawingList = ref([])
|
|
|
const headers = { Authorization: getToken() }
|
|
|
const productId = ref(null)
|
|
|
const technologicalprocessDetailId = ref(null)
|
|
|
-const technologicalprocessId = ref(null)
|
|
|
+const processCode = ref(null)
|
|
|
+const productVersion = ref(null)
|
|
|
/** 查询对象 */
|
|
|
const data = reactive({
|
|
|
queryparams: {
|
|
@@ -238,10 +239,10 @@ function getList() {
|
|
|
|
|
|
|
|
|
productId.value = route.params.productId
|
|
|
- technologicalprocessId.value = route.params.productProcessId
|
|
|
- if (route.params.processDetailId) {
|
|
|
- console.log(route.params.processDetailId)
|
|
|
- technologicalprocessDetailId.value = route.params.processDetailId
|
|
|
+ productVersion.value = route.params.productVersion
|
|
|
+ if (route.params.processCode) {
|
|
|
+ console.log(route.params.processCode)
|
|
|
+ processCode.value = route.params.processCode
|
|
|
}
|
|
|
//查询产品
|
|
|
getById(productId.value).then(resMsg => {
|
|
@@ -255,15 +256,17 @@ function getList() {
|
|
|
if (res.code == 200) {
|
|
|
technologicalProcessList.value = res.data
|
|
|
//版本下拉框默认值
|
|
|
- currentTechnological.value.id = technologicalprocessId.value
|
|
|
- if (technologicalprocessDetailId.value !== undefined && technologicalprocessDetailId.value !== null && technologicalprocessDetailId.value !== 'undefined') {
|
|
|
- technologicalDetailId.value = technologicalprocessDetailId.value
|
|
|
- currentTechnologicalDetail.value.id = technologicalprocessDetailId.value
|
|
|
- }
|
|
|
+ currentTechnological.value.productVersion = productVersion.value
|
|
|
+
|
|
|
//查询工艺工序
|
|
|
- getTechnologicalProcessDetails({ technologicalProcessId: currentTechnological.value.id }).then(response => {
|
|
|
+ getTechnologicalProcessDetails({ technologyVersion: currentTechnological.value.productVersion, productId: productId.value }).then(response => {
|
|
|
if (response.code == 200) {
|
|
|
technologicalProcessDetailsList.value = response.data
|
|
|
+ if (processCode.value !== undefined && processCode.value !== null && processCode.value !== 'undefined') {
|
|
|
+ technologicalDetailId.value = response.data.find(detail => detail.code == processCode.value).value;
|
|
|
+ currentTechnologicalDetail.value.id = response.data.find(detail => detail.code === processCode.value).value;
|
|
|
+ }
|
|
|
+ console.log(123123)
|
|
|
getDrawing()
|
|
|
}
|
|
|
})
|
|
@@ -271,10 +274,10 @@ function getList() {
|
|
|
})
|
|
|
|
|
|
}
|
|
|
-function handleDetailsFormChange() {
|
|
|
- console.log(form.value.technologicalProcessDetailId)
|
|
|
- console.log(technologicalDetailId.value, 123123)
|
|
|
+function handleDetailsFormChange(row) {
|
|
|
technologicalDetailId.value = form.value.technologicalProcessDetailId
|
|
|
+ var matchingDetail = technologicalProcessDetailsList.value.find(detail => detail.value === technologicalDetailId.value);
|
|
|
+ processCode.value = matchingDetail.code
|
|
|
}
|
|
|
|
|
|
function openDrawing() {
|
|
@@ -285,11 +288,11 @@ function openDrawing() {
|
|
|
}
|
|
|
|
|
|
function handleSelectionChange(row) {
|
|
|
+ loading.value = true
|
|
|
+ console.log(row)
|
|
|
currentDrawing.value = row
|
|
|
- console.log(hostUrl)
|
|
|
- console.log(document.location)
|
|
|
drawingUrl.value = fileUrl + encodeURIComponent(Base64.encode(document.location.origin + webHost + row.url))
|
|
|
-
|
|
|
+ loading.value = false
|
|
|
}
|
|
|
|
|
|
/**文件数量超出的回调 */
|
|
@@ -310,22 +313,29 @@ function beforeUpload(file) {
|
|
|
}
|
|
|
function handelUpload() {
|
|
|
open.value = true
|
|
|
+ form.value.productId = productId.value
|
|
|
+ form.value.productVersion = currentTechnological.value.productVersion
|
|
|
+ form.value.processCode = processCode.value
|
|
|
form.value.technologicalProcessDetailId = currentTechnologicalDetail.value.id
|
|
|
- console.log(currentTechnologicalDetail.value.id)
|
|
|
- console.log(technologicalDetailId.value)
|
|
|
}
|
|
|
/**获取图纸列表 */
|
|
|
function getDrawing() {
|
|
|
- console.log(currentTechnological.value.id)
|
|
|
- queryparams.value.technologicalProcessId = currentTechnological.value.id
|
|
|
- if (currentTechnologicalDetail.value.id !== undefined && currentTechnologicalDetail.value.id !== 'undefined') {
|
|
|
- queryparams.value.technologicalProcessDetailId = currentTechnologicalDetail.value.id
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
+
|
|
|
+ queryparams.value.productId = productId.value
|
|
|
+ queryparams.value.productVersion = currentTechnological.value.productVersion
|
|
|
+ queryparams.value.processCode = processCode.value
|
|
|
+ // if (currentTechnologicalDetail.value.id !== undefined && currentTechnologicalDetail.value.id !== 'undefined') {
|
|
|
+ // queryparams.value.technologicalProcessDetailId = currentTechnologicalDetail.value.id
|
|
|
+
|
|
|
+ // }
|
|
|
+ console.log(queryparams.value,7784)
|
|
|
getNormalDrawing(queryparams.value).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
drawingList.value = res.rows
|
|
|
+ if(drawingList.value.length>0){
|
|
|
+ handleSelectionChange(drawingList.value[0])
|
|
|
+
|
|
|
+ }
|
|
|
console.log(res.rows)
|
|
|
total.value = res.total
|
|
|
}
|
|
@@ -337,36 +347,36 @@ function handleSuccess(row) {
|
|
|
|
|
|
var fileDrawing = {}
|
|
|
fileDrawing.drawingName = row.originalFilename
|
|
|
- fileDrawing.technologicalProcessDetailId = currentTechnologicalDetail.value.id
|
|
|
-
|
|
|
- getListByName(fileDrawing).then(res => {
|
|
|
- // debugger;
|
|
|
- if (res.code == 200) {
|
|
|
- console.log(res, "数据库查询")
|
|
|
- repeatingDrawings.value = res.data
|
|
|
- if (repeatingDrawings.value.length == 0) {
|
|
|
-
|
|
|
- coverName.value = row.originalFilename
|
|
|
- formLoading.value = false
|
|
|
- } else {
|
|
|
- //判断重名文件状态是否已发行需要替换
|
|
|
- if (repeatingDrawings.value[0].status == 2) {
|
|
|
- proxy.$modal.msgWarning("待审核中已有相同文件");
|
|
|
- var item = {}
|
|
|
- item = repeatingDrawings.value[0]
|
|
|
- item.parentId = currentDrawing.value.id
|
|
|
- item.id = null
|
|
|
- item.url = replaceForm.value.url
|
|
|
- item.drawingName = fileDrawing.drawingName
|
|
|
- item.technologicalProcessDetailId = fileDrawing.technologicalProcessDetailId
|
|
|
- handleReplace(item)
|
|
|
+ fileDrawing.productId = productId.value
|
|
|
+ fileDrawing.processCode = processCode.value
|
|
|
+ getListByName(fileDrawing).then(res => {
|
|
|
+ // debugger;
|
|
|
+ if (res.code == 200) {
|
|
|
+ console.log(res, "数据库查询")
|
|
|
+ repeatingDrawings.value = res.data
|
|
|
+ if (repeatingDrawings.value.length == 0) {
|
|
|
+
|
|
|
+ coverName.value = row.originalFilename
|
|
|
+ formLoading.value = false
|
|
|
} else {
|
|
|
- proxy.$modal.msgError("已有相同文件,请修改后重新上传");
|
|
|
- open.value = false
|
|
|
+ //判断重名文件状态是否已发行需要替换
|
|
|
+ if (repeatingDrawings.value[0].status == 2) {
|
|
|
+ proxy.$modal.msgWarning("待审核中已有相同文件");
|
|
|
+ var item = {}
|
|
|
+ item = repeatingDrawings.value[0]
|
|
|
+ item.parentId = currentDrawing.value.id
|
|
|
+ item.id = null
|
|
|
+ item.url = replaceForm.value.url
|
|
|
+ item.drawingName = fileDrawing.drawingName
|
|
|
+ item.technologicalProcessDetailId = fileDrawing.technologicalProcessDetailId
|
|
|
+ handleReplace(item)
|
|
|
+ } else {
|
|
|
+ proxy.$modal.msgError("已有相同文件,请修改后重新上传");
|
|
|
+ open.value = false
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
- })
|
|
|
+ })
|
|
|
}
|
|
|
|
|
|
|
|
@@ -426,12 +436,14 @@ function submitForm() {
|
|
|
}
|
|
|
/**保存方法 */
|
|
|
function saveDrawingDetail() {
|
|
|
- if (currentTechnologicalDetail.value.id !== undefined && currentTechnologicalDetail.value.id !== null && currentTechnologicalDetail.value.id !== 'undefined') {
|
|
|
- form.value.technologicalProcessDetailId = currentTechnologicalDetail.value.id
|
|
|
- }
|
|
|
+ // if (currentTechnologicalDetail.value.id !== undefined && currentTechnologicalDetail.value.id !== null && currentTechnologicalDetail.value.id !== 'undefined') {
|
|
|
+ // form.value.technologicalProcessDetailId = currentTechnologicalDetail.value.id
|
|
|
+ // }
|
|
|
|
|
|
form.value.drawingName = coverName.value
|
|
|
-
|
|
|
+ form.value.processCode = processCode.value
|
|
|
+ form.value.productId = productId.value
|
|
|
+ form.value.productVersion = productVersion.value
|
|
|
var itemList = []
|
|
|
itemList.push(form.value)
|
|
|
saveDrawing(itemList).then(res => {
|
|
@@ -450,7 +462,9 @@ function handlePreview(row) {
|
|
|
saveDrawing(drawing).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
proxy.$modal.msgSuccess("审核通过");
|
|
|
+ console.log(111111111)
|
|
|
reset()
|
|
|
+ console.log(2222)
|
|
|
getList();
|
|
|
}
|
|
|
})
|
|
@@ -484,8 +498,12 @@ function handelTechnological(row) {
|
|
|
getDrawing()
|
|
|
}
|
|
|
/**工序选择change事件 */
|
|
|
-function handleDetailsChange(row) {
|
|
|
+function handleDetailsChange() {
|
|
|
+
|
|
|
+ var matchingDetail = technologicalProcessDetailsList.value.find(detail => detail.value === technologicalDetailId.value);
|
|
|
currentTechnologicalDetail.value.id = technologicalDetailId.value == undefined ? null : technologicalDetailId.value
|
|
|
+ processCode.value =matchingDetail.code
|
|
|
+ console.log(technologicalProcessDetailsList.value,currentTechnologicalDetail.value,7979)
|
|
|
getDrawing()
|
|
|
}
|
|
|
/**NG电子图纸 */
|