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

Merge remote-tracking branch 'origin/master'

Browse Source
prod
郑明梁 2 years ago
parent 76405c0a64 7ec3a7d70c
commit e3fb944dd2
16 changed files with 123 additions and 115 deletions
Show Stats Download Patch File Download Diff File

2
.env.development
Unescape Escape View File

@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
ENV = 'development'
# 开发环境
VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://127.0.0.1:9991'
VUE_APP_SYNC_API ="http://127.0.0.1:10001"

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

@ -928,6 +928,9 @@ export default {
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
this.getList();
}else {
this.$message.error(response.message);
this.getList();
}
})

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

@ -156,13 +156,14 @@
>打印
</el-button
>
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native="printOrderDetailPDF(scope.row)"-->
<!-- >报表打印-->
<!-- </el-button-->
<!-- >-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native="printOrderDetailPDF(scope.row)"-->
<!-- >报表打印-->
<!-- </el-button-->
<!-- >-->
<!-- 暂时隐藏-->
<el-button
type="text"
size="small"
@ -301,8 +302,7 @@
type="text"
size="small"
@click.native.stop="upload(scope.row)"
v-if="scope.row.checkFileName != null"
>预览
>编辑
</el-button
>
</template>
@ -400,7 +400,8 @@
<el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
<el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold" :url-list="imgListCold"/>
<el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold"
:url-list="imgListCold"/>
<el-dialog
@ -419,7 +420,6 @@
</el-dialog>
<el-dialog
title="根据当前单据生成新单据"
:visible.sync="stockChangeVisible"
@ -466,8 +466,6 @@ import {
} from "@/api/itextpdf/itextpdf";
const formJson = {
site_id: "",
site_name: "",
@ -480,13 +478,13 @@ export default {
data() {
return {
BASE_URL: process.env.VUE_APP_BASE_API,
imgViewerVisible:false,
imgViewerVisibleCold:false,
currentManufacturer:{},
imgList:[],
imgListCold:[],
imgViewerVisible: false,
imgViewerVisibleCold: false,
currentManufacturer: {},
imgList: [],
imgListCold: [],
showSearch: true,
Upinvoice:false,
Upinvoice: false,
filterQuery: {
id: "",
billNo: null,
@ -605,7 +603,7 @@ export default {
curRow: null,
};
},
components: {DialogcChangeNewOrder,ElImageViewer,DialogCheck},
components: {DialogcChangeNewOrder, ElImageViewer, DialogCheck},
methods: {
onReset() {
this.$router.push({
@ -648,67 +646,75 @@ export default {
this.filterQuery.page = 1;
this.getList();
},
showImgViewer(row){
showImgViewer(row) {
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
console.log(this.certFileUrl+"========");
this.imgList=[];
previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => {
console.log(this.certFileUrl + "========");
this.imgList = [];
previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgList=response.data;
this.imgList = response.data;
}
console.log(this.imgList)
this.imgViewerVisible = true;
});
const m = (e) => { e.preventDefault() };
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); // 禁止页面滑动
},
showImgViewerCold(row){
showImgViewerCold(row) {
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
console.log(this.certFileUrl+"========");
this.imgListCold=[];
previewImage({imageUrl:row.coldFilePath,certFileUrl:this.certFileUrl}).then(response => {
console.log(this.certFileUrl + "========");
this.imgListCold = [];
previewImage({imageUrl: row.coldFilePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgListCold=response.data;
this.imgListCold = response.data;
}
console.log(this.imgListCold)
this.imgViewerVisibleCold = true;
});
const m = (e) => { e.preventDefault() };
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); // 禁止页面滑动
},
closeImgViewer(){
closeImgViewer() {
this.imgViewerVisible = false;
const m = (e) => { e.preventDefault() };
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true);
},
closeImgViewerCold(){
closeImgViewerCold() {
this.imgViewerVisibleCold = false;
const m = (e) => { e.preventDefault() };
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true);
},
upload(row){
upload(row) {
this.currentManufacturer = row;
this.Upinvoice = true;
},
freshen(){
freshen() {
this.Upinvoice = false;
this.getOrderDetails();
},
closeCheckDialog(){
closeCheckDialog() {
this.Upinvoice = false;
this.getOrderDetails();
},
@ -958,7 +964,7 @@ export default {
binaryData.push(response);
//获取blob链接。
let url = window.URL.createObjectURL(
new Blob(binaryData, {type: "application/pdf"})
new Blob(binaryData, {type: "application/pdf"})
);
this.loading = false;
window.open(url);//打开新标签页，预览pdf。

32
src/views/inout/IoCheckAuditOrder.vue
Unescape Escape View File

@ -150,6 +150,8 @@
</el-button
>
<!-- 暂时隐藏-->
<el-button
type="text"
size="small"
@ -301,7 +303,8 @@
</el-table>
<el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
<el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold" :url-list="imgListCold"/>
<el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold"
:url-list="imgListCold"/>
<pagination
@ -553,9 +556,9 @@ export default {
data() {
return {
imgList: [],
imgListCold:[],
imgListCold: [],
imgViewerVisible: false,
imgViewerVisibleCold:false,
imgViewerVisibleCold: false,
BASE_URL: process.env.VUE_APP_BASE_API,
IMAGE_URL: process.env.VUE_APP_SYNC_API,
showSearch: true,
@ -751,18 +754,20 @@ export default {
document.addEventListener("touchmove", m, false); // 禁止页面滑动
},
showImgViewerCold(row){
showImgViewerCold(row) {
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
console.log(this.certFileUrl+"========");
this.imgListCold=[];
previewImage({imageUrl:row.coldFilePath,certFileUrl:this.certFileUrl}).then(response => {
console.log(this.certFileUrl + "========");
this.imgListCold = [];
previewImage({imageUrl: row.coldFilePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgListCold=response.data;
this.imgListCold = response.data;
}
console.log(this.imgListCold)
this.imgViewerVisibleCold = true;
});
const m = (e) => { e.preventDefault() };
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); // 禁止页面滑动
},
@ -776,9 +781,11 @@ export default {
document.removeEventListener("touchmove", m, true);
},
closeImgViewerCold(){
closeImgViewerCold() {
this.imgViewerVisibleCold = false;
const m = (e) => { e.preventDefault() };
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true);
},
@ -954,6 +961,9 @@ export default {
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
this.getList();
} else {
this.$message.error(response.message);
this.getList();
}
})

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

@ -732,6 +732,9 @@ export default {
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
this.getList();
}else {
this.$message.error(response.message);
this.getList();
}
})

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

@ -266,7 +266,6 @@
</el-table-column>
<el-table-column label="操作" width="160" fixed="right">
<template slot-scope="scope">
<el-button
@ -368,8 +367,8 @@
</el-tab-pane>
</el-tabs>
<el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
<el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold" :url-list="imgListCold"/>
<el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold"
:url-list="imgListCold"/>
<el-dialog
@ -438,9 +437,9 @@ export default {
return {
BASE_URL: process.env.VUE_APP_BASE_API,
imgList: [],
imgListCold:[],
imgListCold: [],
imgViewerVisible: false,
imgViewerVisibleCold:false,
imgViewerVisibleCold: false,
showSearch: true,
Upinvoice: false,
currentManufacturer: {},
@ -633,24 +632,25 @@ export default {
document.addEventListener("touchmove", m, false); // 禁止页面滑动
},
showImgViewerCold(row){
showImgViewerCold(row) {
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
console.log(this.certFileUrl+"========");
this.imgListCold=[];
previewImage({imageUrl:row.coldFilePath,certFileUrl:this.certFileUrl}).then(response => {
console.log(this.certFileUrl + "========");
this.imgListCold = [];
previewImage({imageUrl: row.coldFilePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgListCold=response.data;
this.imgListCold = response.data;
}
console.log(this.imgListCold)
this.imgViewerVisibleCold = true;
});
const m = (e) => { e.preventDefault() };
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); // 禁止页面滑动
},
closeImgViewer() {
this.imgViewerVisible = false;
const m = (e) => {
@ -660,9 +660,11 @@ export default {
document.removeEventListener("touchmove", m, true);
},
closeImgViewerCold(){
closeImgViewerCold() {
this.imgViewerVisibleCold = false;
const m = (e) => { e.preventDefault() };
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true);
},
@ -787,7 +789,7 @@ export default {
page: 1,
limit: 10
};
if(!isBlank(this.currentRow.billNo)) {
if (!isBlank(this.currentRow.billNo)) {
this.getBizDetailList();
}
},
@ -910,7 +912,7 @@ export default {
page: 1,
limit: 10
};
if(!isBlank(this.currentRow.billNo)) {
if (!isBlank(this.currentRow.billNo)) {
this.getResultDetailList();
}
},

5
src/views/inout/IoCreateBusOrder.vue
Unescape Escape View File

@ -134,7 +134,7 @@
<el-table-column label=所属仓库 prop="invName" width="120">
</el-table-column>
<el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="来源" prop="fromType" width="140">
<el-table-column label="来源" prop="fromType" width="140">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
@ -456,6 +456,9 @@ export default {
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
this.getList();
} else {
this.$message.error(response.message);
this.getList();
}
})

7
src/views/inout/IoCreateErrorOrder.vue
Unescape Escape View File

@ -119,7 +119,7 @@
<el-table-column label=所属仓库 prop="invName" width="120">
</el-table-column>
<el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="来源" prop="fromType" width="140">
<el-table-column label="来源" prop="fromType" width="140">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
@ -229,7 +229,7 @@ export default {
6: "校验异常",
7: "已审核",
8: "审核拒绝",
9: "正在处理",10: "待审核", 11: "待配货",
9: "正在处理", 10: "待审核", 11: "待配货",
},
curIndex: "",
idQuery: {},
@ -406,6 +406,9 @@ export default {
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
this.getList();
} else {
this.$message.error(response.message);
this.getList();
}
})

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

@ -488,6 +488,9 @@ export default {
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
this.getList();
} else {
this.$message.error(response.message);
this.getList();
}
})

5
src/views/inout/IoCreateScanOrder.vue
Unescape Escape View File

@ -122,7 +122,7 @@
<el-table-column label=所属仓库 prop="invName" width="120">
</el-table-column>
<el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="来源" prop="fromType" width="140">
<el-table-column label="来源" prop="fromType" width="140">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
@ -409,6 +409,9 @@ export default {
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
this.getList();
} else {
this.$message.error(response.message);
this.getList();
}
})

7
src/views/inout/IoDealOrder.vue
Unescape Escape View File

@ -574,6 +574,9 @@ export default {
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
this.getList();
} else {
this.$message.error(response.message);
this.getList();
}
})
@ -588,8 +591,8 @@ export default {
})
.then(() => {
this.deleteOrders(rowId);
this.currentRow=null;
this.bizDetailList=[];
this.currentRow = null;
this.bizDetailList = [];
})
.catch(() => {
});

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

@ -535,6 +535,9 @@ export default {
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
this.getList();
} else {
this.$message.error(response.message);
this.getList();
}
})

3
src/views/inventory/InvPreProducts.vue
Unescape Escape View File

@ -161,9 +161,6 @@
<el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
<el-table-column label="结余数量" prop="reCount" width="120">
<template slot-scope="scope">
<span>{{ scope.row.inCount - scope.row.outCount }}</span>
</template>
</el-table-column>
<el-table-column label="部门" prop="deptName" v-if="showSup"
show-overflow-tooltip width="120"></el-table-column>

9
src/views/inventory/InvProducts.vue
Unescape Escape View File

@ -161,11 +161,12 @@
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
<el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="120">
</el-table-column>
<el-table-column label="结余数量" prop="reCount" width="120">
<template slot-scope="scope">
<span>{{ scope.row.inCount - scope.row.outCount }}</span>
</template>
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.inCount - scope.row.outCount }}</span>-->
<!-- </template>-->
</el-table-column>
<el-table-column label="部门" prop="deptName" v-if="showSup"
show-overflow-tooltip width="120"></el-table-column>

3
src/views/inventory/InvSupPreInProducts.vue
Unescape Escape View File

@ -162,9 +162,6 @@
<el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
<el-table-column label="结余数量" prop="reCount" width="120">
<template slot-scope="scope">
<span>{{ scope.row.inCount - scope.row.outCount }}</span>
</template>
</el-table-column>
<el-table-column label="部门" prop="deptName" v-if="showSup"
show-overflow-tooltip width="120"></el-table-column>

33
src/views/inventory/trace/invUdiTraceOrder.vue
Unescape Escape View File

@ -294,7 +294,7 @@ export default {
},
idQuery: {
id: "",
billNo:""
billNo: ""
},
curIndex: "",
adListNoDataText: "无数据",
@ -468,28 +468,12 @@ export default {
intentDetail(row) {
this.codeDetailVisible = true;
this.idQuery.id = row.id;
this.idQuery.billNo=row.billNo;
this.idQuery.billNo = row.billNo;
},
closeDialog() {
this.successOrderExportPDFSettingVisible = false;
this.getList();
},
deleteOrders(data) {
this.loading = true;
this.deleteData.id = data;
deleteByOrderId(this.deleteData)
.then((response) => {
this.getList();
this.refresgOrderDetail();
this.$message({
type: "success",
message: "删除成功！",
});
})
.catch(() => {
});
},
tableRowClassName({row, rowIndex}) {
if (row.reCount === row.count) {
return "success-row";
@ -497,7 +481,6 @@ export default {
return "warning-row";
}
},
exportDialog(value) {
var mOrder = value;
if (mOrder.exportStatus === "已上传") {
@ -651,18 +634,6 @@ export default {
});
},
deleteDialog(rowId) {
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.deleteOrders(rowId);
})
.catch(() => {
});
},
closeDetailDialog(val) {
this.codeDetailVisible = false;
},

Write Preview
Loading…
Cancel
Save