111

src/view/maint/cargo.vue

@@ -11,7 +11,7 @@
             </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-button type="danger" size="small"  @click="resetButton">重置</el-button>
 		</el-row>
     
 		<el-table :data="tableData" border>
@@ -85,6 +85,28 @@
 		</el-dialog>
 
 		<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-row>
+					
+				</el-form>
+			</div>
 			<el-table :data="tableData2" border>
 			<el-table-column prop="id" label="编号" width="60" v-if="isShow">
 			</el-table-column>
@@ -161,6 +183,28 @@
                     label: '减少'
                 }],
                 optionsCust: [],
+				queryDetail:{
+					uperCustomer:'',
+					Customer:'',
+					RecordDate:[],
+					subStr:'',
+					changeFrom:'',
+				},
+				optionsSubStr:[{
+						value: '增加',
+						label: '增加'
+					}, {
+						value: '减少',
+						label: '减少'
+					}],
+				optionsChangeFrom:[{
+						value: '手动调整',
+						label: '手动调整'
+					}, {
+						value: '货权转移',
+						label: '货权转移'
+					}],
+
 
             }
         },
@@ -196,7 +240,7 @@
 					Customer: this.query.Customer
 				}
 				axios.get(url, param).then(response => {
-					console.log(response.data.data.list)
+					// console.log(response.data.data.list)
 
 					if (response.data.code == 0) {
 						this.tableData = response.data.data.list
@@ -310,20 +354,34 @@
 			handleViewRecord(row){
 				this.dialogVisibleRecord=true;
 				var tempRow = row;
-				
+				this.queryDetail.uperCustomer = tempRow.uperCustomer.id;
+				this.queryDetail.Customer = tempRow.customer.id;
+				this.queryDetail.RecordDate=[],
+				this.queryDetail.subStr='',
+				this.queryDetail.changeFrom='',
 				this.getTableData2(tempRow.uperCustomer.id,tempRow.customer.id)
 				
 			},
 			getTableData2(uperCustomer,Customer){
+
 				var url = 'MaintCargo/queryRecord.do'
+				// alert(this.queryDetail.RecordDate);
+				if(this.queryDetail.RecordDate == null){
+					this.queryDetail.RecordDate =[]
+				}
 				var param = {
 					page: this.currentPage2,
 					rows: this.pageSize2,
-					uperCustomer: uperCustomer,
-					Customer: Customer
+					uperCustomer: this.queryDetail.uperCustomer,
+					Customer: this.queryDetail.Customer,
+					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
+
 				}
 				axios.get(url, param).then(response => {
-					console.log(response.data.data.list)
+					// console.log(response.data.data.list)
 
 					if (response.data.code == 0) {
 						this.tableData2 = response.data.data.list