Merge remote-tracking branch 'origin/dev' into dev

dev
薛宇 2 years ago
commit e6dee7afcf

@ -34,12 +34,10 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
# 漳州中医院
VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
# 片仔癀诊断
# VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/'
# 协调平台测试(片仔癀诊断)
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
# 应用访问路径 例如使用前缀 /admin/

@ -562,3 +562,30 @@ export function orderChange(query) {
});
}
export function rollbackWaitcheck(params) {
return axios({
url: "/udiwms/inout/order/waitCheck/rollback",
method: "get",
params: params
});
}
export function submitCodeResult(query) {
return axios({
url: "/warehouse/inout/codeResult/submitOrderWeb",
method: "post",
data: query
});
}
export function submitCheckResult(query) {
return axios({
url: "/warehouse/inout/codeCheck/submitOrderWeb",
method: "post",
data: query
});
}

@ -9,6 +9,15 @@ export function getDetailCodes(query) {
});
}
export function getCheckDetailCodes(query) {
return axios({
url: "/admin/warehouse/inout/findCheckCode",
method: "get",
params: query
});
}
//获取业务明细
export function getDetailBizs(query) {
return axios({

@ -552,10 +552,10 @@
<el-select v-model="inputQuery.checkWebNew" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
<el-option label="扫码直接生成业务单" :value="0"></el-option>
<el-option label="有三期业务单配/拣货" :value="1"></el-option>
<el-option label="无三期业务单配/拣货" :value="2"></el-option>
<el-option label="有三期业务单校验" :value="3"></el-option>
</el-select>
</el-col>
@ -575,10 +575,10 @@
<el-select v-model="inputQuery.checkPdaUn" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
<el-option label="扫码直接生成业务单" :value="0"></el-option>
<el-option label="有三期业务单配/拣货" :value="1"></el-option>
<el-option label="无三期业务单配/拣货" :value="2"></el-option>
<el-option label="有三期业务单校验" :value="3"></el-option>
</el-select>
</el-col>
@ -598,10 +598,10 @@
<el-select v-model="inputQuery.checkPdaEd" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
<el-option label="扫码直接生成业务单" :value="0"></el-option>
<el-option label="有三期业务单配/拣货" :value="1"></el-option>
<el-option label="无三期业务单配/拣货" :value="2"></el-option>
<el-option label="有三期业务单校验" :value="3"></el-option>
</el-select>
</el-col>
@ -621,10 +621,10 @@
<el-select v-model="inputQuery.checkUdims" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
<el-option label="扫码直接生成业务单" :value="0"></el-option>
<el-option label="有三期业务单配/拣货" :value="1"></el-option>
<el-option label="无三期业务单配/拣货" :value="2"></el-option>
<el-option label="有三期业务单校验" :value="3"></el-option>
</el-select>
</el-col>
@ -644,10 +644,10 @@
<el-select v-model="inputQuery.checkPc" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
<el-option label="扫码直接生成业务单" :value="0"></el-option>
<el-option label="有三期业务单配/拣货" :value="1"></el-option>
<el-option label="无三期业务单配/拣货" :value="2"></el-option>
<el-option label="有三期业务单校验" :value="3"></el-option>
</el-select>
</el-col>
@ -667,10 +667,10 @@
<el-select v-model="inputQuery.checkSp" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
<el-option label="扫码直接生成业务单" :value="0"></el-option>
<el-option label="有三期业务单配/拣货" :value="1"></el-option>
<el-option label="无三期业务单配/拣货" :value="2"></el-option>
<el-option label="有三期业务单校验" :value="3"></el-option>
</el-select>
</el-col>
@ -689,10 +689,10 @@
<el-select v-model="inputQuery.checkChange" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
<el-option label="扫码直接生成业务单" :value="0"></el-option>
<el-option label="有三期业务单配/拣货" :value="1"></el-option>
<el-option label="无三期业务单配/拣货" :value="2"></el-option>
<el-option label="有三期业务单校验" :value="3"></el-option>
</el-select>
</el-col>
@ -712,10 +712,10 @@
<el-select v-model="inputQuery.checkBalance" :disabled="!inputQuery.checkEnable" style="width: 75%"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
<el-option label="扫码直接生成业务单" :value="0"></el-option>
<el-option label="有三期业务单配/拣货" :value="1"></el-option>
<el-option label="无三期业务单配/拣货" :value="2"></el-option>
<el-option label="有三期业务单校验" :value="3"></el-option>
</el-select>
</el-col>
@ -734,11 +734,10 @@
<el-select v-model="inputQuery.checkCopy" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
<el-option label="扫码直接生成业务单" :value="0"></el-option>
<el-option label="有三期业务单配/拣货" :value="1"></el-option>
<el-option label="无三期业务单配/拣货" :value="2"></el-option>
<el-option label="有三期业务单校验" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>

@ -8,39 +8,56 @@
label-width="110px"
style="margin-bottom: -15px"
>
<el-button-group
style="display: flex; margin: 0px 0 15px 75%; height: 35px"
>
<el-button
size="mini"
type="primary"
v-if="documentShow"
@click.native="OptionalDocument()"
>选入预验收库单
</el-button>
<el-button size="mini" type="primary" @click.native="saveOrder()"
>草稿保存
</el-button>
<el-button size="mini" type="primary" @click.native="submit()"
v-if="(viewType != 5 && viewType != 6)&&(curAction.checkWebNew != 2 || viewType !=1)"
>立即提交
</el-button>
<el-button size="mini" type="primary" @click.native="submit(1)"
v-if="curAction.checkWebNew > 1 && viewType == 1"
>待配货提交
</el-button>
<el-button size="mini" type="primary" @click.native="submit(1)"
v-if="viewType == 5"
>完成验收
</el-button>
<el-button size="mini" type="primary" @click.native="submit(1)"
v-if=" viewType == 6"
>完成验收
</el-button>
</el-button-group>
<el-row>
<el-button-group
style="display: flex; margin: 0px 0 15px 0; height: 35px;float: right"
>
<el-button
size="mini"
type="primary"
v-if="documentShow"
@click.native="OptionalDocument()"
>选入预验收库单
</el-button>
<el-button size="mini" type="primary" @click.native="saveOrder()"
>草稿保存
</el-button>
<el-button size="mini" type="primary" @click.native="submit()"
v-if="viewType != 7"
>立即提交
</el-button>
<el-button type="primary" @click="submit(1)"
v-if="viewType == 7">校验结果提交
</el-button>
<el-button type="primary" @click="submit(2)"
v-if="viewType == 7">扫码结果提交
</el-button>
<el-button size="mini" type="primary" @click.native="revokeBill()"
v-if="viewType == 7">撤回单据
</el-button>
<!-- v-if="(viewType != 5 && viewType != 6)&&(curAction.checkWebNew != 2 || viewType !=1)"-->
<!-- <el-button size="mini" type="primary" @click.native="submit(1)"-->
<!-- v-if="curAction.checkWebNew > 1 && viewType == 1"-->
<!-- >待配货提交-->
<!-- </el-button>-->
<!-- <el-button size="mini" type="primary" @click.native="submit(1)"-->
<!-- v-if="viewType == 5"-->
<!-- >完成验收-->
<!-- </el-button>-->
<!-- <el-button size="mini" type="primary" @click.native="submit(1)"-->
<!-- v-if=" viewType == 6"-->
<!-- >完成验收-->
<!-- </el-button>-->
</el-button-group>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="corpOrderId" label="单据号:">
@ -69,7 +86,6 @@
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item prop="invCode" label="当前仓库:">
<el-select
@ -388,6 +404,14 @@
</el-form>
</el-card>
<el-tabs type="border-card" style="margin: 5px">
<el-tab-pane label="校验详情" v-if="viewCheckVisible || viewType == 7">
<checkResultPanel
:idQuery="orderFormData"
:viewType="viewType"
:curBustype="curAction"
v-if="isCheckResultAlive"
></checkResultPanel>
</el-tab-pane>
<el-tab-pane label="业务详情" v-if="bizShow && viewBizVisible || (viewType ==5 || viewType==6)">
<biz-detail-panel
:idQuery="orderFormData"
@ -418,7 +442,6 @@
></codesPanel>
</el-tab-pane>
</el-tabs>
<el-dialog
:title="editTitle"
:visible.sync="editOriginCodeVisible"
@ -471,7 +494,6 @@
></DialogSelectUnit>
</el-dialog>
<!-- 绑定产品-->
<el-dialog
:title="selectRlTitle"
@ -490,7 +512,6 @@
></selectRlDialog>
</el-dialog>
<el-dialog
title="请指定当前产品所在货位"
:visible.sync="selectSpaceVisible"
@ -507,6 +528,23 @@
</el-dialog>
<el-dialog
title="提示"
:visible.sync="checkTipDialogVisible"
width="30%"
append-to-body
center>
<span>{{ checkTip }}</span>
<span slot="footer" class="dialog-footer">
<el-button @click="checkTipDialogVisible = false">取消</el-button>
<el-tooltip content="" placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
<el-button type="primary" @click="submit(1)"></el-button>
<el-button type="primary" @click="submit(2)"></el-button>
</span>
</el-dialog>
</div>
</template>
@ -518,7 +556,7 @@ import {
submitOrderWeb,
saveOrderWeb,
updateCodeBindSup,
enterCodeWeb, submitAllocateBiz,
enterCodeWeb, submitAllocateBiz, rollbackWaitcheck, submitCodeResult, submitCheckResult,
} from "../../api/inout/order";
import {filterSubAll, findByFrom, findInvByUser} from "../../api/system/invSubWarehouse";
import {parseTime} from "../../utils/coTools";
@ -526,6 +564,7 @@ import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain";
import editCodeDialog from "./DialogEditCode";
import DialogCreateOrderSelect from "./DialogCreateOrderSelect";
import checkResultPanel from "./PanelCreateOrderCheckDetail";
import codesPanel from "./PanelCreateOrderCodes";
import codeDetailPanel from "./PanelCreateOrderCodeDetail";
import bizDetailPanel from "./PanelCreateOrderBizDetail";
@ -553,7 +592,7 @@ export default {
required: true,
},
viewType: {
//12.3,4.,5:,6:
//12.3,4.,5:,6:7.
type: Object,
required: true,
},
@ -612,6 +651,7 @@ export default {
fromOptions: [],
isCodeAlive: true,
bizShow: true,
isCheckResultAlive: true,
isBizDetailAlive: true,
isCodeDetailAlive: true,
editCodeVisible: false,
@ -662,7 +702,7 @@ export default {
editTitle: "编辑条码",
fromDeptOptions: [],
enableDept: false,
viewCheckVisible: false,
viewBizVisible: false,
viewCodeVisible: false,
viewCodeDetailVisible: false,
@ -672,10 +712,13 @@ export default {
preSpaceShow: false, //
spaceCodeList: [],
checkTipDialogVisible: false,
checkTip: null,
};
},
components: {
codesPanel,
checkResultPanel,
codeDetailPanel,
bizDetailPanel,
editCodeDialog,
@ -1195,18 +1238,85 @@ export default {
this.isCodeAlive = false;
this.isBizDetailAlive = false;
this.isCodeDetailAlive = false;
this.$nextTick(() => {
//
this.isCodeAlive = true;
this.isBizDetailAlive = true;
this.isCodeDetailAlive = true;
});
//
if (this.isCheckResultAlive) {
this.isCheckResultAlive = false;
this.$nextTick(() => {
//
this.isCheckResultAlive = true;
});
}
},
refreshOrder(orderQuery) {
this.orderFormData = orderQuery;
},
//
revokeBill() {
this.$confirm("是否确定撤回单据至草稿状态?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
let query = {billNo: this.orderFormData.billNo};
rollbackWaitcheck(query)
.then((response) => {
if (response.code == 20000) {
this.$message.success("撤回成功!");
this.closeDialog();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
});
})
.catch(() => {
});
},
submitCheckDialog() {
this.checkTipDialogVisible = true;
},
//
submitCodeResult(query) {
submitCodeResult(query).then((response) => {
if (response.code === 20000) {
this.$message.success("提交成功");
this.closeDialog();
} else {
this.$message.error(response.message);
}
});
},
//
submitCheckResult(query) {
submitCheckResult(query).then((response) => {
if (response.code === 20000) {
this.$message.success("提交成功");
this.closeDialog();
} else {
this.$message.error(response.message);
}
});
},
submit(val) {
if (this.$isBlank(this.orderFormData.action)) {
this.$message.warning("单据类型不能为空!");
@ -1230,13 +1340,10 @@ export default {
return;
}
}
let tQuery = Object.assign(
JSON.parse(JSON.stringify(this.orderFormData))
);
tQuery.orderId = this.orderFormData.billNo;
console.log(this.curAction)
if (this.viewType == 2) { //
submitCodes(tQuery).then((response) => {
if (response.code === 20000) {
@ -1268,7 +1375,33 @@ export default {
this.$message.error(response.message);
}
});
} else { //
} else if (this.viewType == 7) { //
if (val == 1) {
this.$confirm("此操作将以校验的正确结果重新生成业务单并提交,是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.submitCheckResult(tQuery);
})
.catch(() => {
});
} else {
this.$confirm("此操作将以扫码结果重新生成业务单并提交,是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.submitCodeResult(tQuery);
})
.catch(() => {
});
}
} else { //
submitOrderWeb(tQuery).then((response) => {
if (response.code === 20000) {
this.$message.success("提交成功");
@ -1278,7 +1411,6 @@ export default {
}
});
}
},
saveOrder() {
let tQuery = Object.assign(
@ -1452,6 +1584,10 @@ export default {
this.viewCodeDetailVisible = true;
} else if (this.viewType == 1) {
this.viewBizVisible = true;
} else if (this.viewType == 7) {
this.viewCheckVisible = true;
this.viewCodeVisible = true;
this.viewCodeDetailVisible = true;
} else {
this.viewCodeVisible = true;
this.viewCodeDetailVisible = true;

@ -346,7 +346,7 @@
<el-dialog
title="确定"
title="发票—确认登记"
:visible.sync="determineVisible"
width="80%"
:close-on-click-modal="false"

@ -185,6 +185,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="160" fixed="right">
<template slot-scope="scope">
<el-button type="text" :disabled="scope.row.checkStatus==1 " v-if="showSup" size="small"
@ -479,7 +480,7 @@
</el-dialog>
<el-dialog
title="确定"
title="发票—确认登记"
:visible.sync="determineVisible"
width="80%"
:close-on-click-modal="false"

@ -230,7 +230,7 @@
</el-form-item>
</el-form>
<el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
<el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>

@ -143,7 +143,7 @@
</el-table-column>
<el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作" width="150">
<el-table-column label="操作" width="150" fixed="right">
<template slot-scope="scope">
<el-button
type="text"

@ -168,14 +168,14 @@
>删除
</el-button
>
<el-button
type="text"
size="small"
v-if="scope.row.status == 1"
@click.native.stop="onUpload(scope.row.billNo)"
>提交校验
</el-button
>
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- v-if="scope.row.status == 1"-->
<!-- @click.native.stop="onUpload(scope.row.billNo)"-->
<!-- >提交校验-->
<!-- </el-button-->
<!-- >-->
</template>
</el-table-column>
</el-table>

@ -153,14 +153,14 @@
>删除
</el-button
>
<el-button
type="text"
size="small"
v-if="scope.row.status == 1"
@click.native.stop="onUpload(scope.row.billNo)"
>校验提交
</el-button
>
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- v-if="scope.row.status == 1"-->
<!-- @click.native.stop="onUpload(scope.row.billNo)"-->
<!-- >校验提交-->
<!-- </el-button-->
<!-- >-->
</template>
</el-table-column>
</el-table>

@ -188,14 +188,14 @@
>删除
</el-button
>
<el-button
type="text"
size="small"
v-if="scope.row.status == 1"
@click.native.stop="onUpload(scope.row.billNo)"
>校验提交
</el-button
>
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- v-if="scope.row.status == 1"-->
<!-- @click.native.stop="onUpload(scope.row.billNo)"-->
<!-- >校验提交-->
<!-- </el-button-->
<!-- >-->
</template>
</el-table-column>
</el-table>

@ -104,11 +104,12 @@
</el-button
>
<el-button type="primary" icon="el-icon-plus" @click="addOrders"></el-button>
<el-button type="danger" icon="el-icon-error" @click="errOrderDialog"></el-button>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border :default-sort="defaultSort"
border :default-sort="defaultSort"
@sort-change="handleSortChange"
>
<el-table-column label="序号" type="index"></el-table-column>
@ -157,14 +158,14 @@
>删除
</el-button
>
<el-button
type="text"
size="small"
v-if="scope.row.status == 1"
@click.native.stop="onUpload(scope.row.billNo)"
>提交校验
</el-button
>
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- v-if="scope.row.status == 1"-->
<!-- @click.native.stop="onUpload(scope.row.billNo)"-->
<!-- >提交校验-->
<!-- </el-button-->
<!-- >-->
</template>
</el-table-column>
</el-table>
@ -184,6 +185,19 @@
:viewType="viewType"
></addOrder>
</el-dialog>
<el-dialog
title="异常扫码单"
:visible.sync="errOrderVisible"
width="85%"
append-to-body
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="errOrderVisible"
@close='closeDialog'
>
<err-order
></err-order>
</el-dialog>
<pagination
v-show="total>0"
:total="total"
@ -201,6 +215,7 @@ import {
getOrderList, submitCodes
} from "../../api/inout/order";
import addOrder from "./DialogCreateOrder";
import errOrder from "./IoCreateErrorOrder";
import {getInvListByUser} from "@/api/system/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busType";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
@ -246,6 +261,7 @@ export default {
invList: [],
list: [],
addOrderVisible: false,
errOrderVisible: false,
total: 0,
loading: false,
index: null,
@ -316,7 +332,7 @@ export default {
},
components: {
addOrder,
addOrder, errOrder
},
methods: {
onReset() {
@ -489,6 +505,10 @@ export default {
return statusMap[status];
},
errOrderDialog() {
this.errOrderVisible = true;
},
},
mounted() {
document.body.ondrop = function (event) {

@ -0,0 +1,710 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="单号:">
<el-input v-model="filterQuery.billNo" placeholder="单号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="出入库类型:">
<el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
<el-option label="全部" value=""></el-option>
<el-option label="入库" value="WareHouseIn"></el-option>
<el-option label="出库" value="WareHouseOut"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%"
clearable>
<el-option
v-for="item in busTypes"
:key="item.name"
:label="item.name"
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="采购仓库:">-->
<!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in deptList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="所属仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%"
@change="invChange"
>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 90%"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
>重置
</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"
>查询
</el-button
>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%"
highlight-current-row
@row-click="handleSelectionChange"
border
:default-sort="defaultSort"
@sort-change="handleSortChange"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip
sortable="custom"
:sort-orders="['ascending', 'descending']">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="往来单位" prop="fromName" width="220" show-overflow-tooltip>
</el-table-column>
<el-table-column label="所属部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label="所属仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="140">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
<el-table-column label="单据状态" prop="status" width="100">
<template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.status)">{{
checkStatus[scope.row.status]
}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="150" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="addOrders(scope.row)"
>编辑
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row.billNo)"
>删除
</el-button
>
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="onUpload(scope.row.billNo)"-->
<!-- >校验提交-->
<!-- </el-button-->
<!-- >-->
</template>
</el-table-column>
</el-table>
<el-dialog
title="编辑单据"
:visible.sync="addOrderVisible"
width="85%"
append-to-body
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="addOrderVisible"
@close='closeDialog'
>
<addOrder
:closeDialog="closeDialog"
:orderQuery="idQuery"
:viewType="viewType"
></addOrder>
</el-dialog>
<el-dialog
title="单号详情"
:visible.sync="codeDetailVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="80%"
v-if="codeDetailVisible"
>
<codeDetail
:idQuery="idQuery"
v-on:closeDetailDialog="closeDetailDialog"
></codeDetail>
</el-dialog>
<pagination
v-show="total>0"
:total="total"
:page.sync="filterQuery.page"
:limit.sync="filterQuery.limit"
@pagination="getList"
/>
</el-card>
<el-tabs type="border-card" style="margin: 15px">
<!--单据业务详情-->
<el-tab-pane>
<span slot="label">单据 {{ currentRow == null ? '' : currentRow.billNo }}-业务扫码校验结果</span>
<el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
:row-style="rowStyle"
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="物资名称" width="150"
prop="coName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="规格型号" width="150"
prop="spec"
></el-table-column>
<el-table-column label="批次号" header-align="center">
<el-table-column header-align="center"
label="手录" width="100"
prop="bbatchNo"
show-overflow-tooltip
></el-table-column>
<el-table-column header-align="center"
label="扫码"
prop="sbatchNo" width="100"
show-overflow-tooltip
></el-table-column>
</el-table-column>
<el-table-column label="生产日期" header-align="center">
<el-table-column header-align="center"
label="手录" width="100"
prop="bproductDate"
show-overflow-tooltip
></el-table-column>
<el-table-column header-align="center"
label="扫码" width="100"
prop="sproductDate"
show-overflow-tooltip
></el-table-column>
</el-table-column>
<el-table-column label="失效日期" header-align="center">
<el-table-column header-align="center"
label="手录" width="100"
prop="bexpireDate"
show-overflow-tooltip
></el-table-column>
<el-table-column header-align="center"
label="扫码" width="100"
prop="sexpireDate"
show-overflow-tooltip
></el-table-column>
</el-table-column>
<el-table-column label="数量" header-align="center">
<el-table-column
header-align="center"
label="单据数量" width="100"
prop="count"
></el-table-column>
<el-table-column
header-align="center"
label="扫码数量" width="100"
prop="scanCount"
></el-table-column>
</el-table-column>
<el-table-column
label="价格"
prop="price" width="100"
></el-table-column>
<el-table-column width="100" label="计量单位" prop="measname">
</el-table-column>
<el-table-column
label="生产企业"
prop="manufacturer" width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案号" width="160"
prop="certCode"
show-overflow-tooltip
></el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import {
deleteByOrderId,
submitOrderWeb,
updateUnit, mergeOrder,
getOrderList
} from "../../api/inout/order";
import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
import draggable from "vuedraggable";
import addOrder from "./DialogCreateOrder";
import store from "../../store";
import {getInvListByUser} from "@/api/system/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busType";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {isBlank} from "@/utils/strUtil";
import {getBizDetailList, getCheckDetailList} from "@/api/inout/orderDetailBiz";
export default {
name: "IoDealCheckOrder",
data() {
return {
defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true,
filterQuery: {
id: "",
billNo: null,
mainAction: null,
action: null,
statusType: "unCheck",
page: 1,
limit: 10,
startTime: null,
endTime: null,
invCode: this.$store.getters.locInvCode,
vueType: "waitCheck",
},
viewType: 7,
checkStatus: {
1: "草稿",
2: "等待处理",
3: "等待校验",
4: "处理异常",
5: "校验成功",
6: "校验异常",
7: "审核通过",
8: "审核拒绝",
9: "正在处理", 10: "待审核", 11: "待配货",
},
curIndex: "",
idQuery: {},
storageList: [],
invList: [],
list: [],
codeDetailVisible: false,
addOrderVisible: false,
total: 0,
loading: false,
index: null,
formName: null,
errorDetail: "",
formMap: {
add: "新增",
edit: "编辑",
},
enableDept: false,
fromTypeMap: {
"1": "UDIMS平台",
"2": "网页新增",
"3": "pda即时校验",
"4": "pda未校验",
"5": "pc端扫码精灵",
"6": "流转自动补单",
"7": "UDI供应商平台",
"8": "平衡补录单据",
"10": "手动补单",
"11": "仓库盘点",
"12": "采购计划",
"13": "领用单据",
"14": "第三方系统单据",
},
deleteData: {
billNo: "",
status: 10,
},
dialogTableVisible: false,
formLoading: false,
deleteLoading: false,
busTypes: [],
actDateRange: [],
pickerOptions: {
shortcuts: [
{
text: "最近一周",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近一个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近三个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit("pick", [start, end]);
},
},
],
},
currentRow: {
billNo: ""
},
bizQuery: {
productName: null,
orderIdFk: null,
page: 1,
limit: 10
},
bizTotal: 0,
bizDetailLoading: false,
bizDetailList: [],
};
},
components: {
addOrder,
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
id: "",
billNo: null,
mainAction: null,
action: null,
statusType: "unCheck",
page: 1,
limit: 10,
startTime: null,
endTime: null,
vueType: "waitCheck",
invCode: this.$store.getters.locInvCode,
};
this.actDateRange = [];
this.getList();
},
onSubmit() {
if (this.actDateRange !== null) {
this.filterQuery.startTime = this.actDateRange[0];
this.filterQuery.endTime = this.actDateRange[1];
} else {
this.filterQuery.startTime = null;
this.filterQuery.endTime = null;
}
this.filterQuery.page = 1;
this.getList();
},
hideSearch() {
this.showSearch = !this.showSearch;
},
handleSizeChange(val) {
this.filterQuery.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
closeDetailDialog(val) {
this.codeDetailVisible = false;
},
getBusType() {
let query = {
code: this.filterQuery.invCode,
enabled: true,
vueType: "waitCheck",
};
getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.getList();
})
.catch(() => {
});
},
addOrders(row) {
this.currentRow = row;
this.idQuery = {};
this.idQuery = row;
this.addOrderVisible = true;
},
closeDialog() {
this.addOrderVisible = false;
this.addHosOrderVisible = false;
this.getList();
},
handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.filterQuery.sort = 'desc'
} else {
this.filterQuery.sort = 'asc'
}
this.filterQuery.orderBy = column.prop;
this.getList();
},
//
getList() {
this.loading = true;
getOrderList(this.filterQuery)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.list = response.data.list || [];
this.total = response.data.total || 0;
if (this.list.length == 0) {
this.bizDetailList = [];
}
} else {
this.$message.error(response.message);
}
})
.catch((error) => {
this.$message.error(error.message)
this.loading = false;
this.list = [];
this.total = 0;
});
},
deleteOrders(data) {
this.loading = true;
this.deleteData.billNo = data;
deleteByOrderId(this.deleteData)
.then((response) => {
if (response.code == 20000) {
this.getList();
this.$message({
type: "success",
message: "删除成功!",
});
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据!");
this.getList();
} else {
this.$message.error(response.message);
this.getList();
}
})
.catch(() => {
});
},
deleteDialog(rowId) {
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.deleteOrders(rowId);
this.currentRow = null;
this.bizDetailList = [];
})
.catch(() => {
});
},
onUpload(data) {
this.loading = true;
var idQuery = {
billNo: "",
};
idQuery.billNo = data;
submitOrderWeb(idQuery)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.$message.success("提交成功");
this.getList();
this.bizDetailList = [];
} else {
this.$message.error(response.message);
}
this.loading = false;
});
},
getInvList() {
getInvListByUser()
.then((response) => {
this.invList = response.data || [];
})
.catch(() => {
});
},
invChange() {
this.filterQuery.action = null;
this.getBusType();
},
statusFilterType(status) {
const statusMap = {
2: "warning",
1: "warning",
4: "danger",
3: "success",
};
return statusMap[status];
},
rowStyle({row, rowIndex}) {
let rowBackground = {};
if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.bindRlFk)) {
rowBackground.color = '#f60303';
return rowBackground;
}
if (!row.checkSuccess) {
rowBackground.color = '#f60303';
}
if (row.count != row.scanCount) {
rowBackground.color = '#f60303';
}
return rowBackground;
},
onBizReset() {
this.bizQuery = {
productName: null,
orderIdFk: null,
page: 1,
limit: 10
};
this.getBizDetailList();
},
onBizSubmit() {
this.bizQuery.page = 1;
this.getBizDetailList();
},
handleSelectionChange(val) {
this.currentRow = val;
this.getBizDetailList();
},
getBizDetailList() {
if (this.currentRow == null || isBlank(this.currentRow.billNo)) {
this.$message.error("请先选择需要查询的单据!")
return;
}
this.bizDetailLoading = true;
this.bizQuery.orderIdFk = this.currentRow.billNo;
getCheckDetailList(this.bizQuery).then((res) => {
this.bizDetailLoading = false;
if (res.code === 20000) {
this.bizDetailList = res.data || [];
} else {
this.$message.error(res.message);
this.bizDetailList = [];
}
}).catch((error) => {
this.bizDetailLoading = false;
this.$message.error(error.message);
this.bizDetailList = [];
this.bizTotal = 0;
})
},
},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
this.getInvList();
this.getBusType();
this.getList();
},
};
</script>
<style type="text/scss" lang="scss">
</style>

