Merge branch 'master' into dev

fp_dev
anthonywj 2 years ago
commit 7d1131f6a4

@ -6,7 +6,6 @@ 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/'
#林纪裕 #林纪裕
# VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:82/UDI_SPMS_SERVER/' VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:82/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_SPMS_SERVER/'

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

@ -75,3 +75,16 @@ export function getCodeSms() {
timeout: 20000 timeout: 20000
}) })
} }
export function getTitleConfig() {
return request({
url: '/spms/getTitleConfig',
headers: {
isToken: false
},
method: 'get',
timeout: 20000
})
}

@ -172,6 +172,15 @@ export function previewImage(data) {
}); });
} }
export function previewFile(url) {
return axios({
url: url,
method: "get",
responseType: 'arraybuffer'
});
}

@ -1,42 +1,50 @@
import axios from "@/utils/request"; import axios from "@/utils/request";
export function getThrProducts(query) { export function getThrProducts(query) {
return axios({ return axios({
url: "/udiwms/thrsys/getThrProducts", url: "/udiwms/thrsys/getThrProducts",
method: "get", method: "get",
params: query params: query
}); });
} }
export function delThrProducts(query) { export function delThrProducts(query) {
return axios({ return axios({
url: "/udiwms/thrsys/delThrProducts", url: "/udiwms/thrsys/delThrProducts",
method: "post", method: "post",
data: query data: query
}); });
} }
export function downloadAll(query) { export function downloadAll(query) {
return axios({ return axios({
url: "/udiwms/thrsys/products/downloadAll", url: "/udiwms/thrsys/products/downloadAll",
method: "get", method: "get",
params: query params: query
}); });
} }
export function productsDlAll(query) { export function productsDlAll(query) {
return axios({ return axios({
url: "/udiwms/thrsys/products/productsDlAll", url: "/udiwms/thrsys/products/productsDlAll",
method: "post", method: "post",
data: query data: query
}); });
} }
export function saveNewProduct(data) { export function saveNewProduct(data) {
return axios({ return axios({
url: '/udiwms/udiinfo/erp/products/saveProduct', url: '/udiwms/udiinfo/erp/products/saveProduct',
method: 'post', method: 'post',
data: data data: data
}) })
}
export function updateProduct(data) {
return axios({
url: '/udiwms/udiinfo/erp/products/update',
method: 'post',
data: data
})
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 19 KiB

@ -60,7 +60,7 @@ export default {
.sidebar-logo-container { .sidebar-logo-container {
position: relative; position: relative;
width: 100%; width: 100%;
height: 100px; height: 110px;
line-height: 50px; line-height: 50px;
background: #2b2f3a; background: #2b2f3a;
text-align: center; text-align: center;
@ -72,7 +72,7 @@ export default {
& .sidebar-logo { & .sidebar-logo {
width: 100px; width: 100px;
height: 73px; height: 100px;
margin-top: 12px; margin-top: 12px;
vertical-align: middle; vertical-align: middle;
margin-right: 12px; margin-right: 12px;
@ -94,7 +94,7 @@ export default {
&.collapse { &.collapse {
.sidebar-logo { .sidebar-logo {
width: 44px; width: 44px;
height: 32px; height: 44px;
margin-right: 0px; margin-right: 0px;
} }
} }

@ -227,7 +227,7 @@ export default {
limit: 10, limit: 10,
startTime: "", startTime: "",
endTime: "", endTime: "",
inCodeStatus: 1, inCodeStatus: 0,
}, },
detailQuery: { detailQuery: {
orderIdFk: "", orderIdFk: "",
@ -344,7 +344,7 @@ export default {
limit: 10, limit: 10,
startTime: "", startTime: "",
endTime: "", endTime: "",
inCodeStatus: 1, inCodeStatus: 0,
}; };
this.getList(); this.getList();

@ -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>
@ -183,32 +183,32 @@
<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信息 >选入DI信息
</el-button> </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>
@ -246,6 +246,36 @@
width="160" width="160"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column
label="商品名称"
prop="spmc"
width="160"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:spmc')"
></el-table-column>
<el-table-column
label="商品条码"
prop="sptm"
width="160"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:sptm')"
></el-table-column>
<el-table-column
label="医保编码"
prop="ybbm"
width="160"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:ybbm')"
></el-table-column>
<el-table-column
label="计量单位"
prop="measname"
width="160"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:measname')"
></el-table-column>
<el-table-column <el-table-column
label="注册/备案号" label="注册/备案号"
prop="zczbhhzbapzbh" prop="zczbhhzbapzbh"
@ -258,11 +288,69 @@
width="180" width="180"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column
:label="productRemarkSet.remarkTitle1"
prop="basicPrductRemak1"
width="180"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak1')"
></el-table-column>
<el-table-column
:label="productRemarkSet.remarkTitle2"
prop="basicPrductRemak2"
width="180"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak2')"
></el-table-column>
<el-table-column
:label="productRemarkSet.remarkTitle3"
prop="basicPrductRemak3"
width="180"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak3')"
></el-table-column>
<el-table-column
:label="productRemarkSet.remarkTitle4"
prop="basicPrductRemak4"
width="180"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak4')"
></el-table-column>
<el-table-column
:label="productRemarkSet.remarkTitle5"
prop="basicPrductRemak5"
width="180"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak5')"
></el-table-column>
<el-table-column
:label="productRemarkSet.remarkTitle6"
prop="basicPrductRemak6"
width="180"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak6')"
></el-table-column>
<el-table-column
:label="productRemarkSet.remarkTitle7"
prop="basicPrductRemak7"
width="180"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak7')"
></el-table-column>
<el-table-column
:label="productRemarkSet.remarkTitle8"
prop="basicPrductRemak8"
width="180"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak8')"
></el-table-column>
<el-table-column <el-table-column
label="集采状态" label="集采状态"
prop="groupBuy" prop="groupBuy"
width="120" width="120"
show-overflow-tooltip show-overflow-tooltip
v-if="$auth.hasPermi('basic:groupBuy')"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="scope.row.groupBuy | statusFilterType"> <el-tag :type="scope.row.groupBuy | statusFilterType">
@ -275,6 +363,7 @@
prop="dispatch" prop="dispatch"
width="120" width="120"
show-overflow-tooltip show-overflow-tooltip
v-if="$auth.hasPermi('basic:dispatch')"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="scope.row.dispatch | statusFilterType"> <el-tag :type="scope.row.dispatch | statusFilterType">
@ -289,27 +378,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>
@ -918,7 +1007,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
@ -939,7 +1028,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
@ -962,7 +1051,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
@ -983,7 +1072,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
@ -1006,7 +1095,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
@ -1027,7 +1116,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
@ -1050,7 +1139,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
@ -1071,7 +1160,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
@ -1246,7 +1335,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>
</el-col> </el-col>
<el-col :span="2" class="el-col"> <el-col :span="2" class="el-col">
@ -1256,7 +1345,7 @@
@click.native.stop="updateVersion()" @click.native.stop="updateVersion()"
:loading="updateLoading" :loading="updateLoading"
style="margin-left: 5%" style="margin-left: 5%"
>更新当前版本信息 >更新当前版本信息
</el-button> </el-button>
</el-col> </el-col>
</el-row> </el-row>
@ -1291,14 +1380,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>
@ -1320,14 +1409,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>
@ -1473,7 +1562,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";
@ -1484,8 +1573,8 @@ 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";
import { dlLastVersionByDi } from "@/api/basic/udiInfo"; import {dlLastVersionByDi} from "@/api/basic/udiInfo";
export default { export default {
data() { data() {
@ -1534,7 +1623,16 @@ export default {
false: "不可配送", false: "不可配送",
}, },
pId: 0, pId: 0,
productRemarkSet: {}, productRemarkSet: {
remarkTitle1: "备注字段1",
remarkTitle2: "备注字段2",
remarkTitle3: "备注字段3",
remarkTitle4: "备注字段4",
remarkTitle5: "备注字段5",
remarkTitle6: "备注字段6",
remarkTitle7: "备注字段7",
remarkTitle8: "备注字段8",
},
relevanceEdit: { relevanceEdit: {
id: null, id: null,
thirdId: "", thirdId: "",
@ -1581,7 +1679,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,
updateLoading: false, updateLoading: false,
@ -1712,7 +1810,8 @@ export default {
this.$message.error(response.message); this.$message.error(response.message);
} }
}) })
.catch(() => {}); .catch(() => {
});
}, },
deleteDialog(rowId) { deleteDialog(rowId) {
@ -1724,7 +1823,8 @@ export default {
.then(() => { .then(() => {
this.deleteOrders(rowId); this.deleteOrders(rowId);
}) })
.catch(() => {}); .catch(() => {
});
}, },
intentDetail() { intentDetail() {
@ -1762,9 +1862,11 @@ export default {
this.$message.error(response.message); this.$message.error(response.message);
} }
}) })
.catch(() => {}); .catch(() => {
});
}) })
.catch(() => {}); .catch(() => {
});
}, },
removeDi() { removeDi() {
@ -1791,9 +1893,11 @@ export default {
this.$message.error(response.message); this.$message.error(response.message);
} }
}) })
.catch(() => {}); .catch(() => {
});
}) })
.catch(() => {}); .catch(() => {
});
}, },
intentSelectErp(val) { intentSelectErp(val) {
@ -1973,10 +2077,10 @@ export default {
isAdavence: row.isAdavence, isAdavence: row.isAdavence,
}; };
this.editFormat = JSON.parse(JSON.stringify(row)); this.editFormat = JSON.parse(JSON.stringify(row));
if( this.editFormat.overStockNum == null){ if (this.editFormat.overStockNum == null) {
this.editFormat.overStockNum = 0; this.editFormat.overStockNum = 0;
} }
if( this.editFormat.lowStockNum == null){ if (this.editFormat.lowStockNum == null) {
this.editFormat.lowStockNum = 0; this.editFormat.lowStockNum = 0;
} }
this.editDiDialogVisible = true; this.editDiDialogVisible = true;
@ -2085,7 +2189,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) {
@ -2123,7 +2228,6 @@ export default {
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
debugger;
this.updateLoading = true; this.updateLoading = true;
let query = { let query = {
uuid: this.editQuery.uuid, uuid: this.editQuery.uuid,
@ -2145,10 +2249,12 @@ export default {
this.total = 0; this.total = 0;
}); });
}) })
.catch(() => {}); .catch(() => {
});
}, },
}, },
mounted() {}, mounted() {
},
components: { components: {
ProductSingleEdit, ProductSingleEdit,
ProductEdit, ProductEdit,
@ -2174,6 +2280,7 @@ export default {
margin-left: -2px; margin-left: -2px;
height: 30px; height: 30px;
} }
.tree { .tree {
::v-deep .el-tree-node { ::v-deep .el-tree-node {
.el-tree-node__content { .el-tree-node__content {

@ -219,6 +219,7 @@ export default {
}); });
}, },
handleSubForm(data, formName) { // handleSubForm(data, formName) { //
debugger
this.formName = formName; this.formName = formName;
if (formName === "edit") { if (formName === "edit") {
this.subData = JSON.parse(JSON.stringify(data)); this.subData = JSON.parse(JSON.stringify(data));

@ -138,9 +138,10 @@
:action="this.uploadUrl" :action="this.uploadUrl"
:on-preview="uploadHandlePreview" :on-preview="uploadHandlePreview"
:on-remove="uploadHandleRemove" :on-remove="uploadHandleRemove"
:limit="1"
:headers="headers" :headers="headers"
:on-exceed="uploadHandleExceed" :on-exceed="uploadHandleExceed"
accept=".jpg,.png" accept=".jpg,.png,.pdf"
:on-change="uploadOnchange" :on-change="uploadOnchange"
:on-success="uploadHandleSuccess" :on-success="uploadHandleSuccess"
:on-error="uploadHandleError" :on-error="uploadHandleError"
@ -151,7 +152,7 @@
<el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1"> <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">
{{ choiceFile }} {{ choiceFile }}
</el-button> </el-button>
<div>只能上传 jpg,png 文件且不超过 10 MB</div> <div>只能上传 jpg,png,pdf 文件且不超过 10 MB</div>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
@ -189,9 +190,10 @@
:action="this.uploadUrl" :action="this.uploadUrl"
:on-preview="uploadHandlePreview" :on-preview="uploadHandlePreview"
:on-remove="uploadHandleRemove1" :on-remove="uploadHandleRemove1"
:limit="1"
:headers="headers" :headers="headers"
:on-exceed="uploadHandleExceed" :on-exceed="uploadHandleExceed"
accept=".jpg,.png" accept=".jpg,.png,.pdf"
:on-change="uploadOnchange1" :on-change="uploadOnchange1"
:on-success="uploadHandleSuccess1" :on-success="uploadHandleSuccess1"
:on-error="uploadHandleError" :on-error="uploadHandleError"
@ -202,7 +204,7 @@
<el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1"> <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">
{{ choiceFile1 }} {{ choiceFile1 }}
</el-button> </el-button>
<div>只能上传 jpg,png 文件且不超过 10 MB</div> <div>只能上传 jpg,png,pdf 文件且不超过 10 MB</div>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
@ -217,8 +219,7 @@
style="text-align:right" @click="showImgViewerCold"> style="text-align:right" @click="showImgViewerCold">
冷链报告预览 冷链报告预览
</el-button> </el-button>
<el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold" <el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold" :url-list="imgListCold"/>
:url-list="imgListCold"/>
</el-col> </el-col>
@ -226,6 +227,7 @@
</el-row> </el-row>
</el-card> </el-card>
</el-form> </el-form>
@ -236,7 +238,7 @@
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import store from "@/store"; import store from "@/store";
import {updateBizById, updateById} from '@/api/inout/orderDetailBiz' import {updateBizById, updateById} from '@/api/inout/orderDetailBiz'
import {previewImage} from '@/api/purchase/supCompany' import {previewImage,previewFile} from '@/api/purchase/supCompany'
import ElImageViewer from "element-ui/packages/image/src/image-viewer"; import ElImageViewer from "element-ui/packages/image/src/image-viewer";
@ -261,9 +263,9 @@ export default {
data() { data() {
return { return {
imgList: [], imgList: [],
imgListCold: [], imgListCold:[],
imgViewerVisible: false, imgViewerVisible: false,
imgViewerVisibleCold: false, imgViewerVisibleCold:false,
BASE_URL: process.env.VUE_APP_BASE_API, BASE_URL: process.env.VUE_APP_BASE_API,
code: "", code: "",
formData: { formData: {
@ -290,8 +292,7 @@ export default {
headers: {}, headers: {},
choiceFile: "选取文件", choiceFile: "选取文件",
choiceFile1: "选取文件", choiceFile1: "选取文件",
isChangeCheck: false,
isChangeCold: false,
}; };
}, },
components: { components: {
@ -372,7 +373,7 @@ export default {
this.$message.warning(`当前限制选择 1 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`); this.$message.warning(`当前限制选择 1 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`);
}, },
uploadOnchange(file, fileList) { uploadOnchange(file, fileList) {
// this.inputQuery.checkFileName = file.name; this.inputQuery.checkFileName = file.name;
let fileName = file.name; let fileName = file.name;
let uid = file.uid let uid = file.uid
let pos = fileName.lastIndexOf("."); let pos = fileName.lastIndexOf(".");
@ -399,7 +400,7 @@ export default {
return isLt; return isLt;
}, },
uploadOnchange1(file, fileList) { uploadOnchange1(file, fileList) {
// this.inputQuery.checkColdFileName = file.name; this.inputQuery.checkColdFileName = file.name;
let fileName = file.name; let fileName = file.name;
let uid = file.uid let uid = file.uid
let pos = fileName.lastIndexOf("."); let pos = fileName.lastIndexOf(".");
@ -426,37 +427,20 @@ export default {
return isLt; return isLt;
}, },
uploadHandleSuccess(response, file, fileList) { uploadHandleSuccess(response, file, fileList) {
if (response.code === 20000) { if (response.code === 20000) {
if (this.inputQuery.filePath == null || this.isChangeCheck == true) { this.inputQuery.filePath = response.data.name;
this.inputQuery.filePath = response.data.name + ","; // this.onSubmit();
this.inputQuery.checkFileName = file.name + ",";
this.isChangeCheck = false;
} else {
this.inputQuery.filePath += response.data.name + ",";
this.inputQuery.checkFileName += file.name + ",";
}
} else { } else {
this.$message.error("文件上传失败:" + response.message); this.$message.error("文件上传失败:" + response.message);
} }
}, },
uploadHandleSuccess1(response, file, fileList) { uploadHandleSuccess1(response, file, fileList) {
if (response.code === 20000) { if (response.code === 20000) {
if (this.inputQuery.coldFilePath == null || this.isChangeCold == true) { this.inputQuery.coldFilePath = response.data.name;
this.inputQuery.coldFilePath = response.data.name + ","; // this.onSubmit();
this.inputQuery.checkColdFileName = file.name + ",";
this.isChangeCold = false;
} else {
this.inputQuery.coldFilePath += response.data.name + ",";
this.inputQuery.checkColdFileName += file.name + ",";
}
} else { } else {
this.$message.error("文件上传失败:" + response.message); this.$message.error("文件上传失败:" + response.message);
} }
}, },
uploadHandleError() { uploadHandleError() {
@ -471,36 +455,85 @@ export default {
return isJPG || isPNG; return isJPG || isPNG;
}, },
showImgViewer(row) { showImgViewer(row) {
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; if(this.inputQuery.filePath.substr(-1) == ','){
this.inputQuery.filePath=this.inputQuery.filePath.slice(0, this.inputQuery.filePath.length-1);
}
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+this.inputQuery.filePath;
this.imgList = []; this.imgList = [];
previewImage({imageUrl: this.inputQuery.filePath, certFileUrl: this.certFileUrl}).then(response => { this.imgList.push(this.certFileUrl)
if (response.code === 20000) { let index = this.inputQuery.filePath.lastIndexOf('.');
this.imgList = response.data; if(index===-1){
} this.$message.error("文件名异常!")
console.log(this.imgList) return false
this.imgViewerVisible = true; }
}); if(this.inputQuery.filePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
const m = (e) => { const m = (e) => {
e.preventDefault() e.preventDefault();
}; };
document.body.style.overflow = 'hidden'; document.body.style.overflow = "hidden";
document.addEventListener("touchmove", m, false); // document.addEventListener("touchmove", m, false); //
}, },
showImgViewerCold(row) { showImgViewerCold(row){
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; if(this.inputQuery.coldFilePath.substr(-1) == ','){
this.inputQuery.coldFilePath=this.inputQuery.coldFilePath.slice(0, this.inputQuery.coldFilePath.length-1);
}
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+this.inputQuery.coldFilePath;
this.imgList = []; this.imgList = [];
previewImage({imageUrl: this.inputQuery.coldFilePath, certFileUrl: this.certFileUrl}).then(response => { this.imgList.push(this.certFileUrl)
if (response.code === 20000) { let index = this.inputQuery.coldFilePath.lastIndexOf('.');
this.imgList = response.data; if(index===-1){
} this.$message.error("文件名异常!")
console.log(this.imgList) return false
this.imgViewerVisible = true; }
}); if(this.inputQuery.coldFilePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
const m = (e) => { const m = (e) => {
e.preventDefault() e.preventDefault();
}; };
document.body.style.overflow = 'hidden'; document.body.style.overflow = "hidden";
document.addEventListener("touchmove", m, false); // document.addEventListener("touchmove", m, false); //
}, },
@ -514,11 +547,9 @@ export default {
document.removeEventListener("touchmove", m, true); document.removeEventListener("touchmove", m, true);
}, },
closeImgViewerCold() { closeImgViewerCold(){
this.imgViewerVisibleCold = false; this.imgViewerVisibleCold = false;
const m = (e) => { const m = (e) => { e.preventDefault() };
e.preventDefault()
};
document.body.style.overflow = 'auto'; document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true); document.removeEventListener("touchmove", m, true);
}, },
@ -547,13 +578,11 @@ export default {
} }
if (this.inputQuery.filePath != null) { if (this.inputQuery.filePath != null) {
this.choiceFile = "更换检验报告"; this.choiceFile = "更换检验报告";
this.isChangeCheck = true;
} else { } else {
this.choiceFile = "选取检验报告"; this.choiceFile = "选取检验报告";
} }
if (this.inputQuery.coldFilePath != null) { if (this.inputQuery.coldFilePath != null) {
this.isChangeCold = true;
this.choiceFile1 = "更换冷链报告"; this.choiceFile1 = "更换冷链报告";
} else { } else {
this.choiceFile1 = "选取冷链报告"; this.choiceFile1 = "选取冷链报告";

@ -271,7 +271,7 @@ import AcceptOrder from "@/views/inout/DialogReviewOrder";
import DialogInvoice from "@/views/inout/DialogInvoice"; import DialogInvoice from "@/views/inout/DialogInvoice";
import InvoiceRegister from "@/views/inout/InvoiceRegister"; import InvoiceRegister from "@/views/inout/InvoiceRegister";
import {previewImage} from "@/api/purchase/supCompany"; import {previewImage,previewFile} from "@/api/purchase/supCompany";
import ElImageViewer from "element-ui/packages/image/src/image-viewer"; import ElImageViewer from "element-ui/packages/image/src/image-viewer";
import store from "@/store"; import store from "@/store";
import {deleteRe} from "@/api/auth/register"; import {deleteRe} from "@/api/auth/register";
@ -564,7 +564,6 @@ export default {
uploadHandleError() { uploadHandleError() {
}, },
uploadHandleSuccess(response, file, fileList) { uploadHandleSuccess(response, file, fileList) {
debugger;
if (response.code === 20000) { if (response.code === 20000) {
this.inputQuery.licenseUrl = response.data.name; this.inputQuery.licenseUrl = response.data.name;
// this.onSubmit(); // this.onSubmit();
@ -697,18 +696,34 @@ export default {
showImgViewer(row) { showImgViewer(row) {
this.certFileUrl = this.certFileUrl =
this.BASE_URL + this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="; "/udiwms/image/register/file/getImage?type=image2&name="+this.inputQuery.licenseUrl;
this.imgList = []; this.imgList = [];
previewImage({ this.imgList.push(this.certFileUrl)
imageUrl: this.inputQuery.licenseUrl, let index = this.inputQuery.licenseUrl.lastIndexOf('.');
certFileUrl: this.certFileUrl, if(index===-1){
}).then((response) => { this.$message.error("文件名异常!")
if (response.code === 20000) { return false
this.imgList = response.data; }
} if(this.inputQuery.licenseUrl.substr(index+1)==='pdf'){
console.log(this.imgList); let pdf = "application/pdf"
this.imgViewerVisible = true; let binaryData = [];
}); previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
const m = (e) => { const m = (e) => {
e.preventDefault(); e.preventDefault();
}; };

@ -537,7 +537,7 @@ import InvoiceRegistrationDetermine from "@/views/inout/InvoiceRegistrationDeter
import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint" import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
import {getDeptListByUser} from "@/api/auth/authDept"; import {getDeptListByUser} from "@/api/auth/authDept";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"; import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import {previewImage} from '@/api/purchase/supCompany' import {previewImage,previewFile} from '@/api/purchase/supCompany'
import ElImageViewer from "element-ui/packages/image/src/image-viewer"; import ElImageViewer from "element-ui/packages/image/src/image-viewer";
@ -773,19 +773,40 @@ 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.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.licenseUrl;
this.imgList = []; this.imgList = [];
previewImage({imageUrl: row.licenseUrl, certFileUrl: this.certFileUrl}).then(response => { this.imgList.push(this.certFileUrl)
if (response.code === 20000) { let index = row.licenseUrl.lastIndexOf('.');
this.imgList = response.data; if(index===-1){
} this.$message.error("文件名异常!")
console.log(this.imgList) return false
this.imgViewerVisible = true; }
}); if(row.licenseUrl.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
const m = (e) => { const m = (e) => {
e.preventDefault() e.preventDefault();
}; };
document.body.style.overflow = 'hidden'; document.body.style.overflow = "hidden";
document.addEventListener("touchmove", m, false); // document.addEventListener("touchmove", m, false); //
}, },
@ -1163,6 +1184,7 @@ export default {
} }
, ,
created() { created() {
debugger
let supId = this.$store.getters.customerId; let supId = this.$store.getters.customerId;
if (supId == "110") { if (supId == "110") {
this.showSup = true; this.showSup = true;

@ -592,7 +592,7 @@ import {
orderPDFFromTemplateFile orderPDFFromTemplateFile
} from '@/api/itextpdf/orderPrint' } from '@/api/itextpdf/orderPrint'
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"; import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import { previewImage } from '@/api/purchase/supCompany' import { previewImage ,previewFile} from '@/api/purchase/supCompany'
import ElImageViewer from "element-ui/packages/image/src/image-viewer"; import ElImageViewer from "element-ui/packages/image/src/image-viewer";
@ -794,33 +794,78 @@ 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.imgList=[]; this.BASE_URL +
previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => { "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
if (response.code === 20000) { this.imgList = [];
this.imgList=response.data; this.imgList.push(this.certFileUrl)
} let index = row.filePath.lastIndexOf('.');
console.log(this.imgList) if(index===-1){
this.imgViewerVisible = true; this.$message.error("文件名异常!")
}); return false
const m = (e) => { e.preventDefault() }; }
document.body.style.overflow = 'hidden'; if(row.filePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
const m = (e) => {
e.preventDefault();
};
document.body.style.overflow = "hidden";
document.addEventListener("touchmove", m, false); // document.addEventListener("touchmove", m, false); //
}, },
showImgViewerCold(row){ showImgViewerCold(row){
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; this.certFileUrl =
console.log(this.certFileUrl+"========"); this.BASE_URL +
this.imgListCold=[]; "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
previewImage({imageUrl:row.coldFilePath,certFileUrl:this.certFileUrl}).then(response => { this.imgList = [];
if (response.code === 20000) { this.imgList.push(this.certFileUrl)
this.imgListCold=response.data; let index = row.coldFilePath.lastIndexOf('.');
} if(index===-1){
console.log(this.imgListCold) this.$message.error("文件名异常!")
this.imgViewerVisibleCold = true; return false
}); }
const m = (e) => { e.preventDefault() }; if(row.coldFilePath.substr(index+1)==='pdf'){
document.body.style.overflow = 'hidden'; let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
const m = (e) => {
e.preventDefault();
};
document.body.style.overflow = "hidden";
document.addEventListener("touchmove", m, false); // document.addEventListener("touchmove", m, false); //
}, },

@ -614,7 +614,7 @@ import {getCodeList} from "@/api/inout/code";
import AcceptOrder from "@/views/inout/DialogReviewOrder"; import AcceptOrder from "@/views/inout/DialogReviewOrder";
import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint" import {inspectionOrderPDFFromTemplateFile, 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,previewFile } from '@/api/purchase/supCompany'
import DialogCheck from "@/views/inout/DialogCheck"; import DialogCheck from "@/views/inout/DialogCheck";
import ElImageViewer from "element-ui/packages/image/src/image-viewer"; import ElImageViewer from "element-ui/packages/image/src/image-viewer";
@ -820,35 +820,85 @@ export default {
this.getList(); this.getList();
}, },
showImgViewer(row){ showImgViewer(row){
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; if(row.filePath.substr(-1) == ','){
console.log(this.certFileUrl+"========"); row.filePath=row.filePath.slice(0, row.filePath.length-1);
this.imgList=[]; }
previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => { this.certFileUrl =
if (response.code === 20000) { this.BASE_URL +
this.imgList=response.data; "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
} this.imgList = [];
console.log(this.imgList) this.imgList.push(this.certFileUrl)
this.imgViewerVisible = true; let index = row.filePath.lastIndexOf('.');
}); if(index===-1){
const m = (e) => { e.preventDefault() }; this.$message.error("文件名异常!")
document.body.style.overflow = 'hidden'; return false
}
if(row.filePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
const m = (e) => {
e.preventDefault();
};
document.body.style.overflow = "hidden";
document.addEventListener("touchmove", m, false); // document.addEventListener("touchmove", m, false); //
}, },
showImgViewerCold(row){ showImgViewerCold(row){
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; if(row.coldFilePath.substr(-1) == ','){
console.log(this.certFileUrl+"========"); row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
this.imgListCold=[]; }
previewImage({imageUrl:row.coldFilePath,certFileUrl:this.certFileUrl}).then(response => { this.certFileUrl =
if (response.code === 20000) { this.BASE_URL +
this.imgListCold=response.data; "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
} this.imgList = [];
console.log(this.imgListCold) this.imgList.push(this.certFileUrl)
this.imgViewerVisibleCold = true; let index = row.coldFilePath.lastIndexOf('.');
}); if(index===-1){
const m = (e) => { e.preventDefault() }; this.$message.error("文件名异常!")
document.body.style.overflow = 'hidden'; return false
}
if(row.coldFilePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
const m = (e) => {
e.preventDefault();
};
document.body.style.overflow = "hidden";
document.addEventListener("touchmove", m, false); // document.addEventListener("touchmove", m, false); //
}, },

@ -441,7 +441,7 @@ import AcceptOrder from "@/views/inout/DialogThrReviewOrder";
import {getDeptListByUser} from "@/api/auth/authDept"; import {getDeptListByUser} from "@/api/auth/authDept";
import DialogCheck from "@/views/inout/DialogCheck"; import DialogCheck from "@/views/inout/DialogCheck";
import { getBizDetailList } from '@/api/inout/orderDetailBiz' import { getBizDetailList } from '@/api/inout/orderDetailBiz'
import { previewImage } from '@/api/purchase/supCompany' import { previewFile, 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";
@ -639,35 +639,85 @@ export default {
}); });
}, },
showImgViewer(row){ showImgViewer(row) {
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; if(row.filePath.substr(-1) == ','){
console.log(this.certFileUrl+"========"); row.filePath=row.filePath.slice(0, row.filePath.length-1);
this.imgList=[]; }
previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => { this.certFileUrl =
if (response.code === 20000) { this.BASE_URL +
this.imgList=response.data; "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
} this.imgList = [];
console.log(this.imgList) this.imgList.push(this.certFileUrl)
this.imgViewerVisible = true; let index = row.filePath.lastIndexOf('.');
}); if(index===-1){
const m = (e) => { e.preventDefault() }; this.$message.error("文件名异常!")
document.body.style.overflow = 'hidden'; return false
}
if(row.filePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
const m = (e) => {
e.preventDefault();
};
document.body.style.overflow = "hidden";
document.addEventListener("touchmove", m, false); // document.addEventListener("touchmove", m, false); //
}, },
showImgViewerCold(row){ showImgViewerCold(row) {
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; if(row.coldFilePath.substr(-1) == ','){
console.log(this.certFileUrl+"========"); row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
this.imgListCold=[]; }
previewImage({imageUrl:row.coldFilePath,certFileUrl:this.certFileUrl}).then(response => { this.certFileUrl =
if (response.code === 20000) { this.BASE_URL +
this.imgListCold=response.data; "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
} this.imgList = [];
console.log(this.imgListCold) this.imgList.push(this.certFileUrl)
this.imgViewerVisibleCold = true; let index = row.coldFilePath.lastIndexOf('.');
}); if(index===-1){
const m = (e) => { e.preventDefault() }; this.$message.error("文件名异常!")
document.body.style.overflow = 'hidden'; return false
}
if(row.coldFilePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
const m = (e) => {
e.preventDefault();
};
document.body.style.overflow = "hidden";
document.addEventListener("touchmove", m, false); // document.addEventListener("touchmove", m, false); //
}, },

@ -498,7 +498,7 @@ import AcceptOrder from "@/views/inout/DialogReviewOrder";
import DialogCheck from "@/views/inout/DialogCheck"; import DialogCheck from "@/views/inout/DialogCheck";
import {getDeptListByUser} from "@/api/auth/authDept"; import {getDeptListByUser} from "@/api/auth/authDept";
import {previewImage} from '@/api/purchase/supCompany' import {previewImage,previewFile} from '@/api/purchase/supCompany'
import {getBizDetailList} from '@/api/inout/orderDetailBiz' import {getBizDetailList} from '@/api/inout/orderDetailBiz'
import ElImageViewer from "element-ui/packages/image/src/image-viewer"; import ElImageViewer from "element-ui/packages/image/src/image-viewer";
@ -695,53 +695,98 @@ export default {
}, },
showImgViewer(row) { showImgViewer(row) {
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; if(row.filePath.substr(-1) == ','){
console.log(this.certFileUrl + "========"); 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;
this.imgList = []; this.imgList = [];
previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => { this.imgList.push(this.certFileUrl)
if (response.code === 20000) { let index = row.filePath.lastIndexOf('.');
this.imgList = response.data; if(index===-1){
} this.$message.error("文件名异常!")
console.log(this.imgList) return false
this.imgViewerVisible = true; }
}); if(row.filePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
const m = (e) => { const m = (e) => {
e.preventDefault() e.preventDefault();
}; };
document.body.style.overflow = 'hidden'; document.body.style.overflow = "hidden";
document.addEventListener("touchmove", m, false); // document.addEventListener("touchmove", m, false); //
}, },
showImgViewerCold(row) { showImgViewerCold(row) {
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; if(row.coldFilePath.substr(-1) == ','){
console.log(this.certFileUrl + "========"); row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
this.imgListCold = []; }
previewImage({imageUrl: row.coldFilePath, certFileUrl: this.certFileUrl}).then(response => { this.certFileUrl =
if (response.code === 20000) { this.BASE_URL +
this.imgListCold = response.data; "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
} this.imgList = [];
console.log(this.imgListCold) this.imgList.push(this.certFileUrl)
this.imgViewerVisibleCold = true; let index = row.coldFilePath.lastIndexOf('.');
}); if(index===-1){
this.$message.error("文件名异常!")
return false
}
if(row.coldFilePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
const m = (e) => { const m = (e) => {
e.preventDefault() e.preventDefault();
}; };
document.body.style.overflow = 'hidden'; document.body.style.overflow = "hidden";
document.addEventListener("touchmove", m, false); // document.addEventListener("touchmove", m, false); //
}, },
closeImgViewer() { closeImgViewerCold() {
this.imgViewerVisible = false; this.imgViewerVisibleCold = false;
const m = (e) => { const m = (e) => {
e.preventDefault() e.preventDefault()
}; };
document.body.style.overflow = 'auto'; document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true); document.removeEventListener("touchmove", m, true);
}, },
closeImgViewer() {
closeImgViewerCold() { this.imgViewerVisible = false;
this.imgViewerVisibleCold = false;
const m = (e) => { const m = (e) => {
e.preventDefault() e.preventDefault()
}; };
@ -749,7 +794,6 @@ export default {
document.removeEventListener("touchmove", m, true); document.removeEventListener("touchmove", m, true);
}, },
upload(row) { upload(row) {
this.currentManufacturer = row; this.currentManufacturer = row;
this.Upinvoice = true; this.Upinvoice = true;

@ -478,7 +478,7 @@ import AcceptOrder from "@/views/inout/DialogReviewOrder";
import {getDeptListByUser} from "@/api/auth/authDept"; import {getDeptListByUser} from "@/api/auth/authDept";
import DialogCheck from "@/views/inout/DialogCheck"; import DialogCheck from "@/views/inout/DialogCheck";
import {getBizDetailList} from "@/api/inout/orderDetailBiz"; import {getBizDetailList} from "@/api/inout/orderDetailBiz";
import {previewImage} from '@/api/purchase/supCompany' import { previewFile, 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";
@ -677,36 +677,84 @@ 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="; if(row.filePath.substr(-1) == ','){
console.log(this.certFileUrl + "========"); 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;
this.imgList = []; this.imgList = [];
previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => { this.imgList.push(this.certFileUrl)
if (response.code === 20000) { let index = row.filePath.lastIndexOf('.');
this.imgList = response.data; if(index===-1){
} this.$message.error("文件名异常!")
console.log(this.imgList) return false
this.imgViewerVisible = true; }
}); if(row.filePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
const m = (e) => { const m = (e) => {
e.preventDefault() e.preventDefault();
}; };
document.body.style.overflow = 'hidden'; document.body.style.overflow = "hidden";
document.addEventListener("touchmove", m, false); // document.addEventListener("touchmove", m, false); //
}, },
showImgViewerCold(row){ showImgViewerCold(row) {
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; if(row.coldFilePath.substr(-1) == ','){
console.log(this.certFileUrl+"========"); row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
this.imgListCold=[]; }
previewImage({imageUrl:row.coldFilePath,certFileUrl:this.certFileUrl}).then(response => { this.certFileUrl =
if (response.code === 20000) { this.BASE_URL +
this.imgListCold=response.data; "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
} this.imgList = [];
console.log(this.imgListCold) this.imgList.push(this.certFileUrl)
this.imgViewerVisibleCold = true; let index = row.coldFilePath.lastIndexOf('.');
}); if(index===-1){
const m = (e) => { e.preventDefault() }; this.$message.error("文件名异常!")
document.body.style.overflow = 'hidden'; return false
}
if(row.coldFilePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
const m = (e) => {
e.preventDefault();
};
document.body.style.overflow = "hidden";
document.addEventListener("touchmove", m, false); // document.addEventListener("touchmove", m, false); //
}, },

@ -36,10 +36,10 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.batchNo" <el-input v-model="scope.row.batchNo"
:disabled="scope.row.index !== selectedIndex" :disabled="scope.row.index !== selectedIndex"
@input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
ref='inputBatchNoRef' ref='inputBatchNoRef'
placeholder="请输入批次号"></el-input> placeholder="请输入批次号"></el-input>
</template> </template>
<!--@input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"-->
</el-table-column> </el-table-column>
<el-table-column width="120" label="生产日期"> <el-table-column width="120" label="生产日期">
<template slot-scope="scope"> <template slot-scope="scope">

@ -2,7 +2,9 @@
<div class="login-container"> <div class="login-container">
<div> <div>
<el-row> <el-row>
<h3 class="toptitle">平潭协和医院</h3> <!-- <h3 class="toptitle">漳州市中医院</h3>-->
<h3 class="toptitle">{{ title }}</h3>
</el-row> </el-row>
<el-row> <el-row>
<h3 class="topSubtitle">医院UDI管理系统</h3> <h3 class="topSubtitle">医院UDI管理系统</h3>
@ -121,6 +123,7 @@ import Verify from "vue2-verify";
import axios from "axios"; import axios from "axios";
import Cookies from "js-cookie"; import Cookies from "js-cookie";
import {decrypt, encrypt} from "@/utils/jsencrypt"; import {decrypt, encrypt} from "@/utils/jsencrypt";
import {getTitleConfig} from "@/api/login";
export default { export default {
data() { data() {
@ -157,6 +160,7 @@ export default {
showDialog: false, // dialog showDialog: false, // dialog
redirect: null, // redirect: null, //
hospName: "", hospName: "",
title: "福建省XXX医院"
}; };
}, },
methods: { methods: {
@ -266,6 +270,11 @@ export default {
} }
}); });
}, },
getTitleConfig() {
getTitleConfig().then(res => {
this.title = res.data.title;
});
},
}, },
components: { components: {
Verify, Verify,
@ -281,7 +290,7 @@ export default {
axios.get("./config.json").then((res) => { axios.get("./config.json").then((res) => {
this.hospName = res.data.hosp_name; this.hospName = res.data.hosp_name;
}); });
this.getTitleConfig();
this.getCookie(); this.getCookie();
}, },
}; };

@ -682,7 +682,7 @@ export default {
isUseDy: row.isUseDy, isUseDy: row.isUseDy,
isDisable: row.isDisable, isDisable: row.isDisable,
isAdavence: row.isAdavence, isAdavence: row.isAdavence,
useMuti: row.useMuti useMuti: row.useMuti
}; };
}, },
sumitLockStatus(row) { sumitLockStatus(row) {

@ -1100,7 +1100,6 @@ export default {
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
debugger
this.updateLoading = true; this.updateLoading = true;
let query = {uuid: this.editQuery.uuid, originUuid: this.editQuery.originUuid}; let query = {uuid: this.editQuery.uuid, originUuid: this.editQuery.originUuid};
syncOnline(query) syncOnline(query)

@ -83,50 +83,94 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable1">
<!-- <el-row type="flex" class="edit-row">--> <el-form-item :label="productRemarkSet.remarkTitle1+':'">
<!-- <el-col :span="12">--> <el-input
<!-- <el-form-item label="库存积压预警数量:">--> style="width: 80%"
<!-- <el-input--> size="small"
<!-- style="width: 80%"--> splaceholder="请输入内容"
<!-- size="small"--> v-model="editQuery.basicPrductRemak1"
<!-- splaceholder="请输入内容"--> ></el-input>
<!-- v-model="editQuery.overStockNum"--> </el-form-item>
<!-- ></el-input>--> </el-col>
<!-- </el-form-item>--> <el-col :span="12" v-if="productRemarkSet.remarkEnable2">
<!-- </el-col>--> <el-form-item :label="productRemarkSet.remarkTitle2+':'">
<!-- <el-col :span="12">--> <el-input
<!-- <el-form-item label="低库存预警数量:">--> style="width: 80%"
<!-- <el-input--> size="small"
<!-- style="width: 80%"--> splaceholder="请输入内容"
<!-- size="small"--> v-model="editQuery.basicPrductRemak2"
<!-- splaceholder="请输入内容"--> ></el-input>
<!-- v-model="editQuery.lowStockNum"--> </el-form-item>
<!-- ></el-input>--> </el-col>
<!-- </el-form-item>--> </el-row>
<!-- </el-col>--> <el-row type="flex" class="edit-row">
<!-- </el-row>--> <el-col :span="12" v-if="productRemarkSet.remarkEnable3">
<!-- <el-row type="flex" class="edit-row">--> <el-form-item :label="productRemarkSet.remarkTitle3+':'">
<!-- <el-col :span="12">--> <el-input
<!-- <el-form-item label="近效期预警时间:">--> style="width: 80%"
<!-- <el-input--> size="small"
<!-- style="width: 80%"--> splaceholder="请输入内容"
<!-- size="small"--> v-model="editQuery.basicPrductRemak3"
<!-- splaceholder="请输入内容"--> ></el-input>
<!-- v-model="editQuery.recentDateTime"--> </el-form-item>
<!-- ></el-input>--> </el-col>
<!-- </el-form-item>--> <el-col :span="12" v-if="productRemarkSet.remarkEnable4">
<!-- </el-col>--> <el-form-item :label="productRemarkSet.remarkTitle4+':'">
<!-- <el-col :span="12">--> <el-input
<!-- <el-form-item label="预警时间单位:">--> style="width: 80%"
<!-- <el-select v-model="editQuery.isDateBy" style="width: 65%" placeholder="状态" clearable>--> size="small"
<!-- <el-option label="天" :value="1"></el-option>--> splaceholder="请输入内容"
<!-- <el-option label="小时" :value="2"></el-option>--> v-model="editQuery.basicPrductRemak4"
<!-- </el-select>--> ></el-input>
<!-- </el-form-item>--> </el-form-item>
<!-- </el-col>--> </el-col>
<!-- </el-row>--> </el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable5">
<el-form-item :label="productRemarkSet.remarkTitle5+':'">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak5"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-if="productRemarkSet.remarkEnable6">
<el-form-item :label="productRemarkSet.remarkTitle6+':'">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak6"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable7">
<el-form-item :label="productRemarkSet.remarkTitle7+':'">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak7"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-if="productRemarkSet.remarkEnable8">
<el-form-item :label="productRemarkSet.remarkTitle8+':'">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak8"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row"> <el-row type="flex" class="edit-row">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="产品描述:"> <el-form-item label="产品描述:">
@ -134,16 +178,16 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
label="是否可集采:" label="是否可集采:"
prop="spUse" prop="spUse"
class="query-form-item" class="query-form-item"
> >
<el-radio-group v-model="editQuery.groupBuy"> <el-radio-group v-model="editQuery.groupBuy">
<el-radio :label="true"></el-radio> <el-radio :label="true"></el-radio>
<el-radio :label="false"></el-radio> <el-radio :label="false"></el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -251,9 +295,9 @@ export default {
lowStockNum: this.editQuery.lowStockNum, lowStockNum: this.editQuery.lowStockNum,
recentDateTime: this.editQuery.recentDateTime, recentDateTime: this.editQuery.recentDateTime,
isDateBy: this.editQuery.isDateBy, isDateBy: this.editQuery.isDateBy,
relSupId:this.editQuery.id, relSupId: this.editQuery.id,
groupBuy:this.editQuery.groupBuy, groupBuy: this.editQuery.groupBuy,
uid:this.editQuery.uid, uid: this.editQuery.uid,
} }
updateById(data).then(res => { updateById(data).then(res => {

@ -81,12 +81,12 @@
@click="addDiProductVisible = true" @click="addDiProductVisible = true"
>选入DI信息</el-button >选入DI信息</el-button
> >
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
icon="el-icon-plus" <!-- icon="el-icon-plus"-->
@click="addProductVisible = true" <!-- @click="addProductVisible = true"-->
>添加院内字典</el-button <!-- >添加院内字典</el-button-->
> <!-- >-->
</el-button-group> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>

@ -534,7 +534,6 @@ export default {
}, },
onResetintent() { onResetintent() {
debugger;
this.$router.push({ this.$router.push({
path: "", path: "",
}); });

@ -438,7 +438,6 @@ export default {
previewPdf(row) { previewPdf(row) {
debugger
let query = {id: row.id,module:row.module}; let query = {id: row.id,module:row.module};
demoPrint(query).then((response) => { demoPrint(query).then((response) => {
//pdfurl //pdfurl

@ -5,7 +5,8 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="产品编码:"> <el-form-item label="产品编码:">
<el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入产品编码/商品条码/医保编码" clearable @keyup.enter.native="keyupErp_submit($event)"></el-input> <el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入产品编码/商品条码/医保编码" clearable
@keyup.enter.native="keyupErp_submit($event)"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@ -22,7 +23,8 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="注册/备案号:"> <el-form-item label="注册/备案号:">
<el-input v-model="filterQuery.registerNo" clearable style="width: 90%" placeholder="请输入注册/备案号"></el-input> <el-input v-model="filterQuery.registerNo" clearable style="width: 90%"
placeholder="请输入注册/备案号"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@ -48,14 +50,16 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="search"></el-button> <el-button type="primary" icon="el-icon-search" @click="search"></el-button>
<el-button type="primary" icon="el-icon-plus" @click="addProductVisible=true" :disabled="!configParms.basicThirdProducts">新增</el-button> <el-button type="primary" icon="el-icon-plus" @click="addProductVisible=true"
</el-button-group> :disabled="!configParms.basicThirdProducts">新增
</div> </el-button>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
@ -70,7 +74,9 @@
<el-table-column label="操作" width="180px"> <el-table-column label="操作" width="180px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click.native.stop="detailDialog(scope.row)">详情</el-button> <el-button type="text" @click.native.stop="detailDialog(scope.row)">详情</el-button>
<el-button type="text" @click.native.stop="deleteDialog(scope.row)" v-if="thirdSysDetail.fromType!=0" :disabled="!configParms.basicThirdProducts"> <el-button type="text" @click.native.stop="editDialog(scope.row)">编辑</el-button>
<el-button type="text" @click.native.stop="deleteDialog(scope.row)" v-if="thirdSysDetail.fromType!=0"
:disabled="!configParms.basicThirdProducts">删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -112,21 +118,40 @@
class="dialog-two" class="dialog-two"
top="5vh" top="5vh"
> >
<ThrProductsAdd <ThrProductsAdd
:newType="newType" :newType="newType"
:closeAddDialog="closeAddDialog"></ThrProductsAdd> :closeAddDialog="closeAddDialog"></ThrProductsAdd>
</el-dialog> </el-dialog>
<el-dialog
:close-on-click-modal="false"
:close-on-press-escape="false"
title="产品信息编辑"
:visible.sync="thrProductsEditVisible"
width="60%"
class="dialog-two"
top="5vh"
v-if="thrProductsEditVisible"
>
<thrProductsEdit
:newProductData="thisData"
:closeAddDialog="closeAddDialog"
></thrProductsEdit>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import {delThrProducts, saveNewProduct import {
delThrProducts, saveNewProduct
} from "@/api/thrsys/thrProducts"; } from "@/api/thrsys/thrProducts";
import {getInvbasdoc} from "@/api/thrsys/getErps"; import {getInvbasdoc} from "@/api/thrsys/getErps";
import {getBasicThirdSys, filterDetailByKey} from "@/api/thrsys/basicThirdSys"; import {getBasicThirdSys, filterDetailByKey} from "@/api/thrsys/basicThirdSys";
import {selectIp} from "@/api/system/systemParamConfig"; import {selectIp} from "@/api/system/systemParamConfig";
import thrProductsDetail from "./thrProductsDetail"; import thrProductsDetail from "./thrProductsDetail";
import ThrProductsAdd from "@/views/thirdSys/product/thrProductsAdd"; import ThrProductsAdd from "@/views/thirdSys/product/thrProductsAdd";
import thrProductsEdit from "@/views/thirdSys/product/thrProductsEdit";
import {findConfig} from "@/api/sync/spsSyncStatus"; import {findConfig} from "@/api/sync/spsSyncStatus";
export default { export default {
@ -143,7 +168,7 @@ export default {
page: 1, page: 1,
limit: 20, limit: 20,
}, },
mainThirdSys:'', mainThirdSys: '',
total: 0, total: 0,
thirdSys: [], thirdSys: [],
thirdSysDetail: null, thirdSysDetail: null,
@ -155,6 +180,7 @@ export default {
}, },
newType: 1, newType: 1,
thrProductsDetailVisible: false, thrProductsDetailVisible: false,
thrProductsEditVisible: false,
thisData: null, thisData: null,
loading: false, loading: false,
addProductVisible: false, addProductVisible: false,
@ -206,7 +232,7 @@ export default {
this.getList(); this.getList();
}, },
getList() { getList() {
if (this.filterQuery.thirdSys == null ) { if (this.filterQuery.thirdSys == null) {
this.$message.warning("请先选择第三方系统!") this.$message.warning("请先选择第三方系统!")
return; return;
} }
@ -261,6 +287,12 @@ export default {
this.thisData = row; this.thisData = row;
this.thrProductsDetailVisible = true; this.thrProductsDetailVisible = true;
}, },
editDialog(row) {
this.thisData = row;
this.thrProductsEditVisible = true;
},
getBasicThirdSys() { getBasicThirdSys() {
let query = { let query = {
enabled: true, enabled: true,
@ -268,8 +300,8 @@ export default {
getBasicThirdSys(query) getBasicThirdSys(query)
.then((response) => { .then((response) => {
this.thirdSys = response.data.list || []; this.thirdSys = response.data.list || [];
for(var i=0;i<this.thirdSys.length;i++){ for (var i = 0; i < this.thirdSys.length; i++) {
if(this.thirdSys[i].mainSys){ if (this.thirdSys[i].mainSys) {
this.filterQuery.thirdSys = this.thirdSys[i].thirdId; this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
this.mainThirdSys = this.thirdSys[i].thirdId; this.mainThirdSys = this.thirdSys[i].thirdId;
} }
@ -316,6 +348,8 @@ export default {
}) })
}, },
closeAddDialog(val) { closeAddDialog(val) {
this.thrProductsEditVisible = false;
this.thrProductsDetailVisible = false;
this.addProductVisible = false; this.addProductVisible = false;
if (val) { if (val) {
this.getList(); this.getList();
@ -334,7 +368,7 @@ export default {
}, },
}, },
components: { components: {
thrProductsDetail, ThrProductsAdd thrProductsDetail, ThrProductsAdd, thrProductsEdit
}, },
mounted() { mounted() {
}, },

@ -0,0 +1,221 @@
<template>
<el-form :model="newProductData" label-width="120px">
<el-row type="flex">
<el-col :span="11" type="flex">
<el-form-item label="第三方系统" prop="thirdSysFk">
<el-select
style="width: 90%"
disabled
v-model="newProductData.thirdSysFk" placeholder="请选择第三方系统"
>
<el-option
v-for="item in thirdSys"
:key="item.value"
:label="item.thirdName"
:value="item.thirdId">
<span style="float: left">{{ item.thirdName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{
item.thirdId
}}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" type="flex">
<el-form-item label="产品编码:" prop="code">
<el-input style="width: 90%" size="small" placeholder="请输入产品编码"
disabled
v-model.trim="newProductData.code"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" type="flex">
<el-form-item label="产品名称:" prop="name">
<el-input style="width: 90%" size="small" placeholder="请输入产品名称" v-model.trim="newProductData.name"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="规格型号:" prop="spec">
<el-input style="width: 90%" size="small" placeholder="请输入规格型号" v-model.trim="newProductData.spec"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="计量单位:" prop="measname">
<el-input style="width: 90%" size="small" placeholder="请输入计量单位"
v-model.trim="newProductData.measname"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="生产企业:" prop="manufactory">
<el-input style="width: 90%" size="small" placeholder="请输入生产企业"
v-model.trim="newProductData.manufactory"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="注册证号:" prop="registerNo">
<el-input style="width: 90%" size="small" placeholder="请输入注册证号"
v-model.trim="newProductData.registerNo"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="医疗器械注册人:" prop="ylqxzcrbarmc">
<el-input style="width: 90%" size="small" placeholder="请输入医疗器械注册人"
v-model.trim="newProductData.ylqxzcrbarmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="注册人英文名称:" prop="ylqxzcrbarywmc">
<el-input style="width: 90%" size="small" placeholder="请输入注册人英文名称"
v-model.trim="newProductData.ylqxzcrbarywmc"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="产品类别:" prop="cplb">
<el-input style="width: 90%" size="small" placeholder="请输入产品类别" v-model.trim="newProductData.cplb"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="分类编码:" prop="flbm">
<el-input style="width: 90%" size="small" placeholder="请输入分类编码" v-model.trim="newProductData.flbm"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="商品条码:" prop="sptm">
<el-input style="width: 90%" size="small" placeholder="请输入商品条码" v-model.trim="newProductData.sptm"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="医保编码:" prop="ybbm">
<el-input style="width: 90%" size="small" placeholder="请输入医保编码" v-model.trim="newProductData.ybbm"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="统一社会信用号:" prop="tyshxydm">
<el-input style="width: 90%" size="small" placeholder="请输入统一社会信用号"
v-model.trim="newProductData.tyshxydm"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="器械类别:" prop="qxlb">
<el-input style="width: 90%" size="small" placeholder="请输入器械类别" v-model.trim="newProductData.qxlb"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="23" class="el-col">
<el-form-item label="产品描述:" prop="cpms">
<el-input style="width: 92%" type="textarea" size="mini" rows="3" placeholder="请输入产品描述"
v-model.trim="newProductData.cpms"></el-input>
</el-form-item>
</el-col>
</el-row>
<div style='text-align: center; margin-bottom: 10px;'>
<el-button type="primary" @click="saveNewProduct"></el-button>
<el-button type="primary" @click="closeAddDialog"></el-button>
</div>
</el-form>
</template>
<script>
import {updateProduct} from "@/api/thrsys/thrProducts";
import {getBasicThirdSys} from "@/api/thrsys/basicThirdSys";
export default {
name: "thrProductsEdit",
props: {
newProductData: {
type: Object,
required: true,
},
closeAddDialog: {
type: Function,
required: true,
},
},
data() {
return {
thirdSys: [],
}
},
methods: {
saveNewProduct() {
this.addProductVisible = false;
if (this.$isBlank(this.newProductData.thirdSysFk)) {
this.$message.warning("第三方系统不能为空!");
return;
}
if (this.$isBlank(this.newProductData.code)) {
this.$message.warning("产品编码为空!");
return;
}
if (this.$isBlank(this.newProductData.name)) {
this.$message.warning("产品名称不能为空!");
return;
}
if (this.$isBlank(this.newProductData.spec)) {
this.$message.warning("规格型号不能为空");
return;
}
if (this.$isBlank(this.newProductData.measname)) {
this.$message.warning("计量单位不能为空!");
return;
}
if (this.$isBlank(this.newProductData.manufactory)) {
this.$message.warning("生产企业不能为空!");
return;
}
if (this.$isBlank(this.newProductData.registerNo)) {
this.$message.warning("注册证号不能为空!");
return;
}
updateProduct(this.newProductData).then((res) => {
if (res.code == 20000) {
this.$message.success("修改成功!");
this.closeAddDialog(true);
} else {
this.$message.error(res.message);
}
}).catch((error) => {
})
},
getBasicThirdSys() {
let query = {
enabled: true,
};
getBasicThirdSys(query)
.then((response) => {
this.thirdSys = response.data.list || [];
})
.catch(() => {
this.loading = false;
this.list = [];
});
},
},
created() {
this.getBasicThirdSys();
},
}
</script>
<style scoped>
</style>

@ -257,8 +257,8 @@ export default {
systemParamConfigList(this.systemQuery) systemParamConfigList(this.systemQuery)
.then((response) => { .then((response) => {
this.systemLoading = false; this.systemLoading = false;
this.systemLists = response.data.list || []; this.systemList = response.data.list || [];
this.systemList = this.systemLists.filter(item => item.paramValue !=0); // this.systemList = this.systemLists.filter(item => item.paramValue !=0);
this.systemTotal = response.data.total || 0; this.systemTotal = response.data.total || 0;
}) })
.catch(() => { .catch(() => {

Loading…
Cancel
Save