From 519f571634e66a541a40cf9694d933552a0f3802 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期四, 22 一月 2026 14:29:05 +0800
Subject: [PATCH] 1.看板部署2.存货绑定工艺路线弹出框显示默认选中的
---
src/views/kanbanManager/ckgl.vue | 8 ++--
src/permission.js | 2
src/views/materialManager/inventoryList.vue | 5 +-
src/views/qualityManager/processCheck.vue | 34 ++++++++++++++++-
src/router/index.js | 8 +++-
src/views/kanbanManager/jghjcj.vue | 16 ++++---
src/views/kanbanManager/zpcj.vue | 14 +++---
7 files changed, 61 insertions(+), 26 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 7842d41..b61e3a9 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -9,7 +9,7 @@
NProgress.configure({ showSpinner: false }) // NProgress Configuration
-const whiteList = ['/login', '/zhkb', '/cj', '/ckgl'] // no redirect whitelist
+const whiteList = ['/login', '/zhkb', '/zpcj', '/jghjcj', '/ckgl'] // no redirect whitelist
router.beforeEach(async(to, from, next) => {
// start progress bar
diff --git a/src/router/index.js b/src/router/index.js
index cc1eeed..ef55f11 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -40,8 +40,12 @@
component: () => import('@/views/kanbanManager/zhkb'),
hidden: true
}, {
- path: '/cj',
- component: () => import('@/views/kanbanManager/cj'),
+ path: '/zpcj',
+ component: () => import('@/views/kanbanManager/zpcj'),
+ hidden: true
+ }, {
+ path: '/jghjcj',
+ component: () => import('@/views/kanbanManager/jghjcj'),
hidden: true
}, {
path: '/ckgl',
diff --git a/src/views/kanbanManager/ckgl.vue b/src/views/kanbanManager/ckgl.vue
index d2143e6..ba6016e 100644
--- a/src/views/kanbanManager/ckgl.vue
+++ b/src/views/kanbanManager/ckgl.vue
@@ -425,22 +425,22 @@
// 鑾峰彇echarts
getEcharts() {
ProcureOutsourcRightTop().then(res => {
- loadEcharts('bar03', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name)))
+ loadEcharts('bar03', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name + i.specification)))
})
ProductionStockedInRightBottom().then(res => {
- loadEcharts('bar04', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name)))
+ loadEcharts('bar04', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name + i.specification)))
})
this.echartsRightTop = setInterval(() => {
ProcureOutsourcRightTop().then(res => {
- loadEcharts('bar03', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name)))
+ loadEcharts('bar03', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name + i.specification)))
})
}, 1000 * 15)
this.echartsRightBottom = setInterval(() => {
ProductionStockedInRightBottom().then(res => {
- loadEcharts('bar04', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name)))
+ loadEcharts('bar04', bar02(res.data.filter(i => i.qty > 0).map(i => i.qty), res.data.filter(i => i.qty > 0).map(i => i.materiel_name + i.specification)))
})
}, 1000 * 15)
},
diff --git a/src/views/kanbanManager/cj.vue b/src/views/kanbanManager/jghjcj.vue
similarity index 95%
copy from src/views/kanbanManager/cj.vue
copy to src/views/kanbanManager/jghjcj.vue
index 43abef2..6f48418 100644
--- a/src/views/kanbanManager/cj.vue
+++ b/src/views/kanbanManager/jghjcj.vue
@@ -9,8 +9,8 @@
<span>娴欐睙闃块瞾鍏嬪仴韬櫒鏉愭湁闄愬叕鍙�</span>
</div>
- <div class="kb_headTime kb_header_text" style="top: 35px;left: 828px">
- <span>杞﹂棿鏁板瓧鍖栫湅鏉�</span>
+ <div class="kb_headTime kb_header_text" style="top: 35px;left: 772px">
+ <span>閲戝伐鐒婃帴杞﹂棿鏁板瓧鍖栫湅鏉�</span>
</div>
<div class="kb_headTime" style="top: 35px;right: 25px">
@@ -152,7 +152,7 @@
},
methods: {
async getWorkShopProduceTopData() {
- WorkShopProduceTopData({ wkshopcode: '1' }).then(res => {
+ WorkShopProduceTopData({ wkshopcode: '02,03' }).then(res => {
const flag = this.compareArrays(this.configTableTop.data, res.data)
if (!flag) {
this.configTableTop.data = res.data.map(i =>
@@ -189,14 +189,15 @@
// { code: '04', name: '鍠锋紗' },
// { code: '05', name: '缁勮鎴愬搧' }
- { code: '1', name: '鐢熶骇閮�' }
+ { code: '02', name: '閲戝伐杞﹂棿' },
+ { code: '03', name: '鐒婃帴杞﹂棿' }
]
const res4 = await WorkShopProduceBottomLeftData({ wkshopcode: temp.map(i => i.code).join(',') })
// this.cjzl03_xData = res4.data['101,001'].map(i => i.click_date)
// this.cjzl03_yData = res4.data['101,001'].map(i => i.count)
- const a = res4.data['1'].map(i => i.click_date) // echarts妯潗鏍�
+ const a = res4.data['004'].map(i => i.click_date) // echarts妯潗鏍�
const b = temp.map(i => i.name)// legendData鍊�
const c = [
// res4.data['01'].map(i => i.count),
@@ -204,7 +205,7 @@
// res4.data['03'].map(i => i.count),
// res4.data['04'].map(i => i.count),
// res4.data['05'].map(i => i.count)
- res4.data['1'].map(i => i.count)
+ res4.data['004'].map(i => i.count)
]// 绾靛潗鏍囧��
loadEcharts('cjzl03', cjzl03(a, b, c))
@@ -223,7 +224,8 @@
// { code: '04', name: '鍠锋紗' },
// { code: '05', name: '缁勮鎴愬搧' }
- { code: '1', name: '鐢熶骇閮�' }
+ { code: '02', name: '閲戝伐杞﹂棿' },
+ { code: '03', name: '鐒婃帴杞﹂棿' }
]
const res5 = await WorkShopProduceBottomRightData({ wkshopcode: temp.map(i => i.code).join(',') })
this.RightBottom = res5.data
diff --git a/src/views/kanbanManager/cj.vue b/src/views/kanbanManager/zpcj.vue
similarity index 96%
rename from src/views/kanbanManager/cj.vue
rename to src/views/kanbanManager/zpcj.vue
index 43abef2..8e20b9d 100644
--- a/src/views/kanbanManager/cj.vue
+++ b/src/views/kanbanManager/zpcj.vue
@@ -9,8 +9,8 @@
<span>娴欐睙闃块瞾鍏嬪仴韬櫒鏉愭湁闄愬叕鍙�</span>
</div>
- <div class="kb_headTime kb_header_text" style="top: 35px;left: 828px">
- <span>杞﹂棿鏁板瓧鍖栫湅鏉�</span>
+ <div class="kb_headTime kb_header_text" style="top: 35px;left: 800px">
+ <span>瑁呴厤杞﹂棿鏁板瓧鍖栫湅鏉�</span>
</div>
<div class="kb_headTime" style="top: 35px;right: 25px">
@@ -152,7 +152,7 @@
},
methods: {
async getWorkShopProduceTopData() {
- WorkShopProduceTopData({ wkshopcode: '1' }).then(res => {
+ WorkShopProduceTopData({ wkshopcode: '004' }).then(res => {
const flag = this.compareArrays(this.configTableTop.data, res.data)
if (!flag) {
this.configTableTop.data = res.data.map(i =>
@@ -189,14 +189,14 @@
// { code: '04', name: '鍠锋紗' },
// { code: '05', name: '缁勮鎴愬搧' }
- { code: '1', name: '鐢熶骇閮�' }
+ { code: '004', name: '瑁呴厤杞﹂棿' }
]
const res4 = await WorkShopProduceBottomLeftData({ wkshopcode: temp.map(i => i.code).join(',') })
// this.cjzl03_xData = res4.data['101,001'].map(i => i.click_date)
// this.cjzl03_yData = res4.data['101,001'].map(i => i.count)
- const a = res4.data['1'].map(i => i.click_date) // echarts妯潗鏍�
+ const a = res4.data['004'].map(i => i.click_date) // echarts妯潗鏍�
const b = temp.map(i => i.name)// legendData鍊�
const c = [
// res4.data['01'].map(i => i.count),
@@ -204,7 +204,7 @@
// res4.data['03'].map(i => i.count),
// res4.data['04'].map(i => i.count),
// res4.data['05'].map(i => i.count)
- res4.data['1'].map(i => i.count)
+ res4.data['004'].map(i => i.count)
]// 绾靛潗鏍囧��
loadEcharts('cjzl03', cjzl03(a, b, c))
@@ -223,7 +223,7 @@
// { code: '04', name: '鍠锋紗' },
// { code: '05', name: '缁勮鎴愬搧' }
- { code: '1', name: '鐢熶骇閮�' }
+ { code: '004', name: '瑁呴厤杞﹂棿' }
]
const res5 = await WorkShopProduceBottomRightData({ wkshopcode: temp.map(i => i.code).join(',') })
this.RightBottom = res5.data
diff --git a/src/views/materialManager/inventoryList.vue b/src/views/materialManager/inventoryList.vue
index 3b285ad..eb0e07a 100644
--- a/src/views/materialManager/inventoryList.vue
+++ b/src/views/materialManager/inventoryList.vue
@@ -1701,10 +1701,9 @@
// let waitFlag = false// 鍥炴樉绛夊緟鏄惁鏀捐
this.dialogFormRoute.routeOperationArr.forEach((item, index) => {
- item.isSelected1 = false
+ item.isSelected1 = this.defaultroute_code === item.code
item.isSelected2 = false
- if (index === 0) {
- item.isSelected1 = true
+ if (item.isSelected1) {
this.projectTableData = item.Data
}
if (item.flag === 'Y') {
diff --git a/src/views/qualityManager/processCheck.vue b/src/views/qualityManager/processCheck.vue
index 72bd3b7..9a39e91 100644
--- a/src/views/qualityManager/processCheck.vue
+++ b/src/views/qualityManager/processCheck.vue
@@ -74,7 +74,21 @@
</div>
</div>
<div class="content2" style="width: 60%;margin-left: 30px;">
- <div class="orderMsg">鏂规鍚嶇О锛歿{ form.checkstandname }}</div>
+ <div class="orderMsg">鏂规鍚嶇О锛�
+ <el-select
+ v-model="form.checkstandcode"
+ placeholder="璇烽�夋嫨"
+ @change="selectChange"
+ >
+ <el-option
+ v-for="item in checkstandArr"
+ :key="item.checkstandcode"
+ :label="item.checkstandname"
+ :value="item.checkstandcode"
+ />
+ </el-select>
+ </div>
+ <!-- <div class="orderMsg">鏂规鍚嶇О锛歿{ form.checkstandname }}</div>-->
<div class="orderMsg">鎶芥牱鏂瑰紡锛歿{
form.sampmethod === 'FIXED' ? '鍥烘椂鎶芥' : form.sampmethod === 'SCARE' ? '姣斾緥鎶芥' : ''
}}
@@ -307,7 +321,9 @@
stepActive: 0, // 褰撳墠澶勪簬绗嚑浠�
checkItemArr: [],
- check_result: ''
+ check_result: '',
+
+ checkstandArr: []
}
},
@@ -344,6 +360,18 @@
this.getFocus()
},
methods: {
+ // 涓嬫媺鍒囨崲
+ async selectChange(val) {
+ this.stepActive = 0
+ const t = this.checkstandArr.find(i => i.checkstandcode === val)
+ this.form.sampmethod = t.sampmethod
+ this.form.sampscare = t.sampmethod === 'FIXED' ? t.sampscare : Math.ceil(this
+ .form.good_qty * t.sampscare / 100)
+ this.form.sampscare = this.form.sampscare <= this.form.good_qty ? this.form.sampscare : this.form.good_qty
+
+ await this.getMesOrderStepCheckItemList()
+ },
+
// 鑾峰彇鑱氱劍
getFocus() {
this.$nextTick(() => {
@@ -365,6 +393,8 @@
this.form.stepname = res.labcont[0].stepname
this.form.good_qty = res.labcont[0].good_qty
+ this.checkstandArr = res.chekstand
+
this.form.checkstandcode = res.chekstand[0].checkstandcode
this.form.checkstandname = res.chekstand[0].checkstandname
this.form.sampmethod = res.chekstand[0].sampmethod
--
Gitblit v1.9.3