修改货权重量管理界面

src/view/maint/cargo.vue

@@ -1,24 +1,25 @@
 <template>
     <div style="text-align: left;">
 		<el-row>
-			<el-select v-model="query.uperCustomer" filterable placeholder="请选择上游客户">
-                <el-option v-for="item in optionsCust" :key="item.id" :label="item.name" :value="item.id">
+			<el-select v-model="query.uperCustomer" filterable placeholder="请选择上游客户" clearable size="small" style="margin-left: 5px; width: 300px">
+                <el-option v-for="item in optionsCust" :key="item.id" :label="item.name" :value="item.id" >
                 </el-option>
             </el-select>
-			<el-select v-model="query.Customer" filterable placeholder="请选择客户">
+			<el-select v-model="query.Customer" filterable placeholder="请选择客户" clearable size="small" style="margin-left: 5px; width: 300px">
                 <el-option v-for="item in optionsCust" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
             </el-select>
 			<el-button type="info" size="small" @click="search">查询</el-button>
 			<el-button type="primary" size="small" @click="handleAdd">新增</el-button>
+			<el-button type="danger" size="small"  @click="resetButton" :disabled="backAble">重置</el-button>
 		</el-row>
     
 		<el-table :data="tableData" border>
 			<el-table-column prop="id" label="编号" width="60" v-if="isShow">
 			</el-table-column>
-			<el-table-column prop="uperCustomer" label="上游客户" width="120">
+			<el-table-column prop="uperCustomer.name" label="上游客户" width="400">
 			</el-table-column>
-			<el-table-column prop="Customer" label="客户" width="120">
+			<el-table-column prop="customer.name" label="客户" width="400">
 			</el-table-column>
 			<el-table-column prop="sumWeight" label="重量(吨)" width="120">
 			</el-table-column>
@@ -42,25 +43,25 @@
 					<el-input v-model="change.id"></el-input>
 				</el-form-item>
 				<el-form-item label="上游客户">
-					<el-select v-model="change.uperCustomer" filterable placeholder="请选择">
-                        <el-option v-for="item in optionsCust" :key="item.value" :label="item.label" :value="item.value">
+					<el-select v-model="change.uperCustomer" filterable placeholder="请选择" clearable style="margin-left: 5px; width: 300px">
+                        <el-option v-for="item in optionsCust" :key="item.id" :label="item.name" :value="item.id">
                         </el-option>
                     </el-select>
 				</el-form-item>
 				<el-form-item label="客户">
-					<el-select v-model="change.Customer" filterable placeholder="请选择">
-                        <el-option v-for="item in optionsCust" :key="item.value" :label="item.label" :value="item.value">
+					<el-select v-model="change.Customer" filterable placeholder="请选择"  clearable style="margin-left: 5px; width: 300px">
+                        <el-option v-for="item in optionsCust" :key="item.id" :label="item.name" :value="item.id">
                         </el-option>
                     </el-select>
 				</el-form-item>
 				<el-form-item label="修改内容">
-					<el-select v-model="change.sub" filterable placeholder="请选择">
+					<el-select v-model="change.sub" filterable placeholder="请选择" clearable style="margin-left: 5px; width: 300px">
                         <el-option v-for="item in optionsSub" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
 				</el-form-item>
-				<el-form-item label="重量(吨)">
-					<el-input v-model="change.weight"></el-input>
+				<el-form-item label="重量(吨)" >
+					<el-input v-model="change.weight" clearable style="margin-left: 5px; width: 300px"></el-input>
 				</el-form-item>
 
 				<el-form-item>
@@ -128,7 +129,10 @@
 				});
 			},
             handleAdd() {
-
+				this.change.uperCustomer = ''
+				this.change.Customer = ''
+				this.change.sub = ''
+				this.change.weight = ''
                 this.dialogVisible=true;
 				//this.$$refs.area.clearValidate();
             },
@@ -136,13 +140,16 @@
 				this.dialogVisible = false
 			},
             getTableData() {
-				var url = 'MaintCargo/query.do'
+				var url = 'MaintCargo/queryAll.do'
 				var param = {
 					page: this.currentPage,
 					rows: this.pageSize,
-					queryWare: this.queryWare
+					uperCustomer: this.query.uperCustomer,
+					Customer: this.query.Customer
 				}
 				axios.get(url, param).then(response => {
+					console.log(response.data.data.list)
+
 					if (response.data.code == 0) {
 						this.tableData = response.data.data.list
 						this.totalRows = response.data.data.total
@@ -171,9 +178,9 @@
 				this.getTableData()
 			},
             handleSave() {
-				var tempStack = this.area;
+				var tempStack = this.change;
 				var json = JSON.stringify(tempStack)
-				var url = 'MaintArea/save.do'
+				var url = 'MaintCargo/save.do'
 				var param = {
 					json: json
 				}
@@ -188,7 +195,7 @@
 					} else {
 						this.$message({
 							type: 'error',
-							message: '保存失败' + response.data.msg,
+							message: '保存失败!' + response.data.msg,
 						});
 					}
 					// loading.close();
@@ -206,7 +213,7 @@
 					type: 'warning'
 				}).then(() => {
 
-					var url = 'MaintArea/remove.do'
+					var url = 'MaintCargo/remove.do'
 					var param = {
 						id: id
 					}
@@ -236,7 +243,15 @@
 				var tempRow = row;
 				//tempRow.ware.name = tempRow.ware.id;
 				this.dialogVisible = true
-				this.area = tempRow
+				this.change.id = tempRow.id
+				this.change.uperCustomer = tempRow.uperCustomer.id
+				this.change.Customer = tempRow.customer.id
+				this.change.sub = ''
+				this.change.weight = ''
+			},
+			resetButton(){      //查询条件重置
+				this.query.uperCustomer = '',
+				this.query.Customer = ''
 			},
         }
 	}

src/view/maint/customer.vue

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