From 84372c9063b8fa92a6cb392708cfc34ea5648f43 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 11 一月 2024 17:28:20 +0800
Subject: [PATCH] 车间订单修改工艺文件
---
src/views/quality/finishedProductInspection/index.vue | 4
src/views/plan/manufacturingorder/productorder-form.vue | 26 ++++++--
src/views/quality/processInspect/index.vue | 1
src/views/plan/manufacturingorder/routing.vue | 124 ++++++++++++++++++++--------------------
4 files changed, 83 insertions(+), 72 deletions(-)
diff --git a/src/views/plan/manufacturingorder/productorder-form.vue b/src/views/plan/manufacturingorder/productorder-form.vue
index 6ff61e4..081be95 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"
@@ -1113,7 +1121,9 @@
endDate: null,
manufactureAttr: 'N',
isReportOperation: false,
- outPutBatchList: []
+ outPutBatchList: [],
+ technologyDocumentId: null,
+ technologyDocumentName: null,
},
currentRow: [],
currentRouting: {}, // 褰撳墠閫夋嫨鐨勫伐鑹�
@@ -1124,6 +1134,9 @@
operationTemplateList: [], // 鍙傛暟闆�
templateParamList: [], // 鍙傛暟
dataRule: {
+ technologyDocumentName:[
+ { required: true, message: '宸ヨ壓鏂囦欢涓嶈兘涓虹┖', trigger: 'blur' }
+ ],
workshopTypeCode: [
{ required: true, message: '杞﹂棿璁㈠崟绫诲瀷涓嶈兘涓虹┖', trigger: 'blur' }
],
@@ -1420,13 +1433,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
@@ -1562,10 +1569,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) => {})
}
},
@@ -1585,6 +1595,8 @@
})
},
// 2.tabs-宸ヨ壓璺嚎
+ //宸ヨ壓鏂囦欢閫夋嫨
+
// 宸ヨ壓璺嚎閫夋嫨
routingSelectChanged(routingId) {
this.currentRouting = this.dataForm.routingList.find(
diff --git a/src/views/plan/manufacturingorder/routing.vue b/src/views/plan/manufacturingorder/routing.vue
index 51d1794..c5048e3 100644
--- a/src/views/plan/manufacturingorder/routing.vue
+++ b/src/views/plan/manufacturingorder/routing.vue
@@ -31,7 +31,7 @@
</el-dialog>
</template>
<script>
-import { fetchList } from '@/api/technology/routing'
+import { fetchList } from '@/api/technology/document'
import ttable from '@/views/common/ztt-table.vue'
import { remote } from '@/api/admin/dict'
export default {
@@ -73,12 +73,12 @@
border: true, // 鏄惁鏈夌旱鍚戣竟妗�
lazy: false, // 鏄惁闇�瑕佹噿鍔犺浇
fit: true, // 鍒楃殑瀹藉害鏄惁鑷拺寮�
- multiSelect: false, //
+ multiSelect: true, //
seqNo: true,
isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
- isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
- isSearch: false, // 楂樼骇鏌ヨ鎸夐挳
- defaultOrderBy: { column: 'updateTime', direction: 'desc' }
+ isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳H
+ isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
+ defaultOrderBy: { column: 'createTime', direction: 'desc' }
},
table: {
total: 0,
@@ -89,62 +89,62 @@
column: [
{
minWidth: '100',
- prop: 'routingNo',
- label: '宸ヨ壓缂栧彿',
+ prop: 'number',
+ label: '鏂囦欢缂栧彿',
sort: true,
isTrue: true,
isSearch: true,
searchInfoType: 'text'
},
+ {
+ minWidth: '100',
+ prop: 'name',
+ label: '鏂囦欢鍚嶇О',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ // 宸ヨ壓绫诲瀷
+ // {
+ // minWidth: '120',
+ // prop: 'bomTypeDb',
+ // label: '宸ヨ壓绫诲瀷',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: false,
+ // searchInfoType: 'select',
+ // formatter: this.formatBomTypeDbType,
+ // optList: () => {
+ // return this.bomTypeDbOptions
+ // }
+ // },
// {
// minWidth: '100',
- // prop: 'name',
- // label: '宸ヨ壓鍚嶇О',
+ // prop: 'master',
+ // label: '涓诲伐鑹�',
// sort: true,
// isTrue: true,
// isSearch: true,
- // searchInfoType: 'text'
+ // searchInfoType: 'select',
+ // formatter: this.getMaster,
+ // optList: () => {
+ // return this.getMasterList()
+ // }
// },
- // 宸ヨ壓绫诲瀷
- {
- minWidth: '120',
- prop: 'bomTypeDb',
- label: '宸ヨ壓绫诲瀷',
- sort: true,
- isTrue: true,
- isSearch: false,
- searchInfoType: 'select',
- formatter: this.formatBomTypeDbType,
- optList: () => {
- return this.bomTypeDbOptions
- }
- },
- {
- minWidth: '100',
- prop: 'master',
- label: '涓诲伐鑹�',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'select',
- formatter: this.getMaster,
- optList: () => {
- return this.getMasterList()
- }
- },
- {
- minWidth: '100',
- prop: 'state',
- label: '鐘舵��',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'select',
- formatter: this.getMasterState,
- optList: () => {
- return this.getMasterStateList()
- }
- },
+ // {
+ // minWidth: '100',
+ // prop: 'state',
+ // label: '鐘舵��',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'select',
+ // formatter: this.getMasterState,
+ // optList: () => {
+ // return this.getMasterStateList()
+ // }
+ // },
{
minWidth: '100',
prop: 'description',
@@ -154,16 +154,16 @@
isSearch: true,
searchInfoType: 'text'
},
- {
- minWidth: '120',
- prop: 'partName',
- label: '闆朵欢鍚�',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- noShowTip: false
- },
+ // {
+ // minWidth: '120',
+ // prop: 'partName',
+ // label: '闆朵欢鍚�',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text',
+ // noShowTip: false
+ // },
{
minWidth: '120',
prop: 'partNo',
@@ -202,7 +202,7 @@
label: '鑽夌'
},
{
- value: '02accepted',
+ value: '02pending',
label: '宸叉帴鍙�'
},
{
@@ -285,7 +285,7 @@
currshowlist() {
this.innerVisible = this.currshowlist
if (this.currshowlist) {
- this.queryParam.state = '02accepted'
+ this.queryParam.state = '03accepted'
this.$nextTick(() => {
this.getData()
})
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 6a959ab..a5a809e 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -108,7 +108,6 @@
},
{
minWidth: '130',
- width: '150',
prop: 'projectName',
label: '宸ョ▼鍚嶇О',
sort: true,
@@ -134,8 +133,9 @@
},
{
minWidth: '120',
+ width: '150',
prop: 'material',
- label: '浜у搧澶х被',
+ label: '浜у搧鍚嶇О',
isTrue: true,
isSearch: true,
searchInfoType: 'text'
diff --git a/src/views/quality/processInspect/index.vue b/src/views/quality/processInspect/index.vue
index 2ccb642..5e630a0 100644
--- a/src/views/quality/processInspect/index.vue
+++ b/src/views/quality/processInspect/index.vue
@@ -90,7 +90,6 @@
},
{
minWidth: '130',
- width: '150',
prop: 'specs',
label: '瑙勬牸鍨嬪彿',
sort: true,
--
Gitblit v1.9.3