diff --git a/.env.development b/.env.development
index 14e382e..5539ad6 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = 供应商自助管理平台
ENV = 'development'
# 若依管理系统/开发环境
-VUE_APP_BASE_API = 'http://127.0.0.1:9993'
+VUE_APP_BASE_API = 'http://192.168.0.166:9993'
# 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/'
diff --git a/src/views/inout/DialogThrReviewOrder.vue b/src/views/inout/DialogThrReviewOrder.vue
index 98e7563..19d0387 100644
--- a/src/views/inout/DialogThrReviewOrder.vue
+++ b/src/views/inout/DialogThrReviewOrder.vue
@@ -96,6 +96,11 @@
:cell-style="{padding:6+'px'}"
style="width: 100%">
<el-table-column type="index" label="序号" width="50"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column label="物资名称" width="160" prop="coName"></el-table-column>
<el-table-column label="规格型号" width="160" prop="spec"></el-table-column>
<el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
diff --git a/src/views/inout/InvoiceRegByFp.vue b/src/views/inout/InvoiceRegByFp.vue
index 601ee66..4ffe8c1 100644
--- a/src/views/inout/InvoiceRegByFp.vue
+++ b/src/views/inout/InvoiceRegByFp.vue
@@ -227,6 +227,11 @@
row-key="id" highlight-current-row
>
<el-table-column label="序号" type="index"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column
label="物资名称"
prop="coName"
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index e616e80..5d1cdef 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -193,6 +193,11 @@
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column
label="物资名称"
prop="coName"
diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index 6484f0d..cc042eb 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -197,6 +197,11 @@
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column
label="物资名称"
prop="coName"
@@ -282,6 +287,11 @@
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column
label="物资名称"
prop="coName"
@@ -766,7 +776,7 @@ export default {
})
.catch(() => {
});
- this.getBusType();
+ this.getBusType();
},
getSubInvList() {
let query = {
diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index e3a29d3..b7f0532 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -110,7 +110,7 @@
</el-table-column>
<el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip
sortable="custom"
- :sort-orders="['ascending', 'descending']" >
+ :sort-orders="['ascending', 'descending']">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
@@ -235,6 +235,11 @@
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column
label="物资名称" width="150"
prop="coName"
diff --git a/src/views/inout/IoDeliveryAuditOrder.vue b/src/views/inout/IoDeliveryAuditOrder.vue
index 9fd0105..e19e43e 100644
--- a/src/views/inout/IoDeliveryAuditOrder.vue
+++ b/src/views/inout/IoDeliveryAuditOrder.vue
@@ -99,7 +99,7 @@
</el-form-item>
</el-col>
-<!-- <el-col :span="8">-->
+ <!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="审核时间:">-->
<!-- <el-date-picker-->
<!-- :picker-options="pickerOptions"-->
@@ -137,7 +137,7 @@
border
@current-change="handleSelectionChange"
:default-sort="defaultSort"
- @sort-change="handleSortChange" >
+ @sort-change="handleSortChange">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
@@ -145,7 +145,7 @@
</el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"
sortable="custom"
- :sort-orders="['ascending', 'descending']" >
+ :sort-orders="['ascending', 'descending']">
<!--<template slot-scope="scope">-->
<!-- <i class="el-icon-time"></i>-->
<!-- <span>{{ scope.row.createTime }}</span>-->
@@ -153,7 +153,7 @@
</el-table-column>
<el-table-column label="核对时间" prop="checkTime" show-overflow-tooltip width="150"
sortable="custom"
- :sort-orders="['ascending', 'descending']" >
+ :sort-orders="['ascending', 'descending']">
<!--<template slot-scope="scope">-->
<!-- <i class="el-icon-time"></i>-->
<!-- <span>{{ scope.row.createTime }}</span>-->
@@ -286,6 +286,11 @@
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column
label="物资名称"
prop="coName" width="160"
@@ -336,7 +341,7 @@
show-overflow-tooltip
>
<template slot-scope="scope">
- <div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.checkFileName }}</div>
+ <div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.checkFileName }}</div>
</template>
</el-table-column>
@@ -376,7 +381,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
@@ -419,6 +425,11 @@
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column
label="物资名称" width="160"
prop="coName"
@@ -592,11 +603,10 @@ import {
orderPDFFromTemplateFile
} from '@/api/itextpdf/orderPrint'
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
-import { previewImage ,previewFile} from '@/api/purchase/supCompany'
+import {previewImage, previewFile} from '@/api/purchase/supCompany'
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
-
const formJson = {
site_id: "",
site_name: "",
@@ -609,10 +619,10 @@ export default {
data() {
return {
defaultSort: {prop: 'createTime', order: 'desc'},
- imgList:[],
- imgListCold:[],
- imgViewerVisible:false,
- imgViewerVisibleCold:false,
+ imgList: [],
+ imgListCold: [],
+ imgViewerVisible: false,
+ imgViewerVisibleCold: false,
BASE_URL: process.env.VUE_APP_BASE_API,
showSearch: true,
filterQuery: {
@@ -744,7 +754,7 @@ export default {
acceptOrderVisible: false,
};
},
- components: {AcceptOrder,ElImageViewer},
+ components: {AcceptOrder, ElImageViewer},
methods: {
onReset() {
this.$router.push({
@@ -761,9 +771,9 @@ export default {
limit: 10,
startTime: null,
endTime: null,
- invCode : this.$store.getters.locInvCode
+ invCode: this.$store.getters.locInvCode
};
- if(invCode!=this.$store.getters.locInvCode){
+ if (invCode != this.$store.getters.locInvCode) {
this.getBusType();
}
this.actDateRange = [];
@@ -793,21 +803,21 @@ export default {
hideSearch() {
this.showSearch = !this.showSearch;
},
- showImgViewer(row){
+ showImgViewer(row) {
this.certFileUrl =
this.BASE_URL +
- "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
+ "/udiwms/image/register/file/getImage?type=image2&name=" + row.filePath;
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.filePath.lastIndexOf('.');
- if(index===-1){
+ if (index === -1) {
this.$message.error("文件名异常!")
return false
}
- if(row.filePath.substr(index+1)==='pdf'){
+ if (row.filePath.substr(index + 1) === 'pdf') {
let pdf = "application/pdf"
let binaryData = [];
- previewFile(this.certFileUrl).then(res=>{
+ previewFile(this.certFileUrl).then(res => {
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
@@ -831,21 +841,21 @@ export default {
document.addEventListener("touchmove", m, false); // 禁止页面滑动
},
- showImgViewerCold(row){
+ showImgViewerCold(row) {
this.certFileUrl =
this.BASE_URL +
- "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
+ "/udiwms/image/register/file/getImage?type=image2&name=" + row.coldFilePath;
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.coldFilePath.lastIndexOf('.');
- if(index===-1){
+ if (index === -1) {
this.$message.error("文件名异常!")
return false
}
- if(row.coldFilePath.substr(index+1)==='pdf'){
+ if (row.coldFilePath.substr(index + 1) === 'pdf') {
let pdf = "application/pdf"
let binaryData = [];
- previewFile(this.certFileUrl).then(res=>{
+ previewFile(this.certFileUrl).then(res => {
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
@@ -869,16 +879,20 @@ export default {
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);
},
@@ -990,7 +1004,7 @@ export default {
},
handleSelectionChange(val) {
- this.currentRow.billNo=val.billNo;
+ this.currentRow.billNo = val.billNo;
this.getOrderDetails();
},
// 获取单据 业务详情、扫码详情、扫码明细
@@ -1027,7 +1041,6 @@ export default {
},
-
//获取订单列表
getList() {
this.loading = true;
diff --git a/src/views/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue
index a7fbf59..dd11b67 100644
--- a/src/views/inout/IoDeliverySearchOrder.vue
+++ b/src/views/inout/IoDeliverySearchOrder.vue
@@ -154,7 +154,7 @@
border
@current-change="handleSelectionChange"
:default-sort="defaultSort"
- @sort-change="handleSortChange" >
+ @sort-change="handleSortChange">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="送单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
@@ -295,6 +295,11 @@
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column
label="物资名称"
prop="coName"
@@ -426,6 +431,11 @@
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column
label="物资名称" width="160"
prop="coName"
@@ -564,7 +574,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
title="检验报告"
@@ -614,13 +625,11 @@ import {getCodeList} from "@/api/inout/code";
import AcceptOrder from "@/views/inout/DialogReviewOrder";
import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
-import { previewImage,previewFile } from '@/api/purchase/supCompany'
+import {previewImage, previewFile} from '@/api/purchase/supCompany'
import DialogCheck from "@/views/inout/DialogCheck";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
-
-
const formJson = {
site_id: "",
site_name: "",
@@ -633,13 +642,13 @@ export default {
data() {
return {
defaultSort: {prop: 'createTime', order: 'desc'},
- imgViewerVisible:false,
- imgViewerVisibleCold:false,
- imgList:[],
- imgListCold:[],
+ imgViewerVisible: false,
+ imgViewerVisibleCold: false,
+ imgList: [],
+ imgListCold: [],
BASE_URL: process.env.VUE_APP_BASE_API,
- currentManufacturer:{},
- Upinvoice:false,
+ currentManufacturer: {},
+ Upinvoice: false,
showSearch: true,
filterQuery: {
id: "",
@@ -774,7 +783,7 @@ export default {
acceptOrderVisible: false,
};
},
- components: {AcceptOrder,DialogCheck,ElImageViewer},
+ components: {AcceptOrder, DialogCheck, ElImageViewer},
methods: {
onReset() {
this.$router.push({
@@ -819,24 +828,24 @@ export default {
this.filterQuery.page = 1;
this.getList();
},
- showImgViewer(row){
- if(row.filePath.substr(-1) == ','){
- row.filePath=row.filePath.slice(0, row.filePath.length-1);
+ showImgViewer(row) {
+ if (row.filePath.substr(-1) == ',') {
+ row.filePath = row.filePath.slice(0, row.filePath.length - 1);
}
this.certFileUrl =
this.BASE_URL +
- "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
+ "/udiwms/image/register/file/getImage?type=image2&name=" + row.filePath;
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.filePath.lastIndexOf('.');
- if(index===-1){
+ if (index === -1) {
this.$message.error("文件名异常!")
return false
}
- if(row.filePath.substr(index+1)==='pdf'){
+ if (row.filePath.substr(index + 1) === 'pdf') {
let pdf = "application/pdf"
let binaryData = [];
- previewFile(this.certFileUrl).then(res=>{
+ previewFile(this.certFileUrl).then(res => {
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
@@ -861,24 +870,24 @@ export default {
},
- showImgViewerCold(row){
- if(row.coldFilePath.substr(-1) == ','){
- row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
+ showImgViewerCold(row) {
+ if (row.coldFilePath.substr(-1) == ',') {
+ row.coldFilePath = row.coldFilePath.slice(0, row.coldFilePath.length - 1);
}
this.certFileUrl =
this.BASE_URL +
- "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
+ "/udiwms/image/register/file/getImage?type=image2&name=" + row.coldFilePath;
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.coldFilePath.lastIndexOf('.');
- if(index===-1){
+ if (index === -1) {
this.$message.error("文件名异常!")
return false
}
- if(row.coldFilePath.substr(index+1)==='pdf'){
+ if (row.coldFilePath.substr(index + 1) === 'pdf') {
let pdf = "application/pdf"
let binaryData = [];
- previewFile(this.certFileUrl).then(res=>{
+ previewFile(this.certFileUrl).then(res => {
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
@@ -902,38 +911,41 @@ export default {
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();
},
-
hideSearch() {
this.showSearch = !this.showSearch;
},
diff --git a/src/views/inout/IoEditOrder.vue b/src/views/inout/IoEditOrder.vue
index a19dee4..aab5c23 100644
--- a/src/views/inout/IoEditOrder.vue
+++ b/src/views/inout/IoEditOrder.vue
@@ -104,6 +104,11 @@
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column
label="物资名称"
prop="coName"
@@ -187,6 +192,11 @@
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column
label="物资名称"
prop="coName"
diff --git a/src/views/inout/IoInoutSearchOrder.vue b/src/views/inout/IoInoutSearchOrder.vue
index ca8c143..4e5acde 100644
--- a/src/views/inout/IoInoutSearchOrder.vue
+++ b/src/views/inout/IoInoutSearchOrder.vue
@@ -230,6 +230,11 @@
row-key="id"
>
<el-table-column label="序号" type="index" width="50"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column
label="物资名称"
prop="coName" width="160"
@@ -314,6 +319,11 @@
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column
label="物资名称" width="160"
prop="coName"
diff --git a/src/views/inout/IoReturnedSearchOrder.vue b/src/views/inout/IoReturnedSearchOrder.vue
index 340a07b..5fff590 100644
--- a/src/views/inout/IoReturnedSearchOrder.vue
+++ b/src/views/inout/IoReturnedSearchOrder.vue
@@ -262,6 +262,11 @@
row-key="id"
>
<el-table-column label="序号" type="index" width="50"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column
label="物资名称"
prop="coName" width="160"
@@ -347,6 +352,11 @@
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column
label="物资名称" width="160"
prop="coName"
diff --git a/src/views/inout/IoSupAduitOrder.vue b/src/views/inout/IoSupAduitOrder.vue
index dc57cdf..09fcf87 100644
--- a/src/views/inout/IoSupAduitOrder.vue
+++ b/src/views/inout/IoSupAduitOrder.vue
@@ -174,7 +174,7 @@
></pagination>
</el-card>
- <el-tabs type="border-card" style="margin: 15px" >
+ <el-tabs type="border-card" style="margin: 15px">
<!--单据业务详情-->
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
@@ -204,10 +204,15 @@
</el-form-item>
</el-form>
- <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border class="table-fixed"
+ <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border class="table-fixed"
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column
label="物资名称"
prop="coName"
@@ -388,7 +393,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
@@ -440,8 +446,8 @@ import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/ap
import AcceptOrder from "@/views/inout/DialogThrReviewOrder";
import {getDeptListByUser} from "@/api/auth/authDept";
import DialogCheck from "@/views/inout/DialogCheck";
-import { getBizDetailList } from '@/api/inout/orderDetailBiz'
-import { previewFile, previewImage } from '@/api/purchase/supCompany'
+import {getBizDetailList} from '@/api/inout/orderDetailBiz'
+import {previewFile, previewImage} from '@/api/purchase/supCompany'
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
@@ -458,13 +464,13 @@ export default {
return {
defaultSort: {prop: 'createTime', order: 'desc'},
BASE_URL: process.env.VUE_APP_BASE_API,
- imgList:[],
- imgListCold:[],
- imgViewerVisible:false,
- imgViewerVisibleCold:false,
+ imgList: [],
+ imgListCold: [],
+ imgViewerVisible: false,
+ imgViewerVisibleCold: false,
showSearch: true,
- Upinvoice:false,
- currentManufacturer:{},
+ Upinvoice: false,
+ currentManufacturer: {},
filterQuery: {
id: "",
billNo: null,
@@ -585,7 +591,7 @@ export default {
acceptOrderVisible: false,
};
},
- components: {AcceptOrder,DialogCheck,ElImageViewer},
+ components: {AcceptOrder, DialogCheck, ElImageViewer},
methods: {
onReset() {
this.$router.push({
@@ -604,7 +610,7 @@ export default {
endTime: null,
invCode: this.$store.getters.locInvCode,
};
- if(invCode!=this.$store.getters.locInvCode){
+ if (invCode != this.$store.getters.locInvCode) {
this.getBusType();
}
this.actDateRange = [];
@@ -640,23 +646,23 @@ export default {
},
showImgViewer(row) {
- if(row.filePath.substr(-1) == ','){
- row.filePath=row.filePath.slice(0, row.filePath.length-1);
+ if (row.filePath.substr(-1) == ',') {
+ row.filePath = row.filePath.slice(0, row.filePath.length - 1);
}
this.certFileUrl =
this.BASE_URL +
- "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
+ "/udiwms/image/register/file/getImage?type=image2&name=" + row.filePath;
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.filePath.lastIndexOf('.');
- if(index===-1){
+ if (index === -1) {
this.$message.error("文件名异常!")
return false
}
- if(row.filePath.substr(index+1)==='pdf'){
+ if (row.filePath.substr(index + 1) === 'pdf') {
let pdf = "application/pdf"
let binaryData = [];
- previewFile(this.certFileUrl).then(res=>{
+ previewFile(this.certFileUrl).then(res => {
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
@@ -681,23 +687,23 @@ export default {
},
showImgViewerCold(row) {
- if(row.coldFilePath.substr(-1) == ','){
- row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
+ if (row.coldFilePath.substr(-1) == ',') {
+ row.coldFilePath = row.coldFilePath.slice(0, row.coldFilePath.length - 1);
}
this.certFileUrl =
this.BASE_URL +
- "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
+ "/udiwms/image/register/file/getImage?type=image2&name=" + row.coldFilePath;
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.coldFilePath.lastIndexOf('.');
- if(index===-1){
+ if (index === -1) {
this.$message.error("文件名异常!")
return false
}
- if(row.coldFilePath.substr(index+1)==='pdf'){
+ if (row.coldFilePath.substr(index + 1) === 'pdf') {
let pdf = "application/pdf"
let binaryData = [];
- previewFile(this.certFileUrl).then(res=>{
+ previewFile(this.certFileUrl).then(res => {
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
@@ -721,32 +727,35 @@ export default {
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;
},
- closeCheckDialog(){
+ closeCheckDialog() {
this.Upinvoice = false;
this.getOrderDetails();
},
handleSelectionChange(val) {
- this.currentRow.billNo=val.billNo;
+ this.currentRow.billNo = val.billNo;
this.getOrderDetails();
},
// 获取单据 业务详情、扫码详情、扫码明细
@@ -976,7 +985,7 @@ export default {
this.loading = false;
});
},
- freshen(){
+ freshen() {
this.Upinvoice = false;
this.getOrderDetails();
},
diff --git a/src/views/inout/IoSupSearchOrder.vue b/src/views/inout/IoSupSearchOrder.vue
index e3079ac..6690426 100644
--- a/src/views/inout/IoSupSearchOrder.vue
+++ b/src/views/inout/IoSupSearchOrder.vue
@@ -131,7 +131,7 @@
border
@current-change="handleSelectionChange"
:default-sort="defaultSort"
- @sort-change="handleSortChange" >
+ @sort-change="handleSortChange">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
@@ -141,7 +141,7 @@
</el-table-column>
<el-table-column label="审核时间" prop="checkTime" width="140" show-overflow-tooltip
sortable="custom"
- :sort-orders="['ascending', 'descending']" >
+ :sort-orders="['ascending', 'descending']">
</el-table-column>
<!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<!-- </el-table-column>-->
@@ -258,6 +258,11 @@
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column
label="物资名称"
prop="coName"
@@ -498,7 +503,7 @@ import AcceptOrder from "@/views/inout/DialogReviewOrder";
import DialogCheck from "@/views/inout/DialogCheck";
import {getDeptListByUser} from "@/api/auth/authDept";
-import {previewImage,previewFile} from '@/api/purchase/supCompany'
+import {previewImage, previewFile} from '@/api/purchase/supCompany'
import {getBizDetailList} from '@/api/inout/orderDetailBiz'
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
@@ -695,23 +700,23 @@ export default {
},
showImgViewer(row) {
- if(row.filePath.substr(-1) == ','){
- row.filePath=row.filePath.slice(0, row.filePath.length-1);
+ if (row.filePath.substr(-1) == ',') {
+ row.filePath = row.filePath.slice(0, row.filePath.length - 1);
}
this.certFileUrl =
this.BASE_URL +
- "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
+ "/udiwms/image/register/file/getImage?type=image2&name=" + row.filePath;
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.filePath.lastIndexOf('.');
- if(index===-1){
+ if (index === -1) {
this.$message.error("文件名异常!")
return false
}
- if(row.filePath.substr(index+1)==='pdf'){
+ if (row.filePath.substr(index + 1) === 'pdf') {
let pdf = "application/pdf"
let binaryData = [];
- previewFile(this.certFileUrl).then(res=>{
+ previewFile(this.certFileUrl).then(res => {
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
@@ -737,23 +742,23 @@ export default {
showImgViewerCold(row) {
- if(row.coldFilePath.substr(-1) == ','){
- row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
+ if (row.coldFilePath.substr(-1) == ',') {
+ row.coldFilePath = row.coldFilePath.slice(0, row.coldFilePath.length - 1);
}
this.certFileUrl =
this.BASE_URL +
- "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
+ "/udiwms/image/register/file/getImage?type=image2&name=" + row.coldFilePath;
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.coldFilePath.lastIndexOf('.');
- if(index===-1){
+ if (index === -1) {
this.$message.error("文件名异常!")
return false
}
- if(row.coldFilePath.substr(index+1)==='pdf'){
+ if (row.coldFilePath.substr(index + 1) === 'pdf') {
let pdf = "application/pdf"
let binaryData = [];
- previewFile(this.certFileUrl).then(res=>{
+ previewFile(this.certFileUrl).then(res => {
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
diff --git a/src/views/inout/IoSupSecAuditOrder.vue b/src/views/inout/IoSupSecAuditOrder.vue
index 04f92d2..dbebbf5 100644
--- a/src/views/inout/IoSupSecAuditOrder.vue
+++ b/src/views/inout/IoSupSecAuditOrder.vue
@@ -234,6 +234,11 @@
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column
label="物资名称"
prop="coName"
diff --git a/src/views/inout/IoWaitAllocateOrder.vue b/src/views/inout/IoWaitAllocateOrder.vue
index 9463d4a..6fc6832 100644
--- a/src/views/inout/IoWaitAllocateOrder.vue
+++ b/src/views/inout/IoWaitAllocateOrder.vue
@@ -243,6 +243,11 @@
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column
label="物资名称" width="150"
prop="coName"
diff --git a/src/views/inout/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue
index 0e4c5f2..18c7475 100644
--- a/src/views/inout/PanelCreateOrderBizDetail.vue
+++ b/src/views/inout/PanelCreateOrderBizDetail.vue
@@ -22,6 +22,11 @@
:row-style="rowStyle"
max-height="350" height="350" ref="multipleTable">
<el-table-column label="序号" type="index" width="50"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column width="150"
label="物资名称"
prop="coName"
diff --git a/src/views/inout/PanelCreateOrderCodeDetail.vue b/src/views/inout/PanelCreateOrderCodeDetail.vue
index 3da6367..aa95b50 100644
--- a/src/views/inout/PanelCreateOrderCodeDetail.vue
+++ b/src/views/inout/PanelCreateOrderCodeDetail.vue
@@ -5,6 +5,11 @@
:row-style="rowStyle"
ref="multipleTable">
<el-table-column type="index" label="序号" width="50"></el-table-column>
+ <el-table-column
+ label="DI/物资编码" width="150"
+ prop="nameCode"
+ show-overflow-tooltip
+ ></el-table-column>
<el-table-column label="物资名称" width="150" prop="coName" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" width="150" prop="spec" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" width="150" prop="batchNo" show-overflow-tooltip></el-table-column>