From 49f3321fa839e0ff5fb4d2de75756096a6db7b92 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期日, 24 九月 2023 10:50:08 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mom-before
---
src/components/view/sale.vue | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/src/components/view/sale.vue b/src/components/view/sale.vue
index 2e10f82..e4c28ad 100644
--- a/src/components/view/sale.vue
+++ b/src/components/view/sale.vue
@@ -118,7 +118,6 @@
<el-button type="success" @click="syncOrder"
:icon="isSync ? 'el-icon-loading' : 'el-icon-refresh'">鍚屾</el-button>
<el-button type="primary" icon="el-icon-plus" @click="openAddDia">鏂板</el-button>
- <!-- <el-button icon="el-icon-edit-outline">淇敼</el-button> -->
<el-button icon="el-icon-delete" @click="delSales">鍒犻櫎</el-button>
<el-button icon="el-icon-download">瀵煎嚭</el-button>
</el-col>
@@ -156,29 +155,34 @@
</el-table-column>
<el-table-column prop="order_number" label="璁㈠崟缂栧彿" width="150">
</el-table-column>
+ <el-table-column label="璁㈠崟绫诲瀷" width="100">
+ <template slot-scope="scope">
+ <el-tag effect="dark" size="mini" style="font-size: 8px;">{{scope.row.order_type}}</el-tag>
+ </template>
+ </el-table-column>
<el-table-column prop="code" label="鍚堝悓缂栧彿" width="220">
</el-table-column>
- <el-table-column prop="name" label="宸ョ▼鍚嶇О">
+ <el-table-column prop="name" label="宸ョ▼鍚嶇О" width="120">
</el-table-column>
- <el-table-column prop="proname" label="瀹㈡埛鍚嶇О">
+ <el-table-column prop="proname" label="瀹㈡埛鍚嶇О" width="120">
</el-table-column>
<el-table-column prop="浜よ揣鏃ユ湡" label="浜よ揣鏃ユ湡" width="150">
</el-table-column>
- <el-table-column prop="note" label="澶囨敞" width="150">
+ <el-table-column prop="note" label="澶囨敞" width="150" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="type" label="鐘舵��" width="100">
<template slot-scope="scope">
<span style="color: #34BD66;" v-if="scope.row.type == 1">閫氳繃</span>
<span style="color: #E84738;" v-else-if="scope.row.type == 0">涓嶉�氳繃</span>
- <span v-else>鏈鏍�</span>
+ <span v-else>{{null}}</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" width="220">
<template slot-scope="scope">
<span class="table_do" @click="changeShowDetail(scope.row)"> 鏌ョ湅璇︽儏 </span>
- <span class="table_do" v-if="scope.row.type == null" @click="saleCheck(scope)"> 瀹℃牳 </span>
+ <span class="table_do" v-if="scope.row.type == 2" @click="saleCheck(scope)"> 瀹℃牳 </span>
<span class="table_do" v-else> </span>
- <span class="table_do" v-if="scope.row.type == null"
+ <span class="table_do" v-if="scope.row.type == 2"
@click="openUpDia(scope.row.id)"> 缂栬緫 </span>
<span class="table_do" v-else> </span>
<span class="table_do" @click="delSale(scope.$index)"> 鍒犻櫎 </span>
@@ -284,7 +288,7 @@
</el-dialog>
</div>
<div class="select-model">
- <el-dialog :title="`閿�鍞�${upDia == true ? '淇敼' : '鏂板'}`" :visible.sync="addDia" width="850px"
+ <el-dialog :title="`閿�鍞�${upDia == true ? '淇敼' : '鏂板'}`" :visible.sync="addDia" width="900px"
@close="closeDialog">
<div class="body">
<div class="head">鍩烘湰淇℃伅</div>
@@ -304,6 +308,10 @@
<el-col :span="3">宸ョ▼鍚嶇О</el-col>
<el-col :span="8">
<el-input v-model="addData.name" size="small" placeholder="璇疯緭鍏ュ伐绋嬪悕绉�" clearable></el-input>
+ </el-col>
+ <el-col :span="3" :offset="2">澶囨敞</el-col>
+ <el-col :span="8">
+ <el-input v-model="addData.note" size="small" placeholder="璇疯緭鍏ュ娉�" clearable></el-input>
</el-col>
</el-row>
</div>
@@ -349,35 +357,35 @@
placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="unit" label="鍗曚綅">
+ <el-table-column prop="unit" label="鍗曚綅" width="100">
<template slot-scope="scope">
<el-input v-model="scope.row.unit" size="small" clearable placeholder="璇疯緭鍏�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="number" label="鏁伴噺">
+ <el-table-column prop="number" label="鏁伴噺" width="100">
<template slot-scope="scope">
<el-input v-model.number="scope.row.number" size="small"
@change="(val) => scope.row.number = isNaN(val) ? null : val" clearable
placeholder="璇疯緭鍏�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="price" label="鍗曚环">
+ <el-table-column prop="price" label="鍗曚环" width="100">
<template slot-scope="scope">
<el-input v-model="scope.row.price" size="small" clearable placeholder="璇疯緭鍏�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="username" label="鑱旂郴浜�">
+ <el-table-column prop="username" label="鑱旂郴浜�" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.username" size="small" clearable
placeholder="璇疯緭鍏�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="phone" label="鐢佃瘽">
+ <el-table-column prop="phone" label="鐢佃瘽" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.phone" size="small" clearable placeholder="璇疯緭鍏�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="address" label="鍦板潃">
+ <el-table-column prop="address" label="鍦板潃" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.address" size="small" clearable
placeholder="璇疯緭鍏�"></el-input>
@@ -424,6 +432,7 @@
orderNumber: null,
code: null,
name: null,
+ note: null,
proname: null,
adress: null,
username: null,
@@ -446,6 +455,7 @@
orderNumber: null,
code: null,
name: null,
+ note: null,
proname: null,
adress: null,
username: null,
@@ -627,7 +637,7 @@
} else {
for (var c in this.addData.saleMaterialList[b]) {
if (this.addData.saleMaterialList[b][c] == null || this.addData.saleMaterialList[b][c] == '' || Object
- .keys(this.addData.saleMaterialList[b]).length != 6) {
+ .keys(this.addData.saleMaterialList[b]).length != 9) {
this.$message.error('浜у搧淇℃伅鏈夊繀濉」鏈～鍐�')
return
}
--
Gitblit v1.9.3