验收,

prod
anthonywj 2 years ago
parent 9924c9951e
commit e0ac888248

@ -37,8 +37,8 @@ export function deleteCodesTempById(query) {
export function submitOrderWeb(query) { export function submitOrderWeb(query) {
return axios({ return axios({
url: "/warehouse/inout/submitOrderWeb", url: "/warehouse/inout/submitOrderWeb",
method: "get", method: "post",
params: query data: query
}); });
} }

@ -35,7 +35,8 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="产品通用名:"> <el-form-item label="产品通用名:">
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名" clearable="true"></el-input> <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名"
clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@ -67,7 +68,8 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="第三方产品编码:"> <el-form-item label="第三方产品编码:">
<el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码" clearable="true"></el-input> <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码"
clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@ -96,7 +98,8 @@
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" key="1" @selection-change="handleSelectionChange" style="width: 100%" border highlight-current-row> <el-table v-loading="loading" :data="list" key="1" @selection-change="handleSelectionChange" style="width: 100%"
border highlight-current-row>
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="供应商" prop="companyName" show-overflow-tooltip></el-table-column> <el-table-column label="供应商" prop="companyName" show-overflow-tooltip></el-table-column>
@ -288,10 +291,10 @@ export default {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;
}, },
getList() { getList() {
if (this.$isBlank(this.filterQuery.unitFk)) { // if (this.$isBlank(this.filterQuery.unitFk)) {
this.$message.error("请先选择供应商!"); // this.$message.error("");
return; // return;
} // }
this.loading = true; this.loading = true;
filterCompanyProductRelevance(this.filterQuery) filterCompanyProductRelevance(this.filterQuery)
.then((response) => { .then((response) => {

@ -140,8 +140,8 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="checkOrder(scope.row.id)" @click.native.stop="reviewOrder(scope.row)"
>验单据 >单据
</el-button </el-button
> >
</template> </template>
@ -444,6 +444,22 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-dialog
title="单据验收"
:visible.sync="acceptOrderVisible"
width="80%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="acceptOrderVisible"
>
<accept-order
:closeDialog="closeAcceptDialog"
:orderQuery="acceptQuery"
v-on:childByValue="parentByFn"
></accept-order>
</el-dialog>
</div> </div>
</template> </template>
@ -459,6 +475,7 @@ import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {getBizDetailList} from "@/api/inout/orderDetailBiz"; import {getBizDetailList} from "@/api/inout/orderDetailBiz";
import {getCodeDetailList} from "@/api/inout/orderDetailCode"; import {getCodeDetailList} from "@/api/inout/orderDetailCode";
import {getResultDetailList} from "@/api/inout/orderDetailResult"; import {getResultDetailList} from "@/api/inout/orderDetailResult";
import AcceptOrder from "@/views/inout/IoReviewOrder";
const formJson = { const formJson = {
site_id: "", site_id: "",
@ -468,7 +485,7 @@ const formJson = {
}; };
export default { export default {
name: "IoUnCheckedOrder", name: "IoCheckSuccessOrder",
data() { data() {
return { return {
showSearch: true, showSearch: true,
@ -581,9 +598,11 @@ export default {
resultTotal: 0, resultTotal: 0,
resultDetailLoading: false, resultDetailLoading: false,
resultDetailList: [], resultDetailList: [],
acceptQuery: null,
acceptOrderVisible: false,
}; };
}, },
components: {}, components: {AcceptOrder},
methods: { methods: {
onReset() { onReset() {
this.$router.push({ this.$router.push({
@ -841,6 +860,22 @@ export default {
editResultDialog(row) { editResultDialog(row) {
}, },
//
closeAcceptDialog() {
this.acceptOrderVisible = false;
},
//
reviewOrder(row) {
this.acceptQuery = row;
this.acceptOrderVisible = true;
},
parentByFn: function (childValue) {
this.getList();
},
}, },
filters: { filters: {
statusFilterType(status) { statusFilterType(status) {

@ -394,6 +394,26 @@ export default {
}); });
}, },
initBusType() {
let query = {
code: this.orderFormData.invCode,
};
findByInvUser(query)
.then((response) => {
this.busTypeOptions = response.data || [];
this.curAction = this.getActionItem(this.orderFormData.action);
if (this.curAction.checkEnable && this.curAction.checkWebNew) {
this.bizShow = true;
} else
this.bizShow = false;
})
.catch(() => {
});
},
// //
findMethod(query) { findMethod(query) {
this.fromOptions = []; this.fromOptions = [];
@ -686,7 +706,6 @@ export default {
}, },
getInputFocus(event) { getInputFocus(event) {
event.currentTarget.select(); event.currentTarget.select();
}, },
@ -766,7 +785,7 @@ export default {
this.refreshCodesPanel(); this.refreshCodesPanel();
// //
this.findInvListByUser(); this.findInvListByUser();
this.getBusTypeByInv(); this.initBusType();
this.findMethod(this.orderFormData.fromCorp); this.findMethod(this.orderFormData.fromCorp);
this.findFromInvList(); this.findFromInvList();
} else { } else {

@ -288,7 +288,7 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
let query = { let query = {
stockOrderId: this.orderQuery.billNo, orderId: this.orderQuery.billNo,
}; };
updateStatus(query) updateStatus(query)
.then((response) => { .then((response) => {

Loading…
Cancel
Save