UDI
/
udi-spms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

资质证书相关bug修改

Browse Source
ywj_dev
anthonywj 3 years ago
parent 84be4cbd65
commit 8475b6f49a
11 changed files with 1958 additions and 1923 deletions
Show Stats Download Patch File Download Diff File

9
src/api/basic/udiRelevance.js
Unescape Escape View File

@ -25,6 +25,15 @@ export function getSmUdiInfos(query) {
}); });
} }
export function getCertUdis(query) {
return axios({
url: "/udi/cert/filterUdi",
method: "get",
params: query
});
}
export function deletetUdiInfos(query) { export function deletetUdiInfos(query) {
return axios({ return axios({
url: "/udi/udirel/deleteById", url: "/udi/udirel/deleteById",

17
src/views/basic/product/product.vue
Unescape Escape View File

@ -300,6 +300,20 @@
</el-select> </el-select>
</div> </div>
</el-col> </el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>允许无序列号:&nbsp;</span>
</div>
<el-select v-model="editQuery.allowNoSerial" disabled style="width: 65%" size="small">
<el-option label="是" :value="true"></el-option>
<el-option label="否" :value="false"></el-option>
<el-option label="否" :value="null"></el-option>
</el-select>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
@ -312,8 +326,6 @@
</el-select> </el-select>
</div> </div>
</el-col> </el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
@ -1223,6 +1235,7 @@ export default {
allowNoBatch: null, allowNoBatch: null,
allowNoExpire: null, allowNoExpire: null,
allowNoProduct: null, allowNoProduct: null,
allowNoSerial:null,
pId: null, pId: null,
}, },
defaultSys: null, defaultSys: null,

23
src/views/basic/product/productEdit.vue
Unescape Escape View File

@ -467,6 +467,29 @@
<el-divider></el-divider> <el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">允许无序列号</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="editQuery.allowNoSerial" style="width: 65%" placeholder="状态" clearable>
<el-option label="允许" :value="true"></el-option>
<el-option label="不允许" :value="false"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">允许无序列号</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row> <el-row>
<el-col span="5"> <el-col span="5">
<span class="sptext">是否必须维护资质材料</span> <span class="sptext">是否必须维护资质材料</span>

3
src/views/inout/DialogSelectRl.vue
Unescape Escape View File

@ -469,6 +469,9 @@
<el-checkbox v-model="editQuery.allowNoProduct" disabled <el-checkbox v-model="editQuery.allowNoProduct" disabled
>允许无生产日期 >允许无生产日期
</el-checkbox> </el-checkbox>
<el-checkbox v-model="editQuery.allowNoSerial" disabled
>允许无序列号
</el-checkbox>
</div> </div>
</el-col> </el-col>

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

@ -450,6 +450,7 @@ export default {
mainAction: null, mainAction: null,
action: null, action: null,
page: 1, page: 1,
statusType: "supInvoice",
limit: 10, limit: 10,
startTime: null, startTime: null,
endTime: null, endTime: null,
@ -592,6 +593,7 @@ export default {
action: null, action: null,
page: 1, page: 1,
limit: 10, limit: 10,
statusType: "supInvoice",
startTime: null, startTime: null,
endTime: null, endTime: null,
invCode: this.$store.getters.locInvCode, invCode: this.$store.getters.locInvCode,

4
src/views/inout/IoSupSecAuditOrder.vue
Unescape Escape View File

@ -787,7 +787,7 @@ export default {
printOrder(row) { printOrder(row) {
let tQuery = { let tQuery = {
action: row.action, action: row.action,
moduleId: 1, moduleId: 2,
} }
this.loading = true; this.loading = true;
inspectionOrderPDFFromTemplateFile(tQuery).then((response) => { inspectionOrderPDFFromTemplateFile(tQuery).then((response) => {
@ -796,7 +796,7 @@ export default {
templateId: response.data, templateId: response.data,
orderIdFk: row.billNo, orderIdFk: row.billNo,
action: row.action, action: row.action,
moduleId: 1, moduleId: 2,
} }
orderPDFFromTemplateFile(tQuery).then((response) => { orderPDFFromTemplateFile(tQuery).then((response) => {
//将pdf文件转换为url。 //将pdf文件转换为url。

1053
src/views/purchase/cert/supCertificationAdd.vue
View File

File diff suppressed because it is too large Load Diff

1044
src/views/purchase/company/companyProducts.vue
View File

File diff suppressed because it is too large Load Diff

149
src/views/purchase/product/supProductEditDialog.vue
Unescape Escape View File

@ -4,12 +4,11 @@
:model="inputQuery" :model="inputQuery"
:rules="rules" :rules="rules"
ref="inputQuery" ref="inputQuery"
label-width="100px" label-width="150px"
style="margin-top: -30px" style="margin-top: -30px"
> >
<el-card class="el-card"> <el-card class="el-card">
<div style="float: right"> <div style="float: right">
<el-button <el-button
type="primary" type="primary"
size="mini" size="mini"
@ -47,10 +46,9 @@
</el-button </el-button
> >
</div> </div>
<el-row :gutter="20" class="el-row" type="flex" style="margin-top:50px"> <el-row :gutter="20" class="el-row" type="flex" style="margin-top:50px">
<el-col :span="10" class="el-col"> <el-col :span="10" class="el-col">
<el-form-item label="所属供应商:" label-width="150px" prop="customerId"> <el-form-item label="所属供应商:" prop="customerId">
<el-select <el-select
v-model="inputQuery.customerId" v-model="inputQuery.customerId"
filterable filterable
@ -76,7 +74,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10" class="el-col"> <el-col :span="10" class="el-col">
<el-form-item label="所属生产企业:" label-width="150px" prop="manufacturerIdFk"> <el-form-item label="所属生产企业:" prop="manufacturerIdFk">
<el-select <el-select
v-model="inputQuery.companyName" v-model="inputQuery.companyName"
filterable filterable
@ -104,7 +102,7 @@
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col"> <el-col :span="10" class="el-col">
<el-form-item label="产品通用名称:" label-width="150px" prop="recordProductName"> <el-form-item label="产品通用名称:" prop="recordProductName">
<el-input <el-input
size="small" size="small"
disabled disabled
@ -115,7 +113,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10" class="el-col"> <el-col :span="10" class="el-col">
<el-form-item label="注册/备案人名称:" label-width="150px" prop="recordPeopleName"> <el-form-item label="注册/备案人名称:" prop="recordPeopleName">
<el-input <el-input
size="small" size="small"
disabled disabled
@ -129,7 +127,7 @@
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col"> <el-col :span="10" class="el-col">
<el-form-item label="产品类别:" label-width="150px" prop="hchzsb"> <el-form-item label="产品类别:" prop="hchzsb">
<el-select <el-select
size="small" size="small"
disabled disabled
@ -143,7 +141,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10" class="el-col"> <el-col :span="10" class="el-col">
<el-form-item label="器械类别:" label-width="150px" prop="qxlb"> <el-form-item label="器械类别:" prop="qxlb">
<el-select <el-select
size="small" size="small"
v-model="inputQuery.productType" v-model="inputQuery.productType"
@ -160,7 +158,7 @@
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col"> <el-col :span="10" class="el-col">
<el-form-item label="注册/备案号:" label-width="150px" prop="recordCode"> <el-form-item label="注册/备案号:" prop="recordCode">
<el-input <el-input
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
@ -170,7 +168,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10" class="el-col"> <el-col :span="10" class="el-col">
<el-form-item label="器械目录分类编码:" label-width="150px" prop="productDirectoryCode"> <el-form-item label="器械目录分类编码:" prop="productDirectoryCode">
<el-input <el-input
size="small" size="small"
placeholder="请输入内容" placeholder="请输入内容"
@ -180,48 +178,78 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="10" class="el-col">-->
<!-- <el-form-item label="代理人名称:" label-width="150px" prop="agentName">-->
<!-- <el-input-->
<!-- size="small"-->
<!-- placeholder="请输入内容"-->
<!-- v-model="inputQuery.agentName"-->
<!-- @input="change()"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col"> <el-col :span="10" class="el-col">
<el-form-item label="产品描述:" label-width="150px" prop="cpms"> <el-form-item label="允许无批次号">
<el-input <el-select v-model="inputQuery.allowNoBatch" style="width: 100%" size="small">
size="small" <el-option label="是" :value="true"></el-option>
placeholder="请输入内容" <el-option label="否" :value="false"></el-option>
v-model="inputQuery.cpms" <el-option label="否" :value="null"></el-option>
@input="change()" </el-select>
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10" class="el-col"> <el-col :span="10" class="el-col">
<el-form-item label="规格型号:" label-width="150px" prop="specification"> <el-form-item label="允许无失效日期">
<el-input <el-select v-model="inputQuery.allowNoExpire" style="width: 100%" size="small">
size="small" <el-option label="是" :value="true"></el-option>
type="textarea" <el-option label="否" :value="false"></el-option>
autosize <el-option label="否" :value="null"></el-option>
placeholder="请输入内容" </el-select>
v-model="inputQuery.specification"
@input="change()"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col">
<el-form-item label="允许无批次号">
<el-select v-model="inputQuery.allowNoProduct" style="width: 100%" size="small">
<el-option label="是" :value="true"></el-option>
<el-option label="否" :value="false"></el-option>
<el-option label="否" :value="null"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="10" class="el-col">
<el-form-item label="允许无序列号">
<el-select v-model="inputQuery.allowNoSerial" style="width: 100%" size="small">
<el-option label="是" :value="true"></el-option>
<el-option label="否" :value="false"></el-option>
<el-option label="否" :value="null"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row :gutter="20" class="el-row" type="flex">-->
<!-- <el-col :span="10" class="el-col">-->
<!-- <el-form-item label="产品描述:" prop="cpms">-->
<!-- <el-input-->
<!-- size="small"-->
<!-- placeholder="请输入内容"-->
<!-- v-model="inputQuery.cpms"-->
<!-- @input="change()"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="10" class="el-col">-->
<!-- <el-form-item label="规格型号:" prop="specification">-->
<!-- <el-input-->
<!-- size="small"-->
<!-- type="textarea"-->
<!-- autosize-->
<!-- placeholder="请输入内容"-->
<!-- v-model="inputQuery.specification"-->
<!-- @input="change()"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="20" class="el-col"> <el-col :span="20" class="el-col">
<el-form-item label="备注:" label-width="150px" prop="remark"> <el-form-item label="备注:" prop="remark">
<el-input <el-input
type="textarea" type="textarea"
size="small" size="small"
@ -283,7 +311,8 @@
</el-button </el-button
> >
<el-button type="text" size="mini" @click.native="showImgViewer(scope.row)">预览</el-button> <el-button type="text" size="mini" @click.native="showImgViewer(scope.row)">预览</el-button>
<el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList" /> <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer"
:url-list="imgList"/>
<el-button <el-button
type="text" type="text"
size="small" size="small"
@ -378,7 +407,7 @@ import {
} from "../../../api/purchase/suppliersRegistrationBasic"; } from "../../../api/purchase/suppliersRegistrationBasic";
import {regionDataPlus} from "element-china-area-data"; import {regionDataPlus} from "element-china-area-data";
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import { getSupComapnys, previewImage } from '@/api/purchase/supCompany' import {getSupComapnys, previewImage} from '@/api/purchase/supCompany'
import {getCompanyList} from "@/api/purchase/supManufacturer"; import {getCompanyList} from "@/api/purchase/supManufacturer";
import {deleteCompanyCert, filterCompanyCert} from "@/api/purchase/companyCert"; import {deleteCompanyCert, filterCompanyCert} from "@/api/purchase/companyCert";
import companyAddCert from "@/views/purchase/cert/supCertAddDialog"; import companyAddCert from "@/views/purchase/cert/supCertAddDialog";
@ -386,6 +415,7 @@ import supCertSetSelectDialog from "@/views/purchase/cert/supCertSetSelectDialog
import companyProducts from "@/views/purchase/company/companyProducts"; import companyProducts from "@/views/purchase/company/companyProducts";
import {getUUID} from "@/utils/strUtil"; import {getUUID} from "@/utils/strUtil";
import ElImageViewer from "element-ui/packages/image/src/image-viewer" import ElImageViewer from "element-ui/packages/image/src/image-viewer"
export default { export default {
name: "supProductEditDialog", name: "supProductEditDialog",
props: { props: {
@ -411,8 +441,8 @@ export default {
BASE_URL: process.env.VUE_APP_BASE_API, BASE_URL: process.env.VUE_APP_BASE_API,
fromOptions: [], fromOptions: [],
fromPMOptions: [], fromPMOptions: [],
imgViewerVisible:false, imgViewerVisible: false,
imgList:[], imgList: [],
pmQuery: { pmQuery: {
customerId: null, customerId: null,
companyName: null, companyName: null,
@ -551,7 +581,7 @@ export default {
}, },
components: { components: {
draggable, companyAddCert, supCertSetSelectDialog, companyProducts,ElImageViewer draggable, companyAddCert, supCertSetSelectDialog, companyProducts, ElImageViewer
}, },
methods: { methods: {
onModifySubmit(val) { onModifySubmit(val) {
@ -638,34 +668,37 @@ export default {
}, },
isAssetTypeAnImage(ext) { isAssetTypeAnImage(ext) {
return [ return [
'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff']. 'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1;
indexOf(ext.toLowerCase()) !== -1;
}, },
showImgViewer(row){ showImgViewer(row) {
var varindex= row.filePath.lastIndexOf("."); var varindex = row.filePath.lastIndexOf(".");
var varext = row.filePath.substring(varindex+1); var varext = row.filePath.substring(varindex + 1);
var isImage=this.isAssetTypeAnImage(varext); var isImage = this.isAssetTypeAnImage(varext);
if(isImage==true){ if (isImage == true) {
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=";
this.imgList=[]; this.imgList = [];
previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => { previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) { if (response.code === 20000) {
this.imgList.push(response.data); this.imgList.push(response.data);
} }
}); });
this.imgViewerVisible = true; this.imgViewerVisible = true;
const m = (e) => { e.preventDefault() }; const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'hidden'; document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); // 禁止页面滑动 document.addEventListener("touchmove", m, false); // 禁止页面滑动
}else{ } else {
this.toViewCompanyCert(row); this.toViewCompanyCert(row);
} }
}, },
closeImgViewer(){ closeImgViewer() {
this.imgViewerVisible = false; this.imgViewerVisible = false;
const m = (e) => { e.preventDefault() }; const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'auto'; document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true); document.removeEventListener("touchmove", m, true);
}, },

1574
src/views/supplier/company/basicCompanyproductDetail.vue
View File

File diff suppressed because it is too large Load Diff

3
src/views/supplier/company/basicProductEdit.vue
Unescape Escape View File

@ -345,6 +345,9 @@
<el-checkbox v-model="editQuery.allowNoProduct" class="" disabled <el-checkbox v-model="editQuery.allowNoProduct" class="" disabled
>允许无生产日期 >允许无生产日期
</el-checkbox> </el-checkbox>
<el-checkbox v-model="editQuery.allowNoSerial" disabled
>允许无序列号
</el-checkbox>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>

Write Preview
Loading…
Cancel
Save