Browse Source

修改货权重量管理界面

Zhangqy 2 months ago
parent
commit
332df8544a
2 changed files with 41 additions and 26 deletions
  1. 35
    20
      src/view/maint/cargo.vue
  2. 6
    6
      src/view/maint/customer.vue

+ 35
- 20
src/view/maint/cargo.vue View File

1
 <template>
1
 <template>
2
     <div style="text-align: left;">
2
     <div style="text-align: left;">
3
 		<el-row>
3
 		<el-row>
4
-			<el-select v-model="query.uperCustomer" filterable placeholder="请选择上游客户">
5
-                <el-option v-for="item in optionsCust" :key="item.id" :label="item.name" :value="item.id">
4
+			<el-select v-model="query.uperCustomer" filterable placeholder="请选择上游客户" clearable size="small" style="margin-left: 5px; width: 300px">
5
+                <el-option v-for="item in optionsCust" :key="item.id" :label="item.name" :value="item.id" >
6
                 </el-option>
6
                 </el-option>
7
             </el-select>
7
             </el-select>
8
-			<el-select v-model="query.Customer" filterable placeholder="请选择客户">
8
+			<el-select v-model="query.Customer" filterable placeholder="请选择客户" clearable size="small" style="margin-left: 5px; width: 300px">
9
                 <el-option v-for="item in optionsCust" :key="item.id" :label="item.name" :value="item.id">
9
                 <el-option v-for="item in optionsCust" :key="item.id" :label="item.name" :value="item.id">
10
                 </el-option>
10
                 </el-option>
11
             </el-select>
11
             </el-select>
12
 			<el-button type="info" size="small" @click="search">查询</el-button>
12
 			<el-button type="info" size="small" @click="search">查询</el-button>
13
 			<el-button type="primary" size="small" @click="handleAdd">新增</el-button>
13
 			<el-button type="primary" size="small" @click="handleAdd">新增</el-button>
14
+			<el-button type="danger" size="small"  @click="resetButton" :disabled="backAble">重置</el-button>
14
 		</el-row>
15
 		</el-row>
15
     
16
     
16
 		<el-table :data="tableData" border>
17
 		<el-table :data="tableData" border>
17
 			<el-table-column prop="id" label="编号" width="60" v-if="isShow">
18
 			<el-table-column prop="id" label="编号" width="60" v-if="isShow">
18
 			</el-table-column>
19
 			</el-table-column>
19
-			<el-table-column prop="uperCustomer" label="上游客户" width="120">
20
+			<el-table-column prop="uperCustomer.name" label="上游客户" width="400">
20
 			</el-table-column>
21
 			</el-table-column>
21
-			<el-table-column prop="Customer" label="客户" width="120">
22
+			<el-table-column prop="customer.name" label="客户" width="400">
22
 			</el-table-column>
23
 			</el-table-column>
23
 			<el-table-column prop="sumWeight" label="重量(吨)" width="120">
24
 			<el-table-column prop="sumWeight" label="重量(吨)" width="120">
24
 			</el-table-column>
25
 			</el-table-column>
42
 					<el-input v-model="change.id"></el-input>
43
 					<el-input v-model="change.id"></el-input>
43
 				</el-form-item>
44
 				</el-form-item>
44
 				<el-form-item label="上游客户">
45
 				<el-form-item label="上游客户">
45
-					<el-select v-model="change.uperCustomer" filterable placeholder="请选择">
46
-                        <el-option v-for="item in optionsCust" :key="item.value" :label="item.label" :value="item.value">
46
+					<el-select v-model="change.uperCustomer" filterable placeholder="请选择" clearable style="margin-left: 5px; width: 300px">
47
+                        <el-option v-for="item in optionsCust" :key="item.id" :label="item.name" :value="item.id">
47
                         </el-option>
48
                         </el-option>
48
                     </el-select>
49
                     </el-select>
49
 				</el-form-item>
50
 				</el-form-item>
50
 				<el-form-item label="客户">
51
 				<el-form-item label="客户">
