UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

单据管理相关问题修改

Browse Source
prod
anthonywj 2 years ago
parent e0ac888248
commit 13ac7d4539
12 changed files with 317 additions and 338 deletions
Show Stats Download Patch File Download Diff File

18
src/utils/request.js
Unescape Escape View File

@ -78,7 +78,7 @@ service.interceptors.request.use(config => {
// 响应拦截器 // 响应拦截器
service.interceptors.response.use(res => { service.interceptors.response.use(res => {
// 未设置状态码则默认成功状态 // 未设置状态码则默认成功状态
const code = res.data.code || 20000; const code = res.data.code || 200;
// 获取错误信息 // 获取错误信息
const msg = errorCode[code] || res.data.message const msg = errorCode[code] || res.data.message
// 二进制数据则直接返回 // 二进制数据则直接返回
@ -103,21 +103,27 @@ service.interceptors.response.use(res => {
}); });
} }
return Promise.reject('无效的会话，或者会话已过期，请重新登录。') return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
} else if (code === 500) { }else {
return res.data
}
},
/**
* else if (code === 500) {
Message({ Message({
message: msg, message: msg,
type: 'error' type: 'error'
}) })
return Promise.reject(new Error(msg)) return Promise.reject(new Error(msg))
} else if (code !== 20000) { }
else if (code !== 20000) {
Notification.error({ Notification.error({
title: msg title: msg
}) })
return Promise.reject('error') return Promise.reject('error')
} else {
return res.data
} }
}, */
error => { error => {
console.log('err' + error) console.log('err' + error)
let {message} = error; let {message} = error;

1
src/views/basic/corpMaintain/corpMaintain.vue
Unescape Escape View File

@ -322,7 +322,6 @@ export default {
}, },
// 隐藏表单 // 隐藏表单
hideForm() { hideForm() {
debugger
// 更改值 // 更改值
this.formVisible = !this.formVisible; this.formVisible = !this.formVisible;
// this.getList(); // this.getList();

1
src/views/inout/DialogEditCode.vue
Unescape Escape View File

@ -109,7 +109,6 @@ export default {
if (this.editTye == 1) { if (this.editTye == 1) {
this.repeatAddCode(this.editData); this.repeatAddCode(this.editData);
} else { } else {
saveCode(this.editData) saveCode(this.editData)
.then((response) => { .then((response) => {
console.log(response) console.log(response)

46
src/views/inout/IoAuditedOrder.vue
Unescape Escape View File

@ -22,7 +22,8 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="单据类型:"> <el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型" <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%"> style="width: 90%"
clearable>
<el-option <el-option
v-for="item in busTypes" v-for="item in busTypes"
:key="item.name" :key="item.name"
@ -113,37 +114,30 @@
<span>{{ scope.row.createTime }}</span> <span>{{ scope.row.createTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="校验状态" prop="status" width="100"> <!-- <el-table-column label="校验状态" prop="status" width="100">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{ <!-- <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{-->
checkStatus[scope.row.status] <!-- checkStatus[scope.row.status]-->
}} <!-- }}-->
</el-tag> <!-- </el-tag>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="操作" width="150"> <el-table-column label="操作" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="addOrders(scope.row)" @click.native.stop="printDialog(scope.row)"
>编辑 >打印
</el-button </el-button
> >
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="deleteDialog(scope.row.id)" @click.native.stop="deleteDialog(scope.row)"
>删除 >删除
</el-button </el-button
> >
<el-button
type="text"
size="small"
@click.native.stop="checkOrder(scope.row.id)"
>校验单据
</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -230,16 +224,6 @@
label="注册/备案凭证号" label="注册/备案凭证号"
prop="ylqxzcrbarmc" prop="ylqxzcrbarmc"
></el-table-column> ></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
type="text"
@click.native.stop="editBizDialog(scope.row)"
>编辑
</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="bizTotal>0" v-show="bizTotal>0"
@ -676,7 +660,7 @@ export default {
}, },
deleteOrders(data) { deleteOrders(data) {
this.loading = true; this.loading = true;
this.deleteData.id = data; this.deleteData.billNo = data.billNo;
deleteByOrderId(this.deleteData) deleteByOrderId(this.deleteData)
.then((response) => { .then((response) => {
@ -695,7 +679,7 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
deleteDialog(rowId) { deleteDialog(row) {
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", { this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",

99
src/views/inout/IoCheckErrorOrder.vue
Unescape Escape View File

@ -22,7 +22,8 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="单据类型:"> <el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型" <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%"> style="width: 90%"
clearable>
<el-option <el-option
v-for="item in busTypes" v-for="item in busTypes"
:key="item.name" :key="item.name"
@ -115,7 +116,7 @@
</el-table-column> </el-table-column>
<el-table-column label="校验状态" prop="status" width="100"> <el-table-column label="校验状态" prop="status" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{ <el-tag :type="statusFilterType(scope.row.status)">{{
checkStatus[scope.row.status] checkStatus[scope.row.status]
}} }}
</el-tag> </el-tag>
@ -133,17 +134,10 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="deleteDialog(scope.row.id)" @click.native.stop="deleteDialog(scope.row)"
>删除 >删除
</el-button </el-button
> >
<el-button
type="text"
size="small"
@click.native.stop="checkOrder(scope.row.id)"
>校验单据
</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -230,16 +224,6 @@
label="注册/备案凭证号" label="注册/备案凭证号"
prop="ylqxzcrbarmc" prop="ylqxzcrbarmc"
></el-table-column> ></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
type="text"
@click.native.stop="editBizDialog(scope.row)"
>编辑
</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="bizTotal>0" v-show="bizTotal>0"
@ -322,16 +306,6 @@
label="注册/备案凭证号" label="注册/备案凭证号"
prop="ylqxzcrbarmc" prop="ylqxzcrbarmc"
></el-table-column> ></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
type="text"
@click.native.stop="editCodeDialog(scope.row)"
>编辑
</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="codeTotal>0" v-show="codeTotal>0"
@ -423,16 +397,6 @@
label="发票有效期" label="发票有效期"
prop="invoiceDate" prop="invoiceDate"
></el-table-column> ></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
type="text"
@click.native.stop="editResultDialog(scope.row)"
>编辑
</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="resultTotal>0" v-show="resultTotal>0"
@ -444,6 +408,22 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<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"
:errView="1"
:orderQuery="idQuery"
></addOrder>
</el-dialog>
</div> </div>
</template> </template>
@ -461,6 +441,8 @@ 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 addOrder from "./IoCreateOrder";
const formJson = { const formJson = {
site_id: "", site_id: "",
site_name: "", site_name: "",
@ -581,9 +563,15 @@ export default {
resultTotal: 0, resultTotal: 0,
resultDetailLoading: false, resultDetailLoading: false,
resultDetailList: [], resultDetailList: [],
idQuery: {},
addOrderVisible: false,
}; };
}, },
components: {}, components: {
addOrder
},
methods: { methods: {
onReset() { onReset() {
this.$router.push({ this.$router.push({
@ -701,7 +689,7 @@ export default {
}, },
deleteOrders(data) { deleteOrders(data) {
this.loading = true; this.loading = true;
this.deleteData.id = data; this.deleteData.billNo = data.billNo;
deleteByOrderId(this.deleteData) deleteByOrderId(this.deleteData)
.then((response) => { .then((response) => {
@ -720,14 +708,14 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
deleteDialog(rowId) { deleteDialog(row) {
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", { this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
this.deleteOrders(rowId); this.deleteOrders(row);
}) })
.catch(() => { .catch(() => {
}); });
@ -879,18 +867,31 @@ export default {
this.resultTotal = 0; this.resultTotal = 0;
}); });
}, },
editResultDialog(row) {
//单据编辑---
addOrders(row) {
this.idQuery = {};
this.idQuery = row;
this.addOrderVisible = true;
},
closeDialog() {
this.addOrderVisible = false;
this.getList();
}, },
},
filters: {
statusFilterType(status) { statusFilterType(status) {
const statusMap = { const statusMap = {
false: "success", 2: "warning",
true: "warning", 1: "warning",
4: "danger",
6: "danger",
3: "success",
}; };
return statusMap[status]; return statusMap[status];
}, },
}, },
mounted() { mounted() {
document.body.ondrop = function (event) { document.body.ondrop = function (event) {

80
src/views/inout/IoCheckSuccessOrder.vue
Unescape Escape View File

@ -22,7 +22,8 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="单据类型:"> <el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型" <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%"> style="width: 90%"
clearable>
<el-option <el-option
v-for="item in busTypes" v-for="item in busTypes"
:key="item.name" :key="item.name"
@ -115,7 +116,7 @@
</el-table-column> </el-table-column>
<el-table-column label="校验状态" prop="status" width="100"> <el-table-column label="校验状态" prop="status" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{ <el-tag :type="statusFilterType(scope.row.status)">{{
checkStatus[scope.row.status] checkStatus[scope.row.status]
}} }}
</el-tag> </el-tag>
@ -123,17 +124,19 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" width="150"> <el-table-column label="操作" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="addOrders(scope.row)" @click.native.stop="printDialog(scope.row.id)"
>编辑 >打印
</el-button </el-button
> >
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="deleteDialog(scope.row.id)" @click.native.stop="deleteDialog(scope.row)"
>删除 >删除
</el-button </el-button
> >
@ -230,16 +233,6 @@
label="注册/备案凭证号" label="注册/备案凭证号"
prop="ylqxzcrbarmc" prop="ylqxzcrbarmc"
></el-table-column> ></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
type="text"
@click.native.stop="editBizDialog(scope.row)"
>编辑
</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="bizTotal>0" v-show="bizTotal>0"
@ -322,16 +315,6 @@
label="注册/备案凭证号" label="注册/备案凭证号"
prop="ylqxzcrbarmc" prop="ylqxzcrbarmc"
></el-table-column> ></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
type="text"
@click.native.stop="editCodeDialog(scope.row)"
>编辑
</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="codeTotal>0" v-show="codeTotal>0"
@ -423,16 +406,6 @@
label="发票有效期" label="发票有效期"
prop="invoiceDate" prop="invoiceDate"
></el-table-column> ></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
type="text"
@click.native.stop="editResultDialog(scope.row)"
>编辑
</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="resultTotal>0" v-show="resultTotal>0"
@ -444,7 +417,6 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-dialog <el-dialog
title="单据验收" title="单据验收"
:visible.sync="acceptOrderVisible" :visible.sync="acceptOrderVisible"
@ -502,12 +474,15 @@ export default {
invCode: this.$store.getters.locInvCode, invCode: this.$store.getters.locInvCode,
}, },
checkStatus: { checkStatus: {
'-1': "草稿", 1: "草稿",
// 1: "等待处理", 2: "等待处理",
1: "等待处理", 3: "等待校验",
2: "等待校验", 4: "处理异常",
3: "校验异常", 5: "待验收",
4: "校验成功", 6: "校验异常",
7: "审核通过",
8: "审核拒绝",
9: "正在处理"
}, },
storageList: [], storageList: [],
invList: [], invList: [],
@ -700,7 +675,7 @@ export default {
}, },
deleteOrders(data) { deleteOrders(data) {
this.loading = true; this.loading = true;
this.deleteData.id = data; this.deleteData.billNo = data.billNo;
deleteByOrderId(this.deleteData) deleteByOrderId(this.deleteData)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
@ -718,14 +693,14 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
deleteDialog(rowId) { deleteDialog(row) {
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", { this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
this.deleteOrders(rowId); this.deleteOrders(row);
}) })
.catch(() => { .catch(() => {
}); });
@ -776,9 +751,6 @@ export default {
this.bizDetailList = []; this.bizDetailList = [];
this.bizTotal = 0; this.bizTotal = 0;
}) })
},
editBizDialog(row) {
}, },
onCodeReset() { onCodeReset() {
this.codeQuery = { this.codeQuery = {
@ -816,9 +788,6 @@ export default {
this.codeDetailList = []; this.codeDetailList = [];
this.codeTotal = 0; this.codeTotal = 0;
}) })
},
editCodeDialog(row) {
}, },
onResultReset() { onResultReset() {
this.resultQuery = { this.resultQuery = {
@ -876,12 +845,13 @@ export default {
parentByFn: function (childValue) { parentByFn: function (childValue) {
this.getList(); this.getList();
}, },
},
filters: {
statusFilterType(status) { statusFilterType(status) {
const statusMap = { const statusMap = {
false: "success", 5: "warning",
true: "warning", 1: "warning",
6: "danger",
7: "success",
}; };
return statusMap[status]; return statusMap[status];
}, },

21
src/views/inout/IoCreateOrder.vue
Unescape Escape View File

@ -151,6 +151,16 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="errView==1">
<el-col :span="20">
<el-form-item prop="errMsg" label="异常信息:">
<el-input
v-model="orderFormData.errMsg"
disabled
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="20"> <el-col :span="20">
<el-form-item prop="code" label="扫码录入:"> <el-form-item prop="code" label="扫码录入:">
@ -280,6 +290,10 @@ export default {
type: Object, type: Object,
required: true, required: true,
}, },
errView: {
type: Object,
required: true,
},
}, },
data() { data() {
return { return {
@ -295,6 +309,7 @@ export default {
remark: null, remark: null,
fromType: 2, fromType: 2,
}, },
errView: 0,
//扫码相关 //扫码相关
codeFormData: { codeFormData: {
@ -498,14 +513,17 @@ export default {
if (event == null) { if (event == null) {
} else event.target.select(); } else event.target.select();
this.$refs.inputRef.select(); this.$refs.inputRef.select();
if (this.$isBlank(this.orderFormData.action)) { if (this.$isBlank(this.orderFormData.action)) {
this.$message.warning("请选择单据类型！"); this.$message.warning("请选择单据类型！");
return; return;
} }
if (this.$isBlank(this.orderFormData.corpOrderId)) { if (this.$isBlank(this.orderFormData.corpOrderId)) {
let date = new Date(); let date = new Date();
this.orderFormData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10); this.orderFormData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
} }
this.codeFormData.code = this.codeFormData.code.trim(); this.codeFormData.code = this.codeFormData.code.trim();
if (this.$isBlank(this.codeFormData.code)) return; if (this.$isBlank(this.codeFormData.code)) return;
this.loading = true; this.loading = true;
@ -545,6 +563,7 @@ export default {
this.orderFormData.billNo = this.curRow.orderId; this.orderFormData.billNo = this.curRow.orderId;
this.refreshCodesPanel(); this.refreshCodesPanel();
this.selectUnitTitle = response.message; this.selectUnitTitle = response.message;
this.$message.error(response.message);
this.handleUnitClick(response.data); this.handleUnitClick(response.data);
} else if (response.code == 504) { } else if (response.code == 504) {
@ -630,7 +649,7 @@ export default {
}, },
saveOrder() { saveOrder() {
let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData))); let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
tQuery.orderId = this.orderFormData.billNo; tQuery.billNo = this.orderFormData.billNo;
saveOrderWeb(tQuery).then((response) => { saveOrderWeb(tQuery).then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
this.closeDialog(); this.closeDialog();

8
src/views/inout/IoCreateOrderBizDetail.vue
Unescape Escape View File

@ -19,6 +19,14 @@
>第三方单据选入 >第三方单据选入
</el-button </el-button
> >
<el-button
type="primary"
ref="mainTable"
@click.native.stop="selectProductFunction()"
:loading="loading"
>领用单据选入
</el-button
>
</el-button-group> </el-button-group>
</div> </div>

238
src/views/inout/IoCreateOrderCodes.vue
Unescape Escape View File

@ -5,85 +5,87 @@
border border
ref="multipleTable"> ref="multipleTable">
<el-table-column <el-table-column
type="selection" type="selection"
width="55"> width="55">
</el-table-column> </el-table-column>
<el-table-column label="序号" type="index" width="55"></el-table-column> <el-table-column label="序号" type="index" width="55"></el-table-column>
<el-table-column <el-table-column
label="UDI码" label="UDI码"
prop="code" prop="code"
width="280" width="280"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="生产日期" label="生产日期"
prop="produceDate" prop="produceDate"
width="120" width="120"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="失效日期" label="失效日期"
prop="expireDate" prop="expireDate"
width="120" width="120"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="批次号" label="批次号"
prop="batchNo" prop="batchNo"
width="120" width="120"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="序列号" label="序列号"
prop="serialNo" prop="serialNo"
width="120" width="120"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="供应商" label="供应商"
prop="supName" prop="supName"
width="180" width="180"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="扫码数量" label="扫码数量"
prop="count" prop="count"
width="80" width="80"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="实际数量" label="实际数量"
prop="reCount" prop="reCount"
width="80" width="80"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column label="操作" width="240"> <el-table-column label="操作" width="240">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="deleteCode(scope.$index, scope.row)" @click.native.stop="deleteCode(scope.$index, scope.row)"
>减一 >减一
</el-button </el-button
> >
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="bindRl(scope.row)" :disabled="scope.row.relId!=null"
@click.native.stop="bindRl(scope.row)"
>绑定产品 >绑定产品
</el-button </el-button
> >
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="handleUnitClick(scope.row)" :disabled="scope.row.supId!=null"
@click.native.stop="handleUnitClick(scope.row)"
>绑定供应商 >绑定供应商
</el-button </el-button
> >
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="editCode(scope.row)" @click.native.stop="editCode(scope.row)"
>编辑 >编辑
</el-button </el-button
> >
@ -92,78 +94,78 @@
</el-table> </el-table>
<div class="block"> <div class="block">
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="query.page" :page.sync="query.page"
:limit.sync="query.limit" :limit.sync="query.limit"
@pagination="getList" @pagination="getList"
/> />
</div> </div>
<!-- 绑定产品--> <!-- 绑定产品-->
<el-dialog <el-dialog
:title="selectRlTitle" :title="selectRlTitle"
:visible.sync="selectRlVisible" :visible.sync="selectRlVisible"
width="80%" width="80%"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="selectRlVisible" v-if="selectRlVisible"
append-to-body append-to-body
> >
<selectRlDialog <selectRlDialog
:curRow="curRow" :curRow="curRow"
:fromCorp="fromCorp" :fromCorp="fromCorp"
v-on:selectBindRl="selectBindRl" v-on:selectBindRl="selectBindRl"
v-on:closeBindDialog="closeBindDialog" v-on:closeBindDialog="closeBindDialog"
></selectRlDialog> ></selectRlDialog>
</el-dialog> </el-dialog>
<!-- 绑定供应商--> <!-- 绑定供应商-->
<el-dialog <el-dialog
:title="selectUnitTitle" :title="selectUnitTitle"
:visible.sync="dialogTableVisible" :visible.sync="dialogTableVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="dialogTableVisible" v-if="dialogTableVisible"
width="80%" width="80%"
append-to-body append-to-body
> >
<DialogSelectUnit <DialogSelectUnit
:codeId="curRow" :codeId="curRow"
:fromCorp="fromCorp" :fromCorp="fromCorp"
v-on:selectSupUnit="selectSupUnit" v-on:selectSupUnit="selectSupUnit"
v-on:closeBindDialog="closeBindDialog" v-on:closeBindDialog="closeBindDialog"
></DialogSelectUnit> ></DialogSelectUnit>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
:title="editTitle" :title="editTitle"
:visible.sync="editCodeVisible" :visible.sync="editCodeVisible"
append-to-body width="70%" append-to-body width="70%"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="editCodeVisible" v-if="editCodeVisible"
> >
<editCodeDialog <editCodeDialog
editTye="2" editTye="2"
:closeCodeDialog="closeCodeDialog" :closeCodeDialog="closeCodeDialog"
:codeDetail="codeDetail"> :codeDetail="codeDetail">
</editCodeDialog> </editCodeDialog>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
:title="editTitle" :title="editTitle"
:visible.sync="editOriginCodeVisible" :visible.sync="editOriginCodeVisible"
append-to-body width="70%" append-to-body width="70%"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="editOriginCodeVisible"> v-if="editOriginCodeVisible">
<editCodeDialog <editCodeDialog
:closeCodeDialog="closeCodeDialog" :closeCodeDialog="closeCodeDialog"
:repeatAddCode="repeatAddCode" :repeatAddCode="repeatAddCode"
:codeDetail="idQuery" :codeDetail="idQuery"
editTye="1"> editTye="1">
</editCodeDialog> </editCodeDialog>
</el-dialog> </el-dialog>
@ -227,21 +229,21 @@ export default {
this.loading = true; this.loading = true;
this.query.orderId = this.idQuery.billNo; this.query.orderId = this.idQuery.billNo;
errorCodeList(this.query) //查找该单号下的所有条码 errorCodeList(this.query) //查找该单号下的所有条码
.then((response) => { .then((response) => {
this.codeArray = response.data.list || []; this.codeArray = response.data.list || [];
this.total = response.data.total || 0; this.total = response.data.total || 0;
for (let i = 0; i < this.codeArray.length; i++) { for (let i = 0; i < this.codeArray.length; i++) {
this.codeArray[i].fromType = this.formData.fromType; this.codeArray[i].fromType = this.formData.fromType;
this.codeArray[i].billType = this.formData.billType; this.codeArray[i].billType = this.formData.billType;
} }
this.tableSelection(); this.tableSelection();
this.loading = false; this.loading = false;
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
this.list = []; this.list = [];
this.total = 0; this.total = 0;
}); });
}, },
deleteCode(index, row) { deleteCode(index, row) {
@ -255,14 +257,14 @@ export default {
id: row.id id: row.id
} }
deleteCodesTempById(tQuery) deleteCodesTempById(tQuery)
.then((response) => { .then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
this.refreshPanel(); this.refreshPanel();
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
this.loading = false; this.loading = false;
}); });
}).catch(() => { }).catch(() => {
}); });
}, },
@ -336,15 +338,16 @@ export default {
}, },
closeBindDialog(val) { closeBindDialog() {
this.selectRlVisible = false; this.selectRlVisible = false;
this.dialogTableVisible = false; this.dialogTableVisible = false;
this.refreshPanel();
}, },
closeCodeDialog() { closeCodeDialog() {
this.editCodeVisible = false; this.editCodeVisible = false;
this.editOriginCodeVisible = false; this.editOriginCodeVisible = false;
this.getCodeList(); this.refreshPanel();
}, },
repeatAddCode(editData) { repeatAddCode(editData) {
@ -353,7 +356,6 @@ export default {
tQuery.actDate = parseTime(this.orderFormData.actDate, '{y}-{m}-{d} {h}:{i}:{s}'); tQuery.actDate = parseTime(this.orderFormData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
tQuery.action = this.orderFormData.action; tQuery.action = this.orderFormData.action;
this.closeCodeDialog(); this.closeCodeDialog();
this.addCodeSubmit(tQuery);
}, },

50
src/views/inout/IoNewOrder.vue
Unescape Escape View File

@ -22,7 +22,8 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="单据类型:"> <el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型" <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%"> style="width: 90%"
clearable>
<el-option <el-option
v-for="item in busTypes" v-for="item in busTypes"
:key="item.name" :key="item.name"
@ -83,7 +84,7 @@
>查询 >查询
</el-button </el-button
> >
<el-button type="primary" icon="el-icon-s-unfold" @click="mergesOrders">合并单据</el-button> <!-- <el-button type="primary" icon="el-icon-s-unfold" @click="mergesOrders">合并单据</el-button>-->
<el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button> <el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button>
</el-button-group> </el-button-group>
</div> </div>
@ -116,7 +117,7 @@
</el-table-column> </el-table-column>
<el-table-column label="校验状态" prop="status" width="100"> <el-table-column label="校验状态" prop="status" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{ <el-tag :type="statusFilterType(scope.row.status)">{{
checkStatus[scope.row.status] checkStatus[scope.row.status]
}} }}
</el-tag> </el-tag>
@ -150,7 +151,7 @@
type="text" type="text"
size="small" size="small"
v-if="scope.row.status !== -1" v-if="scope.row.status !== -1"
@click.native.stop="onUpload(scope.row.id)" @click.native.stop="onUpload(scope.row.billNo)"
>立即处理 >立即处理
</el-button </el-button
> >
@ -260,19 +261,16 @@
<script> <script>
import { import {
deleteByOrderId, deleteByOrderId,
commitOrder, submitOrderWeb,
updateUnit, mergeOrder, updateUnit, mergeOrder,
getOrderList getOrderList
} from "../../api/inout/order"; } from "../../api/inout/order";
import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain" import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
import draggable from "vuedraggable"; import draggable from "vuedraggable";
// import codeDetail from "./errorCode";
// import ioErrorOrder from "./IOErrorOrder";todo
import addOrder from "./IoCreateOrder"; import addOrder from "./IoCreateOrder";
import store from "../../store"; import store from "../../store";
import {getInvListByUser} from "@/api/system/invWarehouse"; import {getInvListByUser} from "@/api/system/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busType"; import {getLocalJoinByUser} from "@/api/basic/busType";
import {isBlank} from "@/utils/strUtil";
import {selectSysParamByKey} from "@/api/param/systemParamConfig"; import {selectSysParamByKey} from "@/api/param/systemParamConfig";
const formJson = { const formJson = {
@ -307,7 +305,8 @@ export default {
5: "校验成功", 5: "校验成功",
6: "校验异常", 6: "校验异常",
7: "审核通过", 7: "审核通过",
8: "审核拒绝" 8: "审核拒绝",
9: "正在处理"
}, },
curIndex: "", curIndex: "",
unitQuery: {key: "", page: 1, limit: 20}, unitQuery: {key: "", page: 1, limit: 20},
@ -396,7 +395,6 @@ export default {
}; };
}, },
components: { components: {
draggable,
// codeDetail, // codeDetail,
addOrder, addOrder,
// ioErrorOrder // ioErrorOrder
@ -422,7 +420,6 @@ export default {
this.getList(); this.getList();
}, },
onSubmit() { onSubmit() {
this.loading = true;
if (this.actDateRange !== null) { if (this.actDateRange !== null) {
this.filterQuery.startTime = this.actDateRange[0]; this.filterQuery.startTime = this.actDateRange[0];
this.filterQuery.endTime = this.actDateRange[1]; this.filterQuery.endTime = this.actDateRange[1];
@ -606,26 +603,18 @@ export default {
onUpload(data) { onUpload(data) {
this.loading = true; this.loading = true;
var idQuery = { var idQuery = {
orderId: "", billNo: "",
}; };
idQuery.orderId = data; idQuery.billNo = data;
commitOrder(idQuery) submitOrderWeb(idQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) { this.loading = false;
this.$message.success(response.data); if (response.code === 20000) {
for (let i = 0; i < this.list.length; i++) { this.$message.success("提交成功");
if (this.list[i].id === idQuery.orderId) {
this.list.splice(i, 1);
break;
}
}
this.loading = false;
} else { } else {
this.loading = false
this.$message.error(response.message); this.$message.error(response.message);
} }
}) this.loading = false;
.catch(() => {
}); });
}, },
handleErrorDetail(poistion) { handleErrorDetail(poistion) {
@ -667,15 +656,16 @@ export default {
} }
}); });
}, },
},
filters: {
statusFilterType(status) { statusFilterType(status) {
const statusMap = { const statusMap = {
false: "success", 2: "warning",
true: "warning", 1: "warning",
4: "danger",
3: "success",
}; };
return statusMap[status]; return statusMap[status];
}, },
}, },
mounted() { mounted() {
document.body.ondrop = function (event) { document.body.ondrop = function (event) {

3
src/views/inout/IoReviewOrder.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<el-card> <el-card style="margin-top: -20px">
<el-form :model="formData" ref="dataForm" label-width="100px"> <el-form :model="formData" ref="dataForm" label-width="100px">
<el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px"> <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
<el-button <el-button
@ -37,6 +37,7 @@
<el-form-item prop="fromCorp" label="单据类型:"> <el-form-item prop="fromCorp" label="单据类型:">
<el-input v-model="formData.billTypeName" auto-complete="off" <el-input v-model="formData.billTypeName" auto-complete="off"
disabled disabled
clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

90
src/views/inout/IoUnCheckedOrder.vue
Unescape Escape View File

@ -22,7 +22,8 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="单据类型:"> <el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型" <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%"> style="width: 90%"
clearable>
<el-option <el-option
v-for="item in busTypes" v-for="item in busTypes"
:key="item.name" :key="item.name"
@ -133,17 +134,10 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="deleteDialog(scope.row.id)" @click.native.stop="deleteDialog(scope.row)"
>删除 >删除
</el-button </el-button
> >
<el-button
type="text"
size="small"
@click.native.stop="checkOrder(scope.row.id)"
>校验单据
</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -230,16 +224,6 @@
label="注册/备案凭证号" label="注册/备案凭证号"
prop="ylqxzcrbarmc" prop="ylqxzcrbarmc"
></el-table-column> ></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
type="text"
@click.native.stop="editBizDialog(scope.row)"
>编辑
</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="bizTotal>0" v-show="bizTotal>0"
@ -322,16 +306,6 @@
label="注册/备案凭证号" label="注册/备案凭证号"
prop="ylqxzcrbarmc" prop="ylqxzcrbarmc"
></el-table-column> ></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
type="text"
@click.native.stop="editCodeDialog(scope.row)"
>编辑
</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="codeTotal>0" v-show="codeTotal>0"
@ -423,16 +397,6 @@
label="发票有效期" label="发票有效期"
prop="invoiceDate" prop="invoiceDate"
></el-table-column> ></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
type="text"
@click.native.stop="editResultDialog(scope.row)"
>编辑
</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="resultTotal>0" v-show="resultTotal>0"
@ -444,6 +408,24 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<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"
></addOrder>
</el-dialog>
</div> </div>
</template> </template>
@ -460,6 +442,9 @@ 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 addOrder from "./IoCreateOrder";
const formJson = { const formJson = {
site_id: "", site_id: "",
site_name: "", site_name: "",
@ -581,9 +566,15 @@ export default {
resultTotal: 0, resultTotal: 0,
resultDetailLoading: false, resultDetailLoading: false,
resultDetailList: [], resultDetailList: [],
idQuery: {},
addOrderVisible: false,
}; };
}, },
components: {}, components: {
addOrder
},
methods: { methods: {
onReset() { onReset() {
this.$router.push({ this.$router.push({
@ -682,7 +673,7 @@ export default {
}, },
deleteOrders(data) { deleteOrders(data) {
this.loading = true; this.loading = true;
this.deleteData.id = data; this.deleteData.billNo = data.billNo;
deleteByOrderId(this.deleteData) deleteByOrderId(this.deleteData)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
@ -700,14 +691,14 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
deleteDialog(rowId) { deleteDialog(row) {
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", { this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
this.deleteOrders(rowId); this.deleteOrders(row);
}) })
.catch(() => { .catch(() => {
}); });
@ -720,8 +711,6 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
checkOrder(orderId) {
},
onBizReset() { onBizReset() {
this.bizQuery = { this.bizQuery = {
productName: null, productName: null,
@ -840,7 +829,18 @@ export default {
}); });
}, },
editResultDialog(row) { editResultDialog(row) {
},
//单据编辑---
addOrders(row) {
this.idQuery = {};
this.idQuery = row;
this.addOrderVisible = true;
},
closeDialog() {
this.addOrderVisible = false;
this.getList();
}, },
}, },
filters: { filters: {

Write Preview
Loading…
Cancel
Save