Skip to content

F
folacin-front
Commit c2092722 authored by 罗成兵's avatar 罗成兵
Browse files
Options

Merge remote-tracking branch 'origin/gcl' into gcl 

# Conflicts:
#	src/api/index.js
#	src/views/Home.vue
parents 453496e4 0844063e
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 467 deletions
src/api/index.js
View file @ c2092722
......@@ -52,111 +52,11 @@ export default {
return fetch(`/v1/folacin-admin/folacin-consent-info`, params, "post", "json")
},
fetchUpdateConsentInfo(params) {//更新单位的知情同意书
console.log(params)
return fetch(`/v1/folacin-admin/folacin-consent-info/${params.id}`, params, "put", "json")
}
},
//首页接口
homeManage: {
fetchPayAmount(params) { //获取发放量
return fetch(`/stock-info/v1/stock-info/home/get-provide`, params)
},
fetchPayAmountMonth(params) {//每个月的发放量统计
return fetch(`/stock-info/v1/stock-info/home/get-total-provide`, params)
},
fetchPayAmountYear(params) {//一年内药具发放量占比
return fetch(`/stock-info/v1/stock-info/home/get-provide-proportion`, params);
},
fetchRemindWarn(params) {//首页消息提醒
return fetch(`/stock-info/v1/stock-info/home/get-remind-and-waring`, params);
},
updatePwd(params) {//更新密码
return fetch(`/basic-info/v1/basic-info/basic-sys-user/update-password`, params, 'post', 'json')
},
fetchVisitStatistic(params) {//回访统计接口
return fetch(`/stock-info/v1/stock-info/home/get-visit-statistic`, params);
},
fetchDataQuality(params) {//数据质量控制、提醒以及预警接口
return fetch(`/stock-info/v1/stock-info/home/get-data-quality`, params);
},
},
//单位管理端-基础信息管理
baseInfo: {
/*药具基本信息管理*/
fetchCondomInfoList(params) { // 药具信息管理列表
return fetch('/basic-info/v1/basic-info/basic-medical-info', params)
},
fetchCondomInfoDetail(params) {//获取药具信息单条详情
return fetch(`/basic-info/v1/basic-info/basic-medical-info/${params.id}`, params)
},
addCondomInfo(params) { //新增药具信息
return fetch('/basic-info/v1/basic-info/basic-medical-info', params, 'post', 'json')
},
updateCondomInfo(params) { //修改药具信息
return fetch(`/basic-info/v1/basic-info/basic-medical-info/${params.id}`, params, 'put', 'json')
},
/*药具品类信息管理*/
fetchMedicalTypeInfoList(params) {//分类列表
return fetch('/basic-info/v1/basic-info/basic-medical-breed', params)
},
fetchMedicalTypeDetail(params) {//获取分类单条详情
return fetch(`/basic-info/v1/basic-info/basic-medical-breed/${params.id}`, params)
},
addMedicalType(params) {//新增分类
return fetch('/basic-info/v1/basic-info/basic-medical-breed', params, 'post', 'json')
},
updateMedicalType(params) {//修改分类
return fetch(`/basic-info/v1/basic-info/basic-medical-breed/${params.id}`, params, 'put', 'json')
},
/*供应商管理*/
fetchSupplyInfoList(params) { // 供应商信息列表
return fetch('/basic-info/v1/basic-info/basic-supply-info', params)
},
fetchSupplyInfoDetail(params) {//查看供应商详情
return fetch(`/basic-info/v1/basic-info/basic-supply-info/${params.id}`, params)
},
addSupplyInfo(params) { //新增供应商
return fetch('/basic-info/v1/basic-info/basic-supply-info', params, 'post', 'json')
},
updateSupplyInfo(params) { //修改供应商
return fetch(`/basic-info/v1/basic-info/basic-supply-info/${params.id}`, params, 'put', 'json')
},
//合同管理（供应商端管理）
fetchContractInfoList(params) {// 合同管理列表供应商端管理
return fetch('/basic-info/v1/basic-contract-info', params)
},
fetchContractInfoDetail(params) {//合同主键查询（供应商端）
return fetch(`/basic-info/v1/basic-contract-info/${params.id}`, params)
},
addContractInfo(params) { //新增合同（供应商端）
return fetch('/basic-info/v1/basic-contract-info', params, 'post', 'json')
},
updateContractInfo(params) { //修改合同（供应商端）
return fetch(`/basic-info/v1/basic-contract-info/${params.id}`, params, 'put', 'json')
},
// 生产批次管理
fetchBatchInfoDetail(params) {//查看生产批次详情
return fetch(`/basic-info/v1/basic-info/basic-medical-info/${params.id}`, params)
},
/*生产厂家基本信息管理*/
fetchFactoryInfoList(params) { // 生产厂家信息管理列表
return fetch('/basic-info/v1/basic-info/basic-factory-info', params)
},
fetchFactoryInfoDetail(params) {//获取生产厂家信息单条详情
return fetch(`/basic-info/v1/basic-info/basic-factory-info/${params.id}`, params)
},
addFactoryInfo(params) { //新增生产厂家信息
return fetch('/basic-info/v1/basic-info/basic-factory-info', params, 'post', 'json')
},
updateFactoryInfo(params) { //修改生产厂家信息
return fetch(`/basic-info/v1/basic-info/basic-factory-info/${params.id}`, params, 'put', 'json')
},
delFactoryInfo(params) { //删除生产厂家信息
return fetch(`/basic-info/v1/basic-info/basic-factory-info/${params.id}`, params, 'delete', 'json')
},
},
//单位管理端-库存管理
//库存管理
stockManage: {
/*在库管理*/
fetchInStockList(params) {//在库管理列表
......@@ -168,9 +68,6 @@ export default {
fetchMedicineByType(params) {//根据药具品类获取药具
return fetch('/basic-info/v1/basic-info/basic-medical-info/query-breed', params)
},
fetchFactoryByTypeName(params) {//根据分类和名称获取生产厂家
return fetch('/basic-info/v1/basic-info/basic-medical-info/query-factory', params)
},
fetchBatchByTypeAName(params) {//根据分类和品种名称获取生产批次
return fetch('/basic-info/v1/basic-info/basic-batch-info/breed-medical', params)
},
......@@ -180,6 +77,9 @@ export default {
fetchMedicalListByIds(params) {
return fetch(`/v1/folacin-admin/folacin-stock-record/query-ids`, params)
},
/*分配入库*/
fetchInStorageList(params) {//入库管理列表
return fetch('/v1/folacin-admin/folacin-send-record/receive-record', params);
/*出入库记录*/
fetchStockTransferList(params) {//查询出入库记录
return fetch('/v1/folacin-admin/folacin-stock-transfer', params);
......@@ -263,7 +163,14 @@ export default {
return fetch('/stock-info/v1/stock-info/stock-inventory', params, 'post', 'json');
},
},
//单位管理端-物资调拨管理
//叶酸发放登记
folviteDistributionManage: {
fetchFolviteDistributionList(params) {//叶酸发放登记列表
return fetch('/stock-info/v1/stock-info/stock-apply-record', params)
},
},
//物资调拨管理
allocationManagement: {
/*调拨申请*/
fetchAllotApplyList(params) {//调拨申请列表
......@@ -303,306 +210,10 @@ export default {
return fetch('/stock-info/v1/stock-info/stock-send-record', params, 'post', 'json');
}
},
//单位管理端-网点管理
networkManage: {
fetchNetworkList(params) {//列表
return fetch('/basic-info/v1/basic-info/basic-network-info', params)
},
fetchAddNetwork(params) {//新增网点
return fetch('/basic-info/v1/basic-info/basic-network-info', params, 'post', 'json')
},
fetchUpdateNetwork(params) {//停用网点
return fetch(`/basic-info/v1/basic-info/basic-network-info/${params.id}`, params, 'put', 'json')
},
fetchNetworkDetail(params) {// 查看详情
return fetch(`/basic-info/v1/basic-info/basic-network-info/${params.id}`, params)
},
fetchDownQRcode(params) {//下载二维码
return fetch(`/v1/basic-info/basic-network-info/net-qrcode/${params.unitId}`, params)
},
fetchNetworkAuditList(params) {//网点审核列表
return fetch('/basic-info/v1/basic-info/basic-network-info/get-network-info-audit-page', params)
},
fetchNetworkBatchAudit(params) {//网点批量审核通过
return fetch(`/basic-info/v1/basic-info/basic-network-info/network-info-batch-audit`, params)
},
fetchNetworkListByAreaCode(params) {// 获取所属地区下辖可用网点
return fetch(`/basic-info/v1/basic-info/basic-network-info/query-by-area-code`, params)
},
fetchNetworkStockInfoList(params) {//网点库存列表
return fetch('/basic-info/v1/basic-info/basic-network-info/query-network-stock-page', params)
},
fetchNetworkStockDetail(params) {// 网点库存查看详情入库分页
return fetch(`/stock-info/v1/stock-info/stock-transfer-record/get-network-change-list`, params)
},
fetchNetworkOutRecord(params) {// 网点库存查看详情手工调整分页
return fetch(`/stock-info/v1/stock-info/stock-network-change-record`, params)
},
//网点调整库存
fetchAdjustStockInfoList(params) {//网点调整库存列表
return fetch('/basic-info/v1/basic-info/basic-network-info/get-network-change-list', params)
},
fetchAdjustStockInfoBatch(params) {//网点调整库存批量
return fetch('/stock-info/v1/stock-info/stock-basic-info/network-batch-change', params, 'post', 'json')
},
fetchAdjustStockUpDown(params) {//网点调整库存上架下架
return fetch('/stock-info/v1/stock-info/stock-basic-info/network-stock-load-unload', params)
}
},
//单位管理端-预警管理
warningManage: {
fetchValidityWarnList(params) {//有效期预警列表
return fetch('/medicalStockInfo/expired', JSON.stringify(params), 'post')
},
fetchStockWarnList(params) {//库存预警列表
return fetch('/medicalStockInfo/inventoryWarn', JSON.stringify(params), 'post')
}
},
//单位管理端-台账管理
ledgerManage: {
fetchLedgerList(params) {//台账管理列表
return fetch('/stock-info/v1/stock-info/stock-provide-record/account', params);
},
addLedgerInfo(params) {// 人工发放
return fetch('/stock-info/v1/stock-info/stock-provide-record', params, 'post', 'json');
},
},
//随访管理
followupManage: {
fetchFollowUpList(params) {//随访列表
return fetch('/stock-info/v1/stock-info/stock-visit-info', params);
},
fetchIdFollowUp(params) {
return fetch(`/stock-info/v1/stock-info/stock-visit-info/${params.id}`, params);
},
addFollowUpInfo(params) {
return fetch(`/stock-info/v1/stock-info/stock-visit-info`, params, 'post', 'json');
},
},
//系统管理
systemManage: {
/*菜单管理*/
getPageInfoList(params) {
return fetch('/basic-info/v1/basic-info/basic-function-menu', params)
},
getOneById(params) {
return fetch(`/basic-info/v1/basic-info/basic-function-menu/${params.id}`, '', 'get', 'json')
},
getAllMenuList() {
return fetch('/basic-info/v1/basic-info/basic-function-menu/getAllMenuList', '', 'get', 'json')
},
addOne(params) {
return fetch('/basic-info/v1/basic-info/basic-function-menu', params, 'post', 'json')
},
updateOne(params) {
return fetch(`/basic-info/v1/basic-info/basic-function-menu/${params.id}`, params, 'put', 'json')
},
deleteById(params) {
return fetch(`/basic-info/v1/basic-info/basic-function-menu/deleteById/${params.id}`, '', 'get', 'json')
},
/*角色管理*/
getRolePageList(params) {
return fetch('/basic-info/v1/basic-info/basic-sys-role', params)
},
getRoleOneById(params) {
return fetch(`/basic-info/v1/basic-info/basic-sys-role/${params.id}`, '', 'get', 'json')
},
addRoleOne(params) {
return fetch('/basic-info/v1/basic-info/basic-sys-role', params, 'post', 'json')
},
updateRoleOne(params) {
return fetch(`/basic-info/v1/basic-info/basic-sys-role/${params.id}`, params, 'put', 'json')
},
deleteRoleOneById(params) {
return fetch(`/basic-info/v1/basic-info/basic-sys-role/deleteById/${params.id}`, '', 'get', 'json')
},
/*药具有效期预警管理*/
fetchValidityWarnManageList(params) { // 药具有效期预警管理列表
return fetch('/basic-info/v1/basic-info/basic-medical-validity-warning', params)
},
fetchValidityWarnManageDetail(params) {//获取药具有效期预警单条详情
return fetch(`/basic-info/v1/basic-info/basic-medical-validity-warning/${params.id}`, params)
},
addValidityWarnManage(params) { //新增药具有效期预警
return fetch('/basic-info/v1/basic-info/basic-medical-validity-warning/insert-batch', params, 'post', 'json')
},
updateValidityWarnManage(params) { //修改药具有效期预警
return fetch(`/basic-info/v1/basic-info/basic-medical-validity-warning/${params.id}`, params, 'put', 'json')
},
deleteValidityWarnManage(id) { //删除药具有效期预警
return fetch(`/basic-info/v1/basic-info/basic-medical-validity-warning/${id}`, {}, "delete")
},
fetchLeftValidityWarnManage(params) {//选择未设置有效期预警的药具
return fetch(`/basic-info/v1/basic-info/basic-medical-validity-warning/get-warning-medical`, params)
},
/*需求计划上报表单管理*/
fetchDemandPlanFormManageList(params) { // 需求计划上报表单管理列表
return fetch('/basic-info/v1/basic-info/basic-plan-report-tb', params)
},
fetchDemandPlanFormManageDetail(params) {//获取需求计划上报表单详情
return fetch(`/basic-info/v1/basic-info/basic-plan-report-tb/${params.id}`, params)
},
deleteDemandPlanFormManageT(params) {//删除需求计划上报表单管理列表
return fetch(`/basic-info/v1/basic-info/basic-plan-report-tb/${params.id}`, params, 'delete', 'json')
},
addDemandPlanFormManage(params) { //新增需求计划上报表单
return fetch('/basic-info/v1/basic-info/basic-plan-report-tb', params, 'post', 'json')
},
/*入库验收模板管理-列表*/
getTemplateList(params) {
return fetch('/basic-info/v1/basic-info/basic-template', params)
},
/*入库验收模板管理-新增*/
addTemplate(params) {
return fetch('/basic-info/v1/basic-info/basic-template', params, "post", "json")
},
/*入库验收模板管理-详情*/
getTemplateById(id) {
return fetch(`/basic-info/v1/basic-info/basic-template/${id}`)
},
/*入库验收模板管理-更新*/
updateTemplate(params) {
return fetch(`/basic-info/v1/basic-info/basic-template/${params.id}`, params, "put", "json");
},
/*规格管理*/
fetchSpecManageList(params) { // 规格管理列表
return fetch('/basic-info/v1/basic-info/basic-medical-specs', params)
},
deleteSpecOneById(params) {// 删除规格
return fetch(`/basic-info/v1/basic-info/basic-medical-specs/${params.id}`, '', 'delete', 'json')
},
judgeSpecRepeat(params) {//判断当前规格是否重复
return fetch('/basic-info/v1/basic-info/basic-medical-specs/check-only-one', params, "post", "json")
},
addSpec(params) { //新增规格型号
return fetch('/basic-info/v1/basic-info/basic-medical-specs/batch-save', params, "post", "json")
},
// 枚举类型管理
fetchEnumerationManageList(params) { // 枚举类型管理列表
return fetch('/basic-info/v1/basic-info/basic-sys-enum', params)
},
fetchEnumerationTypeDetail(params) { // 枚举类型主键查询
return fetch(`/basic-info/v1/basic-info/basic-sys-enum/${params.id}`, params)
},
updateEnumerationType(params) {//枚举类型修改
return fetch(`/basic-info/v1/basic-info/basic-sys-enum/${params.id}`, params, "put", 'json')
},
addEnumerationType(params) { //新增枚举类型
return fetch('/basic-info/v1/basic-info/basic-sys-enum', params, "post", "json")
},
//枚举管理
fetchEnumerationDetailList(params) { // 枚举管理列表
return fetch('/basic-info/v1/basic-info/basic-sys-enum-value', params)
},
addEnumeration(params) { //新增枚举
return fetch('/basic-info/v1/basic-info/basic-sys-enum-value', params, "post", "json")
},
//发放机厂家设置
fetchDispenserFactoryList(params) { // 发放机厂家列表
return fetch('/basic-info/v1/basic-info/basic-machine-factory-info', params)
},
fetchDispenserFactoryDetail(params) { // 发放机厂家主键查询
return fetch(`/basic-info/v1/basic-info/basic-machine-factory-info/${params.id}`)
},
addDispenserFactory(params) { //新增发放机厂家
return fetch('/basic-info/v1/basic-info/basic-machine-factory-info', params, "post", "json")
},
updateDispenserFactory(params) {//发放机厂家修改
return fetch(`/basic-info/v1/basic-info/basic-machine-factory-info/${params.id}`, params, "put", 'json')
},
deleteDispenserFactory(params) {//发放机厂家删除
return fetch(`/basic-info/v1/basic-info/basic-machine-factory-info/${params.id}`, params, "delete", 'json')
},
//机器类型设置
fetchDispenserTypeList(params) { // 机器类型列表
return fetch('/basic-info/v1/basic-info/basic-machine-type-info', params)
},
fetchDispenserTypeDetail(params) { // 发放机厂家主键查询
return fetch(`/basic-info/v1/basic-info/basic-machine-type-info/${params.id}`)
},
addDispenserTypeInfo(params) { //新增发机器类型
return fetch('/basic-info/v1/basic-info/basic-machine-type-info', params, "post", "json")
},
updateDispenserType(params) {//机器类型修改
return fetch(`/basic-info/v1/basic-info/basic-machine-type-info/${params.id}`, params, "put", 'json')
},
deleteDispenserTypeInfo(params) {//机器类型删除
return fetch(`/basic-info/v1/basic-info/basic-machine-type-info/${params.id}`, params, "delete", 'json')
},
// 生产批次管理
fetchBatchNumberInfoList(params) { // 生产批次管理列表
return fetch('/basic-info/v1/basic-info/basic-batch-info/unit-query-page', params)
},
addBatchNumberInfo(params) { //新增生产批次管理
return fetch('/basic-info/v1/basic-info/basic-batch-info/unit-insert', params, "post", "json")
},
updateBatchNumberInfo(params) { //修改生产批次管理
return fetch(`/basic-info/v1/basic-info/basic-batch-info/${params.id}`, params, "put", "json")
},
fetchBatchNumberInfoDeatail(params) { // 生产批次管理主键查询
return fetch(`/basic-info/v1/basic-info/basic-batch-info/${params.id}`, params)
},
deleteBatchNumberInfo(params) {//删除生产批次
return fetch(`/basic-info/v1/basic-info/basic-batch-info/${params.id}`, params, 'delete', 'json')
}
},
//需求计划管理
demandPlanManage: {
/*需求计划管理*/
fetchDemandPlanList(params) { //获取需求计划列表
return fetch('/stock-info/v1/stock-info/stock-plan-report', params);
},
addDemandPlanList(params) {
return fetch('/stock-info/v1/stock-info/stock-plan-report', params, 'post', 'json')
folviteApplyManage: {
fetchFolviteApplyList(params) {//叶酸申请列表
return fetch('/v1/folacin-admin/folacin-resident-apply', params)
},
fetchLatestDemandPlan(params) {//获取需求计划模板（最新）
return fetch('/basic-info/v1/basic-info/basic-plan-report-tb/get-year-plan-report', params)
},
fetchTempalteById(params) {//根据模板id获取需求计划模板
return fetch('/basic-info/v1/basic-info/basic-plan-report-tb/query-By-plan-report-id', params)
},
fetchDemandPlanDetailById(params) {//根据planid获取需求计划详情
return fetch(`/stock-info/v1/stock-info/stock-plan-report/${params.id}`, params)
},
fetchUnitAuditTree(params) {//获取县级及以上审核树
return fetch('/stock-info/v1/stock-info/stock-plan-report/get-report-unit-and-status', params)
},
onlyAddDemandPlan(params) {//批量保存
return fetch(`/stock-info/v1/stock-info/stock-plan-report/batch-save`, params, 'post', 'json');
},
addDemandPlanAndCommit(params) {//批量保存并提交
return fetch(`/stock-info/v1/stock-info/stock-plan-report/batch-save-submit`, params, 'post', 'json');
},
deleteDemandPlanList(params) {// 需求计划列表删除
return fetch(`/stock-info/v1/stock-info/stock-plan-report/${params.id}`, params, 'delete')
},
fetchCheckReportStatus(params) {//校验单位上报状态
return fetch('/stock-info/v1/stock-info/stock-plan-report/check-report', params)
},
fetchSummaryReport(params) {//汇总上报
return fetch(`/stock-info/v1/stock-info/stock-plan-report/summary-report`, params, 'post', 'json');
},
fetchSummaryAndGenerateTransfer(params) {//省级汇总并生成物资分配单
return fetch(`/stock-info/v1/stock-info/stock-plan-report/summary-and-generate-transfer`, params, 'post', 'json');
},
fetchSummaryReportTransfer(params) {//省级汇总并生成物资分配单(科)
return fetch(`/stock-info/v1/stock-info/stock-plan-report/create-supply-distribution/${params.templateId}`, params, 'put');
},
updateDemandPlanInfo(params) { //修改需求计划
return fetch(`/stock-info/v1/stock-info/stock-plan-report/${params.id}`, params, 'put', 'json')
},
fetchQueryDistribution(params) {//获取物资分配单
return fetch(`/stock-info/v1/stock-info/supply-distribution/query-distribution`, params);
},
fetchSubmitSupply(params) {//提交供应商
return fetch('/stock-info/v1/stock-info/supply-distribution/submit-supply', params, 'post', 'json')
},
updateDemandPlan(params) { //修改需求计划
return fetch(`/stock-info/v1/stock-info/stock-plan-report/${params.id}`, params, 'put', 'json')
},
},
fyManage: {
//从妇幼系统获取菜单及用户信息
......
src/views/Home.vue
View file @ c2092722
......@@ -55,7 +55,8 @@
created() {
//获取妇幼权限和登录基本信息
// document.cookie = 'bGNnd3lwdF9hdA=8f26b5cc-1d66-4b31-8b86-26d916209e1e;'//昆明市
document.cookie = 'bGNnd3lwdF9hdA=e46a9c23-60e1-41f3-a652-089d50b3cbd9;'//云南省
document.cookie = 'bGNnd3lwdF9hdA=5028cd4d-4491-4351-9448-4b357d8f1591;'//云南省
let cookieToken = getCookie('bGNnd3lwdF9hdA')
if (cookieToken) {//根据cookie获取token并调用接口获取菜单并设置初始选中菜单
window.sessionStorage.setItem('token','bearer'+' ' + cookieToken);
......@@ -76,8 +77,7 @@
methods: {
setInitMenuInfo() {//设置默认菜单和菜单缓存
// this.menuList = JSON.parse(window.sessionStorage.getItem('menuList'));
this.menuList = this.menuTest;
console.log(999,this.menuList)
this.menuList = this.menuTest
if (!window.sessionStorage.getItem("tabs")) {
window.sessionStorage.setItem('tabs', JSON.stringify(this.menuTest));
this.$store.commit('changeTabs', this.menuTest)
......
src/views/indexComponent/distributionWarehousing/distributionWarehousing.vue
View file @ c2092722
......@@ -56,7 +56,7 @@
const columns = [
{
title: '发放单位',
dataIndex: 'typeName',
dataIndex: 'sendUnitName',
ellipsis: true
},
{
......@@ -138,7 +138,7 @@
}
},
created() {
this.getInStockList()
this.getInStorageList()
this.getAllFactory()
},
methods: {
......@@ -156,9 +156,9 @@
},
searchList() {
this.pagination.pageIndex = 1
this.getInStockList()
this.getInStorageList()
},
getInStockList() {
getInStorageList() {
this.loading = true
let pars = isEmptyParams(this.searchForm)
let par = {
......@@ -166,12 +166,12 @@
pageIndex: this.pagination.pageIndex,
pageSize: this.pagination.pageSize
}
this.$api.stockManage.fetchInStockList(par).then(({data = {}}) => {
this.$api.stockManage.fetchInStorageList(par).then(({data = {}}) => {
const {dataList = [], total = 0} = data
this.tableData = dataList
this.pagination.total = total
this.loading = false
}).finally(() => {
}).catch(() => {
this.loading = false
})
},
......@@ -179,12 +179,12 @@
showSizeChange(pageNum, pageSize) {
this.pagination.pageIndex = 1;
this.pagination.pageSize = pageSize;
this.getInStockList()
this.getInStorageList()
},
change(pageNum, pageSize) {
this.pagination.pageIndex = pageNum;
this.pagination.pageSize = pageSize;
this.getInStockList()
this.getInStorageList()
},
restSearchForm() {
this.searchForm = {
......
src/views/indexComponent/folviteApply/folviteApply.vue
View file @ c2092722
......@@ -57,56 +57,51 @@
import moment from 'moment'
const columns = [
{
title: '品牌',
title: '女方姓名',
dataIndex: 'medicineName',
ellipsis: true
},
{
title: '供应商名称',
title: '证件类型',
dataIndex: 'typeName',
ellipsis: true
},
{
title: '批次号',
title: '证件号码',
width: '120px',
dataIndex: 'factoryName',
ellipsis: true
},
{
title: '生产批次',
title: '男方姓名',
dataIndex: 'batchNumber',
ellipsis: true
},
{
title: '生产日期',
title: '证件类型',
dataIndex: 'specs',
ellipsis: true
},
{
title: '有效期',
title: '证件号码',
width: '120px',
scopedSlots: {customRender: 'expireDateS'},
},
{
title: '单价(元)',
title: '联系电话',
dataIndex: 'isHistoryName',
ellipsis: true
},
{
title: '规格',
title: '领取状态',
dataIndex: 'specs',
ellipsis: true
},
{
title: '库存总数',
title: '领取日期',
dataIndex: 'stockNum',
ellipsis: true
},
{
title: '入库日期',
dataIndex: 'isHistoryName',
ellipsis: true
},
{
title: '操作',
align: 'center',
......@@ -121,7 +116,6 @@
return {
// 搜索框对象
searchForm: {
breedId: undefined,
medicalName: '',
factoryId: '',
produceDate: undefined
......@@ -136,20 +130,13 @@
columns,
tableData: [],
loading: false,
allSupplyInfo:[],
}
},
created() {
this.getInStockList()
this.getFolviteApplyList()
this.getAllFactory()
},
methods: {
getAllSupply() {
let par= {}
this.$api.common.fetchAllSupply(par).then(({data = []}) => {
this.allSupplyInfo = data
})
},
getAllFactory() {
let par = {}
this.$api.common.fetchAllFactory(par).then(({data = []}) => {
......@@ -158,9 +145,9 @@
},
searchList() {
this.pagination.pageIndex = 1
this.getInStockList()
this.getFolviteApplyList()
},
getInStockList() {
getFolviteApplyList() {
this.loading = true
let pars = isEmptyParams(this.searchForm)
let par = {
......@@ -168,12 +155,12 @@
pageIndex: this.pagination.pageIndex,
pageSize: this.pagination.pageSize
}
this.$api.stockManage.fetchInStockList(par).then(({data = {}}) => {
this.$api.folviteApplyManage.fetchFolviteApplyList(par).then(({data = {}}) => {
const {dataList = [], total = 0} = data
this.tableData = dataList
this.pagination.total = total
this.loading = false
}).finally(() => {
}).catch(() => {
this.loading = false
})
},
......@@ -181,12 +168,12 @@
showSizeChange(pageNum, pageSize) {
this.pagination.pageIndex = 1;
this.pagination.pageSize = pageSize;
this.getInStockList()
this.getFolviteApplyList()
},
change(pageNum, pageSize) {
this.pagination.pageIndex = pageNum;
this.pagination.pageSize = pageSize;
this.getInStockList()
this.getFolviteApplyList()
},
restSearchForm() {
this.searchForm = {
......
src/views/indexComponent/folviteDistribution/folviteDistribution.vue
View file @ c2092722
......@@ -6,7 +6,7 @@
<a-input v-model="searchForm.idCar" placeholder="请输入证件号码" style="width: 250px"></a-input>
</a-form-item>
<a-form-item>
<a-button class="search_btn" @click="restSearchForm">读卡识别</a-button>
<!-- <a-button class="search_btn" @click="restSearchForm">读卡识别</a-button>-->
<a-button type="primary" class="search_btn" style="margin-left: 10px" @click="searchList">搜索</a-button>
<a-button class="search_btn" style="margin-left: 10px" @click="restSearchForm">清空</a-button>
</a-form-item>
......@@ -50,43 +50,43 @@
const columns = [
{
title: '发放日期',
dataIndex: 'medicineName',
dataIndex: 'provideDate',
ellipsis: true
},
{
title: '姓名',
dataIndex: 'typeName',
dataIndex: 'residentId',
ellipsis: true
},
{
title: '证件号码',
width: '120px',
dataIndex: 'factoryName',
dataIndex: 'residentId',
ellipsis: true
},
{
title: '联系电话',
dataIndex: 'batchNumber',
dataIndex: 'residentId',
ellipsis: true
},
{
title: '发放数量(瓶)',
dataIndex: 'specs',
dataIndex: 'number',
ellipsis: true
},
{
/* {
title: '发放时期',
width: '120px',
scopedSlots: {customRender: 'expireDateS'},
},
},*/
{
title: '现住址',
dataIndex: 'isHistoryName',
dataIndex: 'residentId',
ellipsis: true
},
{
title: '登记人',
dataIndex: 'specs',
dataIndex: 'provideDoctorId',
ellipsis: true
},
{
......@@ -115,14 +115,14 @@
}
},
created() {
this.getInStockList()
this.getFolviteDistributionList()
},
methods: {
searchList() {
this.pagination.pageIndex = 1
this.getInStockList()
this.getFolviteDistributionList()
},
getInStockList() {
getFolviteDistributionList() {
this.loading = true
let pars = isEmptyParams(this.searchForm)
let par = {
......@@ -130,12 +130,12 @@
pageIndex: this.pagination.pageIndex,
pageSize: this.pagination.pageSize
}
this.$api.stockManage.fetchInStockList(par).then(({data = {}}) => {
this.$api.folviteDistributionManage.fetchFolviteDistributionList(par).then(({data = {}}) => {
const {dataList = [], total = 0} = data
this.tableData = dataList
this.pagination.total = total
this.loading = false
}).finally(() => {
}).catch(() => {
this.loading = false
})
},
......@@ -143,12 +143,12 @@
showSizeChange(pageNum, pageSize) {
this.pagination.pageIndex = 1;
this.pagination.pageSize = pageSize;
this.getInStockList()
this.getFolviteDistributionList()
},
change(pageNum, pageSize) {
this.pagination.pageIndex = pageNum;
this.pagination.pageSize = pageSize;
this.getInStockList()
this.getFolviteDistributionList()
},
restSearchForm() {
this.searchForm = {
......
src/views/indexComponent/supplyManage/components/addSupply.vue
View file @ c2092722
......@@ -82,7 +82,11 @@
return {
subLoad: false,
// form表单
formData: {},
formData: {
// supplierName: undefined,
// contactsName: undefined,
// contactsPhone: undefined,
},
formRules: {
supplierName: [
{required: true, message: '请选择供应商名称', trigger: 'change'},
......@@ -101,22 +105,23 @@
{required: true, message: '请输入详细地址', trigger: 'change'}
],
},
queryParams: {},
queryParams: {}
}
},
created() {
this.queryParams = this.$route.query;
if (this.queryParams.modeType === "update") {
this.$api.common.fetchSupplyById(this.queryParams.id).then(res => {
console.log(889, res.data)
if (res.code === 'SUCCESS') {
this.formData = res.data;
}
}).catch(() => {
});
}
},
methods: {
// 弹窗确定按钮
submitForm() {
let vm = this;
......
src/views/indexComponent/supplyManage/supplyManage.vue
View file @ c2092722
......@@ -28,6 +28,7 @@
:pagination="false"
>
<template slot="action" slot-scope="record">
<!--<a-button type="link" size="small" @click="toUpdate(record)">修改</a-button>-->
<a-popconfirm
:title="'确定' + (record.status === 1 ? '停用' : '启用') + '该供应商吗？'"
ok-text="是"
......@@ -36,6 +37,7 @@
>
<a href="#">{{record.status === 1 ? '停用' : '启用'}}</a>
</a-popconfirm>
<a-button type="link" size="small" @click="updateSupply(record)">修改</a-button>
<a-button type="link" size="small" @click="deleteConfirm(record)">删除</a-button>
</template>
......@@ -137,7 +139,7 @@
this.tableData = dataList
this.pagination.total = total
this.loading = false
}).finally(() => {
}).catch(() => {
this.loading = false
})
},
......@@ -159,7 +161,7 @@
this.searchList()
},
toAdd() {
this.$router.push({path: '/supplyManage/add', query: {modeType: "add"}});
this.$router.push({path:'/supplyManage/add'})
},
changeStatus(record) {
let par = {
......@@ -194,7 +196,6 @@
},
updateSupply(record) {
this.$router.push({path: '/supplyManage/add', query: {modeType: "update", id: record.id}});
console.log()
}
},
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment