1.转移数量变动日志 新增 (总计 , 备注模糊查询 )

2.货权转移管理列表新增删除

src/view/maint/cargo.vue

@@ -13,7 +13,7 @@
 			<el-button type="primary" size="small" @click="handleAdd">新增</el-button>
 			<el-button type="danger" size="small"  @click="resetButton">重置</el-button>
 		</el-row>
-    
+
 		<el-table :data="tableData" border>
 			<el-table-column prop="id" label="编号" width="60" v-if="isShow">
 			</el-table-column>
@@ -29,7 +29,7 @@
 			<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">
@@ -86,25 +86,39 @@
 
 		<el-dialog title="转移数量变动日志" :visible.sync="dialogVisibleRecord" width="1000px">
 			<div class="searchForm-header">
-				<el-form :model="queryDetail" label-width="100px" inline="">
-					<el-row>
-						<el-form-item>
-							<el-date-picker size="small" v-model="queryDetail.RecordDate"  style="width:330px;margin-left: -8px" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="getTableData2" clearable>
-							</el-date-picker>
-						</el-form-item>
-						<el-form-item>
-							<el-select size="small" v-model="queryDetail.subStr" placeholder="修改类型" @change="getTableData2" clearable>
-								<el-option v-for="item in optionsSubStr" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-							</el-select>
-						</el-form-item>
-						<el-form-item>
-							<el-select size="small" v-model="queryDetail.changeFrom" placeholder="修改来源" @change="getTableData2" clearable>
-								<el-option v-for="item in optionsChangeFrom" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-							</el-select>
-						</el-form-item>
-						
+				<el-form :model="queryDetail" label-width="80px" inline>
+					<el-row :gutter="20">
+						<el-col :span="8">
+							<el-form-item label="日期范围">
+								<el-date-picker size="small" v-model="queryDetail.RecordDate" style="width: 100%;" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="getTableData2" clearable>
+								</el-date-picker>
+							</el-form-item>
+						</el-col>
+						<el-col :span="4">
+							<el-form-item label="修改类型">
+								<el-select size="small" v-model="queryDetail.subStr" placeholder="请选择" @change="getTableData2" clearable>
+									<el-option v-for="item in optionsSubStr" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="4">
+							<el-form-item label="修改来源">
+								<el-select size="small" v-model="queryDetail.changeFrom" placeholder="请选择" @change="getTableData2" clearable>
+									<el-option v-for="item in optionsChangeFrom" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="4">
+							<el-form-item label="备注">
+								<el-input placeholder="模糊查询" v-model="queryDetail.remark" @change="getTableData2" clearable size="small"></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="4">
+							<el-form-item label="合计">
+								<el-input v-model="count" disabled size="small"></el-input>
+							</el-form-item>
+						</el-col>
 					</el-row>
-					
 				</el-form>
 			</div>
 			<el-table :data="tableData2" border>
@@ -151,7 +165,7 @@
                 options: [],
                 tableData: [],
 				tableData2: [],
-
+        count:0,
                 currentPage: 1,
 				totalRows: 0,
 				pageSizes: [50, 100, 200,500],
@@ -178,7 +192,7 @@
                 },
                 optionsSub: [{
                     value: 'up',
-                    label: '增加'}, 
+                    label: '增加'},
                     {value: 'down',
                     label: '减少'
                 }],
@@ -189,6 +203,7 @@
 					RecordDate:[],
 					subStr:'',
 					changeFrom:'',
+          remark: '',
 				},
 				optionsSubStr:[{
 						value: '增加',
@@ -347,9 +362,10 @@
 				this.dialogVisible = true
 				this.change.id = tempRow.id
 				this.change.uperCustomer = tempRow.uperCustomer.id
-				this.change.Customer = ''
+				this.change.Customer = tempRow.customer.id
 				this.change.sub = ''
 				this.change.weight = ''
+        this.change.remark = ''
 			},
 			handleViewRecord(row){
 				this.dialogVisibleRecord=true;
@@ -360,10 +376,10 @@
 				this.queryDetail.subStr='',
 				this.queryDetail.changeFrom='',
 				this.getTableData2(tempRow.uperCustomer.id,tempRow.customer.id)
-				
+
 			},
 			getTableData2(uperCustomer,Customer){
-
+        this.count = 0;
 				var url = 'MaintCargo/queryRecord.do'
 				// alert(this.queryDetail.RecordDate);
 				if(this.queryDetail.RecordDate == null){
@@ -377,7 +393,8 @@
 					RecordDateBegin : (!this.queryDetail.RecordDate[0]) ? "1970-01-01 00:00:00" : this.queryDetail.RecordDate[0].Format("yyyy-MM-dd HH:mm:ss"),
 					RecordDateEnd : (!this.queryDetail.RecordDate[1]) ? "2999-01-01 00:00:00" : this.queryDetail.RecordDate[1].Format("yyyy-MM-dd HH:mm:ss"),
 					subStr:this.queryDetail.subStr,
-					changeFrom:this.queryDetail.changeFrom
+					changeFrom:this.queryDetail.changeFrom,
+          remark:this.queryDetail.remark
 
 				}
 				axios.get(url, param).then(response => {
@@ -386,6 +403,18 @@
 					if (response.data.code == 0) {
 						this.tableData2 = response.data.data.list
 						this.totalRows2 = response.data.data.total
+            if(this.queryDetail.subStr=='增加'){
+              this.tableData2.forEach((item, index) => {
+                console.log(index, item)
+                this.count += item.weight
+              })
+            }else if(this.queryDetail.subStr=='减少'){
+              this.tableData2.forEach((item, index) => {
+                console.log(index, item)
+                this.count += item.weight
+              })
+              this.count = -this.count
+            }
 						//this.drawWareLayout()
 					} else {
 						this.$message({

src/view/record/changerecord.vue

@@ -34,7 +34,7 @@
 							<el-input v-model="query.model" size="small" style="width:120px;margin-left: -8px">
 							</el-input>
 						</el-form-item>
-						<el-form-item label="钢板号" style="margin-left: -35px;margin-top: -15px"> 
+						<el-form-item label="钢板号" style="margin-left: -35px;margin-top: -15px">
 							<el-input v-model="query.plateNo" size="small" style="width:120px;margin-left: -8px">
 							</el-input>
 						</el-form-item>
@@ -44,6 +44,7 @@
 						</el-form-item>
 						<el-form-item label=" " style="margin-top: -15px">
 							<el-button @click="handleSearch" type="primary"  size="small" >查询</el-button>
+							<el-button @click="handleExport" type="success"  size="small" icon="el-icon-download">导出记录</el-button>
 						</el-form-item>
 					</el-row>
 				</el-form>
@@ -102,6 +103,14 @@
 
 		<popup-material ref="PopupMaterial" @receviceFromChild="receviceFromMaterial"></popup-material>
 		<popup-customer ref="PopupCustomer" @receviceFromChild="receviceFromCustomer"></popup-customer>
+
+		<!-- 导出Loading遮罩层 -->
+		<div v-if="exportLoading" class="export-loading-mask">
+			<div class="export-loading-content">
+				<i class="el-icon-loading"></i>
+				<p>正在导出，请稍候...</p>
+			</div>
+		</div>
 	</div>
 </template>
 
@@ -151,10 +160,11 @@
 					plateNo: '',
 					RecordDate:[],
 				},
-				childUrl:'WareChangeRecord/queryTotal.do',
-				loading: false,
+childUrl:'WareChangeRecord/queryTotal.do',
+			loading: false,
+			exportLoading: false,
 
-			};
+		};
 		},
 		//页面加载完成渲染
 		mounted() {
@@ -234,7 +244,7 @@
 					customerName: this.query.customerName,
 					plateNo: this.query.plateNo,
 					pFromDate:(!this.query.RecordDate[0]) ? "1970-01-01 00:00:00" : this.query.RecordDate[0].Format("yyyy-MM-dd HH:mm:ss"),		//date类型
-					pToDate  :(!this.query.RecordDate[1]) ? new Date().Format("yyyy-MM-dd HH:mm:ss") :this.query.RecordDate[1].Format("yyyy-MM-dd HH:mm:ss"), 
+					pToDate  :(!this.query.RecordDate[1]) ? new Date().Format("yyyy-MM-dd HH:mm:ss") :this.query.RecordDate[1].Format("yyyy-MM-dd HH:mm:ss"),
 				}
 				this.childParam = param;
 				axios.get(url, param).then(response => {
@@ -253,12 +263,101 @@
 			},
 			changeWare(){
 
+			},
+			// 导出Excel
+			handleExport() {
+				// 显示加载动画
+				this.exportLoading = true;
+
+				var baseUrl = this.$store.state.app.serverName;
+				var url = baseUrl + 'WareChangeRecord/exportExcel.do';
+				let userId = localStorage.getItem("userId");
+				let belongId = localStorage.getItem("belongId");
+				let token = localStorage.getItem("token");
+
+				var param = {
+					wareName: this.query.wareName,
+					stackName: this.query.stackName,
+					model: this.query.model,
+					materialName: this.query.materialName,
+					standard: this.query.standard,
+					customerName: this.query.customerName,
+					plateNo: this.query.plateNo,
+					pFromDate: (!this.query.RecordDate[0]) ? "1970-01-01 00:00:00" : this.query.RecordDate[0].Format("yyyy-MM-dd HH:mm:ss"),
+					pToDate: (!this.query.RecordDate[1]) ? new Date().Format("yyyy-MM-dd HH:mm:ss") : this.query.RecordDate[1].Format("yyyy-MM-dd HH:mm:ss"),
+					userId: userId,
+					belongId: belongId
+				};
+
+				var params = [];
+				for (var key in param) {
+					params.push(key + '=' + encodeURIComponent(param[key]));
+				}
+				var fullUrl = url + (params.length > 0 ? '?' + params.join('&') : '');
+
+				// 使用 fetch + blob 方式，下载完成后关闭 loading
+				fetch(fullUrl, {
+					headers: {
+						'token': token,
+						'userId': userId,
+						'belongId': belongId
+					}
+				})
+				.then(response => {
+					if (!response.ok) {
+						throw new Error('网络请求失败');
+					}
+					return response.blob();
+				})
+				.then(blob => {
+					// 创建下载链接
+					const url = window.URL.createObjectURL(blob);
+					const link = document.createElement('a');
+					link.href = url;
+					link.download = '转移记录_' + new Date().toISOString().slice(0, 10) + '.xlsx';
+					document.body.appendChild(link);
+					link.click();
+					// 浏览器开始下载后立即关闭 loading
+					this.exportLoading = false;
+					// 清理
+					setTimeout(() => {
+						document.body.removeChild(link);
+						window.URL.revokeObjectURL(url);
+					}, 100);
+				})
+				.catch(error => {
+					console.error('导出失败:', error);
+					this.$message.error('导出失败：' + error.message);
+					this.exportLoading = false;
+				});
 			}
 		},
 	}
 </script>
 
 <style>
+/* 导出Loading遮罩样式 */
+.export-loading-mask {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background-color: rgba(0, 0, 0, 0.5);
+	z-index: 9999;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.export-loading-content {
+	background-color: #fff;
+	padding: 30px 50px;
+	border-radius: 8px;
+	text-align: center;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.3);
+}
+
 .searchForm-header{
 		/*background-color: red;*/
 		height: auto;