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

选择申购部门后，申购仓库下拉框还会显示其它部门所属的仓库信息

Browse Source
dev
薛宇 2 years ago
parent 6b45f52678
commit 06f61cfea3
6 changed files with 208 additions and 203 deletions
Show Stats Download Patch File Download Diff File

1
src/main.js
Unescape Escape View File

@ -97,6 +97,7 @@ DictData.install();
// 修改 el-dialog 默认点击遮照为不关闭
Element.Dialog.props.closeOnClickModal.default = false;
Vue.use(Element, {
size: Cookies.get("size") || "mini", // set element-ui default size
});

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

@ -2247,7 +2247,7 @@ export default {
.itemTag {
float: left;
text-align: right;
margin-top: 5px;
margin-top: 10px;
padding-right: 10px;
width: 35%;
}

4
src/views/inventory/InvCountOrderModify.vue
Unescape Escape View File

@ -531,6 +531,10 @@ export default {
this.$message.warning("请先选择盘点仓库");
return;
}
// if (this.codeArray.length === 0) {
// this.$message.warning("请先录入产品");
// return;
// }
//拉取整个仓库的数据
let params = {
invCode: this.formData.invCode,

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

@ -240,7 +240,8 @@
>
</div>
<el-table v-loading="certLoading" :data="certList" style="width: 100%;margin-top: 40px" border
highlight-current-row>
highlight-current-row
>
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="证书名称" prop="name"></el-table-column>
<el-table-column label="证书编号" prop="code"></el-table-column>
@ -291,7 +292,8 @@
</el-table-column>
</el-table>
<el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer"
:url-list="imgList"/>
:url-list="imgList"
/>
<pagination
v-show="certTotal>0"
:total="certTotal"
@ -311,7 +313,7 @@
width="70%"
v-if="addCertVisible"
append-to-body
@close='closeLocalDialog'
@close="closeLocalDialog"
>
<companyAddCert
:closeDialog="closeLocalDialog"
@ -328,7 +330,7 @@
width="70%"
v-if="selectCertVisible"
append-to-body
@close='closeLocalDialog'
@close="closeLocalDialog"
>
<supCertSetSelectDialog
:certType="certType"
@ -348,7 +350,7 @@
width="70%"
v-if="selectSingleProductVisible"
append-to-body
@close='closeLocalDialog'
@close="closeLocalDialog"
>
<companyProducts
:selectType="selectType"
@ -364,36 +366,36 @@ import {
getRegistrationInfo,
addOrModifyRegistration,
bindProduct
} from "../../../api/purchase/suppliersRegistrationBasic";
import {regionDataPlus} from "element-china-area-data";
import draggable from "vuedraggable";
import {getSupComapnys, previewImage} from '@/api/purchase/supCompany'
import {getCompanyList} from "@/api/purchase/supManufacturer";
import {deleteCompanyCert, filterCompanyCert} from "@/api/purchase/companyCert";
import companyAddCert from "@/views/purchase/cert/supCertAddDialog";
import supCertSetSelectDialog from "@/views/purchase/cert/supCertSetSelectDialog";
import companyProducts from "@/views/purchase/company/companyProducts";
import {getUUID} from "@/utils/strUtil";
import ElImageViewer from "element-ui/packages/image/src/image-viewer"
} from '../../../api/purchase/suppliersRegistrationBasic'
import { regionDataPlus } from 'element-china-area-data'
import draggable from 'vuedraggable'
import { getSupComapnys, previewImage } from '@/api/purchase/supCompany'
import { getCompanyList } from '@/api/purchase/supManufacturer'
import { deleteCompanyCert, filterCompanyCert } from '@/api/purchase/companyCert'
import companyAddCert from '@/views/purchase/cert/supCertAddDialog'
import supCertSetSelectDialog from '@/views/purchase/cert/supCertSetSelectDialog'
import companyProducts from '@/views/purchase/company/companyProducts'
import { getUUID } from '@/utils/strUtil'
import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
export default {
name: "supProductEditDialog",
name: 'supProductEditDialog',
props: {
closeRegistrationDialog: {
type: Function,
required: true,
required: true
},
inputQuery: {
type: Object,
required: true,
required: true
},
editType: {
type: Object,
required: true,
required: true
},
currentManufacturer: {
type: Object,
required: true,
required: true
}
},
data() {
@ -407,7 +409,7 @@ export default {
customerId: null,
companyName: null,
page: 1,
limit: 10,
limit: 10
},
loading: false,
classesDisplay: false,
@ -420,12 +422,11 @@ export default {
customerId: [
{
required: true,
message: "请选择供应商",
trigger: "change"
message: '请选择供应商',
trigger: 'change'
}
],
// manufacturerIdFk: [
// {
// required: true,
@ -437,36 +438,36 @@ export default {
recordCode: [
{
required: true,
message: "请输入注册/备案号",
trigger: "blur"
message: '请输入注册/备案号',
trigger: 'blur'
}
],
recordProductName: [
{
required: true,
message: "请输入注册/备案产品名称",
trigger: "blur"
message: '请输入注册/备案产品名称',
trigger: 'blur'
}
],
productManageType: [
{
required: true,
message: "请选择医疗器械管理类别",
trigger: "change"
message: '请选择医疗器械管理类别',
trigger: 'change'
}
],
productType: [
{
required: true,
message: "请选择器械类别",
trigger: "change"
message: '请选择器械类别',
trigger: 'change'
}
],
recordPeopleName: [
{
required: true,
message: "请输入注册/备案人名称",
trigger: "change"
message: '请输入注册/备案人名称',
trigger: 'change'
}
],
// productDirectoryCode: [
@ -479,10 +480,10 @@ export default {
specification: [
{
required: true,
message: "请输入规格型号",
trigger: "change"
message: '请输入规格型号',
trigger: 'change'
}
],
]
},
fileList: [],
fileList2: [],
@ -497,19 +498,19 @@ export default {
certTotal: 0,
certLoading: false,
addCertVisible: false,
certFileUrl: "",
addType: "3", //证书类型：1:供应商；2.生产企业；3.产品品种
certFileUrl: '',
addType: '3', //证书类型：1:供应商；2.生产企业；3.产品品种
checkFlag: {
0: "草稿",
1: "已通过",
2: "已拒绝",
3: "变更未审核",
6: "未审核",
0: '草稿',
1: '已通过',
2: '已拒绝',
3: '变更未审核',
6: '未审核'
},
editTye: 1,
statusFlag: {
0: "有效",
1: "失效",
0: '有效',
1: '失效'
},
manufacturerId: null,
productId: null,
@ -517,27 +518,27 @@ export default {
selectCertVisible: false,
selectSingleProductVisible: false,
selectType: 1,
certType: 3,
};
certType: 3
}
},
created() {
if (this.editType == 0) {
this.inputQuery.productId = getUUID("");
this.inputQuery.customerId = this.currentManufacturer.customerId;
this.inputQuery.companyName = this.currentManufacturer.companyName;
this.inputQuery.productId = getUUID('')
this.inputQuery.customerId = this.currentManufacturer.customerId
this.inputQuery.companyName = this.currentManufacturer.companyName
} else {
this.getCompanyCertList();
this.pmQuery.customerId = this.inputQuery.customerId;
this.inputQuery.companyName = this.currentManufacturer.companyName;
this.getCompanyCertList()
this.pmQuery.customerId = this.inputQuery.customerId
this.inputQuery.companyName = this.currentManufacturer.companyName
}
this.cuStatus = this.inputQuery.cuStatus;
this.cuStatus = this.inputQuery.cuStatus
this.manufacturerId = this.inputQuery.manufacturerId
this.productId = this.inputQuery.productId
this.findMethod();
this.findPMMethod();
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
this.findMethod()
this.findPMMethod()
this.certFileUrl = this.BASE_URL + '/udiwms/image/register/file/getImage?type=image2&name='
},
components: {
@ -547,150 +548,148 @@ export default {
onModifySubmit(val) {
if (val != 0) {
if (this.cuStatus != 1) {
this.$message.error("生产企业未通过审核不能提交！");
return;
this.$message.error('生产企业未通过审核不能提交！')
return
}
}
if(val==3){
let msg =null;
if(this.inputQuery.auditStatus == 1 || this.inputQuery.auditStatus == 4){
msg = "已审核通过，是否需要重新提交变更";
}else if(this.inputQuery.auditStatus == 2){
msg = "审核拒绝，是否需要重新提交变更";
}
this.$confirm( msg, {
confirmButtonText: "确定",
type: "warning",
showCancelButton: false,
if (val == 3) {
let msg = null
if (this.inputQuery.auditStatus == 1 || this.inputQuery.auditStatus == 4) {
msg = '已审核通过，是否需要重新提交变更'
} else if (this.inputQuery.auditStatus == 2) {
msg = '审核拒绝，是否需要重新提交变更'
}
this.$confirm(msg, {
confirmButtonText: '确定',
type: 'warning',
showCancelButton: false
})
.then(() => {
this.$refs['inputQuery'].validate(valid => {
if (valid) {
// this.inputQuery.auditStatus = val;
let formData = JSON.parse(JSON.stringify(this.inputQuery));
formData.manufacturerIdFk = this.manufacturerId;
formData.auditStatus = val;
this.loading = true;
let urlName = this.editType == 0 ? 'add' : 'update';
let formData = JSON.parse(JSON.stringify(this.inputQuery))
formData.manufacturerIdFk = this.manufacturerId
formData.auditStatus = val
this.loading = true
let urlName = this.editType == 0 ? 'add' : 'update'
addOrModifyRegistration(formData, urlName).then(response => {
this.loading = false;
this.loading = false
if (response.code === 20000) {
this.closeRegistrationDialog(true);
this.$message.success("保存成功");
this.closeRegistrationDialog(true)
this.$message.success('保存成功')
} else {
this.$message.error(response.message);
this.$message.error(response.message)
}
});
})
} else {
return false;
return false
}
});
});
}else{
})
})
} else {
this.$refs['inputQuery'].validate(valid => {
if (valid) {
// this.inputQuery.auditStatus = val;
let formData = JSON.parse(JSON.stringify(this.inputQuery));
formData.manufacturerIdFk = this.manufacturerId;
formData.auditStatus = val;
this.loading = true;
let urlName = this.editType == 0 ? 'add' : 'update';
let formData = JSON.parse(JSON.stringify(this.inputQuery))
formData.manufacturerIdFk = this.manufacturerId
formData.auditStatus = val
this.loading = true
let urlName = this.editType == 0 ? 'add' : 'update'
addOrModifyRegistration(formData, urlName).then(response => {
this.loading = false;
this.loading = false
if (response.code === 20000) {
this.closeRegistrationDialog(true);
this.$message.success("保存成功");
this.closeRegistrationDialog(true)
this.$message.success('保存成功')
} else {
this.$message.error(response.message);
this.$message.error(response.message)
}
});
})
} else {
return false;
return false
}
});
})
}
},
toViewCompanyCert(row) {
window.open(this.certFileUrl + row.filePath);
window.open(this.certFileUrl + row.filePath)
},
rejectInfo(row) {
this.$confirm(row.auditComment, "拒绝说明", {
confirmButtonText: "确定",
type: "warning",
showCancelButton: false,
this.$confirm(row.auditComment, '拒绝说明', {
confirmButtonText: '确定',
type: 'warning',
showCancelButton: false
})
.then(() => {
});
})
},
findMethod(query) {
this.fromOptions = [];
this.fromOptions = []
let cQuery = {
companyName: query,
};
companyName: query
}
getSupComapnys(cQuery)
.then((response) => {
this.loading = false;
this.fromOptions = response.data.list || [];
this.loading = false
this.fromOptions = response.data.list || []
})
.catch(() => {
this.loading = false;
});
this.loading = false
})
},
supChange(val) {
this.pmQuery.customerId = val;
this.findPMMethod();
this.pmQuery.customerId = val
this.findPMMethod()
},
findPMMethod(key) {
this.fromPMOptions = [];
this.pmQuery.companyName = key;
this.fromPMOptions = []
this.pmQuery.companyName = key
getCompanyList(this.pmQuery)
.then((response) => {
this.loading = false;
this.fromPMOptions = response.data.list || [];
this.total = response.data.total || 0;
this.loading = false
this.fromPMOptions = response.data.list || []
this.total = response.data.total || 0
})
.catch(() => {
this.loading = false;
this.fromPMOptions = [];
this.total = 0;
});
this.loading = false
this.fromPMOptions = []
this.total = 0
})
},
closeLocalDialog() {
this.addCertVisible = false;
this.selectCertVisible = false;
this.getCompanyCertList();
this.addCertVisible = false
this.selectCertVisible = false
this.getCompanyCertList()
},
isAssetTypeAnImage(ext) {
return [
'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1;
'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1
},
showImgViewer(row) {
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList = [];
previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgList=response.data;
}
});
this.imgViewerVisible = true;
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); // 禁止页面滑动
this.certFileUrl = this.BASE_URL + '/udiwms/image/register/file/getImage?type=image2&name='
this.imgList = []
previewImage({ imageUrl: row.filePath, certFileUrl: this.certFileUrl }).then(response => {
if (response.code === 20000) {
this.imgList = response.data
}
})
this.imgViewerVisible = true
const m = (e) => {
e.preventDefault()
}
document.body.style.overflow = 'hidden'
document.addEventListener('touchmove', m, false) // 禁止页面滑动
},
closeImgViewer() {
this.imgViewerVisible = false;
this.imgViewerVisible = false
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true);
}
document.body.style.overflow = 'auto'
document.removeEventListener('touchmove', m, true)
},
closeSelDialog(val) {
@ -703,108 +702,108 @@ export default {
companyName: this.inputQuery.companyName,
auditStatus: this.inputQuery.auditStatus
};
}
bindProduct(query).then(response => {
this.loading = false;
this.loading = false
if (response.code === 20000) {
this.inputQuery = response.data;
this.inputQuery.manufacturerId=this.inputQuery.manufacturerIdFk
this.selectSingleProductVisible = false;
this.inputQuery = response.data
this.inputQuery.manufacturerId = this.inputQuery.manufacturerIdFk
this.selectSingleProductVisible = false
// this.inputQuery.recordCode = val.zczbhhzbapzbh//把注册证号覆盖掉
} else {
this.$message.error(response.message);
this.$message.error(response.message)
}
});
})
}
console.log('111' + this.inputQuery.companyName)
},
addCert(row) {
if (this.$isNotBlank(row)) {
this.formName = 2
this.inputQuery.formData = row;
this.editTye = 2;
this.inputQuery.formData = row
this.editTye = 2
} else {
this.formName = 1;
this.editTye = 1;
this.inputQuery.formData = {};
this.formName = 1
this.editTye = 1
this.inputQuery.formData = {}
}
this.addCertVisible = true;
this.addCertVisible = true
},
selectCert() {
this.customerId = this.inputQuery.customerId;
this.selectCertVisible = true;
this.customerId = this.inputQuery.customerId
this.selectCertVisible = true
},
deleteCompanyCert(row) {
this.$confirm("是否删除?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
this.$confirm('是否删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.certLoading = true;
this.certLoading = true
let tquery = {
id: row.id,
filePath: row.filePath,
};
filePath: row.filePath
}
deleteCompanyCert(tquery)
.then((response) => {
this.certLoading = false;
this.certLoading = false
if (response.code === 20000) {
this.getCompanyCertList();
this.getCompanyCertList()
this.$message({
type: "success",
message: "删除成功！",
});
type: 'success',
message: '删除成功！'
})
} else {
this.$message.error(response.message);
this.$message.error(response.message)
}
})
.catch(() => {
this.certLoading = false;
});
this.certLoading = false
})
}).catch(() => {
});
})
},
certHandleCurrentChange(val) {
this.certQuery.page = val.page;
this.getCompanyCertList();
this.certQuery.page = val.page
this.getCompanyCertList()
},
getCompanyCertList() {
this.certLoading = true;
this.certQuery.customerId = this.inputQuery.customerId;
this.certQuery.manufacturerIdFk = this.inputQuery.manufacturerIdFk;
this.certQuery.productIdFk = this.inputQuery.productId;
this.certLoading = true
this.certQuery.customerId = this.inputQuery.customerId
this.certQuery.manufacturerIdFk = this.inputQuery.manufacturerIdFk
this.certQuery.productIdFk = this.inputQuery.productId
filterCompanyCert(this.certQuery)
.then((response) => {
this.certLoading = false;
this.certList = response.data.list || [];
this.certLoading = false
this.certList = response.data.list || []
this.certTotal = response.data.total
})
.catch(() => {
this.certLoading = false;
this.certList = [];
});
this.certLoading = false
this.certList = []
})
},
selectProduct() {
this.selectSingleProductVisible = true;
},
this.selectSingleProductVisible = true
}
},
filters: {
statusFilterType(status) {
const statusMap = {
0: "warning",
1: "success",
2: "danger",
6: "warning",
};
return statusMap[status];
},
},
0: 'warning',
1: 'success',
2: 'danger',
6: 'warning'
}
return statusMap[status]
}
}
};
}
</script>
<style scoped>
.itemTag {

5
src/views/purchase/purApply/pureApplyAudit.vue
Unescape Escape View File

@ -11,7 +11,7 @@
<el-col :span="8">
<el-form-item label="申购部门">
<el-select v-model="filterQuery.deptCode" placeholder="请选择申购部门" style="width: 90%"
<el-select v-model="filterQuery.parentId" placeholder="请选择申购部门" style="width: 90%"
@change="getInvList"
>
<el-option
@ -181,6 +181,7 @@ export default {
targetInvCode: null,
deptCode: null,
invCode: null,
parentId: null
},
formName: null,
formMap: {
@ -408,7 +409,7 @@ export default {
},
getInvList() {
var query = {
parentId: this.filterQuery.targetDeptCode
parentId: this.filterQuery.parentId
}
this.filterQuery.targetInvCode = null
filterSubAll(query).then((res) => {

2
src/views/remind/supCertRemindMsg.vue
Unescape Escape View File

@ -115,7 +115,7 @@
:page.sync="filterQuery.page"
:limit.sync="filterQuery.limit"
@pagination="getList"
/>
></pagination>
</el-card>

Write Preview
Loading…
Cancel
Save