一级页面字段显示

src/api/index.js

@@ -52,87 +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")
         }
     },
 
-    //单位管理端-基础信息管理
-    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) {//在库管理列表
@@ -144,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)
         },
@@ -156,10 +77,9 @@ export default {
         fetchMedicalListByIds(params) {
             return fetch(`/v1/folacin-admin/folacin-stock-record/query-ids`, params)
         },
-
-        /*入库管理*/
-        fetchStockList(params) {//入库管理列表
-            return fetch('/stock-info/v1/stock-info/stock-send-record/receive-order', params);
+        /*分配入库*/
+        fetchInStorageList(params) {//入库管理列表
+            return fetch('/v1/folacin-admin/folacin-send-record/receive-record', params);
         },
         fetchTemplateByMedicalType(params) {//根据分类获取药具检查验收模板
             return fetch(`/basic-info/v1/basic-info/basic-template/query-breed/${params.breedId}`, params)
@@ -236,7 +156,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) {//调拨申请列表
@@ -276,6 +203,11 @@ export default {
             return fetch('/stock-info/v1/stock-info/stock-send-record', params, 'post', 'json');
         }
     },
+    folviteApplyManage: {
+        fetchFolviteApplyList(params) {//叶酸申请列表
+            return fetch('/v1/folacin-admin/folacin-resident-apply', params)
+        },
+    },
     fyManage: {
         //从妇幼系统获取菜单及用户信息
         fetchFYLoginUser(params) {

src/views/indexComponent/distributionWarehousing/distributionWarehousing.vue

@@ -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

@@ -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

@@ -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/supplyManage.vue

@@ -139,7 +139,7 @@
                     this.tableData = dataList
                     this.pagination.total = total
                     this.loading = false
-                }).finally(() => {
+                }).catch(() => {
                     this.loading = false
                 })
             },