|
|
|
@ -152,7 +152,7 @@
|
|
|
|
|
<el-input v-model="form.reportCode" placeholder="请输入报工单编号" disabled />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="报工人员姓名" prop="nickName">
|
|
|
|
|
<el-input v-model="form.nickName" placeholder="请输入报工人员">
|
|
|
|
@ -387,7 +387,7 @@
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="工单编码" width="80" align="left" prop="workorderCode"
|
|
|
|
|
:show-overflow-tooltip="true"/>
|
|
|
|
|
<el-table-column label="报工单号" width="80" align="left" prop="reportCode"
|
|
|
|
|
<el-table-column label="报工单号" width="80" align="left" prop="reportCode"
|
|
|
|
|
:show-overflow-tooltip="true" />
|
|
|
|
|
<el-table-column label="创建时间" align="center" prop="createTime" width="150" />
|
|
|
|
|
<!---->
|
|
|
|
@ -425,13 +425,13 @@
|
|
|
|
|
<el-tabs v-model="activeNameC">
|
|
|
|
|
<el-tab-pane v-for="(item, index) in libConsumeTabs" :key="index" :label="item.title"
|
|
|
|
|
:name="item.libId">
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-table v-loading="loading" highlight-current-row :ref="tableIndex + index" :data="item.libList"
|
|
|
|
|
@select="pConsumeSelection" @select-all="allConsumeSelection">
|
|
|
|
|
<el-table-column width="50" align="center" type="selection" />
|
|
|
|
|
<el-table-column label="recordId" align="center" prop="recordId" v-if="false" />
|
|
|
|
|
<el-table-column label="parentOrder" align="center" prop="parentOrder" v-if="false" />
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-table-column label="订单编码" width="100" align="left" prop="workorderCodeSap"
|
|
|
|
|
:show-overflow-tooltip="true" :formatter="orderCodeFormate" />
|
|
|
|
|
<el-table-column label="物料编码" width="110" align="left" prop="materialCode"
|
|
|
|
@ -501,7 +501,7 @@
|
|
|
|
|
</el-tab-pane>
|
|
|
|
|
-->
|
|
|
|
|
</el-tabs>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
|
|
|
|
|
|
<el-button type="primary" @click="cancel" v-if="optType == 'view'">返回</el-button>
|
|
|
|
@ -513,6 +513,15 @@
|
|
|
|
|
|
|
|
|
|
<!-- SAP收货 -->
|
|
|
|
|
<el-dialog :title="titleReport" :visible.sync="openReportSAP" width="1200px">
|
|
|
|
|
<el-form>
|
|
|
|
|
<el-form-item label="" required>
|
|
|
|
|
<el-select v-model="selectedType" placeholder="请选择库存类型">
|
|
|
|
|
<el-option label="质检" value="2"></el-option>
|
|
|
|
|
<el-option label="冻结" value="3"></el-option>
|
|
|
|
|
<el-option label="非限制" value="1"></el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-form>
|
|
|
|
|
<el-select v-model="selectedWarehouse" placeholder="请选择仓库">
|
|
|
|
|
<el-option v-for="warehouse in warehouseList" :key="warehouse.warehouseCode"
|
|
|
|
|
:label="warehouse.warehouseName" :value="warehouse.warehouseCode"></el-option>
|
|
|
|
@ -715,6 +724,7 @@ export default {
|
|
|
|
|
showSearch: true,
|
|
|
|
|
// 总条数
|
|
|
|
|
total: 0,
|
|
|
|
|
selectedType: '', // 存储用户选择的库存类型
|
|
|
|
|
consumeTotal: 0,
|
|
|
|
|
// 报工报表表格数据
|
|
|
|
|
reportWorkList: [],
|
|
|
|
@ -1338,6 +1348,9 @@ export default {
|
|
|
|
|
this.reportRows.forEach((row) => {
|
|
|
|
|
this.$set(row, "whCode", this.selectedWarehouse);
|
|
|
|
|
});
|
|
|
|
|
this.reportRows.forEach((row) => {
|
|
|
|
|
this.$set(row, "selectedType", this.selectedType);
|
|
|
|
|
});
|
|
|
|
|
console.log("仓库---" + this.selectedWarehouse);
|
|
|
|
|
const reportRowsJson = JSON.stringify(this.reportRows); // 将this.reportRows转换为JSON字符串
|
|
|
|
|
this.loading = true;
|
|
|
|
|