111

src/view/maint/price.vue

@@ -53,10 +53,11 @@
 					</el-select>
 				</el-form-item>
 				<el-form-item label="品名">
-					<el-select v-model="obj.materialName" filterable placeholder="请选择品名" clearable style="width: 300px;">
+					<el-input v-model="obj.materialName" style="width: 300px;"></el-input>
+					<!-- <el-select v-model="obj.materialName" filterable placeholder="请选择品名" clearable style="width: 300px;">
 						<el-option v-for="item in optionsmaterialName" :key="item.label" :label="item.label" :value="item.value" >
 						</el-option>
-					</el-select>
+					</el-select> -->
 				</el-form-item>
 				<el-form-item label="免堆时间">
 					<el-input v-model="obj.keepDay" type="number" style="width: 300px;"></el-input>

src/view/record/outrecord.vue

@@ -82,6 +82,7 @@
 								 :auto-upload="false"  >
 								 <el-button plain slot="trigger"  type="success" v-show="false" style= "margin-left: 5px" size="small">询单导入</el-button>
 								<el-button   type="success" @click="handleExport" style="margin-left: 2px" size="small">导出记录</el-button>
+								<el-button   type="success" @click="handleExport_addPrice" style="margin-left: 2px" size="small">导出价格</el-button>
 							</el-upload>
 						</el-form-item>
 
@@ -920,7 +921,140 @@
 					return v[j]
 				}))
 			},
+
+			handleExport_addPrice() {
+				var imptData = [];
+				
+
+				var url = 'WareOutRecord/query.do'
+				var param = {
+					page: -1,
+					rows: -1,
+					wareName: this.query.wareName,
+					stackName: this.query.stackName,
+					model: this.query.model,
+					materialName: this.query.materialName,
+					standard: this.query.standard,
+					customerName: this.query.customerName,
+					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"),
+					carNo:this.query.carNo,
+					tallyPeople:this.query.tallyPeople,
+					fkComponyName:this.query.fkComponyName,
+					plateNo: this.query.plateNo.length == 0 ? '' : this.query.plateNo.join(','),
+					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
+					contractNo: this.query.contractNo == 0 ? '' : this.query.contractNo.join(','),
+					packNo: this.query.packNo == 0 ? '' : this.query.packNo.join(','),
+				}
+				// alert(JSON.stringify(param))
+
+				axios.get(url, param).then(response => {
+					// alert(JSON.stringify(response))
+					if (response.data.code == 0) {
+						var imptData = response.data.data;
+						if (imptData.length == 0) {
+							this.$alert('无法导出，选择时间段无记录', '提示', {
+								confirmButtonText: '确定',
+								callback: action => {}
+							});
+						} else {
+
+							this.exportExcel2(imptData)
+						}
+					} else {
+						this.$message({
+							type: 'error',
+							message: '操作失败；' + response.data.msg,
+						});
+					}
+
+				});
+				
+			},
+
+			exportExcel2(imptData) {
+				 console.log(JSON.stringify(imptData))
+				const header = ["仓库名称",
+								"垛位",
+								"层号",
+								"品名",
+								"钢种",
+								"产品编号",
+								"订单号",
+								"规格型号",
+								"出库重量",
+								"出库数量",
+								"合约号",
+								"出库车号",
+								"出库时间",
+								"货权单位",
+								"客户名称",
+								"收货地址",
+								"产地",
+								"捆包号",
+								"备注",
+								"出库操作人",
+								"吊装工",
+								"入库车号",
+								"入库时间",
+								"入库操作人",
+								"计量方式",
+								"在库时间",
+								"结算价格",
+								"支付方式",
+								"类型"
+
+				] // 导出的表头名
+				const filterVal = [
+						"wareName",
+						"stackName",
+						"layer",
+						"materialName",
+						"standard",
+						"plateNo",
+						"ordNo",
+						"model",
+						"weight",
+						"count",
+						"contractNo",
+						"outCarNo",
+						"addTime",
+						"fkComponyName",
+						"customerName",
+						"receiveAddress",
+						"productionPlace",
+						"packNo",
+						"remark",
+						"addId",
+						"tallyPeople",
+						"inCarNo",
+						"inTime",
+						"inUser",
+						"wgtDcnMtcCd",
+						"inWareDays",
+						"invoicePrice",
+						"payWay",
+						"recordType"
+				]
+
+				for(var i=0;i<imptData.length;i++){
+					/*imptData[i]["addUserUserDesc"] = imptData[i].addUser.userDesc;
+					imptData[i]["distributionTruckNo"] = imptData[i].distribution.truckNo;*/
+					imptData[i]["recordType"]      = imptData[i]["recordType"] == 0 ? "出库取消" : "出库";
+				}
+				const list = imptData
+				const data = this.formatJson(filterVal, list)
+
+				const filename = '出库单(含价格)' + (new Date()).toLocaleDateString();
+				Export2Excel.export_json_to_excel({
+					header,
+					data,
+					filename
+				})
+			},
 		},
+
+		
 	}
 </script>