From 6e49940f007973cc4c24ca654633a60178ce190c Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 11 五月 2023 10:34:30 +0800
Subject: [PATCH] 1.看板字段去除
---
src/views/kb/zpcj.vue | 44 ++++----
src/views/kb/zp1.vue | 34 +++---
src/views/scgl/gdplgb.vue | 32 ++++++
src/views/kb/ckgl.vue | 38 +++---
src/views/kb/zp3.vue | 34 +++---
src/views/kb/zp2.vue | 34 +++---
src/router/index.js | 4
src/views/kb/jgcj.vue | 34 +++---
8 files changed, 142 insertions(+), 112 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index c62a71b..6ecc627 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -752,9 +752,9 @@
path: '/orderManager',
component: Layout,
redirect: '/orderManager/erpProduceOrder',
- name: '鐢熶骇绠＄悊',
+ name: '璁㈠崟绠＄悊',
code: '2004',
- meta: { code: '2004', title: '鐢熶骇绠＄悊', icon: 'production' },
+ meta: { code: '2004', title: '璁㈠崟绠＄悊', icon: 'production' },
alwaysShow: true,
children: [
{
diff --git a/src/views/kb/ckgl.vue b/src/views/kb/ckgl.vue
index 0989e72..1f1b0ee 100644
--- a/src/views/kb/ckgl.vue
+++ b/src/views/kb/ckgl.vue
@@ -37,7 +37,7 @@
<el-table-column
prop="voucherdate"
label="鍗曟嵁鏃ユ湡"
- width="131"
+ width="151"
>
<template slot-scope="{row}">
<div v-if="row.voucherdate" class="ellipsis">{{ row.voucherdate.substring(0, 10) }}</div>
@@ -47,7 +47,7 @@
<el-table-column
prop="wo"
label="鍗曟嵁缂栧彿"
- width="189"
+ width="209"
>
<template slot-scope="{row}">
<div class="ellipsis">{{ row.wo }}</div>
@@ -56,26 +56,26 @@
<el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
- width="105"
+ width="125"
>
<template slot-scope="{row}">
<div class="ellipsis">{{ row.wkshp_name }}</div>
</template>
</el-table-column>
- <el-table-column
- prop="saleOrderCode"
- label="閿�鍞鍗曞彿"
- width="200"
- >
- <template slot-scope="{row}">
- <div v-if="row.saleOrderCode" class="ellipsis">{{ row.saleOrderCode }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+<!-- <el-table-column-->
+<!-- prop="saleOrderCode"-->
+<!-- label="閿�鍞鍗曞彿"-->
+<!-- width="200"-->
+<!-- >-->
+<!-- <template slot-scope="{row}">-->
+<!-- <div v-if="row.saleOrderCode" class="ellipsis">{{ row.saleOrderCode }}</div>-->
+<!-- <div v-else>/</div>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column
prop="materiel_code"
label="浜у搧缂栧彿"
- width="136"
+ width="156"
>
<template slot-scope="{row}">
<div class="ellipsis">{{ row.materiel_code }}</div>
@@ -84,7 +84,7 @@
<el-table-column
prop="materiel_name"
label="浜у搧鍚嶇О"
- width="180"
+ width="220"
>
<template slot-scope="{row}">
<div class="ellipsis">{{ row.materiel_name }}</div>
@@ -103,7 +103,7 @@
<el-table-column
prop="stck_name"
label="棰勫叆浠撳簱"
- width="100"
+ width="120"
>
<template slot-scope="{row}">
<div v-if="row.stck_name" class="ellipsis">{{ row.stck_name }}</div>
@@ -113,12 +113,12 @@
<el-table-column
prop="quantity"
label="鏁伴噺"
- width="63"
+ width="83"
/>
<el-table-column
prop="totalStockInQuantity"
label="宸插叆搴撴暟閲�"
- width="100"
+ width="120"
>
<template slot-scope="{row}">
<div v-if="row.totalStockInQuantity">{{ row.totalStockInQuantity }}</div>
@@ -143,7 +143,7 @@
<el-table-column
prop="preFinishDate"
label="棰勮鍏ュ簱"
- width="140"
+ width="160"
>
<template slot-scope="{row}">
<div v-if="row.preFinishDate">{{ row.preFinishDate.substring(0, 10) }}</div>
diff --git a/src/views/kb/jgcj.vue b/src/views/kb/jgcj.vue
index 17667af..13ce3bd 100644
--- a/src/views/kb/jgcj.vue
+++ b/src/views/kb/jgcj.vue
@@ -44,7 +44,7 @@
<div v-for="item in lineContent3" :key="item.workcode" class="kb_left_top_block">
<div class="kb_block02 kb_pd10">
<div>
- <div>閿�鍞鍗�:{{ item.saleordercode }}</div>
+<!-- <div>閿�鍞鍗�:{{ item.saleordercode }}</div>-->
<div class="kb_mt10">
鍔犲伐鍗曞彿:{{ item.workcode }}
</div>
@@ -136,7 +136,7 @@
<el-table-column
prop="status"
- width="80"
+ width="100"
label="鐘舵��"
>
<template slot-scope="{row}">
@@ -148,26 +148,26 @@
<el-table-column
prop="lm_date"
label="娲惧彂鏃堕棿"
- width="140"
+ width="180"
>
<template slot-scope="{row}">
<div>{{ row.lm_date.substring(0, 10) }}</div>
</template>
</el-table-column>
- <el-table-column
- prop="saleOrderCode"
- label="閿�鍞鍗曞彿"
- width="190"
- >
- <template slot-scope="{row}">
- <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+<!-- <el-table-column-->
+<!-- prop="saleOrderCode"-->
+<!-- label="閿�鍞鍗曞彿"-->
+<!-- width="190"-->
+<!-- >-->
+<!-- <template slot-scope="{row}">-->
+<!-- <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>-->
+<!-- <div v-else>/</div>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column
prop="wo_code"
label="鍔犲伐鍗曞彿"
- width="220"
+ width="240"
/>
<el-table-column
prop="partname"
@@ -182,12 +182,12 @@
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
- width="125"
+ width="165"
/>
<el-table-column
prop="good_qty"
label="瀹屽伐鏁伴噺"
- width="125"
+ width="165"
/>
<!-- <el-table-column-->
<!-- prop="ng_qty"-->
@@ -196,7 +196,7 @@
<!-- />-->
<el-table-column
label="瀹屾垚鐜�"
- width="134"
+ width="164"
>
<template slot-scope="{row}">
<div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>
diff --git a/src/views/kb/zp1.vue b/src/views/kb/zp1.vue
index e841448..7ba32e3 100644
--- a/src/views/kb/zp1.vue
+++ b/src/views/kb/zp1.vue
@@ -45,7 +45,7 @@
<div v-for="item in lineContent3" :key="item.workcode" class="kb_left_top_block">
<div class="kb_block02 kb_pd10">
<div>
- <div>閿�鍞鍗�:{{ item.saleordercode }}</div>
+<!-- <div>閿�鍞鍗�:{{ item.saleordercode }}</div>-->
<div class="kb_mt10">
鍔犲伐鍗曞彿:{{ item.workcode }}
</div>
@@ -137,7 +137,7 @@
<el-table-column
prop="status"
- width="80"
+ width="100"
label="鐘舵��"
>
<template slot-scope="{row}">
@@ -149,26 +149,26 @@
<el-table-column
prop="lm_date"
label="娲惧彂鏃堕棿"
- width="140"
+ width="180"
>
<template slot-scope="{row}">
<div>{{ row.lm_date.substring(0, 10) }}</div>
</template>
</el-table-column>
- <el-table-column
- prop="saleOrderCode"
- label="閿�鍞鍗曞彿"
- width="190"
- >
- <template slot-scope="{row}">
- <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="saleOrderCode"-->
+ <!-- label="閿�鍞鍗曞彿"-->
+ <!-- width="190"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="wo_code"
label="鍔犲伐鍗曞彿"
- width="220"
+ width="240"
/>
<el-table-column
prop="partname"
@@ -183,12 +183,12 @@
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
- width="125"
+ width="165"
/>
<el-table-column
prop="good_qty"
label="瀹屽伐鏁伴噺"
- width="125"
+ width="165"
/>
<!-- <el-table-column-->
<!-- prop="ng_qty"-->
@@ -197,7 +197,7 @@
<!-- />-->
<el-table-column
label="瀹屾垚鐜�"
- width="134"
+ width="164"
>
<template slot-scope="{row}">
<div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>
diff --git a/src/views/kb/zp2.vue b/src/views/kb/zp2.vue
index 5787222..49e541d 100644
--- a/src/views/kb/zp2.vue
+++ b/src/views/kb/zp2.vue
@@ -45,7 +45,7 @@
<div v-for="item in lineContent3" :key="item.workcode" class="kb_left_top_block">
<div class="kb_block02 kb_pd10">
<div>
- <div>閿�鍞鍗�:{{ item.saleordercode }}</div>
+<!-- <div>閿�鍞鍗�:{{ item.saleordercode }}</div>-->
<div class="kb_mt10">
鍔犲伐鍗曞彿:{{ item.workcode }}
</div>
@@ -137,7 +137,7 @@
<el-table-column
prop="status"
- width="80"
+ width="100"
label="鐘舵��"
>
<template slot-scope="{row}">
@@ -149,26 +149,26 @@
<el-table-column
prop="lm_date"
label="娲惧彂鏃堕棿"
- width="140"
+ width="180"
>
<template slot-scope="{row}">
<div>{{ row.lm_date.substring(0, 10) }}</div>
</template>
</el-table-column>
- <el-table-column
- prop="saleOrderCode"
- label="閿�鍞鍗曞彿"
- width="190"
- >
- <template slot-scope="{row}">
- <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="saleOrderCode"-->
+ <!-- label="閿�鍞鍗曞彿"-->
+ <!-- width="190"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="wo_code"
label="鍔犲伐鍗曞彿"
- width="220"
+ width="240"
/>
<el-table-column
prop="partname"
@@ -183,12 +183,12 @@
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
- width="125"
+ width="165"
/>
<el-table-column
prop="good_qty"
label="瀹屽伐鏁伴噺"
- width="125"
+ width="165"
/>
<!-- <el-table-column-->
<!-- prop="ng_qty"-->
@@ -197,7 +197,7 @@
<!-- />-->
<el-table-column
label="瀹屾垚鐜�"
- width="134"
+ width="164"
>
<template slot-scope="{row}">
<div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>
diff --git a/src/views/kb/zp3.vue b/src/views/kb/zp3.vue
index 139962e..85e2a62 100644
--- a/src/views/kb/zp3.vue
+++ b/src/views/kb/zp3.vue
@@ -45,7 +45,7 @@
<div v-for="item in lineContent3" :key="item.workcode" class="kb_left_top_block">
<div class="kb_block02 kb_pd10">
<div>
- <div>閿�鍞鍗�:{{ item.saleordercode }}</div>
+<!-- <div>閿�鍞鍗�:{{ item.saleordercode }}</div>-->
<div class="kb_mt10">
鍔犲伐鍗曞彿:{{ item.workcode }}
</div>
@@ -137,7 +137,7 @@
<el-table-column
prop="status"
- width="80"
+ width="100"
label="鐘舵��"
>
<template slot-scope="{row}">
@@ -149,26 +149,26 @@
<el-table-column
prop="lm_date"
label="娲惧彂鏃堕棿"
- width="140"
+ width="180"
>
<template slot-scope="{row}">
<div>{{ row.lm_date.substring(0, 10) }}</div>
</template>
</el-table-column>
- <el-table-column
- prop="saleOrderCode"
- label="閿�鍞鍗曞彿"
- width="190"
- >
- <template slot-scope="{row}">
- <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="saleOrderCode"-->
+ <!-- label="閿�鍞鍗曞彿"-->
+ <!-- width="190"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="wo_code"
label="鍔犲伐鍗曞彿"
- width="220"
+ width="240"
/>
<el-table-column
prop="partname"
@@ -183,12 +183,12 @@
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
- width="125"
+ width="165"
/>
<el-table-column
prop="good_qty"
label="瀹屽伐鏁伴噺"
- width="125"
+ width="165"
/>
<!-- <el-table-column-->
<!-- prop="ng_qty"-->
@@ -197,7 +197,7 @@
<!-- />-->
<el-table-column
label="瀹屾垚鐜�"
- width="134"
+ width="164"
>
<template slot-scope="{row}">
<div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>
diff --git a/src/views/kb/zpcj.vue b/src/views/kb/zpcj.vue
index 7c28136..1a0aa70 100644
--- a/src/views/kb/zpcj.vue
+++ b/src/views/kb/zpcj.vue
@@ -45,7 +45,7 @@
<div v-for="item in lineContent3" :key="item.workcode" class="kb_left_top_block">
<div class="kb_block02 kb_pd10">
<div>
- <div>閿�鍞鍗�:{{ item.saleordercode }}</div>
+<!-- <div>閿�鍞鍗�:{{ item.saleordercode }}</div>-->
<div class="kb_mt10">
鍔犲伐鍗曞彿:{{ item.workcode }}
</div>
@@ -137,7 +137,7 @@
<el-table-column
prop="status"
- width="80"
+ width="100"
label="鐘舵��"
>
<template slot-scope="{row}">
@@ -149,26 +149,26 @@
<el-table-column
prop="lm_date"
label="娲惧彂鏃堕棿"
- width="140"
+ width="180"
>
<template slot-scope="{row}">
<div>{{ row.lm_date.substring(0, 10) }}</div>
</template>
</el-table-column>
- <el-table-column
- prop="saleOrderCode"
- label="閿�鍞鍗曞彿"
- width="190"
- >
- <template slot-scope="{row}">
- <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="saleOrderCode"-->
+ <!-- label="閿�鍞鍗曞彿"-->
+ <!-- width="190"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="wo_code"
label="鍔犲伐鍗曞彿"
- width="220"
+ width="240"
/>
<el-table-column
prop="partname"
@@ -183,21 +183,21 @@
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
- width="125"
+ width="165"
/>
<el-table-column
prop="good_qty"
label="瀹屽伐鏁伴噺"
- width="125"
+ width="165"
/>
-<!-- <el-table-column-->
-<!-- prop="ng_qty"-->
-<!-- label="涓嶈壇鏁伴噺"-->
-<!-- width="105"-->
-<!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="ng_qty"-->
+ <!-- label="涓嶈壇鏁伴噺"-->
+ <!-- width="105"-->
+ <!-- />-->
<el-table-column
label="瀹屾垚鐜�"
- width="134"
+ width="164"
>
<template slot-scope="{row}">
<div>{{ parseFloat((row.good_qty * 100 / row.plan_qty).toFixed(2)) }}%</div>
diff --git a/src/views/scgl/gdplgb.vue b/src/views/scgl/gdplgb.vue
index cf08a4e..5570eac 100644
--- a/src/views/scgl/gdplgb.vue
+++ b/src/views/scgl/gdplgb.vue
@@ -16,7 +16,22 @@
>
<div class="elForm">
<el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">
- <el-input v-model="form.mesorderstus" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <!-- <el-input v-model="form.mesorderstus" placeholder="璇疯緭鍏�" style="width: 200px" />-->
+ <el-select
+ v-model="form.mesorderstus"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ filterable
+ @change="erporderstusChange"
+ >
+ <el-option
+ v-for="item in erporderstusArr"
+ :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.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
@@ -405,6 +420,17 @@
total: 10,
tableData: [],
+ erporderstusArr: [
+ { code: 'NEW', name: '鏂板伐鍗�' },
+ // { code: 'CREATING', name: '鎵ц涓�' },
+ // { code: 'CREATED', name: '宸插叧闂�' }
+ { code: 'ALLO', name: '宸叉淳鍙�' },
+ { code: 'START', name: '寮�宸�' },
+ { code: 'CLOSED', name: '瀹屽伐' }
+ // { code: 'NOSCHED', name: '寰呮帓绋�' },
+ // { code: 'SCHED', name: '宸叉帓绋�' }
+ ],
+
multipleSelection: [],
title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
@@ -450,6 +476,10 @@
search() {
this.getMesOrderBitchClosedSearch()
},
+ // 璁㈠崟鐘舵�佹敼鍙樻椂
+ erporderstusChange(val) {
+ this.form.mesorderstus = val
+ },
// 瀵煎叆鎸夐挳
upload() {
this.shows = true
--
Gitblit v1.9.3