51
-					<el-select v-model="change.Customer" filterable placeholder="请选择">
52
-                        <el-option v-for="item in optionsCust" :key="item.value" :label="item.label" :value="item.value">
52
+					<el-select v-model="change.Customer" filterable placeholder="请选择"  clearable style="margin-left: 5px; width: 300px">
53
+                        <el-option v-for="item in optionsCust" :key="item.id" :label="item.name" :value="item.id">
53
                         </el-option>
54
                         </el-option>
54
                     </el-select>
55
                     </el-select>
55
 				</el-form-item>
56
 				</el-form-item>
56
 				<el-form-item label="修改内容">
57
 				<el-form-item label="修改内容">
57
-					<el-select v-model="change.sub" filterable placeholder="请选择">
58
+					<el-select v-model="change.sub" filterable placeholder="请选择" clearable style="margin-left: 5px; width: 300px">
58
                         <el-option v-for="item in optionsSub" :key="item.value" :label="item.label" :value="item.value">
59
                         <el-option v-for="item in optionsSub" :key="item.value" :label="item.label" :value="item.value">
59
                         </el-option>
60
                         </el-option>
60
                     </el-select>
61
                     </el-select>
61
 				</el-form-item>
62
 				</el-form-item>
62
-				<el-form-item label="重量(吨)">
63
-					<el-input v-model="change.weight"></el-input>
63
+				<el-form-item label="重量(吨)" >
64
+					<el-input v-model="change.weight" clearable style="margin-left: 5px; width: 300px"></el-input>
64
 				</el-form-item>
65
 				</el-form-item>
65
 
66
 
66
 				<el-form-item>
67
 				<el-form-item>
128
 				});
129
 				});
129
 			},
130
 			},
130
             handleAdd() {
131
             handleAdd() {
131
-
132
+				this.change.uperCustomer = ''
133
+				this.change.Customer = ''
134
+				this.change.sub = ''
135
+				this.change.weight = ''
132
                 this.dialogVisible=true;
136
                 this.dialogVisible=true;
133
 				//this.$$refs.area.clearValidate();
137
 				//this.$$refs.area.clearValidate();
134
             },
138
             },
136
 				this.dialogVisible = false
140
 				this.dialogVisible = false
137
 			},
141
 			},
138
             getTableData() {
142
             getTableData() {
139
-				var url = 'MaintCargo/query.do'
143
+				var url = 'MaintCargo/queryAll.do'
140
 				var param = {
144
 				var param = {
141
 					page: this.currentPage,
145
 					page: this.currentPage,
142
 					rows: this.pageSize,
146
 					rows: this.pageSize,
143
-					queryWare: this.queryWare
147
+					uperCustomer: this.query.uperCustomer,
148
+					Customer: this.query.Customer
144
 				}
149
 				}
145
 				axios.get(url, param).then(response => {
150
 				axios.get(url, param).then(response => {
151
+					console.log(response.data.data.list)
152
+
146
 					if (response.data.code == 0) {
153
 					if (response.data.code == 0) {
147
 						this.tableData = response.data.data.list
154
 						this.tableData = response.data.data.list
148
 						this.totalRows = response.data.data.total
155
 						this.totalRows = response.data.data.total
171
 				this.getTableData()
178
 				this.getTableData()
172
 			},
179
 			},
173
             handleSave() {
180
             handleSave() {
174
-				var tempStack = this.area;
181
+				var tempStack = this.change;
175
 				var json = JSON.stringify(tempStack)
182
 				var json = JSON.stringify(tempStack)
176
-				var url = 'MaintArea/save.do'
183
+				var url = 'MaintCargo/save.do'
177
 				var param = {
184
 				var param = {
178
 					json: json
185
 					json: json
179
 				}
186
 				}
188
 					} else {
195
 					} else {
189
 						this.$message({
196
 						this.$message({
190
 							type: 'error',
197
 							type: 'error',
191
-							message: '保存失败' + response.data.msg,
198
+							message: '保存失败!' + response.data.msg,
192
 						});
199
 						});
193
 					}
200
 					}
194
 					// loading.close();
201
 					// loading.close();
206
 					type: 'warning'
213
 					type: 'warning'
207
 				}).then(() => {
214
 				}).then(() => {
208
 
215
 
209
-					var url = 'MaintArea/remove.do'
216
+					var url = 'MaintCargo/remove.do'
210
 					var param = {
217
 					var param = {
211
 						id: id
218
 						id: id
212
 					}
219
 					}
236
 				var tempRow = row;
243
 				var tempRow = row;
237
 				//tempRow.ware.name = tempRow.ware.id;
244
 				//tempRow.ware.name = tempRow.ware.id;
238
 				this.dialogVisible = true
245
 				this.dialogVisible = true
239
-				this.area = tempRow
246
+				this.change.id = tempRow.id
247
+				this.change.uperCustomer = tempRow.uperCustomer.id
248
+				this.change.Customer = tempRow.customer.id
249
+				this.change.sub = ''
250
+				this.change.weight = ''
251
+			},
252
+			resetButton(){      //查询条件重置
253
+				this.query.uperCustomer = '',
254
+				this.query.Customer = ''
240
 			},
255
 			},
241
         }
256
         }
242
 	}
257
 	}