@ -128,7 +128,7 @@
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="往来单位" prop="fromName" width="220">
<el-table-column label="往来单位" prop="fromName" width="220" show-overflow-tooltip>
</el-table-column>
<el-table-column label="所属部门" prop="deptName" width="120">
</el-table-column>
@ -167,13 +167,13 @@
>删除
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="onUpload(scope.row.billNo)"
>校验提交
</el-button
>
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="onUpload(scope.row.billNo)"-->
<!-- >校验提交-->
<!-- </el-button-->
<!-- >-->
</template>
</el-table-column>
</el-table>
@ -373,6 +373,7 @@ export default {
startTime: null,
endTime: null,
invCode: this.$store.getters.locInvCode,
vueType: "waitDeal",
},
viewType: 3,
checkStatus: {
@ -417,6 +418,7 @@ export default {
"12": "采购计划",
"13": "领用单据",
"14": "第三方系统单据",
"15": "采购计划转单",
},
deleteData: {
billNo: "",
@ -491,6 +493,7 @@ export default {
limit: 10,
startTime: null,
endTime: null,
vueType: "waitDeal",
invCode: this.$store.getters.locInvCode,
};
this.actDateRange = [];
@ -526,7 +529,7 @@ export default {
let query = {
code: this.filterQuery.invCode,
enabled: true,
vueType: "supDelivery",
vueType: "waitDeal",
};
getLocalJoinByUser(query)
.then((response) => {
@ -671,6 +674,9 @@ export default {
if (!row.checkSuccess) {
rowBackground.color = '#f60303';
}
if (row.count != row.scanCount) {
rowBackground.color = '#f60303';
}
return rowBackground;
},

@ -0,0 +1,416 @@
<template>
<div>
<el-table v-loading="loading" :data="detailList" style="width: 100%" border
:row-style="rowStyle"
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="物资名称" width="150"
prop="coName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="规格型号" width="150"
prop="spec"
></el-table-column>
<el-table-column label="批次号" header-align="center">
<el-table-column header-align="center"
label="手录" width="100"
prop="bbatchNo"
show-overflow-tooltip
></el-table-column>
<el-table-column header-align="center"
label="扫码"
prop="sbatchNo" width="100"
show-overflow-tooltip
></el-table-column>
</el-table-column>
<el-table-column label="生产日期" header-align="center">
<el-table-column header-align="center"
label="手录" width="100"
prop="bproductDate"
show-overflow-tooltip
></el-table-column>
<el-table-column header-align="center"
label="扫码" width="100"
prop="sproductDate"
show-overflow-tooltip
></el-table-column>
</el-table-column>
<el-table-column label="失效日期" header-align="center">
<el-table-column header-align="center"
label="手录" width="100"
prop="bexpireDate"
show-overflow-tooltip
></el-table-column>
<el-table-column header-align="center"
label="扫码" width="100"
prop="sexpireDate"
show-overflow-tooltip
></el-table-column>
</el-table-column>
<el-table-column label="数量" header-align="center">
<el-table-column
header-align="center"
label="单据数量" width="100"
prop="count"
></el-table-column>
<el-table-column
header-align="center"
label="扫码数量" width="100"
prop="scanCount"
></el-table-column>
</el-table-column>
<el-table-column
label="价格"
prop="price" width="100"
></el-table-column>
<el-table-column width="100" label="计量单位" prop="measname">
</el-table-column>
<el-table-column
label="生产企业"
prop="manufacturer" width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案号" width="160"
prop="certCode"
show-overflow-tooltip
></el-table-column>
</el-table>
</div>
</template>
<script>
import stockOrderNewSelectProduct from "./DialogSelectProduct";
import dialogInvProduct from "./DialogSelectInvProduct";
import {addBizProduct, getDetailBizs, updateBizProduct, delBizProduct} from "@/api/inout/orderDetailCode";
import {updateBizBind} from "@/api/inout/order";
import selectRlDialog from "@/views/inout/DialogSelectRl";
import DialogSelectUnit from "@/views/inout/DialogSelectUnit";
import {getCheckDetailList} from "@/api/inout/orderDetailBiz";
export default {
name: "PanelCreateOrderCheckDetail",
props: {
idQuery: {
type: Object,
required: true,
},
refreshPanel: {
type: Function,
required: true,
},
refreshOrder: {
type: Function,
required: true,
},
viewType: {
type: Object,
required: true,
},
curBustype: {
type: Object,
required: true,
},
},
data() {
return {
bizType: 1,
loading: false,
query: {
orderId: null,
code: "",
corpOrderId: "",
},
detailList: [],
total: 0,
iCount: 0,
selectProductVisible: false,
selectInvProductVisible: false,
thisData: {},
selectedIndex: null,
invQueryData: {
invCode: null,
},
selectRlVisible: false,
dialogTableVisible: false,
curRow: null,
};
},
components: {
selectRlDialog, DialogSelectUnit,
stockOrderNewSelectProduct,
dialogInvProduct,
},
methods: {
getOrderDetails() {
this.loading = true;
this.query.orderIdFk = this.idQuery.billNo;
getCheckDetailList(this.query) //
.then((response) => {
this.detailList = response.data || [];
this.total = response.data || 0;
this.loading = false;
})
.catch(() => {
this.loading = false;
this.detailList = [];
this.total = 0;
});
},
rowChange(val) {
this.currentRow = val;
if (this.currentRow.batchNo == '')
this.currentRow.batchNo = null;
this.selectedIndex = val.index;
},
closeDialog(rData) {
this.selectProductVisible = false;
this.selectInvProductVisible = false;
this.idQuery = rData;
this.getOrderDetails();
},
closeDialogC2(rData) {
this.idQuery = rData;
this.selectInvProductVisible = false;
this.getOrderDetails();
},
rowStyle({row, rowIndex}) {
let rowBackground = {};
if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.bindRlFk)) {
rowBackground.color = '#f60303';
return rowBackground;
}
if (this.viewType == 1)
return null;
if (!row.checkSuccess) {
rowBackground.color = '#f60303';
}
if (row.count != row.scanCount) {
rowBackground.color = '#f60303';
}
return rowBackground;
},
tableRowClassName({row, rowIndex}) {
row.index = rowIndex;
},
selectProductFunction() {
this.thisData = this.idQuery;
if (this.$isBlank(this.idQuery.action)) {
this.$message.error("单据类型不能为空!")
return;
}
if (this.$isBlank(this.idQuery.invCode)) {
this.$message.error("当前仓库不能为空!");
return;
}
if (this.$isBlank(this.idQuery.fromCorp) && this.$isBlank(this.idQuery.fromInvCode)) {
this.$message.error("往来信息不能为空!");
return;
}
if (this.curBustype.corpType == 3) {//
this.invQueryData.invCode = this.idQuery.invCode;
this.selectInvProductVisible = true;
} else if (this.curBustype.corpType == 2) { //
this.selectProductVisible = true;
} else if (this.curBustype.corpType === 1) {//
this.invQueryData.invCode = this.idQuery.invCode;
this.selectInvProductVisible = true;
}
},
saveChange(row) {
if (row.batchNo == '') {
row.batchNo = null;
}
updateBizProduct(row)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.$message.success("保存成功!");
this.selectedIndex = null;
this.refreshPanel();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.dataList = [];
this.pageTotal = 0;
});
},
copyDetail(row) {
let data = {
relId: row.bindRlFk,
supId: row.supId,
zczbhhzbapzbh: row.certCode,
orderEntity: this.idQuery,
}
this.loading = true;
addBizProduct(data)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.getOrderDetails();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.dataList = [];
this.pageTotal = 0;
});
},
deleteDetail(row) {
let data = {
id: row.id,
}
this.loading = true;
delBizProduct(data)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.getOrderDetails();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.dataList = [];
this.pageTotal = 0;
});
},
bindRl(val) {
this.curRow = val;
this.selectRlVisible = true;
},
handleUnitClick(row) {
this.curRow = row;
this.dialogTableVisible = true;
},
selectBindRl(row) {
let query = {
id: this.curRow.id,
bindRlFk: row.id,
};
updateBizBind(query).then((response) => {
if (response.code == 20000) {
this.$message.success("绑定成功");
this.getOrderDetails();
} else
this.$message.error(response.message);
}
).catch(() => {
});
},
selectSupUnit(row) {
let query = {
id: this.curRow.id,
supId: row.erpId,
};
updateBizBind(query).then((response) => {
if (response.code == 20000) {
this.$message.success("绑定成功");
this.getOrderDetails();
} else {
this.$message.error(response.message);
}
}).catch(() => {
});
}
,
closeBindDialog() {
this.selectRlVisible = false;
this.dialogTableVisible = false;
this.refreshPanel();
}
,
}
,
filters: {}
,
watch: {
'idQuery.billNo':
{
handler() {
this.refreshOrder(this.idQuery);
}
,
}
}
,
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
}
,
created() {
if (this.idQuery.billNo != null)
this.getOrderDetails();
}
,
}
;
</script>
<style scoped>
.el-table_fixed, el-table__fixed-right {
height: 80% !important;
}
.el-table__fixed-body-wrapper {
height: 80% !important;
}
.ao-text {
width: 100%;
font-size: 13px;
font-family: "Microsoft YaHei";
float: right;
text-align: right;
margin-top: 10px;
}
/**
解决el-input输入框 type=number时输入中文光标上移问题
*/
.el-input__inner {
line-height: 1px !important;
}
</style>

