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 5da9a04140 4a4b30a580
commit c390bbee45
6 changed files with 148 additions and 135 deletions
Show Stats Download Patch File Download Diff File

2
.env.development
Unescape Escape View File

@ -7,6 +7,8 @@ ENV = 'development'
# 若依管理系统/开发环境 # 若依管理系统/开发环境
VUE_APP_BASE_API = '/dev-api' VUE_APP_BASE_API = '/dev-api'
VUE_APP_SYNC_API ="http://127.0.0.1:10001"
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/' VUE_APP_CONTEXT_PATH = '/'

12
.env.production
Unescape Escape View File

@ -2,9 +2,6 @@
VUE_APP_TITLE = UDI管理系统 VUE_APP_TITLE = UDI管理系统
# 生产环境配置 # 生产环境配置
ENV = 'production' ENV = 'production'
# VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
@ -13,13 +10,18 @@ ENV = 'production'
#林纪裕cd #林纪裕cd
# VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_WMS_MC/'
# 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/'
VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
# 测试服务器 # 测试服务器
# VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/'
# 文明东 # 文明东1
# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
# 文明东2
VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
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_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/'

4
.env.test
Unescape Escape View File

@ -16,12 +16,12 @@ ENV = 'test'
# VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/'
# 文明东 # 文明东
# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/' VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
# 吴总测试服务器 # 吴总测试服务器
# 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/'
VUE_APP_BASE_API = 'http://192.168.0.66:8883/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.66:8883/UDI_WMS_MC/'
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/' VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'

16
src/views/inout/DialogCheck.vue
Unescape Escape View File

