From 4d051089b33582019716598e7d700f20cdca16d2 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 12 十月 2023 11:13:55 +0800
Subject: [PATCH] modified: src/views/plan/customerorder/index.vue modified: src/views/plan/customerorder/sample-customerorder-form.vue
---
src/views/plan/customerorder/index.vue | 41 ++++++++++----------
src/views/plan/customerorder/sample-customerorder-form.vue | 72 ++++++++++++++++++++++++++++--------
2 files changed, 77 insertions(+), 36 deletions(-)
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index c061cf7..24f2a0b 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -12,7 +12,7 @@
ref="customerOrderTable"
>
<template #toolbar>
- <el-dropdown
+ <!-- <el-dropdown
v-if="permissions.customerorder_state_change"
@command="handleCommand"
>
@@ -27,7 +27,7 @@
{{ item.label }}
</el-dropdown-item>
</el-dropdown-menu>
- </el-dropdown>
+ </el-dropdown> -->
<el-dropdown
v-if="permissions.customerorder_doc_relate"
@command="documentHandle"
@@ -71,12 +71,12 @@
@click="pushOtc"
>鎺ㄩ�丒RP</el-button
> -->
- <el-button
+ <!-- <el-button
style="margin-left:10px;"
type="primary"
@click="importOutPutBatch"
>瀵煎叆浜у嚭鎵规</el-button
- >
+ > -->
<el-button
style="margin-left:10px;"
type="primary"
@@ -1238,14 +1238,14 @@
// })
// }
if (this.permissions.customerorder_submit_oa) {
- this.table.toolbar.push({
- text: '鎻愪氦瀹℃牳',
- type: 'primary',
- fun: this.auditCustomerOrder,
- disabled: false,
- permitArr: [],
- loading: false
- })
+ // this.table.toolbar.push({
+ // text: '鎻愪氦瀹℃牳',
+ // type: 'primary',
+ // fun: this.auditCustomerOrder,
+ // disabled: false,
+ // permitArr: [],
+ // loading: false
+ // })
}
if (this.permissions.customerorder_set_salesparts) {
this.table.toolbar.push({
@@ -1293,18 +1293,19 @@
},
// 鍒涘缓涓荤敓浜ц鍒�
masterPlanHandle() {
+ console.log(this.multipleSelection);
if (this.multipleSelection && this.multipleSelection.length > 0) {
if (this.judgeCoState(this.multipleSelection)) {
// 鍒ゆ柇涓�涓嬪墿浣欐暟閲忔槸鍚﹀ぇ浜�0
for (let i = 0, len = this.multipleSelection.length; i < len; i++) {
- if (
- this.multipleSelection[i].buyQtyDue -
- this.multipleSelection[i].requireNumber <=
- 0
- ) {
- this.$message.error('璇烽�夊簱瀛樻暟閲忓ぇ浜庡凡涓嬪彂鏁伴噺鐨勯攢鍞鍗�')
- return
- }
+ // if (
+ // this.multipleSelection[i].buyQtyDue -
+ // this.multipleSelection[i].requireNumber <=
+ // 0
+ // ) {
+ // this.$message.error('璇烽�夊簱瀛樻暟閲忓ぇ浜庡凡涓嬪彂鏁伴噺鐨勯攢鍞鍗�')
+ // return
+ // }
if (
!(
this.multipleSelection[i].isAudit != null &&
diff --git a/src/views/plan/customerorder/sample-customerorder-form.vue b/src/views/plan/customerorder/sample-customerorder-form.vue
index 8f4892b..53415cf 100644
--- a/src/views/plan/customerorder/sample-customerorder-form.vue
+++ b/src/views/plan/customerorder/sample-customerorder-form.vue
@@ -51,21 +51,21 @@
<el-input v-model="dataForm.entityName" placeholder=""></el-input>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="浜嬩笟閮�" prop="salesDepartment">
<el-input
v-model="dataForm.salesDepartment"
placeholder=""
></el-input>
</el-form-item>
- </el-col>
- </el-row>
- <el-row>
+ </el-col> -->
<el-col :span="6">
<el-form-item label="鐪佷唤" prop="province">
<el-input v-model="dataForm.province" placeholder=""></el-input>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="6">
<el-form-item label="涓氬姟鍛�" prop="salesMan">
<el-select v-model="dataForm.salesMan" style="width:100%">
@@ -82,6 +82,14 @@
</el-form-item>
</el-col>
<el-col :span="6">
+ <el-form-item label="鍚堝悓姝ｆ湰鐘舵��" prop="returnStatus">
+ <el-input
+ v-model="dataForm.returnStatus"
+ placeholder=""
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item label="椤圭洰鎬ц川" prop="isCp">
<el-input v-model="dataForm.isCp" placeholder=""></el-input>
</el-form-item>
@@ -91,14 +99,6 @@
<el-col :span="6">
<el-form-item label="瀹㈡埛缂栫爜" prop="customerNo">
<el-input v-model="dataForm.customerNo" placeholder=""></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍚堝悓姝ｆ湰鐘舵��" prop="returnStatus">
- <el-input
- v-model="dataForm.returnStatus"
- placeholder=""
- ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -123,8 +123,6 @@
</el-date-picker>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="6">
<el-form-item label="浜よ揣鏃ユ湡" prop="deliveryDate">
<el-date-picker
@@ -143,7 +141,48 @@
<el-divider
><span style="font-weight:bold;font-size:16px;">璁㈠崟琛�</span></el-divider
>
- <div class="l-mes normal-form">
+ <el-table
+ :data="tableData"
+ border
+ style="width: 100%">
+ <el-table-column
+ prop="date"
+ label="闆朵欢鍙�">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="闆朵欢瑙勬牸">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="浜у搧鍚嶇О">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="浜у搧绫诲瀷">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鍒堕�犲睘鎬�">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鏀惰揣鍦板潃">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鏁伴噺">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鍗曚綅">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="澶囨敞">
+ </el-table-column>
+ </el-table>
+ <!-- <div class="l-mes normal-form">
<el-row :gutter="20">
<el-col :span="2">
<span>闆朵欢鍙�</span>
@@ -332,7 +371,7 @@
></el-input>
</el-col>
</el-row>
- </div>
+ </div> -->
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">鍙栨秷</el-button>
@@ -383,6 +422,7 @@
},
data() {
return {
+ tableData: [],
staffOptions: [],
title: '',
isFullScreen: false,
--
Gitblit v1.9.3