@ -15,6 +15,18 @@
width="280"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="物资名称"
prop="productName"
width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="规格型号"
prop="ggxh"
width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="批次号"
prop="batchNo"
@ -94,13 +106,32 @@
</template>
</el-table-column>
</el-table>
<el-row v-if="viewType==7">
<el-col span="10">
<div style="float: left">
<td>
<div style="background-color: #FC4A45;width: 10px;height: 10px"></div>
</td>
<td><span>红色:多余条码</span></td>
<td>
<div style="background-color: #F4BD25;width: 10px;height: 10px;margin-left: 15px"></div>
</td>
<td>
<span>黄色:包含多余条码</span>
</td>
</div>
</el-col>
</el-row>
<div class="block">
<pagination
v-show="total>0"
:total="total"
:page.sync="query.page"
:limit.sync="query.limit"
@pagination="getList"
@pagination="getCodeList"
/>
</div>
@ -166,6 +197,7 @@ import selectRlDialog from "./DialogSelectRl";
import DialogSelectUnit from "./DialogSelectUnit";
import editCodeDialog from "./DialogEditCode";
import {parseTime} from "@/utils/coTools";
import {getCheckDetailCodes} from "@/api/inout/orderDetailCode";
export default {
name: "IoAddCodeDetail",
@ -189,6 +221,10 @@ export default {
editTitle: {
type: Object,
required: true,
},
viewType: {
type: Object,
required: true,
}
},
@ -214,22 +250,41 @@ export default {
getCodeList() {
this.loading = true;
this.query.orderId = this.idQuery.billNo;
errorCodeList(this.query) //
.then((response) => {
this.codeArray = response.data.list || [];
this.total = response.data.total || 0;
for (let i = 0; i < this.codeArray.length; i++) {
this.codeArray[i].fromType = this.formData.fromType;
this.codeArray[i].billType = this.formData.billType;
}
this.tableSelection();
this.loading = false;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
if (this.viewType == 7) {
//
getCheckDetailCodes(this.query) //
.then((response) => {
this.codeArray = response.data.list || [];
this.total = response.data.total || 0;
this.loading = false;
})
.catch(() => {
this.loading = false;
this.detailList = [];
this.total = 0;
});
} else {
errorCodeList(this.query) //
.then((response) => {
this.codeArray = response.data.list || [];
this.total = response.data.total || 0;
for (let i = 0; i < this.codeArray.length; i++) {
this.codeArray[i].fromType = this.formData.fromType;
this.codeArray[i].billType = this.formData.billType;
}
this.tableSelection();
this.loading = false;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
}
},
deleteCode(index, row) {
@ -277,6 +332,11 @@ export default {
if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.relId)) {
rowBackground.color = '#f60303';
}
if (row.checkStatus == 2) {
rowBackground.color = '#F7BB29';
} else if (row.checkStatus == 1) {
rowBackground.color = '#FC4A45';
}
return rowBackground;
},

@ -10,7 +10,7 @@
<el-col :span="17">
<el-form-item label="UDI:">
<el-input v-model="inputQuery.udiCode" ref="udiCodeInputRef" @keypress.enter.native="addCode($event)"
:disabled="detailList.length>0" placeholder="请输入UDI" clearable></el-input>
:disabled="detailList.length>0 || this.formName==2" placeholder="请输入UDI" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="2">
@ -220,6 +220,7 @@ export default {
this.pId = response.data;
filterMutiList({id: this.pId}).then((response) => {
if (response.code == 20000) {
this.showFlg=true;
this.inputQuery.cpmctymc = response.data.data.cpmctymc
this.inputQuery.ggxh = response.data.data.ggxh
this.inputQuery.totalCount = response.data.data.totalCount
@ -257,7 +258,8 @@ export default {
this.inputQuery.useCount = response.data.data.useCount
this.$refs.fromCorpInputRef.focus();
this.checkType=null;
this.showFlg=false;
this.showFlg=true;
this.formName=2
this.enterKeyup();
} else {
this.$refs.markInputRef.focus();
@ -427,6 +429,7 @@ export default {
this.inputQuery.useCount = response.data.useCount
this.pId = response.data.id;
this.showFlg=true;
this.formName=2
this.$refs.fromCorpInputRef.focus();
this.selectMutiDetailList()
} else {

@ -551,7 +551,13 @@ export default {
}
}
if(val==3){
this.$confirm( "已审核通过,是否需要重新提交变更", {
let msg =null;
if(this.inputQuery.auditStatus == 1 || this.inputQuery.auditStatus == 4){
msg = "已审核通过,是否需要重新提交变更";
}else if(this.inputQuery.auditStatus == 2){
msg = "审核拒绝,是否需要重新提交变更";
}
this.$confirm( msg, {
confirmButtonText: "确定",
type: "warning",
showCancelButton: false,

Loading…
Cancel
Save