界面流程相关问题修改

ywj_dev
anthonywj 2 years ago
parent dabdc47dc0
commit 9cecb43ec7

@ -3,18 +3,16 @@
<el-card class="el-card">
<el-form :model="query" label-width="100px" v-show="showSearch">
<el-row style="width: 100%">
<el-col :span="6">
<el-col :span="8">
<el-form-item label="单号:">
<el-input v-model="query.billNo" style="width: 90%" placeholder="请输入单号" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="状态:" prop="inCodeStatus" clearable>
<el-col :span="8">
<el-form-item label="打印状态:" prop="inCodeStatus" clearable>
<el-select v-model="query.inCodeStatus" style="width: 90%">
<el-option label="未打印" value="1"></el-option>
<el-option label="已打印" value="2"></el-option>
<el-option label="未打印" :value="1"></el-option>
<el-option label="已打印" :value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
@ -25,7 +23,7 @@
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6">
<el-col :span="8">
<el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="query.action" placeholder="请选择单据类型"
style="width: 90%"
@ -40,6 +38,22 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="单据状态:">
<el-select v-model="query.status" placeholder="请选择单据状态">
<el-option label="草稿" :value=1>草稿</el-option>
<el-option label="待校验" :value=3>待校验</el-option>
<el-option label="待核对" :value=5>待核对</el-option>
<el-option label="待审核" :value=10>待审核</el-option>
<el-option label="已审核" :value=7>已审核</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="创建时间:">
<el-date-picker
@ -56,7 +70,6 @@
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
@ -154,7 +167,7 @@
</el-card>
<el-dialog
title="内部码详情"
title="内部码管理"
:visible.sync="qrcodeDetailVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
@ -205,11 +218,13 @@ export default {
invWarehouseCode: this.$store.getters.locSubInvCode,
billNo: "",
status: "",
action: null,
statusType: "supInCode",
page: 1,
limit: 10,
startTime: "",
endTime: "",
inCodeStatus: null,
inCodeStatus: 2,
},
detailQuery: {
orderIdFk: "",
@ -314,13 +329,19 @@ export default {
path: ""
});
this.query = {
billType: null,
corpName: null,
locStorageCode: this.$store.getters.locInvCode,
invWarehouseCode: this.$store.getters.locSubInvCode,
billNo: "",
status: "",
action: null,
statusType: "supInCode",
page: 1,
limit: 10,
startTime: "",
endTime: "",
locStorageCode: store.getters.customerId,
inCodeStatus: 2,
};
this.getList();

