From 2a1ea6a1c5b2210b3ac751e344517741cfbac2dd Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 19 一月 2024 10:59:31 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/plan/manufacturingorder/productorder-form.vue | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/src/views/plan/manufacturingorder/productorder-form.vue b/src/views/plan/manufacturingorder/productorder-form.vue
index e825e10..50a0c0c 100644
--- a/src/views/plan/manufacturingorder/productorder-form.vue
+++ b/src/views/plan/manufacturingorder/productorder-form.vue
@@ -154,6 +154,14 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="10">
+ <el-form-item label="宸ヨ壓鏂囦欢" prop="technologyDocumentName">
+ <el-tooltip class="item" effect="dark" :content="dataForm.technologyDocumentName">
+ <el-input v-model="dataForm.technologyDocumentName" placeholder="">
+ </el-input>
+ </el-tooltip>
+ </el-form-item>
+ </el-col>
</el-row>
<!-- <el-col
:span="2"
@@ -328,17 +336,14 @@
fallbackClass="fallbackStyle"
ghostClass="item_ghost"
@end="dragEnd"
+ :default-sort="{ prop: 'operationOrder' }"
+ @choose="operationRowClick"
>
<div
:class="{ dragItem: true, active: x.active }"
v-for="(x, i) in operations"
:key="i"
>
- <!-- <div class="dragBody">
- <div class="info">{{ x.operationNo }}</div>
- <div class="info">{{ x.operationName }}</div>
- <div class="info">{{ x.partName }}</div>
- </div> -->
<el-row>
<el-col :span="2" class="frame">{{ i+1 }}
</el-col>
@@ -362,10 +367,6 @@
</el-card>
</el-col>
</el-row>
-
-
-
-
@@ -1193,7 +1194,9 @@
endDate: null,
manufactureAttr: 'N',
isReportOperation: false,
- outPutBatchList: []
+ outPutBatchList: [],
+ technologyDocumentId: null,
+ technologyDocumentName: null,
},
currentRow: [],
currentRouting: {}, // 褰撳墠閫夋嫨鐨勫伐鑹�
@@ -1204,6 +1207,9 @@
operationTemplateList: [], // 鍙傛暟闆�
templateParamList: [], // 鍙傛暟
dataRule: {
+ technologyDocumentName:[
+ { required: true, message: '宸ヨ壓鏂囦欢涓嶈兘涓虹┖', trigger: 'blur' }
+ ],
workshopTypeCode: [
{ required: true, message: '杞﹂棿璁㈠崟绫诲瀷涓嶈兘涓虹┖', trigger: 'blur' }
],
@@ -1414,9 +1420,7 @@
operationOrder:el.operationOrder,
}
})
- console.log(data,"id");
changeOrder(data).then((res) =>{
- console.log(res,"鍥炶皟");
}).catch(error => {
console.error(error)
});
@@ -1522,13 +1526,7 @@
checkPart(value, this.dataForm.workshopTypeCode)
.then((response) => {
const manufacturingOrderDTO = response.data.data
- /* this.dataForm.routingList = manufacturingOrderDTO.routingList.filter(
- (e) => e.bomTypeDb === this.dataForm.workshopTypeCode
- ) */
this.dataForm.routingList = manufacturingOrderDTO.routingList
- /* this.dataForm.bomList = manufacturingOrderDTO.bomList.filter(
- (e) => e.bomTypeDb === this.dataForm.workshopTypeCode
- ) */
this.dataForm.bomList = manufacturingOrderDTO.bomList
this.dataForm.technologyRoutingId =
manufacturingOrderDTO.technologyRoutingId
@@ -1664,10 +1662,13 @@
this.showRouting = true
},
selectRouting(param) {
+ console.log(param);
if (param) {
this.dataForm.partNo = param.partNo
this.dataForm.partName = param.partName
this.dataForm.partId = param.partId
+ this.dataForm.technologyDocumentId = param.id
+ this.dataForm.technologyDocumentName = param.name
this.$refs.dataForm.validateField('partId', (valid) => {})
}
},
@@ -1687,6 +1688,8 @@
})
},
// 2.tabs-宸ヨ壓璺嚎
+ //宸ヨ壓鏂囦欢閫夋嫨
+
// 宸ヨ壓璺嚎閫夋嫨
routingSelectChanged(routingId) {
this.currentRouting = this.dataForm.routingList.find(
@@ -1759,7 +1762,8 @@
this.dataForm.bomId = null
},
// 鐐瑰嚮宸ヨ壓宸ュ簭琛岃Е鍙戞牎楠屽伐鑹烘槸鍚︿慨鏀癸紝鑻ヤ慨鏀瑰垯涓嶅彲鎿嶄綔锛岄渶鍏堜繚瀛橈紝鑻ユ湭淇敼锛屽垯鍙煡璇㈠嚭瀵瑰簲鐨勫弬鏁伴泦
- operationRowClick(row) {
+ operationRowClick(event) {
+ const row = this.operations[event.oldIndex]
if (this.dataForm.id != null && this.dataForm.id !== 0) {
this.routingOperationId = row.technologyRoutingOperationId
this.moRoutingOperationId = row.id
--
Gitblit v1.9.3