From db407663e3024050ab3eb701f10ee00ddaf5f1ee Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 16 六月 2023 11:28:38 +0800
Subject: [PATCH] 1.制造模型引入车间概念
---
src/views/makeModel/InventoryList.vue | 90 ++++++++++++++++++++++++--------------------
1 files changed, 49 insertions(+), 41 deletions(-)
diff --git a/src/views/makeModel/InventoryList.vue b/src/views/makeModel/InventoryList.vue
index 6edf62f..6affcad 100644
--- a/src/views/makeModel/InventoryList.vue
+++ b/src/views/makeModel/InventoryList.vue
@@ -218,7 +218,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="total,prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes,jumper"
popper-class="select_bottom"
@pagination="getInventoryFileSelect"
/>
@@ -615,26 +615,26 @@
</div>
</div>
- <el-divider />
- <div>
- <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 榛樿宸ヨ壓璺嚎
- </div>
- <div style="margin-top: 20px">
- <el-select
- v-model="defaultroute_code"
- filterable
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- class="defaultroute_code"
- >
- <el-option
- v-for="item in defaultroute_codeArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </div>
+ <!-- <el-divider />-->
+ <!-- <div >-->
+ <!-- <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 榛樿宸ヨ壓璺嚎-->
+ <!-- </div>-->
+ <!-- <div style="margin-top: 20px">-->
+ <!-- <el-select-->
+ <!-- v-model="defaultroute_code"-->
+ <!-- filterable-->
+ <!-- style="width: 200px;"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- class="defaultroute_code"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in defaultroute_codeArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </div>-->
<el-divider />
<div style="margin-bottom: 10px">
<i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 宸ュ簭鍒楄〃
@@ -976,7 +976,7 @@
// routeOperationSelectedArr: [] // 宸ヨ壓璺嚎閫変腑闆嗗悎鏁扮粍
},
defaultroute_code: '', // 榛樿宸ヨ壓璺嚎閫変腑鍊�
- defaultroute_codeArr: '', // 榛樿宸ヨ壓璺嚎鏁扮粍
+ defaultroute_codeArr: [], // 榛樿宸ヨ壓璺嚎鏁扮粍
projectTableData: [], // 璁惧鍒楄〃
isBatchNo: false, // 鏄惁鎵规绠＄悊
isFifo: false, // 鏄惁鍏堣繘鍏堝嚭
@@ -1271,7 +1271,8 @@
background: 'rgba(0, 0, 0, 0.7)'
})
- this.defaultroute_code = row.default_route
+ // this.defaultroute_code = row.default_route
+ // this.defaultroute_code = ''
this.dialogFormRoute.projectCode = row.partcode
this.dialogFormRoute.projectName = row.partname
@@ -1310,7 +1311,7 @@
}
})
- this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.flag === 'Y')
+ // this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.flag === 'Y')
}, 1000)
} else {
loading.close()
@@ -1320,7 +1321,7 @@
// 瀵硅瘽妗嗗叧闂�
handleCloseRoute() {
this.dialogFormRoute.routeOperationArr = []
- this.defaultroute_codeArr = []
+ // this.defaultroute_codeArr = []
},
// 鍙栨秷
routeDialogVisibleCancel() {
@@ -1328,20 +1329,26 @@
},
// 纭畾
async routeDialogVisibleConfirm() {
- console.log(this.defaultroute_code)
- if (this.defaultroute_code === null || this.defaultroute_code === 'null') {
- return this.$message.info('榛樿宸ヨ壓璺嚎涓嶈兘涓虹┖锛�')
- }
+ // console.log(this.defaultroute_code)
+ // if (this.defaultroute_code === null || this.defaultroute_code === 'null') {
+ // return this.$message.info('榛樿宸ヨ壓璺嚎涓嶈兘涓虹┖锛�')
+ // }
// 鎻愪氦鏍煎紡
const data = []
this.dialogFormRoute.routeOperationArr.forEach(item => {
if (item.isSelected2) {
- data.push({ code: item.code, name: item.name })
+ data.push({
+ code: item.code,
+ name: item.name,
+ wkshopcode: item.wkshopcode,
+ wkshopname: item.wkshopname
+ })
}
})
this.$store.state.app.buttonIsDisabled = true
- const res = await SaveInventoryFile(this.dialogFormRoute.projectCode, this.defaultroute_code, data)
+ // const res = await SaveInventoryFile(this.dialogFormRoute.projectCode, this.defaultroute_code, data)
+ const res = await SaveInventoryFile(this.dialogFormRoute.projectCode, '', data)
if (res.code === '200') {
this.dialogVisibleRoute = false
this.$message.success('淇濆瓨鎴愬姛锛�')
@@ -1368,10 +1375,11 @@
item.flag = !item.flag
}
})
- if (val.code === this.defaultroute_code) {
- this.defaultroute_code = ''
- }
- this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.isSelected2)
+ // if (val.code === this.defaultroute_code) {
+ // this.defaultroute_code = ''
+ // }
+ // this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.isSelected2)
+ this.$forceUpdate()
},
/* 鍗曚綅妯″潡*/
// 鍗曚綅鎸夐挳鐐瑰嚮浜嬩欢
@@ -1562,12 +1570,12 @@
}
}
-.defaultroute_code ::v-deep .el-input__suffix-inner {
- display: flex;
- align-items: center;
- justify-content: center;
- margin-top: -3px;
-}
+//.defaultroute_code ::v-deep .el-input__suffix-inner {
+// display: flex;
+// align-items: center;
+// justify-content: center;
+// margin-top: -3px;
+//}
</style>
<!--鍏叡椤甸潰鏍峰紡-->
--
Gitblit v1.9.3