@ -1,145 +1,147 @@
<template>
<div>
<el-form :model="formData" :rules="formRules" ref="dataForm" label-width="100px">
<el-row type="flex" justify="end">
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: -10px">
<el-button type="primary" @click.native="generateQRCodeText()" :loading="loading">生成内部码</el-button>
<el-button type="primary" @click.native="printStockOrderDetailPDF()" :loading="loading">打印全部</el-button>
<el-switch style="margin-left: 50px;" v-model="filterUDIType" active-text="过滤已有UDI码的产品"></el-switch>
</el-button-group>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="单据号" prop="billNo">
<el-input v-model="formData.billNo" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="单据日期" prop="billdate">
<el-input v-model="formData.createTime" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="送货单位" prop="corpName">
<el-input v-model="formData.customerName" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="业务类型" prop="billTypeName">
<el-input v-model="formData.billTypeName" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
border ref="multipleTable">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="内部码" prop="udiCode"></el-table-column>
<el-table-column label="状态">
<template slot-scope="scope">
<span>{{ statusMap[scope.row.status] }}</span>
</template>
</el-table-column>
<el-table-column label="标签数量">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.count" placeholder="请输入打印标签数量" style="width: 50%"
oninput="value=value.replace(/[^\d]/g,'')"></el-input>
<!-- <span>{{ scope.row.reCount }}</span>-->
</template>
</el-table-column>
<el-table-column label="时间" prop="create_time" show-overflow-tooltip>
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.updateTime }}</span>
</template>
</el-table-column>
<el-table-column label="操作"width="150">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native="printStockOrderDetailPDF(scope.row)"
>标签打印
</el-button
>
</template>
</el-table-column>
</el-table>
<div class="block">
<pagination
v-show="total>0"
:total="total"
:limit.sync="query.limit"
:page.sync="query.page"
@pagination="handleCurrentChange"
></pagination>
</div>
</el-form>
<div>
<el-card>
<el-form :model="formData" :rules="formRules" ref="dataForm" label-width="100px">
<el-row type="flex" justify="end">
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;">
<el-button type="primary" @click.native="generateQRCodeText()" :loading="loading">生成内部码</el-button>
<el-button type="primary" @click.native="printStockOrderDetailPDF()" :loading="loading">打印全部</el-button>
<el-switch style="margin-left: 50px;" v-model="filterUDIType" active-text="过滤已有UDI码的产品"></el-switch>
</el-button-group>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="单据号" prop="billNo">
<el-input v-model="formData.billNo" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="单据日期" prop="billdate">
<el-input v-model="formData.createTime" style="width: 90%" auto-complete="off"
:disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="送货单位" prop="corpName">
<el-input v-model="formData.customerName" style="width: 90%" auto-complete="off"
:disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="业务类型" prop="billTypeName">
<el-input v-model="formData.billTypeName" style="width: 90%" auto-complete="off"
:disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
<el-card>
<el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
border ref="multipleTable">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="内部码" prop="udiCode"></el-table-column>
<el-table-column label="状态">
<template slot-scope="scope">
<span>{{ statusMap[scope.row.status] }}</span>
</template>
</el-table-column>
<el-table-column label="标签数量">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.count" placeholder="请输入打印标签数量" style="width: 50%"
oninput="value=value.replace(/[^\d]/g,'')"></el-input>
<!-- <span>{{ scope.row.reCount }}</span>-->
</template>
</el-table-column>
<el-table-column label="时间" prop="create_time" show-overflow-tooltip>
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.updateTime }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="150">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native="printStockOrderDetailPDF(scope.row)"
>标签打印
</el-button
>
</template>
</el-table-column>
</el-table>
<div class="block">
<pagination
v-show="total>0"
:total="total"
:limit.sync="query.limit"
:page.sync="query.page"
@pagination="handleCurrentChange"
></pagination>
</div>
</el-card>
<el-dialog
title="标签打印文件列表"
:visible.sync="labelPrintVisible"
width="60%"
:close-on-click-modal="false"
:close-on-press-escape="false"
append-to-body
v-if="labelPrintVisible"
>
<el-button-group style="display: flex">
<el-button
type="primary"
@click.native="refeshLabel()"
style="margin: -50px 60px 10px auto; height: 35px"
>刷新
</el-button
>
</el-button-group>
<el-table :data="lableFileLsit" style="width: 100%" border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="文件名称"
prop="fileName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生成状态"
prop="status"
show-overflow-tooltip
>
<template slot-scope="scope">
<el-dialog
title="标签打印文件列表"
:visible.sync="labelPrintVisible"
width="60%"
:close-on-click-modal="false"
:close-on-press-escape="false"
append-to-body
v-if="labelPrintVisible"
>
<el-button-group style="display: flex">
<el-button
type="primary"
@click.native="refeshLabel()"
style="margin: -50px 60px 10px auto; height: 35px"
>刷新
</el-button
>
</el-button-group>
<el-table :data="lableFileLsit" style="width: 100%" border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="文件名称"
prop="fileName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生成状态"
prop="status"
show-overflow-tooltip
>
<template slot-scope="scope">
<el-tag :type="(scope.row.status) | statusFilterType">
{{ printMap[scope.row.status] }}
</el-tag>
<el-tag :type="(scope.row.status) | statusFilterType">
{{ printMap[scope.row.status] }}
</el-tag>
</template>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="printLabel(scope.row)"></el-button>
</template>
</el-table-column>
</el-table>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="printLabel(scope.row)"></el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="labltotal>0"
:total="labltotal"
:limit.sync="refreshQuery.limit"
:page.sync="refreshQuery.page"
@pagination="handleLableChange"
></pagination>
</el-dialog>
<pagination
v-show="labltotal>0"
:total="labltotal"
:limit.sync="refreshQuery.limit"
:page.sync="refreshQuery.page"
@pagination="handleLableChange"
></pagination>
</el-dialog>
</div>
</div>
</template>
<script>
@ -155,286 +157,287 @@ import {
import {generateInCodeQRCodeText, generateInnerQRCodeText} from "@/api/inout/innerOrderQRCode";
export default {
name: "idQuery",
props: {
closeDialog: {
type: Function,
required: true,
},
idQuery: {
type: Object,
required: true,
},
name: "idQuery",
props: {
closeDialog: {
type: Function,
required: true,
},
data() {
return {
code: "",
BASE_URL: process.env.VUE_APP_BASE_API,
query: {
sOrderId: null,
orderIdFk: "",
page: 1,
limit: 10,
},
busTypes: [],
formData: {},
codeArray: [],
total: 0,
loading: false,
index: null,
formLoading: false,
formVisible: false,
deleteLoading: false,
orderNo: null,
labelPrintVisible: false,
lableFileLsit: [],
labltotal: null,
refreshQuery: {
page: 1,
limit: 10,
printCodeIdFk: null,
stockOrderFk: null,
},
filterUDIType:false,
statusMap: {
0: "未打印",
1: "已打印",
},
printMap: {
0: "正在生成",
1: "已生成",
2: "生成失败"
},
};
idQuery: {
type: Object,
required: true,
},
components: {
draggable,
},
methods: {
//
resetForm() {
if (this.$refs["dataForm"]) {
//
this.$refs["dataForm"].clearValidate();
//
this.$refs["dataForm"].resetFields();
this.getList();
}
},
printLabel(row) {
window.open(this.pdffileUrl + row.fileName, '_blank');
},
data() {
return {
code: "",
BASE_URL: process.env.VUE_APP_BASE_API,
query: {
sOrderId: null,
orderIdFk: "",
page: 1,
limit: 10,
},
refeshLabel() {
filterTemp(this.refreshQuery).then((response) => {
if (response.code == 20000) {
this.lableFileLsit = response.data.list;
this.labelPrintVisible = true;
this.labltotal = response.data.total || 0;
}
}).catch(() => {
this.loading = false;
});
},
handleCurrentChange(val) {
this.query.page = val.page;
this.getStockQRCodeTextList();
},
getStockQRCodeTextList() {
this.loading = true;
filterPrint(this.query) //
.then((response) => {
console.log(response)
this.codeArray = response.data.list || [];
this.total = response.data.total || 0;
this.loading = false;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
handleLableChange(val) {
this.refreshQuery.page = val.page;
this.refeshLabel();
this.getOrderQRCodeTextList();
busTypes: [],
formData: {},
codeArray: [],
total: 0,
loading: false,
index: null,
formLoading: false,
formVisible: false,
deleteLoading: false,
orderNo: null,
labelPrintVisible: false,
lableFileLsit: [],
labltotal: null,
refreshQuery: {
page: 1,
limit: 10,
printCodeIdFk: null,
stockOrderFk: null,
},
filterUDIType: false,
statusMap: {
0: "未打印",
1: "已打印",
},
getOrderQRCodeTextList() {
printMap: {
0: "正在生成",
1: "已生成",
2: "生成失败"
},
};
},
components: {
draggable,
},
methods: {
//
resetForm() {
if (this.$refs["dataForm"]) {
//
this.$refs["dataForm"].clearValidate();
//
this.$refs["dataForm"].resetFields();
this.getList();
}
},
printLabel(row) {
window.open(this.pdffileUrl + row.fileName, '_blank');
},
refeshLabel() {
filterTemp(this.refreshQuery).then((response) => {
if (response.code == 20000) {
this.lableFileLsit = response.data.list;
this.labelPrintVisible = true;
this.labltotal = response.data.total || 0;
}
}).catch(() => {
this.loading = false;
});
},
handleCurrentChange(val) {
this.query.page = val.page;
this.getStockQRCodeTextList();
},
getStockQRCodeTextList() {
this.loading = true;
filterPrint(this.query) //
.then((response) => {
console.log(response)
this.codeArray = response.data.list || [];
this.total = response.data.total || 0;
this.loading = false;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
handleLableChange(val) {
this.refreshQuery.page = val.page;
this.refeshLabel();
this.getOrderQRCodeTextList();
},
getOrderQRCodeTextList() {
this.loading = true;
filterPrint(this.query) //
.then((response) => {
console.log(response)
this.codeArray = response.data.list || [];
this.total = response.data.total || 0;
this.loading = false;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
generateQRCodeText() {
this.$confirm("确定生成内部码?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
this.loading = true;
filterPrint(this.query) //
.then((response) => {
console.log(response)
this.codeArray = response.data.list || [];
this.total = response.data.total || 0;
generateInCodeQRCodeText({orderIdFk: this.formData.billNo, chack: this.filterUDIType})
.then(response => {
this.loading = false;
if (response.code === 20000) {
this.$message.success("生成成功!");
this.getOrderQRCodeTextList();
this.detailList = [];
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
generateQRCodeText() {
this.$confirm("确定生成内部码?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
this.loading = true;
generateInCodeQRCodeText({orderIdFk:this.formData.billNo,chack:this.filterUDIType})
.then(response => {
this.loading = false;
if (response.code === 20000) {
this.$message.success("生成成功!");
this.getOrderQRCodeTextList();
this.detailList = [];
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
})
}).catch(() => {
})
}).catch(() => {
});
},
printStockOrderDetailPDF(row) {
let tQuery = {
queryId: null,
orderId: null,
countList: [],
};
if (row == null) {
tQuery.orderId = this.formData.billNo;
} else {
if (row.reCount <= 0) {
return this.$message.error('数量错误');
}
tQuery.queryId = row.id;
});
},
printStockOrderDetailPDF(row) {
let tQuery = {
queryId: null,
orderId: null,
countList: [],
};
if (row == null) {
tQuery.orderId = this.formData.billNo;
} else {
if (row.reCount <= 0) {
return this.$message.error('数量错误');
}
tQuery.queryId = row.id;
}
this.loading = true;
inspectionStockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
if (response.code === 20000) {
if (row != null) {
tQuery.id = row.id;
tQuery.rowCount = row.reCount;
this.loading = true;
inspectionStockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
if (response.code === 20000) {
if (row != null) {
tQuery.id = row.id;
tQuery.rowCount = row.reCount;
let data = {
queryId: row.id,
rowCount: row.count
}
tQuery.countList.push(data);
} else {
for (let i = 0; i < this.codeArray.length; i++) {
let data = {
queryId: row.id,
rowCount: row.count
queryId: this.codeArray[i].id,
rowCount: this.codeArray[i].count
}
tQuery.countList.push(data);
} else {
for (let i = 0; i < this.codeArray.length; i++) {
let data = {
queryId: this.codeArray[i].id,
rowCount: this.codeArray[i].count
}
tQuery.countList.push(data);
}
}
let count = 0;
for (let i = 0; i < tQuery.countList.length; i++) {
}
let count = 0;
for (let i = 0; i < tQuery.countList.length; i++) {
count = count + tQuery.countList[i].rowCount;
console.log(count);
}
count = count + tQuery.countList[i].rowCount;
console.log(count);
if (count > 100) {
stockQRCodeTextPDFFromTemplateFileMax(tQuery).then((response) => {
if (response.code == 20000) {
this.lableFileLsit = response.data.list;
this.labltotal = response.data.total || 0;
this.labelPrintVisible = true;
this.refreshQuery = {
page: 1,
limit: 10,
printCodeIdFk: tQuery.queryId,
stockOrderFk: tQuery.orderId,
}
this.loading = false;
this.$message.warning("打印文件正在生成中,请点击刷新按钮查看进度,请勿关闭按钮重复打印!");
}
console.log(count);
if (count > 100) {
stockQRCodeTextPDFFromTemplateFileMax(tQuery).then((response) => {
if (response.code == 20000) {
this.lableFileLsit = response.data.list;
this.labltotal = response.data.total || 0;
this.labelPrintVisible = true;
this.refreshQuery = {
page: 1,
limit: 10,
printCodeIdFk: tQuery.queryId,
stockOrderFk: tQuery.orderId,
}
}).catch(() => {
this.loading = false;
});
this.$message.warning("打印文件正在生成中,请点击刷新按钮查看进度,请勿关闭按钮重复打印!");
}
}).catch(() => {
this.loading = false;
});
} else
stockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
} else
stockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
//pdfurl
const binaryData = [];
binaryData.push(response);
//blob
let url = window.URL.createObjectURL(
new Blob(binaryData, {type: "application/pdf"})
);
this.loading = false;
window.open(url);//pdf
}).catch(() => {
this.loading = false;
});
} else {
this.loading = false;
this.$message.error(response.message);
}
}).catch(() => {
//pdfurl
const binaryData = [];
binaryData.push(response);
//blob
let url = window.URL.createObjectURL(
new Blob(binaryData, {type: "application/pdf"})
);
this.loading = false;
window.open(url);//pdf
}).catch(() => {
this.loading = false;
});
} else {
this.loading = false;
});
},
getBusType() {
let query = {
enabled: true,
};
getLocalJoinBusType(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;
// this.getList();
})
.catch(() => {
});
},
},
filters: {
statusFilterType(status) {
const statusMap = {
0: "warning",
1: "success",
2: "danger"
};
return statusMap[status];
}},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
// this.getBusType();
this.pdffileUrl = this.BASE_URL + "/spms/donwload/pdf?fileName=";
this.formData = {};
this.codeArray = [];
if (this.$isNotBlank(this.idQuery.id)) {
this.formData = this.idQuery.formData;
this.query.orderIdFk=this.formData.billNo;
this.query.sOrderId = this.formData.orderIdFk;
this.getStockQRCodeTextList();
this.$message.error(response.message);
}
}).catch(() => {
this.loading = false;
});
},
getBusType() {
let query = {
enabled: true,
};
getLocalJoinBusType(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;
// this.getList();
})
.catch(() => {
});
},
},
filters: {
statusFilterType(status) {
const statusMap = {
0: "warning",
1: "success",
2: "danger"
};
return statusMap[status];
}
},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
// this.getBusType();
this.pdffileUrl = this.BASE_URL + "/spms/donwload/pdf?fileName=";
this.formData = {};
this.codeArray = [];
if (this.$isNotBlank(this.idQuery.id)) {
this.formData = this.idQuery.formData;
this.query.orderIdFk = this.formData.billNo;
this.query.sOrderId = this.formData.orderIdFk;
this.getStockQRCodeTextList();
}
},
};
</script>
<style>
.ao-text {
width: 100%;
font-size: 13px;
font-family: "Microsoft YaHei";
float: right;
text-align: right;
margin-top: 10px;
width: 100%;
font-size: 13px;
font-family: "Microsoft YaHei";
float: right;
text-align: right;
margin-top: 10px;
}
</style>

@ -278,7 +278,7 @@
highlight-current-row>
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="证书名称" prop="name"></el-table-column>
<el-table-column label="证书编号" prop="name"></el-table-column>
<el-table-column label="证书编号" prop="code"></el-table-column>
<el-table-column label="生效期" prop="vailDate"></el-table-column>
<el-table-column label="失效期" prop="expireDate"></el-table-column>
<el-table-column label="审核状态" prop="auditStatus" width="120">

@ -237,6 +237,7 @@ export default {
lowStockNum: this.editQuery.lowStockNum,
recentDateTime: this.editQuery.recentDateTime,
isDateBy: this.editQuery.isDateBy,
relSupId:this.editQuery.id,
}
updateById(data).then(res => {

Loading…
Cancel
Save