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 c4ccb4f931
commit 2cb7e20ca3
6 changed files with 107 additions and 44 deletions
Show Stats Download Patch File Download Diff File

4
.env.development
Unescape Escape View File

@ -4,8 +4,8 @@ VUE_APP_TITLE = UDI管理系统
# 开发环境配置 # 开发环境配置
ENV = 'development' ENV = 'development'
# 若依管理系统/开发环境 # 开发环境
VUE_APP_BASE_API = '/dev-api' VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/'
VUE_APP_SYNC_API ="http://127.0.0.1:10001" VUE_APP_SYNC_API ="http://127.0.0.1:10001"

4
.env.production
Unescape Escape View File

@ -23,11 +23,11 @@ ENV = 'production'
# VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER" # VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER"
# 平潭正式 # 平潭正式
# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# VUE_APP_SYNC_API ="http://55.55.0.24:9150/SP_SYNC_SERVER" # VUE_APP_SYNC_API ="http://55.55.0.24:9150/SP_SYNC_SERVER"
# 吴总测试服务器 # 吴总测试服务器
VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/

91
src/views/basic/product/product.vue
Unescape Escape View File

@ -13,8 +13,8 @@
> >
<span class="custom-tree-node" slot-scope="{ node, data }"> <span class="custom-tree-node" slot-scope="{ node, data }">
<span style="font-size: 14px; font-weight: 500">{{ <span style="font-size: 14px; font-weight: 500">{{
node.label node.label
}}</span></span }}</span></span
> >
</el-tree> </el-tree>
</el-col> </el-col>
@ -182,32 +182,38 @@
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch" <el-button icon="el-icon-view" type="primary" @click="hideSearch"
>显示/隐藏搜索栏</el-button >显示/隐藏搜索栏
</el-button
> >
<el-button type="primary" icon="el-icon-refresh" @click="onReset" <el-button type="primary" icon="el-icon-refresh" @click="onReset"
>重置</el-button >重置
</el-button
> >
<el-button type="primary" icon="el-icon-search" @click="submit" <el-button type="primary" icon="el-icon-search" @click="submit"
>查询</el-button >查询
</el-button
> >
<!-- <el-button type="primary" icon="el-icon-plus" @click="editUdiType">物资分类管理</el-button>--> <!-- <el-button type="primary" icon="el-icon-plus" @click="editUdiType">物资分类管理</el-button>-->
<el-button <el-button
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
@click="intentImportUdi" @click="intentImportUdi"
>选入DI信息</el-button >选入DI信息
</el-button
> >
<el-button <el-button
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
@click="intentImportErp" @click="intentImportErp"
>添加院内字典</el-button >添加院内字典
</el-button
> >
<el-button <el-button
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
@click="intentDetail" @click="intentDetail"
>关联添加</el-button >关联添加
</el-button
> >
</el-button-group> </el-button-group>
</div> </div>
@ -288,27 +294,27 @@
size="small" size="small"
:disabled="scope.row.originUuid != null" :disabled="scope.row.originUuid != null"
@click.native.stop="intentSelectUdi(scope.row)" @click.native.stop="intentSelectUdi(scope.row)"
>关联DI >关联DI
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="handleModifyClick(scope.row)" @click.native.stop="handleModifyClick(scope.row)"
>详情 >详情
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="diEdit(scope.row)" @click.native.stop="diEdit(scope.row)"
>编辑 >编辑
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
size="small" size="small"
@click.native.stop="deleteDialog(scope.row)" @click.native.stop="deleteDialog(scope.row)"
>删除 >删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -917,7 +923,7 @@
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
<span <span
>{{ productRemarkSet.remarkTitle1 }}:&nbsp;</span >{{ productRemarkSet.remarkTitle1 }}:&nbsp;</span
> >
</div> </div>
<el-input <el-input
@ -938,7 +944,7 @@
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
<span <span
>{{ productRemarkSet.remarkTitle2 }}:&nbsp;</span >{{ productRemarkSet.remarkTitle2 }}:&nbsp;</span
> >
</div> </div>
<el-input <el-input
@ -961,7 +967,7 @@
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
<span <span
>{{ productRemarkSet.remarkTitle3 }}:&nbsp;</span >{{ productRemarkSet.remarkTitle3 }}:&nbsp;</span
> >
</div> </div>
<el-input <el-input
@ -982,7 +988,7 @@
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
<span <span
>{{ productRemarkSet.remarkTitle4 }}:&nbsp;</span >{{ productRemarkSet.remarkTitle4 }}:&nbsp;</span
> >
</div> </div>
<el-input <el-input
@ -1005,7 +1011,7 @@
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
<span <span
>{{ productRemarkSet.remarkTitle5 }}:&nbsp;</span >{{ productRemarkSet.remarkTitle5 }}:&nbsp;</span
> >
</div> </div>
<el-input <el-input
@ -1026,7 +1032,7 @@
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
<span <span
>{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span >{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span
> >
</div> </div>
<el-input <el-input
@ -1049,7 +1055,7 @@
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
<span <span
>{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span >{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span
> >
</div> </div>
<el-input <el-input
@ -1070,7 +1076,7 @@
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
<span <span
>{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span >{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span
> >
</div> </div>
<el-input <el-input
@ -1243,7 +1249,7 @@
size="small" size="small"
@click.native.stop="selectVersion()" @click.native.stop="selectVersion()"
style="margin-left: 5%" style="margin-left: 5%"
>切换版本 >切换版本
</el-button> </el-button>
</div> </div>
</el-col> </el-col>
@ -1279,14 +1285,14 @@
size="small" size="small"
icon="search" icon="search"
@click="onAddSubmit(false)" @click="onAddSubmit(false)"
>提交 >提交
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
size="small" size="small"
icon="search" icon="search"
@click="cancelDialog" @click="cancelDialog"
>取消 >取消
</el-button> </el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -1308,14 +1314,14 @@
size="small" size="small"
icon="search" icon="search"
@click="onAddSingleSubmit(false)" @click="onAddSingleSubmit(false)"
>提交 >提交
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
size="small" size="small"
icon="search" icon="search"
@click="cancelDialog" @click="cancelDialog"
>取消 >取消
</el-button> </el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -1460,7 +1466,7 @@ import {
selectSysParamByKey, selectSysParamByKey,
finProductSet, finProductSet,
} from "@/api/param/systemParamConfig"; } from "@/api/param/systemParamConfig";
import { filterByUuid } from "@/api/basic/product/udiInfo"; import {filterByUuid} from "@/api/basic/product/udiInfo";
import selectUdi from "./UdiInfoSelectRel.vue"; import selectUdi from "./UdiInfoSelectRel.vue";
import selectErp from "./udiInfoselectErpUdi"; import selectErp from "./udiInfoselectErpUdi";
@ -1471,7 +1477,7 @@ import ProductSingleEdit from "@/views/basic/product/productSingleEdit";
import productUdiType from "@/views/basic/product/productUdiType"; import productUdiType from "@/views/basic/product/productUdiType";
import selectHospProduct from "@/views/basic/product/bindHospProduct"; import selectHospProduct from "@/views/basic/product/bindHospProduct";
import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct"; import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct";
import { getBasicHospType, getListTree } from "@/api/basic/basicHospType"; import {getBasicHospType, getListTree} from "@/api/basic/basicHospType";
export default { export default {
data() { data() {
@ -1567,7 +1573,7 @@ export default {
selectVersionVisible: false, selectVersionVisible: false,
selectLocalVisible: false, //关联UDI selectLocalVisible: false, //关联UDI
isUseDyCheck: false, isUseDyCheck: false,
lockStatusMap: { 1: "未提交", 2: "已提交", 3: "已锁定" }, lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
activeNames: ["1"], activeNames: ["1"],
useNumEnable: true, useNumEnable: true,
}; };
@ -1697,7 +1703,8 @@ export default {
this.$message.error(response.message); this.$message.error(response.message);
} }
}) })
.catch(() => {}); .catch(() => {
});
}, },
deleteDialog(rowId) { deleteDialog(rowId) {
@ -1709,7 +1716,8 @@ export default {
.then(() => { .then(() => {
this.deleteOrders(rowId); this.deleteOrders(rowId);
}) })
.catch(() => {}); .catch(() => {
});
}, },
intentDetail() { intentDetail() {
@ -1747,9 +1755,11 @@ export default {
this.$message.error(response.message); this.$message.error(response.message);
} }
}) })
.catch(() => {}); .catch(() => {
});
}) })
.catch(() => {}); .catch(() => {
});
}, },
removeDi() { removeDi() {
@ -1776,9 +1786,11 @@ export default {
this.$message.error(response.message); this.$message.error(response.message);
} }
}) })
.catch(() => {}); .catch(() => {
});
}) })
.catch(() => {}); .catch(() => {
});
}, },
intentSelectErp(val) { intentSelectErp(val) {
@ -1975,7 +1987,7 @@ export default {
if (response.code == 20000) { if (response.code == 20000) {
this.getList(); this.getList();
this.cancelDialog(); this.cancelDialog();
this.editDialogVisible = false; this.editDiDialogVisible = false;
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
@ -2064,7 +2076,8 @@ export default {
var invlist = response.data || []; var invlist = response.data || [];
this.treeList = this.handleTree(invlist, "code", "parentCode"); this.treeList = this.handleTree(invlist, "code", "parentCode");
}) })
.catch(() => {}); .catch(() => {
});
}, },
addHospProduct(data) { addHospProduct(data) {
@ -2095,7 +2108,8 @@ export default {
this.getList(); this.getList();
}, },
}, },
mounted() {}, mounted() {
},
components: { components: {
ProductSingleEdit, ProductSingleEdit,
ProductEdit, ProductEdit,
@ -2121,15 +2135,18 @@ export default {
margin-left: 0px; margin-left: 0px;
height: 30px; height: 30px;
} }
.tree { .tree {
::v-deep .el-tree-node { ::v-deep .el-tree-node {
white-space: normal; white-space: normal;
.el-tree-node__content { .el-tree-node__content {
height: 100%; height: 100%;
align-items: start; align-items: start;
} }
} }
} }
.itemTag { .itemTag {
float: left; float: left;
text-align: right; text-align: right;

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

@ -132,7 +132,7 @@
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="200" fixed="right"> <el-table-column label="操作" width="220" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -142,6 +142,14 @@
>打印 >打印
</el-button </el-button
> >
<el-button
type="text"
size="small"
@click.native="printOrderDetailPDF(scope.row)"
>报表打印
</el-button
>
<el-button <el-button
type="text" type="text"
size="small" size="small"
@ -522,7 +530,11 @@ import {getCodeDetailList} from "@/api/inout/orderDetailCode";
import {getCodeList} from "@/api/inout/code"; import {getCodeList} from "@/api/inout/code";
import AcceptOrder from "@/views/inout/DialogReviewOrder"; import AcceptOrder from "@/views/inout/DialogReviewOrder";
import NewAcceptOrder from "@/views/inout/DialogNewReviewOrder"; import NewAcceptOrder from "@/views/inout/DialogNewReviewOrder";
import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint" import {
inspectionOrderPDFFromStatemenTemplateFile,
inspectionOrderPDFFromTemplateFile, orderPDFFromStatemenTemplateFile,
orderPDFFromTemplateFile
} from "@/api/itextpdf/orderPrint"
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"; import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import {previewImage} from '@/api/purchase/supCompany' import {previewImage} from '@/api/purchase/supCompany'
@ -812,6 +824,39 @@ export default {
this.loading = false; this.loading = false;
}); });
}, },
printOrderDetailPDF(row) {
let tQuery = {
labelId: 5,
orderIdFk: row.billNo
};
this.loading = true;
inspectionOrderPDFFromStatemenTemplateFile(tQuery).then((response) => {
if (response.code === 20000) {
orderPDFFromStatemenTemplateFile(tQuery).then((response) => {
//将pdf文件转换为url。
const binaryData = [];
binaryData.push(response);
//获取blob链接。
let url = window.URL.createObjectURL(
new Blob(binaryData, {type: "application/pdf"})
);
this.loading = false;
window.open(url);//打开新标签页，预览pdf。
this.getOrderQRCodeTextList();
}).catch(() => {
this.loading = false;
});
} else {
this.loading = false;
this.$message.error(response.message);
}
}).catch(() => {
this.loading = false;
});
},
getBusType() { getBusType() {
let query = { let query = {
code: this.filterQuery.invCode, code: this.filterQuery.invCode,

1
src/views/system/param/systemParamConfig.vue
Unescape Escape View File

@ -136,6 +136,7 @@ export default {
key: null, key: null,
paramStatus: 1, paramStatus: 1,
page: 1, page: 1,
paramType: 0,
limit: 20, limit: 20,
}, },
list: [], list: [],

2
vue.config.js
Unescape Escape View File

@ -35,7 +35,7 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: `http://127.0.0.1:9991`, target: process.env.VUE_APP_BASE_API,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "", ["^" + process.env.VUE_APP_BASE_API]: "",

Write Preview
Loading…
Cancel
Save