+ 6
- 6
src/view/maint/customer.vue View File

1
 <template>
1
 <template>
2
-	<div style="text-align: center;">
2
+	<div style="text-align: left;">
3
 		<div style="width:600px;float: left; margin-left: 10px;margin-bottom: 10px;">
3
 		<div style="width:600px;float: left; margin-left: 10px;margin-bottom: 10px;">
4
 			<el-input v-model="query" size="small" placeholder="请输入查询条件" style="width :300px;float: left;"></el-input>
4
 			<el-input v-model="query" size="small" placeholder="请输入查询条件" style="width :300px;float: left;"></el-input>
5
 			<el-button type="info" size="small"  @click="search">查询</el-button>
5
 			<el-button type="info" size="small"  @click="search">查询</el-button>
10
 			<el-table v-loading="loading" :data="tableData" border size="small">
10
 			<el-table v-loading="loading" :data="tableData" border size="small">
11
 				<el-table-column prop="id" size="small" label="编号" width="60" v-if="isShow">
11
 				<el-table-column prop="id" size="small" label="编号" width="60" v-if="isShow">
12
 				</el-table-column>
12
 				</el-table-column>
13
-				<el-table-column prop="name" size="small" label="客户名称" width="250" show-overflow-tooltip>
13
+				<el-table-column prop="name" size="small" label="客户名称" width="450" show-overflow-tooltip>
14
 				</el-table-column>
14
 				</el-table-column>
15
-				<el-table-column prop="contact" size="small" label="联系人" width="120" show-overflow-tooltip>
16
-				</el-table-column>
17
-				<el-table-column prop="phone" size="small" label="联系方式" width="200" show-overflow-tooltip>
15
+				<el-table-column prop="code" size="small" label="客户名称(简称)" width="250" show-overflow-tooltip>
18
 				</el-table-column>
16
 				</el-table-column>
19
-				<el-table-column prop="address" size="small" label="默认地址" width="500" show-overflow-tooltip>
17
+				<el-table-column prop="contact" size="small" label="联系人" width="120" show-overflow-tooltip>
20
 				</el-table-column>
18
 				</el-table-column>
21
 				<el-table-column label="操作" width="250">
19
 				<el-table-column label="操作" width="250">
22
 					<template slot-scope="scope">
20
 					<template slot-scope="scope">
25
 						<el-button size="small" @click="showAddress(scope.row)">地址</el-button>
23
 						<el-button size="small" @click="showAddress(scope.row)">地址</el-button>
26
 					</template>
24
 					</template>
27
 				</el-table-column>
25
 				</el-table-column>
26
+				
28
 			</el-table>
27
 			</el-table>
29
 		</div>
28
 		</div>
30
 		<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
29
 		<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
31
 		 :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalRows">
30
 		 :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalRows">
32
 		</el-pagination>
31
 		</el-pagination>
32
+		
33
 
33
 
34
 
34
 
35
 
35
 

Loading…
Cancel
Save