From 4951d18cec6485e4d0e2fc2f529b35407c8db957 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 14 十一月 2023 17:46:46 +0800
Subject: [PATCH] modified: src/views/common/ztt-table.vue modified: src/views/plan/customerorder/index.vue
---
src/views/plan/customerorder/index.vue | 51 ++++++++++++++++++++++++++++++++++-----------------
src/views/common/ztt-table.vue | 7 ++++---
2 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index 1127f78..54ffcda 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -327,10 +327,11 @@
<template v-else>
<template v-if="!item.render">
<template v-if="item.formatter">
- <span v-if="item.isTag">
- <el-tag type="success">aaa</el-tag>
- </span>
+ <div v-if="item.isTag" style="margin: 2px;text-align: center;">
+ <el-tag :type="scope.row[item.prop]==0?'success':'info'">{{item.formatter(scope.row, item, scope.row[item.prop])}}</el-tag>
+ </div>
<span
+ v-else
v-html="
item.formatter(scope.row, item, scope.row[item.prop])
"
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 9c4423c..d9fddcf 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -342,6 +342,15 @@
showCustomerorderReturn: false,
scheduleVisible: false,
showDocument: false,
+ sourceIdList: [{
+ label: '澶栭儴',
+ value: '0',
+ type: 'success',
+ },{
+ label: '鍐呴儴',
+ value: '1',
+ type: ''
+ }],
stateTagArr: [
{
label: '鏍囪闆朵欢寰呴��',
@@ -661,18 +670,18 @@
],
toolbar: [],
operator: [
- {
- text: '璁㈠崟璇存槑',
- type: 'text',
- size: 'small',
- fun: this.openCustomerOrder
- },
- {
- text: '鏌ョ湅搴撳瓨',
- type: 'text',
- size: 'small',
- fun: this.stockHandle
- },
+ // {
+ // text: '璁㈠崟璇存槑',
+ // type: 'text',
+ // size: 'small',
+ // fun: this.openCustomerOrder
+ // },
+ // {
+ // text: '鏌ョ湅搴撳瓨',
+ // type: 'text',
+ // size: 'small',
+ // fun: this.stockHandle
+ // },
{
text: '浣滃簾',
type: 'text',
@@ -692,7 +701,7 @@
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
- width: 260,
+ width: 100,
minWidth: 100
}
},
@@ -860,6 +869,14 @@
}
},
methods: {
+ getSourceId(row, column, cellValue) {
+ this.sourceIdList.forEach((obj) => {
+ if (obj.value === cellValue) {
+ cellValue = obj.label
+ }
+ })
+ return cellValue
+ },
getOtcPartSyncOptionList() {
return this.otcPartSyncOptionList
},
@@ -1353,10 +1370,10 @@
'瀛樺湪閿�鍞鍗曞凡鍏宠仈宸ヨ壓鏂囦欢锛屽闇�鏇存敼锛岃鍏堣В闄ゅ叧鑱�'
)
}
- if (item.salesPartNo == null || item.salesPartNo === '') {
- status = true
- this.$message.error('瀛樺湪閿�鍞鍗曟湭缁戝畾閿�鍞欢锛岃鍏堢粦瀹�')
- }
+ // if (item.salesPartNo == null || item.salesPartNo === '') {
+ // status = true
+ // this.$message.error('瀛樺湪閿�鍞鍗曟湭缁戝畾閿�鍞欢锛岃鍏堢粦瀹�')
+ // }
if (item.partNo != firstPartNo) {
status = true
this.$message.error('璁㈠崟闆朵欢鍙蜂笉涓�鑷�')
--
Gitblit v1.9.3