|
@@ -31,6 +31,8 @@
|
|
|
style="width:200px"
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item>
|
|
|
<el-button type="primary" class="btn" @click="onclick">
|
|
|
<i class="el-icon-search"></i>
|
|
|
</el-button>
|
|
@@ -50,7 +52,7 @@
|
|
|
border
|
|
|
stripe
|
|
|
style="width: 100%; margin-top: 20px"
|
|
|
- max-height="800px"
|
|
|
+ max-height="700px"
|
|
|
@cell-click="cellClik"
|
|
|
:row-style="{ height: '30px' }"
|
|
|
:cell-style="{ fontWeight: '700' }"
|
|
@@ -59,7 +61,6 @@
|
|
|
width="50"
|
|
|
label="序号"
|
|
|
align="center"
|
|
|
- fixed="left"
|
|
|
:resizable="false"
|
|
|
>
|
|
|
<template slot-scope="scope">{{ scope.row.group + 1 }}</template>
|
|
@@ -69,8 +70,7 @@
|
|
|
column-key="capacityNo"
|
|
|
label="车牌号"
|
|
|
align="center"
|
|
|
- width="250px"
|
|
|
- fixed
|
|
|
+ width="150px"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
@@ -90,7 +90,7 @@
|
|
|
prop="materialNumber"
|
|
|
label="物资件数"
|
|
|
align="center"
|
|
|
- width="200px"
|
|
|
+ width="150px"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<button
|
|
@@ -158,15 +158,24 @@
|
|
|
<el-table-column
|
|
|
label="操作"
|
|
|
fixed="right"
|
|
|
- width="120px"
|
|
|
+ width="220px"
|
|
|
align="center"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.numberOfFurnaces"
|
|
|
+ v-if="
|
|
|
+ !scope.row.materialName.includes('乱尺') &&
|
|
|
+ scope.row.input == 'true'
|
|
|
+ "
|
|
|
+ placeholder="格式为:炉号1-件数/炉号2-件数"
|
|
|
+ style="width:180px"
|
|
|
+ >
|
|
|
+ </el-input>
|
|
|
<el-button
|
|
|
type="text"
|
|
|
size="small"
|
|
|
@click="disorderlyOutbound(scope.row)"
|
|
|
- :disabled="!scope.row.materialName.includes('乱尺')"
|
|
|
>出库申请</el-button
|
|
|
>
|
|
|
</template>
|
|
@@ -298,6 +307,7 @@ export default {
|
|
|
},
|
|
|
//查询,输入查询条件
|
|
|
onclick() {
|
|
|
+ console.log("我点击实践");
|
|
|
let startTime = null;
|
|
|
let endTime = null;
|
|
|
let capacityNo = null;
|
|
@@ -307,12 +317,10 @@ export default {
|
|
|
}
|
|
|
this.axios
|
|
|
.post(
|
|
|
- "/api/v1/tms/getSaleSteelReport?startTime=" +
|
|
|
+ "/api/v1/oms/getWarehouseMes?startTime=" +
|
|
|
startTime +
|
|
|
"&endTime=" +
|
|
|
endTime +
|
|
|
- "&carrierSsoId=" +
|
|
|
- carrierSsoId +
|
|
|
"&i=" +
|
|
|
new Date() +
|
|
|
"&capacityNo=" +
|
|
@@ -346,6 +354,7 @@ export default {
|
|
|
},
|
|
|
disorderlyOutbound(row) {
|
|
|
console.log(row);
|
|
|
+ this.$set(row, "input", "true");
|
|
|
if (row.warehouseId == null) {
|
|
|
this.$message.error("请先选择装货点");
|
|
|
return;
|