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/reportManager/subcontractingOperation.vue | 2
src/views/reportManager/logisticsCheck.vue | 2
src/views/reportManager/installationLampList.vue | 4
src/views/produceManager/workOrderBatchClose.vue | 2
src/views/purchasesManager/InventoryLedgerList.vue | 2
src/views/purchasesManager/purchasesList.vue | 2
src/views/basicSettings/userList.vue | 15 +
src/views/deviceManager/maintainRecord.vue | 16
src/views/materialManager/locationDefine.vue | 2
src/views/qualityManager/processCheckRecord.vue | 2
src/views/reportManager/produceSchedule.vue | 3
src/views/produceManager/AutoScheduling.vue | 2
src/views/deviceManager/repairRecord.vue | 17
src/views/makeModel/processRoute.vue | 139 ++++++++++-
src/views/materialManager/storehouseDefine.vue | 2
src/views/produceManager/capacityPlanning.vue | 2
src/views/makeModel/meterPrice.vue | 2
src/views/systemSettings/codingRules.vue | 2
src/views/qualityManager/qualityPlaning.vue | 2
src/views/makeModel/materialList.vue | 2
src/views/produceManager/workOrder.vue | 138 ++++++-----
src/components/RightPanel/index.vue | 10
src/views/qualityManager/processCheckStandard.vue | 2
src/views/purchasesManager/arrivalNoticeList.vue | 2
src/views/purchasesManager/salesStatisticsList.vue | 2
src/views/qualityManager/defectDefine.vue | 2
src/views/makeModel/processDefine.vue | 129 +++++++---
src/views/purchasesManager/goodsStatisticsList.vue | 2
src/views/deviceManager/checkRecord.vue | 20 +
src/views/systemSettings/shopNotice.vue | 2
src/views/qualityManager/processCheckItem.vue | 2
src/views/reportManager/defectDetailList.vue | 2
src/views/reportManager/personSalaryList.vue | 4
src/views/makeModel/InventoryList.vue | 90 ++++---
src/views/produceManager/produceStartOrder.vue | 8
src/api/basicSettings.js | 4
src/views/reportManager/repairDetailList.vue | 2
src/views/produceManager/produceOrder.vue | 2
src/views/reportManager/groupSalaryList.vue | 4
src/api/makeModel.js | 13
40 files changed, 438 insertions(+), 224 deletions(-)
diff --git a/src/api/basicSettings.js b/src/api/basicSettings.js
index f33e37f..32fdff9 100644
--- a/src/api/basicSettings.js
+++ b/src/api/basicSettings.js
@@ -77,9 +77,9 @@
})
}
// 鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊淇濆瓨
-export function SaveUserAssoctRole(data, usercode, stu_torgcode) {
+export function SaveUserAssoctRole(data, usercode, stu_torgcode, description) {
return request({
- url: 'BasicSetting/SaveUserAssoctRole?usercode=' + usercode + '&stu_torgcode=' + stu_torgcode,
+ url: 'BasicSetting/SaveUserAssoctRole?usercode=' + usercode + '&stu_torgcode=' + stu_torgcode + '&description=' + description,
method: 'post',
data
})
diff --git a/src/api/makeModel.js b/src/api/makeModel.js
index e9154a7..94a8989 100644
--- a/src/api/makeModel.js
+++ b/src/api/makeModel.js
@@ -189,9 +189,9 @@
}
// 宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐彁浜�
-export function SaveStepAssociationEqp(stepcode, data) {
+export function SaveStepAssociationEqp(stepcode, WorkShop, data) {
return request({
- url: 'ProductModel/SaveStepAssociationEqp?stepcode=' + stepcode,
+ url: 'ProductModel/SaveStepAssociationEqp?stepcode=' + stepcode + '&WorkShop=' + WorkShop,
method: 'post',
data
})
@@ -207,9 +207,9 @@
}
// 宸ュ簭鍏宠仈缂洪櫡鎻愪氦
-export function SaveStepAssociationDefect(stepcode, data) {
+export function SaveStepAssociationDefect(stepcode, WorkShop, data) {
return request({
- url: 'ProductModel/SaveStepAssociationDefect?stepcode=' + stepcode,
+ url: 'ProductModel/SaveStepAssociationDefect?stepcode=' + stepcode + '&WorkShop=' + WorkShop,
method: 'post',
data
})
@@ -295,10 +295,11 @@
}
// 宸ヨ壓璺嚎宸ヨ壓璁剧疆涓嬫媺
-export function StepSelect() {
+export function StepSelect(data) {
return request({
url: 'ProductModel/StepSelect',
- method: 'get'
+ method: 'get',
+ params: data
})
}
diff --git a/src/components/RightPanel/index.vue b/src/components/RightPanel/index.vue
index 83fed05..d89c4e5 100644
--- a/src/components/RightPanel/index.vue
+++ b/src/components/RightPanel/index.vue
@@ -42,11 +42,11 @@
if (value && !this.clickNotClose) {
this.addEventClick()
}
- if (value) {
- addClass(document.body, 'showRightPanel')
- } else {
- removeClass(document.body, 'showRightPanel')
- }
+ // if (value) {
+ // addClass(document.body, 'showRightPanel')
+ // } else {
+ // removeClass(document.body, 'showRightPanel')
+ // }
}
},
mounted() {
diff --git a/src/views/basicSettings/userList.vue b/src/views/basicSettings/userList.vue
index acb3481..550b62d 100644
--- a/src/views/basicSettings/userList.vue
+++ b/src/views/basicSettings/userList.vue
@@ -973,6 +973,7 @@
dialogVisibleRoles: false,
dialogFormRoles: {
stu_torgcode: '', // 鎵�灞炵粍缁�
+ description: '', // 鎵�灞炵粍缁囩被鍨�
username: '', // 鐢ㄦ埛鍚嶇О
usercode: '', // 鐢ㄦ埛缂栫爜
rolesArr: [], // 瑙掕壊绫诲瀷闆嗗悎
@@ -1243,11 +1244,13 @@
this.dialogFormRoles.rolesArrSelectedArr = []
this.dialogFormRoles.rolesArr = []
+ this.dialogFormRoles.roleTree = []
this.dialogFormRoles.roleTreeSelectedArr = []
this.dialogFormRoles.username = row.username
this.dialogFormRoles.usercode = row.usercode
this.dialogFormRoles.stu_torgcode = row.stu_torgcode
+ this.dialogFormRoles.description = row.description
UserAssociationRole({ usercode: row.usercode, stu_torgcode: row.stu_torgcode, description: row.description }).then(res => {
if (res.code === '200') {
setTimeout(() => {
@@ -1311,7 +1314,10 @@
// 鐢ㄦ埛鍏宠仈瀵硅瘽妗嗙‘璁や簨浠�
async rolesDialogVisibleConfirm() {
this.$store.state.app.buttonIsDisabled = true
- const res = await SaveUserAssoctRole(this.dialogFormRoles.roleTreeSelectedArr, this.dialogFormRoles.usercode, this.dialogFormRoles.stu_torgcode)
+ this.dialogFormRoles.roleTreeSelectedArr.forEach(i => {
+ i.Data = [...new Set(i.Data)]
+ })
+ const res = await SaveUserAssoctRole(this.dialogFormRoles.roleTreeSelectedArr, this.dialogFormRoles.usercode, this.dialogFormRoles.stu_torgcode, this.dialogFormRoles.description)
if (res.code === '200') {
this.dialogVisibleRoles = false
this.$message.success('淇濆瓨鎴愬姛锛�')
@@ -1375,12 +1381,17 @@
} else {
this.dialogFormRoles.roleTreeSelectedArr.forEach((i, ind) => { // 褰撻�夊瓙code鏃舵墽琛�
if (i.Code === checkedFatherCode) {
+ let flag = true
this.dialogFormRoles.roleTreeSelectedArr[ind].Data.forEach((i1, ind2) => {
if (i1 === a[0]) {
// this.dialogFormRoles.roleTreeSelectedArr[ind].Data.splice(ind2, 1)// 褰撳瓙code涓庣幇鍦ㄧ殑code鐩稿悓鏃舵墽琛�
this.dialogFormRoles.roleTreeSelectedArr[ind].Data = this.dialogFormRoles.roleTreeSelectedArr[ind].Data.filter(i2 => i2 !== a[0])
+ flag = false
} else {
- this.dialogFormRoles.roleTreeSelectedArr[ind].Data.push(a[0])// //褰撳瓙code涓庣幇鍦ㄧ殑code涓嶇浉鍚屾椂鎵ц
+ if (flag) {
+ console.log('鎵ц浜�')
+ this.dialogFormRoles.roleTreeSelectedArr[ind].Data.push(a[0])// //褰撳瓙code涓庣幇鍦ㄧ殑code涓嶇浉鍚屾椂鎵ц
+ }
}
})
// this.dialogFormRoles.roleTreeSelectedArr[ind].Data.filter((i1, ind2) => i1 !== a[0])// 杩囨护鎺夐�変腑鐩稿悓鐨�
diff --git a/src/views/deviceManager/checkRecord.vue b/src/views/deviceManager/checkRecord.vue
index 2bef154..049f162 100644
--- a/src/views/deviceManager/checkRecord.vue
+++ b/src/views/deviceManager/checkRecord.vue
@@ -20,9 +20,9 @@
<el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in wkshopSelectArr"
- :key="item.org_code"
- :label="item.org_name"
- :value="item.org_code"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
</el-form-item>
@@ -265,8 +265,12 @@
import { getCookie } from '@/utils/auth'
import ImportPicker from '@/components/ImportPicker'
import { handleDatetime, validateCode } from '@/utils/global'
-import { DeviceCheckSubTakeSearch, DeviceCheckTakeOutExcel, DeviceCheckTakeSearch } from '@/api/deviceManager'
-import { ShopSearch } from '@/api/kanbanManager'
+import {
+ DeviceCheckSubTakeSearch,
+ DeviceCheckTakeOutExcel,
+ DeviceCheckTakeSearch,
+ WorkShopSelect
+} from '@/api/deviceManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import TableColumnSettings from '@/components/TableColumnSettings'
@@ -284,7 +288,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
- wkshopcode: '', // 杞﹂棿缂栫爜
+ wkshopcode: this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode'), // 鎵�灞炶溅闂�
eqpcode: '', // 璁惧缂栫爜
eqpname: '', // 璁惧鍚嶇О
stanedname: '', // 鏍囧噯鍚嶇О
@@ -473,7 +477,7 @@
},
// 鑾峰彇鎵ц杞﹂棿涓嬫媺鏁扮粍
async getShopSearch() {
- const { data: res } = await ShopSearch()
+ const { data: res } = await WorkShopSelect()
this.wkshopSelectArr = res
},
// 鎺掑簭鏀瑰彉鏃�
@@ -503,7 +507,7 @@
},
// 閲嶇疆
reset() {
- this.form.wkshopcode = ''
+ this.form.wkshopcode = this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode') // 鎵�灞炶溅闂�
this.form.eqpcode = ''
this.form.eqpname = ''
this.form.stanedname = ''
diff --git a/src/views/deviceManager/maintainRecord.vue b/src/views/deviceManager/maintainRecord.vue
index 2834557..0c3b4c8 100644
--- a/src/views/deviceManager/maintainRecord.vue
+++ b/src/views/deviceManager/maintainRecord.vue
@@ -20,9 +20,9 @@
<el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in wkshopSelectArr"
- :key="item.org_code"
- :label="item.org_name"
- :value="item.org_code"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
</el-form-item>
@@ -254,9 +254,9 @@
import { getCookie } from '@/utils/auth'
import ImportPicker from '@/components/ImportPicker'
import { handleDatetime } from '@/utils/global'
-import { DeviceRepairSubTakeSearch, DeviceRepairTakeOutExcel, DeviceRepairTakeSearch
+import {
+ DeviceRepairSubTakeSearch, DeviceRepairTakeOutExcel, DeviceRepairTakeSearch, WorkShopSelect
} from '@/api/deviceManager'
-import { ShopSearch } from '@/api/kanbanManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import TableColumnSettings from '@/components/TableColumnSettings'
@@ -274,7 +274,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
- wkshopcode: '', // 杞﹂棿缂栫爜
+ wkshopcode: this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode'), // 鎵�灞炶溅闂�
eqpcode: '', // 璁惧缂栫爜
eqpname: '', // 璁惧鍚嶇О
stanedname: '', // 鏍囧噯鍚嶇О
@@ -492,7 +492,7 @@
},
// 鑾峰彇鎵ц杞﹂棿涓嬫媺鏁扮粍
async getShopSearch() {
- const { data: res } = await ShopSearch()
+ const { data: res } = await WorkShopSelect()
this.wkshopSelectArr = res
},
// 鎺掑簭鏀瑰彉鏃�
@@ -522,7 +522,7 @@
},
// 閲嶇疆
reset() {
- this.form.wkshopcode = ''
+ this.form.wkshopcode = this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode') // 鎵�灞炶溅闂�
this.form.eqpcode = ''
this.form.eqpname = ''
this.form.stanedname = ''
diff --git a/src/views/deviceManager/repairRecord.vue b/src/views/deviceManager/repairRecord.vue
index 62ca8a0..1f01a75 100644
--- a/src/views/deviceManager/repairRecord.vue
+++ b/src/views/deviceManager/repairRecord.vue
@@ -14,13 +14,13 @@
style="display: flex;"
>
<div class="elForm">
- <el-form-item label="鐢熶骇杞﹂棿"style=" display: flex;">
+ <el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
<el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in wkshopSelectArr"
- :key="item.org_code"
- :label="item.org_name"
- :value="item.org_code"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
</el-form-item>
@@ -327,11 +327,12 @@
import Pagination from '@/components/Pagination'
import ImportPicker from '@/components/ImportPicker'
import { handleDatetime } from '@/utils/global'
-import { DeviceUpdateOutExcel, DeviceUpdateSearch, DeviceUpdateSubSearch } from '@/api/deviceManager'
+import { DeviceUpdateOutExcel, DeviceUpdateSearch, DeviceUpdateSubSearch, WorkShopSelect } from '@/api/deviceManager'
import { ShopSearch } from '@/api/kanbanManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import TableColumnSettings from '@/components/TableColumnSettings'
+import { getCookie } from '@/utils/auth'
export default {
name: 'Zzjg',
@@ -346,7 +347,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
- wkshopcode: '', // 杞﹂棿缂栫爜
+ wkshopcode: this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode'), // 鎵�灞炶溅闂�
eqpcode: '', // 璁惧缂栫爜
eqpname: '', // 璁惧鍚嶇О
reportuser: '', // 鎶ヤ慨浜哄憳
@@ -582,7 +583,7 @@
},
// 鑾峰彇鎵ц杞﹂棿涓嬫媺鏁扮粍
async getShopSearch() {
- const { data: res } = await ShopSearch()
+ const { data: res } = await WorkShopSelect()
this.wkshopSelectArr = res
},
// 鎺掑簭鏀瑰彉鏃�
@@ -612,7 +613,7 @@
},
// 閲嶇疆
reset() {
- this.form.wkshopcode = ''
+ this.form.wkshopcode = this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode') // 鎵�灞炶溅闂�
this.form.eqpcode = ''
this.form.eqpname = ''
this.form.reportuser = ''
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>
<!--鍏叡椤甸潰鏍峰紡-->
diff --git a/src/views/makeModel/materialList.vue b/src/views/makeModel/materialList.vue
index 4fa42f3..40f8286 100644
--- a/src/views/makeModel/materialList.vue
+++ b/src/views/makeModel/materialList.vue
@@ -287,7 +287,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="getBoIventorySelect"
/>
diff --git a/src/views/makeModel/meterPrice.vue b/src/views/makeModel/meterPrice.vue
index f8c506f..c722feb 100644
--- a/src/views/makeModel/meterPrice.vue
+++ b/src/views/makeModel/meterPrice.vue
@@ -273,7 +273,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="getBeatRateSearch"
/>
diff --git a/src/views/makeModel/processDefine.vue b/src/views/makeModel/processDefine.vue
index 9b9ddd3..f2e5a46 100644
--- a/src/views/makeModel/processDefine.vue
+++ b/src/views/makeModel/processDefine.vue
@@ -16,27 +16,27 @@
style="display: flex;"
>
<div class="elForm">
- <el-form-item label="宸ュ簭缂栫爜" style=" display: flex;">
- <el-input v-model="form.stepcode" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
- <el-form-item label="宸ュ簭鍚嶇О" style=" display: flex;">
- <el-input v-model="form.stepname" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
- <el-form-item label="鍚敤鐘舵��" style=" display: flex;">
+ <el-form-item label="鎵�灞炶溅闂�" style=" display: flex;">
<el-select
- v-model="form.enable"
- filterable
+ v-model="form.WorkShop"
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
>
+ <!-- @focus="getWareHouseSelect"-->
<el-option
- v-for="item in enableArr"
+ v-for="item in WorkShopArr"
:key="item.code"
:label="item.name"
:value="item.code"
/>
</el-select>
+ </el-form-item>
+ <el-form-item label="宸ュ簭缂栫爜" style=" display: flex;">
+ <el-input v-model="form.stepcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="宸ュ簭鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.stepname" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="宸ュ簭绫诲瀷" style=" display: flex;">
<el-select
@@ -48,6 +48,22 @@
>
<el-option
v-for="item in steptypeArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="鍚敤鐘舵��" style=" display: flex;">
+ <el-select
+ v-model="form.enable"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in enableArr"
:key="item.code"
:label="item.name"
:value="item.code"
@@ -189,7 +205,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="getStepSearch"
/>
@@ -217,7 +233,7 @@
<el-form-item prop="steptypecode" label="宸ュ簭绫诲瀷">
<el-radio-group
v-model="dialogForm.steptypecode"
- style="width: 200px"
+ style="width: 210px"
>
<el-radio
v-for="item in steptypeArr"
@@ -226,20 +242,22 @@
:label="item.name"
/>
</el-radio-group>
- <!-- <el-select-->
- <!-- v-model="dialogForm.steptypecode"-->
- <!-- filterable-->
- <!-- style="width: 200px"-->
- <!-- placeholder="璇烽�夋嫨"-->
- <!-- :popper-append-to-body="false"-->
- <!-- >-->
- <!-- <el-option-->
- <!-- v-for="item in steptypeArr"-->
- <!-- :key="item.code"-->
- <!-- :label="item.name"-->
- <!-- :value="item.code"-->
- <!-- />-->
- <!-- </el-select>-->
+ <el-form-item prop="wkshopcode" label="鎵�灞炶溅闂�">
+ <el-select
+ v-model="dialogForm.wkshopcode"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ :popper-append-to-body="false"
+ >
+ <el-option
+ v-for="item in WorkShopArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
</el-form-item>
<el-form-item prop="enable" label="鍚敤鐘舵��">
<el-select
@@ -295,7 +313,7 @@
<el-divider />
<div>
<div style="margin-bottom:20px">
- <i class="el-icon-s-operation":style="{color:$store.state.settings.theme}" /> 宸ヤ綔绔欓泦鍚堬細
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 宸ヤ綔绔欓泦鍚堬細
</div>
<div class="myCheckboxGroup">
<div
@@ -429,6 +447,8 @@
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import TableColumnSettings from '@/components/TableColumnSettings'
+import { getCookie } from '@/utils/auth'
+import { WorkShopSelect } from '@/api/deviceManager'
export default {
name: 'GXDY',
@@ -447,6 +467,7 @@
stepcode: '', // 宸ュ簭缂栫爜
stepname: '', // 宸ュ簭鍚嶇О
enable: '', // 鍚敤鐘舵��
+ WorkShop: this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode'), // 鎵�灞炶溅闂�
steptypecode: [], // 宸ュ簭绫诲瀷缂栫爜
createuser: '', // 鍒涘缓浜哄憳
prop: 'lm_date', // 鎺掑簭瀛楁
@@ -463,6 +484,7 @@
{ code: 'W', name: '澶栧崗' }
// { code: 'Z;W', name: '鑷埗锛涘鍗�' }
],
+ WorkShopArr: [], // 鎵�灞炶溅闂存暟缁�
total: 10,
tableData: [],
tableColumnSettingsArray: [
@@ -517,13 +539,31 @@
show: true,
fixed: false,
sortable: true
+ }, {
+ minWidth: 110,
+ width: false,
+ prop: 'org_code',
+ label: '鎵�灞炵粍缁囩紪鐮�',
+ id: 8,
+ show: false,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: 110,
+ width: false,
+ prop: 'org_name',
+ label: '鎵�灞炶溅闂�',
+ id: 9,
+ show: true,
+ fixed: false,
+ sortable: true
},
{
minWidth: false,
width: 110,
prop: 'lm_user',
label: '鍒涘缓浜哄憳',
- id: 8,
+ id: 10,
show: true,
fixed: false,
sortable: true
@@ -533,7 +573,7 @@
width: 160,
prop: 'lm_date',
label: '鍒涘缓鏃堕棿',
- id: 9,
+ id: 11,
show: true,
fixed: false,
sortable: true
@@ -543,7 +583,7 @@
width: 110,
prop: 'is_eqp',
label: '鍏宠仈宸ヤ綔绔�',
- id: 10,
+ id: 12,
show: true,
fixed: false,
sortable: false
@@ -553,7 +593,7 @@
width: 110,
prop: 'is_defect',
label: '鍏宠仈缂洪櫡',
- id: 11,
+ id: 13,
show: true,
fixed: false,
sortable: false
@@ -568,7 +608,8 @@
'steptypecode': '鑷埗',
'enable': 'Y',
'description': '',
- 'OperType': ''
+ 'OperType': '',
+ 'wkshopcode': this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode') // 鎵�灞炶溅闂�
},
operation: '',
dialogFormRules: {
@@ -583,12 +624,16 @@
],
enable: [
{ required: true, message: '璇烽�夋嫨鐘舵��', trigger: ['blur', 'change'] }
+ ],
+ wkshopcode: [
+ { required: true, message: '璇烽�夋嫨鎵�灞炶溅闂�', trigger: ['blur', 'change'] }
]
},
workDialogVisible: false,
workDialogForm: {
stepcode: '', // 宸ュ簭缂栫爜
stepname: '', // 宸ュ簭鍚嶇О
+ WorkShop: '', // 鎵�灞炶溅闂�
workArr: [], // 宸ヤ綔绔欐墍鏈夋暟缁�
workGatherArr: [], // 宸ヤ綔绔欓泦鍚堟暟缁�
workCodeSelectedGatherArr: [], // 宸ヤ綔绔欓�変腑闆嗗悎鐨刢ode鏁扮粍
@@ -609,12 +654,18 @@
},
created() {
this.getStepSearch()
+ this.getWorkShopSelect()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
+ async getWorkShopSelect() {
+ const { data: res } = await WorkShopSelect()
+ this.WorkShopArr = res
+ },
tableColumnUpdate(val, isCopyTrue) {
if (isCopyTrue) {
this.tableColumnSettingsArray = val
@@ -657,6 +708,7 @@
this.form.enable = ''
this.form.steptypecode = ''
this.form.createuser = ''
+ this.form.WorkShop = this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode')// 鎵�灞炶溅闂�
this.getStepSearch()
},
@@ -676,6 +728,7 @@
this.dialogForm.stepname = row.stepname
this.dialogForm.steptypecode = this.steptypeArr.find(item => item.code === row.flwtype).name
this.dialogForm.description = row.descr
+ this.dialogForm.wkshopcode = row.org_code
this.dialogForm.enable = row.enable
})
},
@@ -706,6 +759,7 @@
this.dialogForm.steptypecode = '鑷埗'
this.dialogForm.enable = 'Y'
this.dialogForm.description = ''
+ this.dialogForm.wkshopcode = this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode')// 鎵�灞炶溅闂�
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -724,6 +778,7 @@
steptypecode: this.steptypeArr.find(item => item.name === this.dialogForm.steptypecode).code,
enable: this.dialogForm.enable,
description: this.dialogForm.description,
+ WorkShop: this.dialogForm.wkshopcode,
OperType: this.operation === 'add' ? 'Add' : 'Update'
}
AddUpdateStep(data).then(res => {
@@ -765,7 +820,8 @@
this.workDialogForm.stepcode = row.stepcode
this.workDialogForm.stepname = row.stepname
- StepAssociationEqp({ stepcode: this.workDialogForm.stepcode }).then(res => {
+ this.workDialogForm.WorkShop = row.org_code
+ StepAssociationEqp({ stepcode: this.workDialogForm.stepcode, WorkShop: row.org_code }).then(res => {
if (res.code === '200') {
setTimeout(() => {
loading.close()
@@ -1049,7 +1105,7 @@
}
})
this.$store.state.app.buttonIsDisabled = true
- const res = await SaveStepAssociationEqp(this.workDialogForm.stepcode, data)
+ const res = await SaveStepAssociationEqp(this.workDialogForm.stepcode, this.workDialogForm.WorkShop, data)
if (res.code === '200') {
this.workDialogVisible = false
this.$message.success('淇濆瓨鎴愬姛锛�')
@@ -1070,8 +1126,9 @@
this.defectTreeCode = row.stepcode
this.defectTreeName = row.stepname
+ this.workDialogForm.WorkShop = row.org_code
- StepAssociationDefect({ stepcode: row.stepcode }).then(res => {
+ StepAssociationDefect({ stepcode: row.stepcode, WorkShop: row.org_code }).then(res => {
if (res.code === '200') {
setTimeout(() => {
loading.close()
@@ -1114,7 +1171,7 @@
}
})
this.$store.state.app.buttonIsDisabled = true
- const res = await SaveStepAssociationDefect(this.defectTreeCode, data)
+ const res = await SaveStepAssociationDefect(this.defectTreeCode, this.workDialogForm.WorkShop, data)
if (res.code === '200') {
this.defectDialogVisible = false
this.$message.success('淇濆瓨鎴愬姛锛�')
diff --git a/src/views/makeModel/processRoute.vue b/src/views/makeModel/processRoute.vue
index 572ae4c..07931f3 100644
--- a/src/views/makeModel/processRoute.vue
+++ b/src/views/makeModel/processRoute.vue
@@ -16,6 +16,22 @@
style="display: flex;"
>
<div class="elForm">
+ <el-form-item label="鎵�灞炶溅闂�" style=" display: flex;">
+ <el-select
+ v-model="form.WorkShop"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <!-- @focus="getWareHouseSelect"-->
+ <el-option
+ v-for="item in WorkShopArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="宸ヨ壓璺嚎缂栫爜" style=" display: flex;">
<el-input v-model="form.routecode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
@@ -25,7 +41,7 @@
<el-form-item label="宸ヨ壓鎻忚堪" style=" display: flex;">
<el-input v-model="form.description" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="form.createuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
@@ -36,7 +52,21 @@
</el-form>
<div
class="bodyTopFormExpand"
- />
+ >
+ <svg-icon
+ v-show="mouseHoverType==='mouseout'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+ @mouseenter="mouseHoverType=$event.type"
+ />
+ <svg-icon
+ v-show="mouseHoverType==='mouseenter'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+ @click="isExpandForm=!isExpandForm"
+ @mouseout="mouseHoverType=$event.type"
+ />
+ </div>
</div>
<div class="elTableDiv">
@@ -49,10 +79,10 @@
:key="tableTimeStampKey"
class="tableFixed"
:data="tableData"
- :height="tableHeight"
+ :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:tableHeight+'px',}"
+ :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -182,7 +212,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="getRouteSearch"
/>
@@ -234,10 +264,37 @@
/>
</el-form-item>
</div>
+ <div style="display: flex">
+ <el-form-item prop="wkshopcode" label="鎵�灞炶溅闂�" style="margin-right: 20px">
+ <el-select
+ v-model="dialogForm.wkshopcode"
+ filterable
+ :disabled="operation==='edit'"
+ :popper-append-to-body="false"
+ style="width: 220px"
+ placeholder="璇烽�夋嫨"
+ @change="wkshopcodeChange"
+ >
+ <el-option
+ v-for="item in WorkShopArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+
+ </div>
+
<el-form-item label="宸ヨ壓璁剧疆" prop="Data" style="margin-top: 30px">
<div class="settingDiv">
<!-- 瀹炵幇宸ヨ壓璁剧疆鍔ㄦ�佹坊鍔�-->
- <div v-for="(tag,index) in dynamicTags" :key="tag.seq" style="display: flex;align-items: center">
+ <!-- v-if="false"-->
+ <div
+ v-for="(tag,index) in dynamicTags"
+ :key="tag.seq"
+ style="display: flex;align-items: center"
+ >
<div style="display: flex;align-items: center;position: relative;">
<div
class="orderNumber"
@@ -349,6 +406,8 @@
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import TableColumnSettings from '@/components/TableColumnSettings'
+import { WorkShopSelect } from '@/api/deviceManager'
+import { getCookie } from '@/utils/auth'
export default {
name: 'GYLX',
@@ -359,12 +418,15 @@
data() {
return {
isIpad: false,
+ mouseHoverType: 'mouseout',
+ isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
form: {
routecode: '', // 宸ヨ壓璺嚎缂栫爜
routename: '', // 宸ヨ壓璺嚎鍚嶇О
description: '', // 宸ヨ壓璺嚎鎻忚堪
+ WorkShop: this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode'), // 鎵�灞炶溅闂�
createuser: '', // 鍒涘缓浜哄憳
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
@@ -375,6 +437,7 @@
{ label: '鏄�', value: 'Y' },
{ label: '鍚�', value: 'N' }
],
+ WorkShopArr: [], // 鎵�灞炶溅闂存暟缁�
total: 10,
tableData: [],
tableColumnSettingsArray: [
@@ -423,9 +486,29 @@
{
minWidth: 110,
width: false,
+ prop: 'org_code',
+ label: '鎵�灞炶溅闂寸紪鐮�',
+ id: 7,
+ show: false,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'org_name',
+ label: '鎵�灞炶溅闂�',
+ id: 8,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
prop: 'lm_user',
label: '鍒涘缓浜哄憳',
- id: 7,
+ id: 9,
show: true,
fixed: false,
sortable: true
@@ -435,7 +518,7 @@
width: false,
prop: 'lm_date',
label: '鍒涘缓鏃堕棿',
- id: 8,
+ id: 10,
show: true,
fixed: false,
sortable: true
@@ -449,6 +532,7 @@
name: '',
enable: 'Y',
description: '',
+ wkshopcode: this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode'), // 鎵�灞炶溅闂�
Data: []
},
dynamicTags: [// 宸ヨ壓璁剧疆鏁扮粍
@@ -474,6 +558,9 @@
],
enable: [
{ required: true, message: '璇烽�夋嫨浣跨敤鐘舵��', trigger: ['blur', 'change'] }
+ ],
+ wkshopcode: [
+ { required: true, message: '璇烽�夋嫨鎵�灞炶溅闂�', trigger: ['blur', 'change'] }
]
// Data: [
// { required: true, message: '璇疯缃伐鑹�', trigger: ['blur', 'change'] }
@@ -484,12 +571,18 @@
},
created() {
this.getRouteSearch()
+ this.getWorkShopSelect()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
+ async getWorkShopSelect() {
+ const { data: res } = await WorkShopSelect()
+ this.WorkShopArr = res
+ },
tableColumnUpdate(val, isCopyTrue) {
if (isCopyTrue) {
this.tableColumnSettingsArray = val
@@ -513,9 +606,12 @@
return (res.value.toLowerCase().indexOf(queryString.toLowerCase()) !== -1)
}
},
+ wkshopcodeChange() {
+ this.getStepSelectArr()
+ },
// 宸ヨ壓璁剧疆 涓嬫媺鑾峰彇鎵�鏈�
async getStepSelectArr() {
- const { data: res } = await StepSelect()
+ const { data: res } = await StepSelect({ WorkShop: this.dialogForm.wkshopcode })
this.routeArr = res
},
// 澶勭悊涓嬫媺閫夋嫨
@@ -585,6 +681,13 @@
},
// tag鐐瑰嚮淇敼鎸夐挳
tagEdit(tag) {
+ if (!this.dialogForm.wkshopcode) {
+ return this.$message.info('璇峰厛閫夋嫨鎵�灞炶溅闂达紒')
+ }
+ if (this.routeArr.length === 0) {
+ return this.$message.info('璇ヨ溅闂存湭璁剧疆宸ュ簭锛�')
+ }
+
this.autocompleteValue = ''
this.dynamicTags.forEach(item => {
item.stepname = item.stepname.trim()
@@ -731,6 +834,7 @@
this.form.routename = ''
this.form.description = ''
this.form.createuser = ''
+ this.form.WorkShop = this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode') // 鎵�灞炶溅闂�
this.getRouteSearch()
},
@@ -738,7 +842,10 @@
add(operation) {
this.operation = operation
this.dialogVisible = true
- this.getStepSelectArr()
+
+ if (this.$store.state.settings.orgType === 'W') {
+ this.getStepSelectArr()
+ }
},
// 宸ヨ壓璺嚎棰勮
async edit(operation, row) {
@@ -753,6 +860,8 @@
this.dialogForm.name = res[0].name
this.dialogForm.enable = res[0].enable
this.dialogForm.description = res[0].description
+ this.dialogForm.wkshopcode = res[0].wkshopcode
+
// this.dialogForm.Data = row.description
res[0].Data.forEach(item => {
this.dynamicTags.push(
@@ -786,7 +895,10 @@
this.operation = operation
this.dialogVisible = true
- await this.getStepSelectArr()
+ if (this.$store.state.settings.orgType === 'W') {
+ await this.getStepSelectArr()
+ }
+
const { data: res } = await ViewRoute({ routecode: row.code })
// 寰呮敼
this.dynamicTags = []
@@ -796,6 +908,7 @@
this.dialogForm.name = res[0].name
this.dialogForm.enable = res[0].enable
this.dialogForm.description = res[0].description
+ this.dialogForm.wkshopcode = res[0].wkshopcode
res[0].Data.forEach((item, index) => {
this.dynamicTags.push(
{ seq: item.seq, stepname: item.stepname, stepcode: item.stepcode, editDisabled: true, effect: index === res[0].Data.length - 1 ? 'dark' : 'light' }
@@ -818,6 +931,7 @@
this.dialogForm.name = ''
this.dialogForm.enable = 'Y'
this.dialogForm.description = ''
+ this.dialogForm.wkshopcode = this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode'), // 鎵�灞炶溅闂�
this.dialogForm.Data = []
this.dynamicTags = [
@@ -859,6 +973,7 @@
name: this.dialogForm.name,
enable: this.dialogForm.enable,
description: this.dialogForm.description,
+ wkshopcode: this.dialogForm.wkshopcode,
Data: Data
}
@@ -879,7 +994,7 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 195
+ this.tableHeight = this.mainHeight - 255
if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 40
}
diff --git a/src/views/materialManager/locationDefine.vue b/src/views/materialManager/locationDefine.vue
index b76b0db..2f42d81 100644
--- a/src/views/materialManager/locationDefine.vue
+++ b/src/views/materialManager/locationDefine.vue
@@ -184,7 +184,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="getStorageDefSearch"
/>
diff --git a/src/views/materialManager/storehouseDefine.vue b/src/views/materialManager/storehouseDefine.vue
index 1082367..759e084 100644
--- a/src/views/materialManager/storehouseDefine.vue
+++ b/src/views/materialManager/storehouseDefine.vue
@@ -156,7 +156,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="getWareHouseDefSearch"
/>
diff --git a/src/views/produceManager/AutoScheduling.vue b/src/views/produceManager/AutoScheduling.vue
index 579626b..5266ff6 100644
--- a/src/views/produceManager/AutoScheduling.vue
+++ b/src/views/produceManager/AutoScheduling.vue
@@ -178,7 +178,7 @@
:page.sync="formTop.page"
:limit.sync="formTop.rows"
align="right"
- layout="total,prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes,jumper"
popper-class="select_bottom"
@pagination="getAdvancedSchedulingSearch"
/>
diff --git a/src/views/produceManager/capacityPlanning.vue b/src/views/produceManager/capacityPlanning.vue
index a46ff53..295b8ef 100644
--- a/src/views/produceManager/capacityPlanning.vue
+++ b/src/views/produceManager/capacityPlanning.vue
@@ -181,7 +181,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="getCapacityPlanningSearch"
/>
diff --git a/src/views/produceManager/produceOrder.vue b/src/views/produceManager/produceOrder.vue
index 463ba96..fd06019 100644
--- a/src/views/produceManager/produceOrder.vue
+++ b/src/views/produceManager/produceOrder.vue
@@ -335,7 +335,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="getErpOrderSearch"
/>
diff --git a/src/views/produceManager/produceStartOrder.vue b/src/views/produceManager/produceStartOrder.vue
index 111a38d..b552629 100644
--- a/src/views/produceManager/produceStartOrder.vue
+++ b/src/views/produceManager/produceStartOrder.vue
@@ -187,7 +187,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="getMesOrderStepSearch"
/>
@@ -387,7 +387,7 @@
:page.sync="WXform.page"
:limit.sync="WXform.rows"
align="right"
- layout="total,prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes,jumper"
popper-class="select_bottom"
@pagination="getMesOrderStepSearch"
/>
@@ -505,7 +505,7 @@
:page.sync="badForm.page"
:limit.sync="badForm.rows"
align="right"
- layout="total,prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes,jumper"
popper-class="select_bottom"
@pagination="getBadList"
/>
@@ -784,7 +784,7 @@
:page.sync="Userform.page"
:limit.sync="Userform.rows"
align="right"
- layout="total,prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes,jumper"
popper-class="select_bottom"
@pagination="getMesOrderStepSearch"
/>
diff --git a/src/views/produceManager/workOrder.vue b/src/views/produceManager/workOrder.vue
index a9908d3..9773266 100644
--- a/src/views/produceManager/workOrder.vue
+++ b/src/views/produceManager/workOrder.vue
@@ -362,7 +362,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="getMesOrderSearch"
/>
@@ -587,15 +587,33 @@
<el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
</el-form-item>
<div style="display: flex">
+ <el-form-item label="鐢熶骇杞﹂棿" prop="wkshopcode">
+ <el-select
+ v-model="dialogForm.wkshopcode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ :disabled="dialogForm.partcode===''"
+ @change="val=>wkshopcodeChange(val,dialogForm.partcode)"
+ >
+ <el-option
+ v-for="item in wkshopArr"
+ :key="item.org_code"
+ :label="item.org_name"
+ :value="item.org_code"
+ />
+ </el-select>
+ </el-form-item>
<div style="display: flex;flex-wrap: nowrap">
<el-form-item label="宸ヨ壓璺嚎" prop="routecode">
<el-select
v-model="dialogForm.routecode"
filterable
- :disabled="dialogForm.partcode===''"
:popper-append-to-body="false"
style="width: 172px"
placeholder="璇烽�夋嫨"
+ :disabled="dialogForm.wkshopcode===''"
@change="routecodeChange"
>
<el-option
@@ -616,24 +634,6 @@
<!-- :disabled="dialogForm.routecode===''"-->
</div>
- <el-form-item label="鐢熶骇杞﹂棿" prop="wkshopcode">
- <el-select
- v-model="dialogForm.wkshopcode"
- filterable
- :popper-append-to-body="false"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- :disabled="dialogForm.routecode===''"
- @change="wkshopcodeChange"
- >
- <el-option
- v-for="item in wkshopArr"
- :key="item.org_code"
- :label="item.org_name"
- :value="item.org_code"
- />
- </el-select>
- </el-form-item>
</div>
<el-form-item label="鏄惁鎺掔▼" prop="isAps">
<el-radio-group v-model="dialogForm.isAps" style="width:200px" @change="changeIsAps">
@@ -2338,51 +2338,69 @@
},
// 浜у搧淇℃伅鍊兼敼鍙�
async partcodeChange(val) {
- const { data: res } = await PartSelectRoute({ partcode: val })
+ const { data: res } = await RouteSelectWkshop({ partcode: val })
+ this.wkshopArr = res
+
+ // this.dialogForm.wkshopcode=res.length === 1?res[0].org_code:''
+ if (res.length === 1) {
+ this.dialogForm.wkshopcode = res[0].org_code
+ await this.wkshopcodeChange(res[0].org_code, val)
+ } else {
+ this.dialogForm.wkshopcode = ''
+ }
+
+ // this.routeArr = res
+
+ // let flag = false
+ // this.routeArr.forEach(item => {
+ // if (item.code === item.default_route) {
+ // this.dialogForm.routecode = item.code
+ // // this.routecodeChange(this.dialogForm.routecode)
+ // this.wkshopcodeChange(this.dialogForm.routecode)
+ // flag = true
+ // }
+ // })
+ // if (!flag) {
+ // this.dialogForm.routecode = ''
+ // }
+ //
+ // this.dialogForm.wkshopcode = ''
+ //
+ // this.submitButtonIsDisabled = false
+ },
+ // 宸ヨ壓璺嚎鍊兼敼鍙�
+ async routecodeChange(partcode, routecode) {
+ // const data = {
+ // partcode,
+ // routecode
+ // }
+ },
+ // 鐢熶骇杞﹂棿鍊兼敼鍙樻椂
+ async wkshopcodeChange(wkshopcode, partcode) {
+ const data = {
+ partcode,
+ wkshopcode
+ }
+
+ const { data: res } = await PartSelectRoute(data)
this.routeArr = res
- let flag = false
- this.routeArr.forEach(item => {
- if (item.code === item.default_route) {
- this.dialogForm.routecode = item.code
- this.routecodeChange(this.dialogForm.routecode)
- flag = true
- }
- })
- if (!flag) {
+ if (res.length === 1) {
+ this.dialogForm.routecode = res[0].code
+ } else {
this.dialogForm.routecode = ''
}
- this.dialogForm.wkshopcode = ''
-
- this.submitButtonIsDisabled = false
- },
- // 宸ヨ壓璺嚎鍊兼敼鍙�
- async routecodeChange(val) {
- const data = {
- partcode: this.dialogForm.partcode,
- routecode: this.dialogForm.routecode
- }
- // 鑾峰彇鐢熶骇杞﹂棿鏁扮粍
- const { data: res2 } = await RouteSelectWkshop(data)
- this.wkshopArr = res2
- this.dialogForm.wkshopcode = ''
-
- this.submitButtonIsDisabled = false
- },
- // 鐢熶骇杞﹂棿鍊兼敼鍙樻椂
- wkshopcodeChange(val) {
- const data = {
- partcode: this.dialogForm.partcode,
- routecode: this.dialogForm.routecode,
- wkshopcode: val
- }
- SelectRouteOrWkshop(data).then((res) => {
- // console.log(res, 1)
- }).catch(err => {
- // console.log(err, 2)
- this.submitButtonIsDisabled = true
- })
+ // const data = {
+ // partcode: this.dialogForm.partcode,
+ // routecode: this.dialogForm.routecode,
+ // wkshopcode: val
+ // }
+ // SelectRouteOrWkshop(data).then((res) => {
+ //
+ // }).catch(err => {
+ // this.submitButtonIsDisabled = true
+ // })
},
// 鏄惁鎺掔▼鍊兼敼鍙樻椂
diff --git a/src/views/produceManager/workOrderBatchClose.vue b/src/views/produceManager/workOrderBatchClose.vue
index 6df9dc8..84284a1 100644
--- a/src/views/produceManager/workOrderBatchClose.vue
+++ b/src/views/produceManager/workOrderBatchClose.vue
@@ -361,7 +361,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="getMesOrderBitchClosedSearch"
/>
diff --git a/src/views/purchasesManager/InventoryLedgerList.vue b/src/views/purchasesManager/InventoryLedgerList.vue
index 3ef7931..51e8dc5 100644
--- a/src/views/purchasesManager/InventoryLedgerList.vue
+++ b/src/views/purchasesManager/InventoryLedgerList.vue
@@ -220,7 +220,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="getOrganizationSearch"
/>
diff --git a/src/views/purchasesManager/arrivalNoticeList.vue b/src/views/purchasesManager/arrivalNoticeList.vue
index 3eea821..283f055 100644
--- a/src/views/purchasesManager/arrivalNoticeList.vue
+++ b/src/views/purchasesManager/arrivalNoticeList.vue
@@ -214,7 +214,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="getPurchaseArrivalOrderSearch"
/>
diff --git a/src/views/purchasesManager/goodsStatisticsList.vue b/src/views/purchasesManager/goodsStatisticsList.vue
index 7721be2..3cd21b5 100644
--- a/src/views/purchasesManager/goodsStatisticsList.vue
+++ b/src/views/purchasesManager/goodsStatisticsList.vue
@@ -124,7 +124,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="getOrganizationSearch"
/>
diff --git a/src/views/purchasesManager/purchasesList.vue b/src/views/purchasesManager/purchasesList.vue
index 41795de..3dc5af4 100644
--- a/src/views/purchasesManager/purchasesList.vue
+++ b/src/views/purchasesManager/purchasesList.vue
@@ -225,7 +225,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="getPurchaseOrderSearch"
/>
diff --git a/src/views/purchasesManager/salesStatisticsList.vue b/src/views/purchasesManager/salesStatisticsList.vue
index f08586d..e634736 100644
--- a/src/views/purchasesManager/salesStatisticsList.vue
+++ b/src/views/purchasesManager/salesStatisticsList.vue
@@ -124,7 +124,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="getOrganizationSearch"
/>
diff --git a/src/views/qualityManager/defectDefine.vue b/src/views/qualityManager/defectDefine.vue
index 95a4568..4cb8263 100644
--- a/src/views/qualityManager/defectDefine.vue
+++ b/src/views/qualityManager/defectDefine.vue
@@ -98,7 +98,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="getDedectSearch"
/>
diff --git a/src/views/qualityManager/processCheckItem.vue b/src/views/qualityManager/processCheckItem.vue
index 5a53ca5..b85c0cd 100644
--- a/src/views/qualityManager/processCheckItem.vue
+++ b/src/views/qualityManager/processCheckItem.vue
@@ -96,7 +96,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="getStepCheckItemSearch"
/>
diff --git a/src/views/qualityManager/processCheckRecord.vue b/src/views/qualityManager/processCheckRecord.vue
index f869827..8a75198 100644
--- a/src/views/qualityManager/processCheckRecord.vue
+++ b/src/views/qualityManager/processCheckRecord.vue
@@ -160,7 +160,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="prev, pager, next,sizes,jumper"
popper-class="select_bottom"
@pagination="getStepCheckTableSearch"
/>
diff --git a/src/views/qualityManager/processCheckStandard.vue b/src/views/qualityManager/processCheckStandard.vue
index abf3791..36552fc 100644
--- a/src/views/qualityManager/processCheckStandard.vue
+++ b/src/views/qualityManager/processCheckStandard.vue
@@ -104,7 +104,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="getStepCheckStanedSearch"
/>
diff --git a/src/views/qualityManager/qualityPlaning.vue b/src/views/qualityManager/qualityPlaning.vue
index 25f7b9e..b7b1a58 100644
--- a/src/views/qualityManager/qualityPlaning.vue
+++ b/src/views/qualityManager/qualityPlaning.vue
@@ -252,7 +252,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="getQualityInspectionSearch"
/>
diff --git a/src/views/reportManager/defectDetailList.vue b/src/views/reportManager/defectDetailList.vue
index ea98c79..4a51f16 100644
--- a/src/views/reportManager/defectDetailList.vue
+++ b/src/views/reportManager/defectDetailList.vue
@@ -204,7 +204,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="getDefectDetailsReportSearch"
/>
diff --git a/src/views/reportManager/groupSalaryList.vue b/src/views/reportManager/groupSalaryList.vue
index c3faf1f..2efeb32 100644
--- a/src/views/reportManager/groupSalaryList.vue
+++ b/src/views/reportManager/groupSalaryList.vue
@@ -273,7 +273,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="getGroupSalaryReportSearch"
/>
@@ -437,7 +437,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="getGroupSalaryReportSearch"
/>
diff --git a/src/views/reportManager/installationLampList.vue b/src/views/reportManager/installationLampList.vue
index 3c0a719..b1aee76 100644
--- a/src/views/reportManager/installationLampList.vue
+++ b/src/views/reportManager/installationLampList.vue
@@ -271,7 +271,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="getAnDonReportDefinitSearch"
/>
@@ -327,7 +327,7 @@
:page.sync="formSum.page"
:limit.sync="formSum.rows"
align="right"
- layout="total,prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes,jumper"
popper-class="select_bottom"
@pagination="getAnDonReportDefinitSearch"
/>
diff --git a/src/views/reportManager/logisticsCheck.vue b/src/views/reportManager/logisticsCheck.vue
index d733d02..eacd22e 100644
--- a/src/views/reportManager/logisticsCheck.vue
+++ b/src/views/reportManager/logisticsCheck.vue
@@ -256,7 +256,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="getLogisticsCheckSearch"
/>
diff --git a/src/views/reportManager/personSalaryList.vue b/src/views/reportManager/personSalaryList.vue
index ea90155..5ea0ea2 100644
--- a/src/views/reportManager/personSalaryList.vue
+++ b/src/views/reportManager/personSalaryList.vue
@@ -266,7 +266,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="getPeopleSalaryReportSearch"
/>
@@ -413,7 +413,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="getPeopleSalaryReportSearch"
/>
diff --git a/src/views/reportManager/produceSchedule.vue b/src/views/reportManager/produceSchedule.vue
index 610b990..6687144 100644
--- a/src/views/reportManager/produceSchedule.vue
+++ b/src/views/reportManager/produceSchedule.vue
@@ -180,7 +180,6 @@
label="鐢熶骇杩涘害"
min-width="521"
sortable="custom"
- show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div style="min-width: 900px;display: flex;overflow-x: auto;overflow-y: hidden">
@@ -236,7 +235,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="getProductionScheduleReportSearch"
/>
diff --git a/src/views/reportManager/repairDetailList.vue b/src/views/reportManager/repairDetailList.vue
index f0b1b96..8f9be8d 100644
--- a/src/views/reportManager/repairDetailList.vue
+++ b/src/views/reportManager/repairDetailList.vue
@@ -215,7 +215,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="getMaintenanceDetailsReportSearch"
/>
diff --git a/src/views/reportManager/subcontractingOperation.vue b/src/views/reportManager/subcontractingOperation.vue
index 4a420e1..1c99156 100644
--- a/src/views/reportManager/subcontractingOperation.vue
+++ b/src/views/reportManager/subcontractingOperation.vue
@@ -269,7 +269,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="getOutSourceReportSearch"
/>
diff --git a/src/views/systemSettings/codingRules.vue b/src/views/systemSettings/codingRules.vue
index f159583..d40ca7b 100644
--- a/src/views/systemSettings/codingRules.vue
+++ b/src/views/systemSettings/codingRules.vue
@@ -145,7 +145,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="getEncodingRules"
/>
diff --git a/src/views/systemSettings/shopNotice.vue b/src/views/systemSettings/shopNotice.vue
index d6e1014..1667b94 100644
--- a/src/views/systemSettings/shopNotice.vue
+++ b/src/views/systemSettings/shopNotice.vue
@@ -174,7 +174,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="getSystemAnnouncementSearch"
/>
--
Gitblit v1.9.3