|
|
@@ -2,21 +2,30 @@
|
|
2
|
2
|
<div>
|
|
3
|
3
|
<el-row>
|
|
4
|
4
|
<el-form :model="query" label-width="100px" inline="">
|
|
5
|
|
-
|
|
6
|
|
- <el-button type="info" @click="search" size="small">查询</el-button>
|
|
7
|
|
- <el-button type="primary" @click="handleAdd" size="small">新增</el-button>
|
|
|
5
|
+ <el-form-item label="客户名称" >
|
|
|
6
|
+ <el-select v-model="query.customerName" filterable placeholder="请选择订单客户" clearable size="small">
|
|
|
7
|
+ <el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.name" >
|
|
|
8
|
+ </el-option>
|
|
|
9
|
+ </el-select>
|
|
|
10
|
+ </el-form-item>
|
|
|
11
|
+ <el-form-item>
|
|
|
12
|
+ <el-button type="info" @click="search" size="small">查询</el-button>
|
|
|
13
|
+ <el-button type="primary" @click="handleAdd" size="small">新增</el-button>
|
|
|
14
|
+ </el-form-item>
|
|
8
|
15
|
</el-form>
|
|
9
|
16
|
</el-row>
|
|
10
|
17
|
|
|
11
|
18
|
<el-table v-loading="loading" :data="tableData" border>
|
|
12
|
19
|
<el-table-column prop="id" label="编号" width="60" v-if="isShow"></el-table-column>
|
|
13
|
|
- <el-table-column prop="material.name" label="物料" width="180" show-overflow-tooltip ></el-table-column>
|
|
|
20
|
+ <!-- <el-table-column prop="material.name" label="物料" width="180" show-overflow-tooltip ></el-table-column>
|
|
14
|
21
|
<el-table-column prop="material.standard" label="钢种" width="180" show-overflow-tooltip ></el-table-column>
|
|
15
|
|
- <el-table-column prop="storageType" label="类型" width="180" show-overflow-tooltip align="center" :formatter="typeFormatter"></el-table-column>
|
|
16
|
|
- <el-table-column prop="storagePrice" label="价格" width="100" show-overflow-tooltip align="right"></el-table-column>
|
|
17
|
|
- <el-table-column prop="weightPrice" label="价格" width="100" show-overflow-tooltip align="right"></el-table-column>
|
|
18
|
|
- <el-table-column prop="addUser.userDesc" label="添加人" width="120" show-overflow-tooltip ></el-table-column>
|
|
19
|
|
- <el-table-column prop="addTime" label="添加时间" width="200" show-overflow-tooltip ></el-table-column>
|
|
|
22
|
+ <el-table-column prop="storageType" label="类型" width="180" show-overflow-tooltip align="center" :formatter="typeFormatter"></el-table-column> -->
|
|
|
23
|
+ <el-table-column prop="customer.name" label="客户名称" width="180" show-overflow-tooltip ></el-table-column>
|
|
|
24
|
+ <el-table-column prop="keepDay" label="免堆时间（天）" width="200" show-overflow-tooltip ></el-table-column>
|
|
|
25
|
+ <el-table-column prop="ordPrice" label="免堆期价格（元/吨）" width="200" show-overflow-tooltip align="right"></el-table-column>
|
|
|
26
|
+ <el-table-column prop="outOrdPrice" label="超期价格（元/吨）" width="200" show-overflow-tooltip align="right"></el-table-column>
|
|
|
27
|
+ <el-table-column prop="addUser.userDesc" label="添加人" width="120" show-overflow-tooltip ></el-table-column>
|
|
|
28
|
+ <el-table-column prop="addTime" label="添加时间" width="200" show-overflow-tooltip ></el-table-column>
|
|
20
|
29
|
<el-table-column label="操作" width="200">
|
|
21
|
30
|
<template slot-scope="scope">
|
|
22
|
31
|
<!-- 编辑、删除向后台传参数时，传整行数据row 删除时id=row.id -->
|
|
|
@@ -33,32 +42,25 @@
|
|
33
|
42
|
|
|
34
|
43
|
<!-- 弹出框 另起名字 var json = JSON.stringify(this.自己起的名字)
|
|
35
|
44
|
var url = 后台对应的url 'MaintPrice/save.do' -->
|
|
36
|
|
- <el-dialog title="物料明细" :visible.sync="dialogVisible" width="500px">
|
|
|
45
|
+ <el-dialog title="价格明细" :visible.sync="dialogVisible" width="500px">
|
|
37
|
46
|
<el-form :model="obj" label-width="100px">
|
|
38
|
47
|
<el-form-item label="id" v-if="isShow">
|
|
39
|
48
|
<el-input v-model="obj.id"></el-input>
|
|
40
|
49
|
</el-form-item>
|
|
41
|
|
- <el-form-item label="物料">
|
|
42
|
|
- <el-input v-model="obj.material.name" style="width: 300px;">
|
|
43
|
|
- <el-button slot="append" icon="el-icon-search" @click="showMaterialDialog"></el-button>
|
|
44
|
|
- </el-input>
|
|
45
|
|
- </el-form-item>
|
|
46
|
|
- <el-form-item label="钢种">
|
|
47
|
|
- <el-input v-model="obj.material.standard" style="width: 300px;">
|
|
48
|
|
- <el-button slot="append" icon="el-icon-search" @click="showMaterialDialog"></el-button>
|
|
49
|
|
- </el-input>
|
|
50
|
|
- </el-form-item>
|
|
51
|
|
- <el-form-item label="类型">
|
|
52
|
|
- <el-select v-model="obj.storageType" placeholder="请选择" style="width: 300px;">
|
|
53
|
|
- <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
|
|
|
50
|
+ <el-form-item label="客户名称">
|
|
|
51
|
+ <el-select v-model="obj.customer.id" filterable placeholder="请选择订单客户" clearable style="width: 300px;">
|
|
|
52
|
+ <el-option v-for="item in optionsCust" :key="item.name" :label="item.name" :value="item.id" >
|
|
54
|
53
|
</el-option>
|
|
55
|
54
|
</el-select>
|
|
56
|
55
|
</el-form-item>
|
|
57
|
|
- <el-form-item label="库存单价">
|
|
58
|
|
- <el-input v-model="obj.storagePrice" style="width: 300px;"></el-input>
|
|
|
56
|
+ <el-form-item label="免堆时间">
|
|
|
57
|
+ <el-input v-model="obj.keepDay" type="number" style="width: 300px;"></el-input>
|
|
|
58
|
+ </el-form-item>
|
|
|
59
|
+ <el-form-item label="免堆期价格">
|
|
|
60
|
+ <el-input v-model="obj.ordPrice" type="number" style="width: 300px;"></el-input>
|
|
59
|
61
|
</el-form-item>
|
|
60
|
|
- <el-form-item label="过磅单价">
|
|
61
|
|
- <el-input v-model="obj.weightPrice" style="width: 300px;"></el-input>
|
|
|
62
|
+ <el-form-item label="超期价格">
|
|
|
63
|
+ <el-input v-model="obj.outOrdPrice" type="number" style="width: 300px;"></el-input>
|
|
62
|
64
|
</el-form-item>
|
|
63
|
65
|
<el-form-item>
|
|
64
|
66
|
<el-button type="success" @click="handleSave">保存</el-button>
|
|
|
@@ -95,29 +97,30 @@
|
|
95
|
97
|
pageSize: 50,
|
|
96
|
98
|
//查询条件
|
|
97
|
99
|
query: {
|
|
98
|
|
- material: '',
|
|
99
|
|
- standard: '',
|
|
|
100
|
+ customerName: '',
|
|
100
|
101
|
},
|
|
101
|
102
|
//录入框
|
|
102
|
103
|
dialogVisible: false,
|
|
103
|
104
|
isShow: false,
|
|
104
|
105
|
loading: true,
|
|
105
|
106
|
obj: {
|
|
106
|
|
- material: {
|
|
|
107
|
+ id:'',
|
|
|
108
|
+ customer: {
|
|
107
|
109
|
id: '',
|
|
108
|
110
|
name: '',
|
|
109
|
|
- standard: '',
|
|
110
|
111
|
},
|
|
111
|
|
- storagePrice: '',
|
|
112
|
|
- storageType: '',
|
|
113
|
|
- weightType: '',
|
|
|
112
|
+ keepDay: '',
|
|
|
113
|
+ ordPrice: '',
|
|
|
114
|
+ outOrdPrice: '',
|
|
114
|
115
|
},
|
|
|
116
|
+ optionsCust: [],
|
|
115
|
117
|
|
|
116
|
118
|
}
|
|
117
|
119
|
},
|
|
118
|
120
|
//界面渲染完毕调用 初始化表格参数
|
|
119
|
121
|
mounted() {
|
|
120
|
122
|
this.getTableData()
|
|
|
123
|
+ this.getAllCustomer()
|
|
121
|
124
|
},
|
|
122
|
125
|
methods: {
|
|
123
|
126
|
typeFormatter: function(row, column) {
|
|
|
@@ -130,6 +133,14 @@
|
|
130
|
133
|
break;
|
|
131
|
134
|
}
|
|
132
|
135
|
},
|
|
|
136
|
+
|
|
|
137
|
+ getAllCustomer() {
|
|
|
138
|
+ var url = 'MaintCustomer/queryByUserId.do'
|
|
|
139
|
+ var param = {}
|
|
|
140
|
+ axios.get(url, param).then(response => {
|
|
|
141
|
+ this.optionsCust = response.data.data
|
|
|
142
|
+ });
|
|
|
143
|
+ },
|
|
133
|
144
|
|
|
134
|
145
|
showMaterial() {
|
|
135
|
146
|
this.$refs.PopupMaterial.show()
|
|
|
@@ -152,8 +163,7 @@
|
|
152
|
163
|
var param = {
|
|
153
|
164
|
page: this.currentPage,
|
|
154
|
165
|
rows: this.pageSize,
|
|
155
|
|
- materialName: this.query.material,
|
|
156
|
|
- standard: this.query.standard,
|
|
|
166
|
+ customerName: this.query.customerName,
|
|
157
|
167
|
}
|
|
158
|
168
|
axios.get(url, param).then(response => {
|
|
159
|
169
|
if (response.data.code == 0) {
|
|
|
@@ -189,7 +199,7 @@
|
|
189
|
199
|
json: json
|
|
190
|
200
|
}
|
|
191
|
201
|
axios.post(url, param).then(response => {
|
|
192
|
|
- alert(JSON.stringify(response))
|
|
|
202
|
+ console.log(response)
|
|
193
|
203
|
if (response.data.code == 0) {
|
|
194
|
204
|
this.$message({
|
|
195
|
205
|
type: 'success',
|
|
|
@@ -200,7 +210,7 @@
|
|
200
|
210
|
} else {
|
|
201
|
211
|
this.$message({
|
|
202
|
212
|
type: 'error',
|
|
203
|
|
- message: '保存失败:' + response.data,
|
|
|
213
|
+ message: '保存失败:' + response.data.msg,
|
|
204
|
214
|
});
|
|
205
|
215
|
}
|
|
206
|
216
|
// loading.close();
|
|
|
@@ -217,13 +227,14 @@
|
|
217
|
227
|
handleAdd() {
|
|
218
|
228
|
this.dialogVisible = true
|
|
219
|
229
|
this.obj = {
|
|
220
|
|
- material: {
|
|
|
230
|
+ id:'',
|
|
|
231
|
+ customer: {
|
|
221
|
232
|
id: '',
|
|
222
|
233
|
name: '',
|
|
223
|
|
- standard: '',
|
|
224
|
234
|
},
|
|
225
|
|
- storagePrice: '',
|
|
226
|
|
- storageType: '',
|
|
|
235
|
+ keepDay: '',
|
|
|
236
|
+ ordPrice: '',
|
|
|
237
|
+ outOrdPrice: '',
|
|
227
|
238
|
}
|
|
228
|
239
|
|
|
229
|
240
|
},
|
|
|
@@ -274,3 +285,16 @@
|
|
274
|
285
|
}
|
|
275
|
286
|
}
|
|
276
|
287
|
</script>
|
|
|
288
|
+<style>
|
|
|
289
|
+ .el-table .warning-row {
|
|
|
290
|
+ background: #F08080;
|
|
|
291
|
+ }
|
|
|
292
|
+
|
|
|
293
|
+ .el-select-dropdown .el-scrollbar .el-scrollbar__wrap
|
|
|
294
|
+ {
|
|
|
295
|
+ overflow: scroll!important;
|
|
|
296
|
+ }
|
|
|
297
|
+ .el-upload-list__item-name{
|
|
|
298
|
+ background-color: #9f9;
|
|
|
299
|
+ }
|
|
|
300
|
+</style>
|
Zhangqy
1 місяць тому