|
|
|
@ -27,45 +27,6 @@
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="8" :offset="2">
|
|
|
|
|
<el-form-item label="成品名称" prop="productName">
|
|
|
|
|
<el-input v-model="form.productName" disabled/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8" :offset="2">
|
|
|
|
|
<el-form-item label="物料名称" prop="materialName">
|
|
|
|
|
<el-input v-model="form.materialName" disabled/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="8" :offset="2">
|
|
|
|
|
<el-form-item label="物料条码" prop="materialBarcode">
|
|
|
|
|
<el-input v-model="form.materialBarcode" disabled/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8" :offset="2">
|
|
|
|
|
<el-form-item label="批次码" prop="batchCode">
|
|
|
|
|
<el-input v-model="form.batchCode" disabled/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="8" :offset="2">
|
|
|
|
|
<el-form-item label="计划退库数量" prop="planAmount">
|
|
|
|
|
<el-input v-model="form.planAmount" disabled/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8" :offset="2" v-if="detailFlag">
|
|
|
|
|
<el-form-item label="已退库数量" prop="returnAmount">
|
|
|
|
|
<el-input v-model="form.returnAmount" disabled/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="8" :offset="2">
|
|
|
|
|
<el-form-item label="申请人" prop="applyBy">
|
|
|
|
@ -142,7 +103,27 @@
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-divider content-position="center">原材料退库明细信息</el-divider>
|
|
|
|
|
<el-table :data="wmsRawReturnDetailList" :row-class-name="rowWmsRawReturnDetailIndex"
|
|
|
|
|
ref="wmsRawReturnDetail">
|
|
|
|
|
<el-table-column label="序号" align="center" prop="index" width="50"/>
|
|
|
|
|
<el-table-column label="库位编码" prop="locationCode"/>
|
|
|
|
|
<el-table-column label="物料名称" prop="materialName"/>
|
|
|
|
|
<el-table-column label="物料批次" prop="batchCode"/>
|
|
|
|
|
<el-table-column label="计划数量" prop="planAmount"/>
|
|
|
|
|
<el-table-column label="已退库数量" prop="returnAmount" v-if="detailFlag"/>
|
|
|
|
|
<el-table-column label="执行状态" prop="executeStatus" v-if="detailFlag">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<dict-tag :options="dict.type.wms_execute_status" :value="scope.row.executeStatus"/>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="同步ERP状态" prop="erpStatus" v-if="detailFlag">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<dict-tag :options="dict.type.wms_erp_status" :value="scope.row.erpStatus"/>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="同步ERP数量" prop="erpAmount" v-if="detailFlag"/>
|
|
|
|
|
</el-table>
|
|
|
|
|
</el-form>
|
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
|
<el-button type="primary" @click="auditPass" v-if="!detailFlag">审核通过</el-button>
|
|
|
|
@ -153,7 +134,7 @@
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
<script>
|
|
|
|
|
import {auditRawReturn, getRawreturn4Audit} from "@/api/wms/rawreturn";
|
|
|
|
|
import {auditRawReturn, getRawReturnByTaskCode} from "@/api/wms/rawreturn";
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
|
name: "Rawreturn",
|
|
|
|
@ -184,15 +165,13 @@ export default {
|
|
|
|
|
open: false,
|
|
|
|
|
// 表单参数
|
|
|
|
|
form: {},
|
|
|
|
|
// 表单校验
|
|
|
|
|
|
|
|
|
|
detailFlag: true,
|
|
|
|
|
rawReturnId: null,
|
|
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
created() {
|
|
|
|
|
const rawReturnId = this.$route.params && this.$route.params.rawReturnId;
|
|
|
|
|
const taskCode = this.$route.params && this.$route.params.taskCode;
|
|
|
|
|
const taskCode = this.$route.query && this.$route.query.taskCode;
|
|
|
|
|
const detailFlag = this.$route.params && this.$route.params.detailFlag;
|
|
|
|
|
const warehouseName = this.$route.params && this.$route.params.warehouseName;
|
|
|
|
|
this.detailFlag = detailFlag == "1";
|
|
|
|
@ -205,8 +184,10 @@ export default {
|
|
|
|
|
/** 查询原材料退库记录列表 */
|
|
|
|
|
getRawReturn() {
|
|
|
|
|
this.loading = true;
|
|
|
|
|
getRawreturn4Audit(this.rawReturnId).then(response => {
|
|
|
|
|
this.form = response.data;
|
|
|
|
|
getRawReturnByTaskCode(this.form.taskCode).then(response => {
|
|
|
|
|
this.form = response.data.wmsRawReturn;
|
|
|
|
|
this.wmsRawReturnDetailList = response.data.wmsRawReturnDetailList;
|
|
|
|
|
console.log(this.wmsRawReturnDetailList)
|
|
|
|
|
this.form.warehouseName = this.warehouseName;
|
|
|
|
|
this.loading = false;
|
|
|
|
|
});
|
|
|
|
@ -257,7 +238,10 @@ export default {
|
|
|
|
|
this.form.auditStatus = "1";
|
|
|
|
|
this.submitForm();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
/** 原材料出库记录明细序号 */
|
|
|
|
|
rowWmsRawReturnDetailIndex({row, rowIndex}) {
|
|
|
|
|
row.index = rowIndex + 1;
|
|
|
|
|
},
|
|
|
|
|
auditFail() {
|
|
|
|
|
this.form.auditStatus = "2";
|
|
|
|
|
if (!this.form.auditReason || this.form.auditReason == "" || this.form.auditReason == undefined) {
|
|
|
|
|