From 821bbd07d3782ed131fe3fdc8f861649221d7aa5 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 2 Nov 2022 11:23:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E8=90=A5=E8=B5=84=E8=B4=A8=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config.json | 4 +- src/api/purchase/companyCert.js | 1 + src/api/purchase/supCertSet.js | 54 ++ src/api/purchase/supCompany.js | 12 + src/api/purchase/supManufacturer.js | 7 + .../purchase/suppliersRegistrationBasic.js | 9 + src/router/index.js | 235 ++++- src/views/basic/CorpMaintain.vue | 1 + src/views/basic/CorpMaintainSelect.vue | 159 ++++ src/views/basic/basicCompany.vue | 171 +++- .../basic/basicCompanyProductsImport.vue | 20 +- src/views/basic/basicSelectSingleProducts.vue | 881 ++++++++++++++++++ src/views/purchase/supCertAddDialog.vue | 92 +- src/views/purchase/supCertAudit.vue | 26 +- src/views/purchase/supCertSearch.vue | 7 +- src/views/purchase/supCertSet.vue | 719 ++++++++++++++ src/views/purchase/supCertSetSelectDialog.vue | 146 +++ src/views/purchase/supCertificationAdd.vue | 558 +++++++++++ src/views/purchase/supCompanyAdd.vue | 3 +- src/views/purchase/supCompanyAduditDialog.vue | 3 +- src/views/purchase/supCompanyAudit.vue | 3 +- src/views/purchase/supCompanyEditDialog.vue | 119 ++- src/views/purchase/supCompanySearch.vue | 3 +- src/views/purchase/supManufacturerAdd.vue | 5 +- src/views/purchase/supManufacturerAudit.vue | 7 +- .../purchase/supManufacturerAuditDialog.vue | 7 +- .../purchase/supManufacturerEditDialog.vue | 156 +++- src/views/purchase/supManufacturerSearch.vue | 7 +- src/views/purchase/supProductAdd.vue | 673 ++++++------- src/views/purchase/supProductAudit.vue | 9 +- src/views/purchase/supProductAuditDialog.vue | 9 +- src/views/purchase/supProductEditDialog.vue | 195 +++- src/views/purchase/supProductSearch.vue | 7 +- .../userManage/suppliersEnterpriseBasic.vue | 4 +- .../suppliersEnterpriseBasicAdd.vue | 4 +- .../userManage/suppliersRegistrationBasic.vue | 74 +- src/views/warehouse/AdditionalOrder.vue | 4 +- src/views/warehouse/codeReplace.vue | 777 +++++++-------- src/views/warehouse/company.vue | 272 +++--- src/views/warehouse/stockOrderChange.vue | 593 ++++++++++++ 40 files changed, 4959 insertions(+), 1077 deletions(-) create mode 100644 src/api/purchase/supCertSet.js create mode 100644 src/views/basic/CorpMaintainSelect.vue create mode 100644 src/views/basic/basicSelectSingleProducts.vue create mode 100644 src/views/purchase/supCertSet.vue create mode 100644 src/views/purchase/supCertSetSelectDialog.vue create mode 100644 src/views/purchase/supCertificationAdd.vue create mode 100644 src/views/warehouse/stockOrderChange.vue diff --git a/public/config.json b/public/config.json index a919abd..f987e7a 100644 --- a/public/config.json +++ b/public/config.json @@ -1,6 +1,6 @@ { - "BASE_URL": "http://127.0.0.1:9906", - "SERVER_IP": "http://127.0.0.1:9906", + "BASE_URL": "http://192.168.0.109:9906", + "SERVER_IP": "http://192.168.0.109:9906", "hosp_name": "福建省XX市医院" } diff --git a/src/api/purchase/companyCert.js b/src/api/purchase/companyCert.js index 7931790..4dd36a7 100644 --- a/src/api/purchase/companyCert.js +++ b/src/api/purchase/companyCert.js @@ -43,6 +43,7 @@ export function auditSupCert(query) { + export function deleteCompanyCert(query) { return axios( { diff --git a/src/api/purchase/supCertSet.js b/src/api/purchase/supCertSet.js new file mode 100644 index 0000000..9233230 --- /dev/null +++ b/src/api/purchase/supCertSet.js @@ -0,0 +1,54 @@ +import axios from "../../utils/axios"; + +export function filterCertSet(query) { + return axios( + { + url: "/sup/cert/set/filter", + method: "get", + params: query + } + ); +} + +export function delSupCertCert(query) { + return axios( + { + url: "/sup/cert/set/delete", + method: "post", + data: query + } + ); +} + +export function addSupCertSet(query) { + return axios( + { + url: "/sup/cert/set/add", + method: "post", + data: query + } + ); +} + +export function modifySupCertSet(query) { + return axios( + { + url: "/sup/cert/set/update", + method: "post", + data: query + } + ); +} + +export function selectAllCert(query) { + return axios( + { + url: "/sup/info/selectAllCert", + method: "post", + data: query + } + ); +} + + + diff --git a/src/api/purchase/supCompany.js b/src/api/purchase/supCompany.js index 19d39e8..b2c84d1 100644 --- a/src/api/purchase/supCompany.js +++ b/src/api/purchase/supCompany.js @@ -98,5 +98,17 @@ export function getSubCompany(query) { +export function bindCorp(query) { + return axios( + { + url: "/sup/company/selectBind", + method: "post", + data: query + } + ); +} + + + diff --git a/src/api/purchase/supManufacturer.js b/src/api/purchase/supManufacturer.js index 91451de..e1f057d 100644 --- a/src/api/purchase/supManufacturer.js +++ b/src/api/purchase/supManufacturer.js @@ -7,6 +7,13 @@ export function getCompanyList(query) { params: query }); } +export function getCompanyBySup(query) { + return axios({ + url: "/sup/manufacturer/getCompanyBySup", + method: "get", + params: query + }); +} export function getCompanyInfo(query) { return axios({ diff --git a/src/api/purchase/suppliersRegistrationBasic.js b/src/api/purchase/suppliersRegistrationBasic.js index 8fc9538..0456f57 100644 --- a/src/api/purchase/suppliersRegistrationBasic.js +++ b/src/api/purchase/suppliersRegistrationBasic.js @@ -44,4 +44,13 @@ export function auditSupProduct(data) { data: data }) } +export function bindProduct(data) { + return axios({ + url: '/sup/product/selectBind', + method: 'post', + data: data + }) +} + + diff --git a/src/router/index.js b/src/router/index.js index 6673d92..c5421be 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -53,6 +53,7 @@ import stockOrderInCode from "../views/warehouse/stockOrderInCode"; import stockOrderDelSearch from "../views/warehouse/stockOrderDelSearch"; import stockOrderInvSearch from "../views/warehouse/stockOrderInvSearch"; import stockOrderDelete from "../views/warehouse/stockOrderDelete"; +import stockOrderChange from "../views/warehouse/stockOrderChange"; import stockOrderEditor from "../views/warehouse/stockOrderEditor"; import stockOrderSearch from "../views/warehouse/stockOrderSearch"; import stockOrderNew from "../views/warehouse/stockOrderNew"; @@ -117,6 +118,22 @@ import sysUdimsDownloadData from "../views/thrsys/SysUdimsDownloadData"; import thrProductsAddDi from "@/views/thrsys/ThrProductsAddDi"; +//资质审核 +import supCompany from "../views/purchase/supCompanyAdd.vue"; +import supCompanyAudit from "../views/purchase/supCompanyAudit.vue"; +import supCompanySearch from "../views/purchase/supCompanySearch.vue"; +import supManufacturer from "../views/purchase/supManufacturerAdd.vue"; +import supManufacturerAudit from "../views/purchase/supManufacturerAudit.vue"; +import supManufacturerSearch from "../views/purchase/supManufacturerSearch.vue"; +import supProduct from "../views/purchase/supProductAdd.vue"; +import supProductAudit from "../views/purchase/supProductAudit.vue"; +import supProductSearch from "../views/purchase/supProductSearch.vue"; +import supCertAudit from "../views/purchase/supCertAudit.vue"; +import supCertSearch from "../views/purchase/supCertSearch.vue"; +import supCertSet from "../views/purchase/supCertSet.vue"; +import supCertificationAdd from "../views/purchase/supCertificationAdd.vue"; + + const err401 = r => require.ensure([], () => r(require("../views/error/err401.vue")), "home"); @@ -464,8 +481,6 @@ export const asyncRouterMap = [ ] }, - - { path: "/basicProduct", redirect: "/udiInfo/UdiInfoManage", @@ -601,6 +616,205 @@ export const asyncRouterMap = [ ] }, + + { + path: "/firstCamp", + component: Home, + redirect: "/firstCamp/certAdd", + icon: "tongyong", + name: "首营资质", + noDropdown: false, + meta: { + authRule: ["firstCamp"] + }, + children: [ + + + { + path: "/certAdd", + redirect: "/certAdd/supplierAdd", + name: "资质新增", + hidden: true, + component: Empty, + meta: { + authRule: ["firstCamp/certAdd"] + }, + children: [ + { + path: "supplierAdd", + name: "供应商资质新增", + component: supCompany, + meta: { + authRule: ["firstCamp/certAdd/supplierAdd"] + } + }, + { + path: "manufacturerAdd", + name: "生产企业资质新增", + component: supManufacturer, + meta: { + authRule: ["firstCamp/certAdd/manufacturerAdd"] + } + }, + + { + path: "productAdd", + name: "产品资质新增", + component: supProduct, + meta: { + authRule: ["firstCamp/certAdd/productAdd"] + } + }, + ] + }, + + + { + path: "certAudit", + component: supCertAudit, + name: "资质审核", + icon: "", + meta: { + authRule: ["firstCamp/certAudit"] + } + }, + + { + path: "certSearch", + component: supCertSearch, + name: "资质查询", + icon: "", + meta: { + authRule: ["firstCamp/certSearch"] + } + }, + + + { + path: "certSet", + component: supCertSet, + name: "资质上传设置", + icon: "", + meta: { + authRule: ["firstCamp/certSet"] + } + }, + + + { + path: "/supplierManage", + redirect: "/supplierManage/supplierAdd", + name: "供应商资质管理", + component: Empty, hidden: true, + meta: { + authRule: ["firstCamp/supplierManage"] + }, + children: [ + { + path: "supplierAdd", + name: "供应商资质新增", + component: supCompany, + meta: { + authRule: ["firstCamp/supplierManage/supplierAdd"] + } + }, + { + path: "supplierAudit", + name: "供应商资质审核", + component: supCompanyAudit, + meta: { + authRule: ["firstCamp/supplierManage/supplierAudit"] + } + }, + + { + path: "supplierSearch", + name: "供应商资质查询", + component: supCompanySearch, + meta: { + authRule: ["firstCamp/supplierManage/supplierSearch"] + } + }, + ] + }, + + + { + path: "/manufacturerManage", + redirect: "/manufacturerManage/manufacturerAdd", + name: "生产企业资质管理", hidden: true, + component: Empty, + meta: { + authRule: ["firstCamp/manufacturerManage"] + }, + children: [ + { + path: "manufacturerAdd", + name: "生产企业资质新增", + component: supManufacturer, + meta: { + authRule: ["firstCamp/manufacturerManage/manufacturerAdd"] + } + }, + { + path: "manufacturerAudit", + name: "生产企业资质审核", + component: supManufacturerAudit, + meta: { + authRule: ["firstCamp/manufacturerManage/manufacturerAudit"] + } + }, + + { + path: "manufacturerSearch", + name: "生产企业资质查询", + component: supManufacturerSearch, + meta: { + authRule: ["firstCamp/manufacturerManage/manufacturerSearch"] + } + }, + ] + }, + + { + path: "/productManage", + redirect: "/productManage/productAdd", + name: "产品资质管理", hidden: true, + component: Empty, + meta: { + authRule: ["firstCamp/productManage"] + }, + children: [ + { + path: "productAdd", + name: "产品资质新增", + component: supProduct, + meta: { + authRule: ["firstCamp/productManage/productAdd"] + } + }, + { + path: "supProductAudit", + name: "产品资质审核", + component: supProductAudit, + meta: { + authRule: ["firstCamp/productManage/supProductAudit"] + } + }, + + { + path: "supProductSearch", + name: "产品资质查询", + component: supProductSearch, + meta: { + authRule: ["firstCamp/productManage/supProductSearch"] + } + }, + ] + }, + ] + }, + { path: "/supplierManagement", redirect: "/supplierManagement/config/index", @@ -1006,6 +1220,15 @@ export const asyncRouterMap = [ } }, + { + path: "stockOrderChange", + component: stockOrderChange, + name: "单据流转查询", + meta: { + authRule: ["stock/stockOrderChange"] + } + }, + ] }, @@ -1200,6 +1423,14 @@ export const asyncRouterMap = [ authRule: ["basic/basicCompany"] } }, + { + path: "supCertificationAdd", + name: "本企业资质", + component: supCertificationAdd, + meta: { + authRule: ["basic/supCertificationAdd"] + } + }, { path: "basicCompanyProduct", name: "本企业产品", diff --git a/src/views/basic/CorpMaintain.vue b/src/views/basic/CorpMaintain.vue index 961ddcf..cae4982 100644 --- a/src/views/basic/CorpMaintain.vue +++ b/src/views/basic/CorpMaintain.vue @@ -393,6 +393,7 @@ export default { selectDrugDialogVisible: false, selectSingleUnitVisible: false, list: [], + loading:false, sysList: [], total: 0, multipleSelection: [], diff --git a/src/views/basic/CorpMaintainSelect.vue b/src/views/basic/CorpMaintainSelect.vue new file mode 100644 index 0000000..fd921f1 --- /dev/null +++ b/src/views/basic/CorpMaintainSelect.vue @@ -0,0 +1,159 @@ + + + + + diff --git a/src/views/basic/basicCompany.vue b/src/views/basic/basicCompany.vue index 9ca9930..4a47389 100644 --- a/src/views/basic/basicCompany.vue +++ b/src/views/basic/basicCompany.vue @@ -8,11 +8,23 @@ > -
+
+ + 本企业信息审核状态： + + {{ checkFlag[inputQuery.auditStatus] }} + + + + +
+ +
草稿保存 提交审核 + + 提交变更 +
- + - 选入资质证书 + + + 添加资质证书 - + @@ -146,10 +177,29 @@ + + + + + + @@ -178,7 +248,7 @@ + + + + +
@@ -210,8 +298,11 @@ import { CodeToText, TextToCode, } from "element-china-area-data"; -import {filterCompanyCert, deleteCompanyCert} from "../../api/purchase/companyCert"; +import {filterCompanyCert, deleteCompanyCert, updateCompanyCert} from "../../api/purchase/companyCert"; import companyAddCert from "./../purchase/supCertAddDialog"; +import supCertSetSelectDialog from "./../purchase/supCertSetSelectDialog"; + + import draggable from "vuedraggable"; import {BASE_URL} from "@/config/app"; import {getUUID} from "@/utils/strUtil"; @@ -220,8 +311,6 @@ import {getCompany} from "@/api/warehouse/company"; export default { name: "supCompanyEdit", - - data() { return { inputQuery: {}, @@ -299,6 +388,7 @@ export default { certFileUrl: "", url: 'http://127.0.0.1:9996/udiwms/image/register/file/getImage?type=image1&name=t11111.jpg', certQuery: { + type: 1, page: 1, limit: 20 }, @@ -306,6 +396,7 @@ export default { certTotal: 0, certLoading: false, addCertVisible: false, + certType: 1, salesmanQuery: { name: "", page: 1, @@ -334,17 +425,29 @@ export default { companyEditDisabled: true, companyEditButtonStr: "编辑", addType: "1", //证书类型：1:供应商；2.生产企业；3.产品品种 + editTye: 1, checkFlag: { 0: "草稿", 1: "已通过", 2: "已拒绝", + 4: "变更未审核", 6: "未审核", }, + + statusFlag: { + 0: "正常", + 1: "禁用", + }, + formName: 1, + formMap: { + 1: "新增本企业资质证书", + 2: "编辑本企业资质证书", + }, + + selectCertVisible: false, }; }, created() { - - this.getCompanyCertList(); this.getCompanyInfo(); this.headers = { @@ -353,13 +456,13 @@ export default { }; }, components: { - draggable, companyAddCert + draggable, companyAddCert, supCertSetSelectDialog }, methods: { getCompanyInfo() { - let query={ - customerId:this.$store.getters.customerId + let query = { + customerId: this.$store.getters.customerId } getCompany(query) .then((response) => { @@ -429,6 +532,20 @@ export default { }, + disableCert(row, status) { + row.status = status; + updateCompanyCert(row).then(response => { + this.loading = false; + if (response.code === 20000) { + this.$message.success("更新成功！"); + this.getCompanyCertList(); + } else { + this.$message.error(response.message); + } + }); + + }, + cancelDialog() { this.closeDialog(); @@ -436,6 +553,7 @@ export default { closeLocalDialog() { this.addCertVisible = false; + this.selectCertVisible = false; this.getCompanyCertList(); }, @@ -445,15 +563,22 @@ export default { this.inputQuery.areaCode = value.toString(); }, - addCert(index, row) { - this.inputQuery.id = ''; - if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) { - this.inputQuery.id = row.id; + addCert(row) { + if (this.$isNotBlank(row)) { + this.formName = 2 this.inputQuery.formData = row; + this.editTye = 2; + } else { + this.formName = 1; + this.editTye = 1; } this.addCertVisible = true; }, + selectCert() { + this.selectCertVisible = true; + }, + toViewCompanyCert(row) { this.certFileUrl = BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; window.open(this.certFileUrl + row.filePath); @@ -516,10 +641,22 @@ export default { 0: "warning", 1: "success", 2: "danger", + 4: "warning", 6: "warning", }; return statusMap[status]; }, + + + statusType(status) { + const statusMap = { + 0: "success", + 1: "warning", + }; + return statusMap[status]; + }, + + }, }; diff --git a/src/views/basic/basicCompanyProductsImport.vue b/src/views/basic/basicCompanyProductsImport.vue index aef343b..bbcefe4 100644 --- a/src/views/basic/basicCompanyProductsImport.vue +++ b/src/views/basic/basicCompanyProductsImport.vue @@ -55,7 +55,7 @@ 1) { this.$refs.diList.clearSelection(); this.$refs.diList.toggleRowSelection(selection.pop()); } - + this.multipleSelection = selection this.currentRow = selection; this.replTitle = "(" + this.currentRow.cpmctymc + ")" + "产品信息补齐:"; @@ -1185,7 +1185,7 @@ export default { diff --git a/src/views/purchase/supCertAddDialog.vue b/src/views/purchase/supCertAddDialog.vue index 4d445f3..ed7a15c 100644 --- a/src/views/purchase/supCertAddDialog.vue +++ b/src/views/purchase/supCertAddDialog.vue @@ -1,7 +1,6 @@ diff --git a/src/views/warehouse/company.vue b/src/views/warehouse/company.vue index e984299..e531d0e 100644 --- a/src/views/warehouse/company.vue +++ b/src/views/warehouse/company.vue @@ -248,7 +248,7 @@ size="small" icon="search" style="margin-top: 20px; width: 200px" - @click="onModifySubmit('inputQuery')" + @click="onModifySubmit()" >保 存 @@ -259,157 +259,149 @@ diff --git a/src/views/warehouse/stockOrderChange.vue b/src/views/warehouse/stockOrderChange.vue new file mode 100644 index 0000000..9bcf653 --- /dev/null +++ b/src/views/warehouse/stockOrderChange.vue @@ -0,0 +1,593 @@ + + + + + +