Merge remote-tracking branch 'origin/fp_dev' into fp_dev

fp_dev
郑明梁 2 years ago
commit c7fc939ea4

@ -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 = '/'

@ -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>

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"
@ -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"
@ -596,7 +607,6 @@ import { previewImage ,previewFile} from '@/api/purchase/supCompany'
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
const formJson = {
site_id: "",
site_name: "",
@ -871,14 +881,18 @@ export default {
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() {
this.imgViewerVisibleCold = false;
const m = (e) => { e.preventDefault() };
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true);
},
@ -1027,7 +1041,6 @@ export default {
},
//
getList() {
this.loading = true;

@ -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="检验报告"
@ -619,8 +630,6 @@ import DialogCheck from "@/views/inout/DialogCheck";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
const formJson = {
site_id: "",
site_name: "",
@ -904,14 +913,18 @@ export default {
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() {
this.imgViewerVisibleCold = false;
const m = (e) => { e.preventDefault() };
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true);
},
@ -933,7 +946,6 @@ export default {
},
hideSearch() {
this.showSearch = !this.showSearch;
},

@ -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"

@ -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"

@ -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"

@ -208,6 +208,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"
@ -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
@ -723,19 +729,22 @@ export default {
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() {
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) {
this.currentManufacturer = row;
this.Upinvoice = true;

@ -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"

@ -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"

@ -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"

@ -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"

@ -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>

Loading…
Cancel
Save