@ -123,7 +123,6 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">
@ -167,7 +166,8 @@
style="text-align:right" @click="showImgViewer"> style="text-align:right" @click="showImgViewer">
检验报告预览 检验报告预览
</el-button> </el-button>
<el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/> <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer"
:url-list="imgList"/>
</el-col> </el-col>
@ -187,7 +187,6 @@ import { previewImage } from '@/api/purchase/supCompany'
import ElImageViewer from "element-ui/packages/image/src/image-viewer"; import ElImageViewer from "element-ui/packages/image/src/image-viewer";
export default { export default {
name: "DialogCheck", name: "DialogCheck",
props: { props: {
@ -211,6 +210,7 @@ export default {
imgList: [], imgList: [],
imgViewerVisible: false, imgViewerVisible: false,
BASE_URL: process.env.VUE_APP_BASE_API, BASE_URL: process.env.VUE_APP_BASE_API,
IMAGE_URL: process.env.VUE_APP_SYNC_API,
code: "", code: "",
formData: { formData: {
ggxh: "", ggxh: "",
@ -350,7 +350,7 @@ export default {
}, },
showImgViewer(row) { showImgViewer(row) {
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; this.certFileUrl = this.IMAGE_URL + "/mapi" + "/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList = []; this.imgList = [];
previewImage({imageUrl: this.inputQuery.filePath, certFileUrl: this.certFileUrl}).then(response => { previewImage({imageUrl: this.inputQuery.filePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) { if (response.code === 20000) {
@ -359,14 +359,18 @@ export default {
console.log(this.imgList) console.log(this.imgList)
this.imgViewerVisible = true; this.imgViewerVisible = true;
}); });
const m = (e) => { e.preventDefault() }; const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'hidden'; document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); // 禁止页面滑动 document.addEventListener("touchmove", m, false); // 禁止页面滑动
}, },
closeImgViewer() { closeImgViewer() {
this.imgViewerVisible = false; this.imgViewerVisible = false;
const m = (e) => { e.preventDefault() }; const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'auto'; document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true); document.removeEventListener("touchmove", m, true);
}, },

44
src/views/inout/InvoiceCkeck.vue
Unescape Escape View File

@ -17,18 +17,18 @@
style="padding-top: 40px" style="padding-top: 40px"
> >
<el-card style="margin-top: -30px"> <el-card style="margin-top: -30px">
<el-row> <!--<el-row>-->
<el-col :span="20"> <!-- <el-col :span="20">-->
<el-form-item prop="code" label="扫码校验:"> <!-- <el-form-item prop="code" label="发票码:">-->
<el-input <!-- <el-input-->
id="inputer" <!-- id="inputer"-->
placeholder="请输入发票码" <!-- placeholder="请输入发票码"-->
type="tel" <!-- type="tel"-->
:disabled="true" <!-- :disabled="true"-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> <!--</el-row>-->
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="机械编码:" prop="machineNo"> <el-form-item label="机械编码:" prop="machineNo">
@ -168,6 +168,11 @@
> >
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="发票编码"
prop="invoiceCodes"
show-overflow-tooltip
></el-table-column>
<el-table-column <el-table-column
label="物资名称" label="物资名称"
prop="coName" prop="coName"
@ -224,11 +229,7 @@
prop="certCode" prop="certCode"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column
label="发票编码"
prop="invoiceCodes"
show-overflow-tooltip
></el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="codeTotal > 0" v-show="codeTotal > 0"
@ -317,6 +318,7 @@ export default {
imgList: [], imgList: [],
imgViewerVisible: false, imgViewerVisible: false,
BASE_URL: process.env.VUE_APP_BASE_API, BASE_URL: process.env.VUE_APP_BASE_API,
IMAGE_URL: process.env.VUE_APP_SYNC_API,
showSearch: true, showSearch: true,
filterQuery: { filterQuery: {
id: "", id: "",
@ -516,7 +518,8 @@ export default {
}); });
}, },
uploadHandleError() {}, uploadHandleError() {
},
uploadHandleSuccess(response, file, fileList) { uploadHandleSuccess(response, file, fileList) {
debugger; debugger;
if (response.code === 20000) { if (response.code === 20000) {
@ -645,11 +648,12 @@ export default {
.then((res) => { .then((res) => {
this.closeDialog(); this.closeDialog();
}) })
.catch((error) => {}); .catch((error) => {
});
}, },
showImgViewer(row) { showImgViewer(row) {
this.certFileUrl = this.certFileUrl =
this.BASE_URL + this.IMAGE_URL + "/mapi" +
"/udiwms/image/register/file/getImage?type=image2&name="; "/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList = []; this.imgList = [];
previewImage({ previewImage({

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

@ -196,14 +196,16 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" width="180" fixed="right"> <el-table-column label="操作" width="180" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" :disabled="scope.row.checkStatus==1" v-if="showSup" size="small" @click.native.stop="determine(scope.row)">确认</el-button> <el-button type="text" :disabled="scope.row.checkStatus==1" size="small"
<el-button @click.native.stop="determine(scope.row)">确认
type="text" </el-button>
size="small" <!--<el-button-->
@click.native.stop="InvoiceRegister1(scope.row)" <!-- type="text"-->
>发票登记 <!-- size="small"-->
</el-button <!-- @click.native.stop="InvoiceRegister1(scope.row)"-->
> <!--&gt;发票登记-->
<!--</el-button-->
<!--&gt;-->
<el-button <el-button
type="text" type="text"
@click="getNewInv(scope.row)" @click="getNewInv(scope.row)"
@ -341,7 +343,10 @@
row-key="id" row-key="id"
> >
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="发票编码" width="150"
prop="invoiceEncode"
></el-table-column>
<el-table-column <el-table-column
label="物资名称" label="物资名称"
prop="cpmctymc" width="150" prop="cpmctymc" width="150"
@ -366,10 +371,7 @@
label="发票代码" width="150" label="发票代码" width="150"
prop="invoiceCode" prop="invoiceCode"
></el-table-column> ></el-table-column>
<el-table-column
label="发票编码" width="150"
prop="invoiceEncode"
></el-table-column>
<el-table-column <el-table-column
label="开票日期" width="150" label="开票日期" width="150"
prop="invoiceDate" prop="invoiceDate"
@ -462,9 +464,6 @@
</el-dialog> </el-dialog>
<el-dialog <el-dialog
:title="formMap[formName]" :title="formMap[formName]"
:visible.sync="InvoiceRegisterv" :visible.sync="InvoiceRegisterv"
@ -559,6 +558,7 @@ export default {
imgList: [], imgList: [],
imgViewerVisible: false, imgViewerVisible: false,
BASE_URL: process.env.VUE_APP_BASE_API, BASE_URL: process.env.VUE_APP_BASE_API,
IMAGE_URL: process.env.VUE_APP_SYNC_API,
showSearch: true, showSearch: true,
filterQuery: { filterQuery: {
id: "", id: "",
@ -777,7 +777,7 @@ export default {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;
}, },
showImgViewer(row) { showImgViewer(row) {
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; this.certFileUrl = this.IMAGE_URL + "/mapi" + "/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList = []; this.imgList = [];
previewImage({imageUrl: row.licenseUrl, certFileUrl: this.certFileUrl}).then(response => { previewImage({imageUrl: row.licenseUrl, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) { if (response.code === 20000) {
@ -1039,11 +1039,11 @@ export default {
return; return;
} }
this.bizDetailLoading = true; this.bizDetailLoading = true;
this.bizQuery.orderIdFk = this.currentRow.billNo;
if (row != null) { if (row != null) {
this.bizQuery.orderIdFk = row.orderIdFk;
this.bizQuery.batchNo = row.batchNo; this.bizQuery.batchNo = row.batchNo;
this.bizQuery.relId = row.bindRlFk; this.bizQuery.relId = row.bindRlFk;
this.bizQuery.bizIdFk = row.id; // this.bizQuery.bizIdFk = row.id;
} }
filterListInvoice(this.bizQuery).then((res) => { filterListInvoice(this.bizQuery).then((res) => {
this.bizDetailLoading = false; this.bizDetailLoading = false;
@ -1157,6 +1157,7 @@ export default {
} }
, ,
created() { created() {
let supId = this.$store.getters.customerId; let supId = this.$store.getters.customerId;
if (supId == "110") { if (supId == "110") {
this.showSup = true; this.showSup = true;

Write Preview
Loading…
Cancel
Save