|
|
|
@ -129,7 +129,7 @@
|
|
|
|
type="text"
|
|
|
|
type="text"
|
|
|
|
size="small"
|
|
|
|
size="small"
|
|
|
|
@click.native="receiveFinish(scope.row)"
|
|
|
|
@click.native="receiveFinish(scope.row)"
|
|
|
|
>完成验收
|
|
|
|
>验收
|
|
|
|
</el-button
|
|
|
|
</el-button
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<el-button
|
|
|
|
<el-button
|
|
|
|
@ -284,7 +284,7 @@
|
|
|
|
<StockOrderEdit
|
|
|
|
<StockOrderEdit
|
|
|
|
:closeDialog="closeDialog"
|
|
|
|
:closeDialog="closeDialog"
|
|
|
|
:detailList="detailList"
|
|
|
|
:detailList="detailList"
|
|
|
|
|
|
|
|
v-on:childByValue="parentByFn"
|
|
|
|
></StockOrderEdit>
|
|
|
|
></StockOrderEdit>
|
|
|
|
</el-dialog>
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
|
|
@ -458,6 +458,20 @@
|
|
|
|
:idQuery="idQuery"
|
|
|
|
:idQuery="idQuery"
|
|
|
|
></stockQRCodeExport>
|
|
|
|
></stockQRCodeExport>
|
|
|
|
</el-dialog>
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
<el-dialog
|
|
|
|
|
|
|
|
title="单据验收"
|
|
|
|
|
|
|
|
:visible.sync="acceptOrderVisible"
|
|
|
|
|
|
|
|
width="80%"
|
|
|
|
|
|
|
|
:close-on-click-modal="false"
|
|
|
|
|
|
|
|
:close-on-press-escape="false"
|
|
|
|
|
|
|
|
v-if="acceptOrderVisible"
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
<acceptOrder
|
|
|
|
|
|
|
|
:closeDialog="closeAcceptDialog"
|
|
|
|
|
|
|
|
:orderQuery="acceptQuery"
|
|
|
|
|
|
|
|
v-on:childByValue="acceptOrderFn"
|
|
|
|
|
|
|
|
></acceptOrder>
|
|
|
|
|
|
|
|
</el-dialog>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
|
|
@ -474,6 +488,7 @@ import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
|
|
|
|
import stockOrderEditDistribution from "./stockOrderEditDistribution";
|
|
|
|
import stockOrderEditDistribution from "./stockOrderEditDistribution";
|
|
|
|
import stockQRCodeExport from "./stockQRCodeExport";
|
|
|
|
import stockQRCodeExport from "./stockQRCodeExport";
|
|
|
|
import draggable from "vuedraggable";
|
|
|
|
import draggable from "vuedraggable";
|
|
|
|
|
|
|
|
import acceptOrder from "@/views/inout/acceptOrder";
|
|
|
|
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
|
|
|
|
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
|
|
|
|
import store from "../../store";
|
|
|
|
import store from "../../store";
|
|
|
|
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
|
|
|
|
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
|
|
|
|
@ -555,8 +570,10 @@ export default {
|
|
|
|
detailFormLoading: false,
|
|
|
|
detailFormLoading: false,
|
|
|
|
haveDistributionVisible: true,
|
|
|
|
haveDistributionVisible: true,
|
|
|
|
qrcodeDetailVisible: false,
|
|
|
|
qrcodeDetailVisible: false,
|
|
|
|
|
|
|
|
acceptOrderVisible: false,
|
|
|
|
qrcodeExportVisible: false,
|
|
|
|
qrcodeExportVisible: false,
|
|
|
|
actDateRange: [],
|
|
|
|
actDateRange: [],
|
|
|
|
|
|
|
|
acceptQuery: null,
|
|
|
|
isReceAble: false,
|
|
|
|
isReceAble: false,
|
|
|
|
pickerOptions: {
|
|
|
|
pickerOptions: {
|
|
|
|
shortcuts: [
|
|
|
|
shortcuts: [
|
|
|
|
@ -740,6 +757,12 @@ export default {
|
|
|
|
this.detailList = [];
|
|
|
|
this.detailList = [];
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
parentByFn: function (childValue) {
|
|
|
|
|
|
|
|
this.getList();
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
acceptOrderFn: function (childValue) {
|
|
|
|
|
|
|
|
this.getList();
|
|
|
|
|
|
|
|
},
|
|
|
|
distributionForm(index, row) {
|
|
|
|
distributionForm(index, row) {
|
|
|
|
this.idQuery.id = '';
|
|
|
|
this.idQuery.id = '';
|
|
|
|
if (this.$isNotBlank(row.id)) {
|
|
|
|
if (this.$isNotBlank(row.id)) {
|
|
|
|
@ -917,6 +940,10 @@ export default {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
closeAcceptDialog() {
|
|
|
|
|
|
|
|
this.acceptOrderVisible = false;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
getBusType() {
|
|
|
|
getBusType() {
|
|
|
|
let query = {
|
|
|
|
let query = {
|
|
|
|
code: this.query.invWarehouseCode,
|
|
|
|
code: this.query.invWarehouseCode,
|
|
|
|
@ -1017,18 +1044,20 @@ export default {
|
|
|
|
let query = {
|
|
|
|
let query = {
|
|
|
|
stockOrderId: row.billNo,
|
|
|
|
stockOrderId: row.billNo,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
updateStatus(query)
|
|
|
|
this.acceptQuery = row;
|
|
|
|
.then((response) => {
|
|
|
|
this.acceptOrderVisible = true;
|
|
|
|
if (response.code == 20000) {
|
|
|
|
// updateStatus(query)
|
|
|
|
this.getList();
|
|
|
|
// .then((response) => {
|
|
|
|
this.$message.success("验收成功！");
|
|
|
|
// if (response.code == 20000) {
|
|
|
|
} else {
|
|
|
|
// this.getList();
|
|
|
|
this.$message.error(response.message);
|
|
|
|
// this.$message.success("验收成功！");
|
|
|
|
}
|
|
|
|
// } else {
|
|
|
|
|
|
|
|
// this.$message.error(response.message);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
})
|
|
|
|
// })
|
|
|
|
.catch(() => {
|
|
|
|
// .catch(() => {
|
|
|
|
});
|
|
|
|
// });
|
|
|
|
},
|
|
|
|
},
|
|
|
|
rollback(row) {
|
|
|
|
rollback(row) {
|
|
|
|
this.$confirm('此操作将回退单据, 是否继续?', '提示', {
|
|
|
|
this.$confirm('此操作将回退单据, 是否继续?', '提示', {
|
|
|
|
@ -1055,6 +1084,7 @@ export default {
|
|
|
|
stockOrderEditDistribution,
|
|
|
|
stockOrderEditDistribution,
|
|
|
|
stockOrderQRCodeDetail,
|
|
|
|
stockOrderQRCodeDetail,
|
|
|
|
stockQRCodeExport,
|
|
|
|
stockQRCodeExport,
|
|
|
|
|
|
|
|
acceptOrder,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
,
|
|
|
|
,
|
|
|
|
filters: {
|
|
|
|
filters: {
|
|
|
|
|
