111

src/view/maint/cargo.vue

@@ -29,7 +29,12 @@
 			<el-table-column label="操作">
 				<template slot-scope="scope">
 					<el-button size="mini" @click="handleEdit(scope.row)">编辑</el-button>
-					<el-button size="mini" type="danger" @click="handleDelete(scope.row.id)">删除</el-button>
+					<!-- <el-button size="mini" type="danger" @click="handleDelete(scope.row.id)">删除</el-button> -->
+				</template>
+			</el-table-column>
+			<el-table-column label="日志记录" width="120">
+				<template slot-scope="scope">
+					<el-button @click="handleViewRecord(scope.row)" type="text" size="small">查看使用量变动记录</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -73,7 +78,29 @@
 			</el-form>
 		</el-dialog>
 
-
+		<el-dialog title="转移数量变动日志" :visible.sync="dialogVisibleRecord" width="800px">
+			<el-table :data="tableData2" border>
+			<el-table-column prop="id" label="编号" width="60" v-if="isShow">
+			</el-table-column>
+			<el-table-column prop="uperCustomer.name" label="上游客户" width="400" v-if="isShow">
+			</el-table-column>
+			<el-table-column prop="customer.name" label="客户" width="400" v-if="isShow">
+			</el-table-column>
+			<el-table-column prop="modifyTime" label="修改时间" width="240">
+			</el-table-column>
+			<el-table-column prop="modifyUser.userName" label="修改人员" width="120">
+			</el-table-column>
+			<el-table-column prop="weight" label="修改重量" width="120">
+			</el-table-column>
+			<el-table-column prop="subStr" label="修改类型" width="120">
+			</el-table-column>
+			<el-table-column prop="changeFrom" label="修改来源" width="120">
+			</el-table-column>
+		</el-table>
+		<el-pagination @size-change="handleSizeChange2" @current-change="handleCurrentChange2" :current-page="currentPage2"
+		 :page-sizes="pageSizes2" :page-size="pageSize2" layout="total, sizes, prev, pager, next, jumper" :total="totalRows2">
+		</el-pagination>
+		</el-dialog>
 	</div>
 </template>
 
@@ -91,15 +118,22 @@
                 },
                 options: [],
                 tableData: [],
+				tableData2: [],
 
                 currentPage: 1,
 				totalRows: 0,
 				pageSizes: [50, 100, 200,500],
 				pageSize: 50,
 
+				currentPage2: 1,
+				totalRows2: 0,
+				pageSizes2: [50, 100, 200,500],
+				pageSize2: 50,
+
                 loading: true,
                 isShow: false,
                 dialogVisible: false,
+				dialogVisibleRecord: false,
 
                 change: {
                     id: '',
@@ -173,12 +207,22 @@
 				this.pageSize = val
 				this.getTableData()
 			},
+			handleSizeChange2(val) {
+				console.log(`每页 ${val} 条`);
+				this.pageSize = val
+				this.getTableData2()
+			},
 			// 修改当前页事件
 			handleCurrentChange(val) {
 				console.log(`当前页: ${val}`);
 				this.currentPage = val
 				this.getTableData()
 			},
+			handleCurrentChange2(val) {
+				console.log(`当前页: ${val}`);
+				this.currentPage2 = val
+				this.getTableData2()
+			},
             handleSave() {
 				var tempStack = this.change;
 				var json = JSON.stringify(tempStack)
@@ -251,6 +295,36 @@
 				this.change.sub = ''
 				this.change.weight = ''
 			},
+			handleViewRecord(row){
+				this.dialogVisibleRecord=true;
+				var tempRow = row;
+				
+				this.getTableData2(tempRow.uperCustomer.id,tempRow.customer.id)
+				
+			},
+			getTableData2(uperCustomer,Customer){
+				var url = 'MaintCargo/queryRecord.do'
+				var param = {
+					page: this.currentPage2,
+					rows: this.pageSize2,
+					uperCustomer: uperCustomer,
+					Customer: Customer
+				}
+				axios.get(url, param).then(response => {
+					console.log(response.data.data.list)
+
+					if (response.data.code == 0) {
+						this.tableData2 = response.data.data.list
+						this.totalRows2 = response.data.data.total
+						//this.drawWareLayout()
+					} else {
+						this.$message({
+							type: 'error',
+							message: '查询失败' + response.data.msg,
+						});
+					}
+				});
+			},
 			resetButton(){      //查询条件重置
 				this.query.uperCustomer = '',
 				this.query.Customer = ''

src/view/ware/storechange.vue

@@ -126,11 +126,16 @@
 		<popup-in ref="PopupIn" @receviceFromChild="receviceFromIn" :wares="options" :wareId="query.wareId" :stack="moveFromStack"></popup-in>
 		<el-dialog title="货权转移" :visible.sync="customerDialogVisible" width="500px">
 			<el-form>
-				<el-form-item label="货权转移">
-					<el-input v-model="newCustomer.name">
-						<el-button slot="append" icon="el-icon-search" @click="showNewCustomer"></el-button>
+				<el-form-item label="旧货主">
+					<el-input v-model="oldCustomer">
 					</el-input>
 				</el-form-item>
+				<el-form-item label="新货主">
+					<el-select v-model="newCustomer.name" filterable placeholder="请选择订单客户" clearable>
+						<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-input v-model="newAddress">
 						<el-button slot="append" icon="el-icon-search" @click="showAddress"></el-button>
@@ -242,7 +247,7 @@
 				tableData: [],
 				optionsWare: [],
 
-
+				oldCustomer:'',
 				newCustomer: {
 					id: '',
 					name: ''
@@ -473,8 +478,8 @@
 					}
 				}
 				if (boolean) {
-					this.newCustomer = this.multipleSelection[0].customer
-					this.newAddress = this.multipleSelection[0].receiveAddress
+					this.oldCustomer = this.multipleSelection[0].customer.name
+					//this.newAddress = this.multipleSelection[0].receiveAddress
 					this.customerDialogVisible = true
 				} else {
 					this.$message({
@@ -485,25 +490,10 @@
 			},
 
 			handleCustomerSave() {
-
-				// 				var boolean = true
-				// 				for (var i = 0; i < this.multipleSelection.length; i++) {
-				// 					if (this.multipleSelection[i].customer.name == this.newCustomer.name) {
-				// 						boolean = boolean && false
-				// 						break
-				// 					}
-				// 				}
-				// 				if (!boolean) {
-				// 					this.$message({
-				// 						type: 'error',
-				// 						message: '转移客户与原客户相同！',
-				// 					});
-				// 					return
-				// 				} 
-				// 
-
+				this.newCustomer.id = this.newCustomer.name;
 				var url = 'WareChange/changeCustomer.do'
 				var param = {
+
 					json: JSON.stringify(this.multipleSelection),
 					customer: JSON.stringify(this.newCustomer),
 					address: this.newAddress