发票,检验报告修改

prod
anthonywj 2 years ago
parent 1edf3f3fc6
commit 4a4b30a580

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

@ -2,9 +2,6 @@
VUE_APP_TITLE = UDI管理系统
# 生产环境配置
ENV = 'production'
# VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
@ -13,13 +10,18 @@ ENV = 'production'
#林纪裕cd
# 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://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://192.168.0.66:9150/UDI_WMS_MC/'
# 文明东
# 文明东1
# 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/'

@ -9,19 +9,19 @@ ENV = 'test'
#林纪裕cd
# 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://r.jiyuudims.cloud:5004/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/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://192.168.0.66:8883/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.66:8883/UDI_WMS_MC/'
# 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'

@ -39,7 +39,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="name">
<el-input v-model="inputQuery.batchNo" auto-complete="off" :disabled="true" ></el-input>
<el-input v-model="inputQuery.batchNo" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
@ -50,7 +50,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="code">
<el-input v-model="inputQuery.price" auto-complete="off" :disabled="true"></el-input>
<el-input v-model="inputQuery.price" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -62,7 +62,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="name">
<el-input v-model="inputQuery.manufacturer" auto-complete="off" :disabled="true" ></el-input>
<el-input v-model="inputQuery.manufacturer" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
@ -73,7 +73,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="code">
<el-input v-model="inputQuery.certCode" auto-complete="off" :disabled="true" ></el-input>
<el-input v-model="inputQuery.certCode" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
@ -83,7 +83,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="code">
<el-input v-model="inputQuery.productDate" auto-complete="off" :disabled="true" ></el-input>
<el-input v-model="inputQuery.productDate" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
@ -93,7 +93,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="code">
<el-input v-model="inputQuery.measname" auto-complete="off" :disabled="true"></el-input>
<el-input v-model="inputQuery.measname" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
@ -123,7 +123,6 @@
</el-row>
<el-row>
<el-col :span="3">
<div class="ao-text">
@ -164,10 +163,11 @@
</el-col>
<el-col :span="8">
<el-button type="primary" size="mini" icon="search" v-if="this.inputQuery.filePath!=null"
style="text-align:right" @click="showImgViewer" >
检验报告预览
style="text-align:right" @click="showImgViewer">
检验报告预览
</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>
@ -183,11 +183,10 @@ import draggable from "vuedraggable";
import store from "@/store";
import {updateById} from '@/api/inout/orderDetailBiz'
import {updateOrderDetailBiz} from '@/api/inout/order'
import { previewImage } from '@/api/purchase/supCompany'
import {previewImage} from '@/api/purchase/supCompany'
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
export default {
name: "DialogCheck",
props: {
@ -208,19 +207,20 @@ export default {
},
data() {
return {
imgList:[],
imgViewerVisible:false,
imgList: [],
imgViewerVisible: false,
BASE_URL: process.env.VUE_APP_BASE_API,
IMAGE_URL: process.env.VUE_APP_SYNC_API,
code: "",
formData: {
ggxh:"",
cpmctymc:"",
machineNo:"",
invoiceCode:"",
invoiceEncode:"",
price:"",
remark:"",
licenseUrl:""
ggxh: "",
cpmctymc: "",
machineNo: "",
invoiceCode: "",
invoiceEncode: "",
price: "",
remark: "",
licenseUrl: ""
},
// formRules: {
// name: [
@ -239,20 +239,20 @@ export default {
};
},
components: {
draggable,ElImageViewer
draggable, ElImageViewer
},
methods: {
submitUpload() {
updateById(this.inputQuery).then((res) =>{
if(res.code==20000){
this.$message({
type: "success",
message: "修改成功!",
});
this.closeDialog();
}
updateById(this.inputQuery).then((res) => {
if (res.code == 20000) {
this.$message({
type: "success",
message: "修改成功!",
});
this.closeDialog();
}
} )
})
},
@ -299,8 +299,8 @@ export default {
//
// },
uploadHandleRemove(file, fileList) {
this.inputQuery.filePath=null;
this.inputQuery.checkFileName=null;
this.inputQuery.filePath = null;
this.inputQuery.checkFileName = null;
console.log(file, fileList);
},
uploadHandlePreview(file) {
@ -311,7 +311,7 @@ export default {
this.$message.warning(`当前限制选择 1 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`);
},
uploadOnchange(file, fileList) {
this.inputQuery.checkFileName=file.name;
this.inputQuery.checkFileName = file.name;
let fileName = file.name;
let uid = file.uid
let pos = fileName.lastIndexOf(".");
@ -340,7 +340,7 @@ export default {
uploadHandleSuccess(response, file, fileList) {
if (response.code === 20000) {
this.inputQuery.filePath = response.data.name;
// this.onSubmit();
// this.onSubmit();
} else {
this.$message.error("文件上传失败:" + response.message);
}
@ -349,24 +349,28 @@ export default {
},
showImgViewer(row){
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList=[];
previewImage({imageUrl:this.inputQuery.filePath,certFileUrl:this.certFileUrl}).then(response => {
showImgViewer(row) {
this.certFileUrl = this.IMAGE_URL + "/mapi" + "/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList = [];
previewImage({imageUrl: this.inputQuery.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); //
},
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);
},

@ -166,7 +166,7 @@
row-key="id"
highlight-current-row
>
<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="发票编码"
@ -264,7 +264,7 @@ import AcceptOrder from "@/views/inout/DialogReviewOrder";
import DialogInvoice from "@/views/inout/DialogInvoice";
import InvoiceRegister from "@/views/inout/InvoiceRegister";
import { previewImage } from "@/api/purchase/supCompany";
import {previewImage} from "@/api/purchase/supCompany";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
import store from "@/store";
@ -318,6 +318,7 @@ export default {
imgList: [],
imgViewerVisible: false,
BASE_URL: process.env.VUE_APP_BASE_API,
IMAGE_URL: process.env.VUE_APP_SYNC_API,
showSearch: true,
filterQuery: {
id: "",
@ -341,16 +342,16 @@ export default {
},
formRules: {
machineNo: [
{ required: true, message: "请输入机械编码", trigger: "blur" },
{required: true, message: "请输入机械编码", trigger: "blur"},
],
invoiceCode: [
{ required: true, message: "请输入发票代码", trigger: "blur" },
{required: true, message: "请输入发票代码", trigger: "blur"},
],
invoiceEncode: [
{ required: true, message: "请输入发票编码", trigger: "blur" },
{required: true, message: "请输入发票编码", trigger: "blur"},
],
price: [{ required: true, message: "请输入发票价格", trigger: "blur" }],
invoiceDate: [{ required: true, message: "请输入日期", trigger: "blur" }],
price: [{required: true, message: "请输入发票价格", trigger: "blur"}],
invoiceDate: [{required: true, message: "请输入日期", trigger: "blur"}],
},
certFileUrl: "",
Upinvoice: false,
@ -471,7 +472,7 @@ export default {
subRow: null,
};
},
components: { AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer },
components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer},
methods: {
onSubmit() {
if (this.invoiceRow == null) {
@ -517,7 +518,8 @@ export default {
});
},
uploadHandleError() {},
uploadHandleError() {
},
uploadHandleSuccess(response, file, fileList) {
debugger;
if (response.code === 20000) {
@ -646,11 +648,12 @@ export default {
.then((res) => {
this.closeDialog();
})
.catch((error) => {});
.catch((error) => {
});
},
showImgViewer(row) {
this.certFileUrl =
this.BASE_URL +
this.IMAGE_URL + "/mapi" +
"/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList = [];
previewImage({

@ -196,7 +196,9 @@
</el-table-column>
<el-table-column label="操作" width="180" fixed="right">
<template slot-scope="scope">
<el-button type="text" :disabled="scope.row.checkStatus==1" size="small" @click.native.stop="determine(scope.row)">确认</el-button>
<el-button type="text" :disabled="scope.row.checkStatus==1" size="small"
@click.native.stop="determine(scope.row)">确认
</el-button>
<!--<el-button-->
<!-- type="text"-->
<!-- size="small"-->
@ -225,7 +227,7 @@
<!--单据业务详情-->
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
<el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
<el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
@row-click="BizDetail"
row-key="id" highlight-current-row
>
@ -337,11 +339,14 @@
<!--单据业务详情-->
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-发票信息</span>
<el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
<el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="发票编码" width="150"
prop="invoiceEncode"
></el-table-column>
<el-table-column
label="物资名称"
prop="cpmctymc" width="150"
@ -366,10 +371,7 @@
label="发票代码" width="150"
prop="invoiceCode"
></el-table-column>
<el-table-column
label="发票编码" width="150"
prop="invoiceEncode"
></el-table-column>
<el-table-column
label="开票日期" width="150"
prop="invoiceDate"
@ -462,9 +464,6 @@
</el-dialog>
<el-dialog
:title="formMap[formName]"
:visible.sync="InvoiceRegisterv"
@ -514,7 +513,7 @@
<script>
import {
deleteByOrderId,
getOrderList, rollUnReceivebackOrder, filterInvoice, filterOrder,filterOrderList
getOrderList, rollUnReceivebackOrder, filterInvoice, filterOrder, filterOrderList
} from '../../api/inout/order'
import {getLocalJoinByUser} from "@/api/basic/busType";
import {getInvListByUser} from "@/api/system/invWarehouse";
@ -552,13 +551,14 @@ export default {
name: "IoCheckSuccessOrder",
data() {
return {
savebillno:null,
invoiceRow:[],
inputInv:[],
checkInvoice:false,
savebillno: null,
invoiceRow: [],
inputInv: [],
checkInvoice: false,
imgList: [],
imgViewerVisible: false,
BASE_URL: process.env.VUE_APP_BASE_API,
IMAGE_URL: process.env.VUE_APP_SYNC_API,
showSearch: true,
filterQuery: {
id: "",
@ -572,17 +572,17 @@ export default {
endTime: null,
invCode: this.$store.getters.locInvCode,
},
Refresh:{
id:"",
orderIdFk:null,
bizIdFk:"",
Refresh: {
id: "",
orderIdFk: null,
bizIdFk: "",
},
determineVisible: false,
determineData:null,
determineData: null,
corpLoading: false,
fromOptions: [],
regId:null,
par:[],
regId: null,
par: [],
formName: 1,
formMap: {
@ -711,7 +711,7 @@ export default {
subRow: null,
};
},
components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer,InvoiceRegistrationDetermine,checkInvoice},
components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer, InvoiceRegistrationDetermine, checkInvoice},
methods: {
// upData(data){
// this.invoiceRow = data;
@ -732,21 +732,21 @@ export default {
endTime: null,
invCode: this.$store.getters.locInvCode,
};
this.actDateRange=[];
this.auditDateRange=[];
this.actDateRange = [];
this.auditDateRange = [];
this.getList();
},
InvoiceRegister1(row){
this.savebillno=row.billNo
this.inputInv=row;
this.checkInvoice=true;
InvoiceRegister1(row) {
this.savebillno = row.billNo
this.inputInv = row;
this.checkInvoice = true;
},
closecheckInvoice(){
this.checkInvoice=false;
closecheckInvoice() {
this.checkInvoice = false;
this.getList();
this.currentRow.billNo=this.savebillno;
this.bizQuery.orderIdFk=this.savebillno;
this.codeQuery.orderIdFk=this.savebillno;
this.currentRow.billNo = this.savebillno;
this.bizQuery.orderIdFk = this.savebillno;
this.codeQuery.orderIdFk = this.savebillno;
this.getCodeDetailList();
this.getBizDetailListInv();
@ -777,7 +777,7 @@ export default {
this.showSearch = !this.showSearch;
},
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 = [];
previewImage({imageUrl: row.licenseUrl, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
@ -836,8 +836,8 @@ export default {
type: "warning",
})
.then(() => {
this.par=row;
this.par.regId=this.regId;
this.par = row;
this.par.regId = this.regId;
deleteById(row)
.then((response) => {
if (response.code == 20000) {
@ -1039,11 +1039,11 @@ export default {
return;
}
this.bizDetailLoading = true;
if(row != null) {
this.bizQuery.orderIdFk=row.orderIdFk;
if (row != null) {
this.bizQuery.orderIdFk = row.orderIdFk;
this.bizQuery.batchNo = row.batchNo;
this.bizQuery.relId = row.bindRlFk;
// this.bizQuery.bizIdFk = row.id;
// this.bizQuery.bizIdFk = row.id;
}
filterListInvoice(this.bizQuery).then((res) => {
this.bizDetailLoading = false;
@ -1065,14 +1065,14 @@ export default {
BizDetail(row) {
this.regId=row.id;
this.regId = row.id;
this.bizQuery.page = 1;
this.subRow = row;
this.getBizDetailListInv(row);
},
determine(row){
this.determineData=row;
this.determineVisible=true;
determine(row) {
this.determineData = row;
this.determineVisible = true;
},
//
@ -1134,9 +1134,9 @@ export default {
return statusMap[status];
},
getNewInv (row){
this.Refresh.orderIdFk=row.billNo;
addBizProduct(this.Refresh).then( (res) => {
getNewInv(row) {
this.Refresh.orderIdFk = row.billNo;
addBizProduct(this.Refresh).then((res) => {
if (res.code === 20000) {
this.$message.success("刷新成功!");
this.getList();

Loading…
Cancel
Save