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 默认点击遮照为不关闭 // 修改 el-dialog 默认点击遮照为不关闭
Element.Dialog.props.closeOnClickModal.default = false; Element.Dialog.props.closeOnClickModal.default = false;
Vue.use(Element, { Vue.use(Element, {
size: Cookies.get("size") || "mini", // set element-ui default size 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 { .itemTag {
float: left; float: left;
text-align: right; text-align: right;
margin-top: 5px; margin-top: 10px;
padding-right: 10px; padding-right: 10px;
width: 35%; width: 35%;
} }

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

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

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

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

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

@ -11,7 +11,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="申购部门"> <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" @change="getInvList"
> >
<el-option <el-option
@ -181,6 +181,7 @@ export default {
targetInvCode: null, targetInvCode: null,
deptCode: null, deptCode: null,
invCode: null, invCode: null,
parentId: null
}, },
formName: null, formName: null,
formMap: { formMap: {
@ -408,7 +409,7 @@ export default {
}, },
getInvList() { getInvList() {
var query = { var query = {
parentId: this.filterQuery.targetDeptCode parentId: this.filterQuery.parentId
} }
this.filterQuery.targetInvCode = null this.filterQuery.targetInvCode = null
filterSubAll(query).then((res) => { filterSubAll(query).then((res) => {

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

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

Write Preview
Loading…
Cancel
Save