新增发放登记以及查看详情

.env.dev

 NODE_ENV = dev
-VUE_APP_BASE_URL2 = http://123.56.183.13:8083
-VUE_APP_BASE_URL = http://127.0.0.1:8082
+VUE_APP_BASE_URL = http://192.168.1.242:8082
+VUE_APP_BASE_URL2 = http://127.0.0.1:8082
 VUE_APP_BASE_PATH = https://beta-yac.yiboshi.com
 VUE_APP_KEY_WORD = 'XwKsGlMcdPMEhR1B'

.env.production

 NODE_ENV = prod
-VUE_APP_BASE_URL = https://beta-yjservice.yiboshi.com
+VUE_APP_BASE_URL = http://123.56.183.13:8083
 VUE_APP_BASE_PATH = https://beta-yac.yiboshi.com
 VUE_APP_KEY_WORD = 'XwKsGlMcdPMEhR1B'

src/api/index.js

@@ -53,6 +53,9 @@ export default {
         },
         fetchUpdateConsentInfo(params) {//更新单位的知情同意书
             return fetch(`/v1/folacin-admin/folacin-consent-info/${params.id}`, params, "put", "json")
+        },
+        fetchAllDoctor() {//查询当前单位下的所有医生
+            return fetch(`/v1/folacin-admin/folacin-provide-record/doctor`)
         }
     },
 
@@ -174,9 +177,12 @@ export default {
         fetchFolviteDistributionList(params) {//叶酸发放登记列表
             return fetch('/v1/folacin-admin/folacin-resident-info/grant-page', params)
         },
-        fetchAddFolviteDistribution(params)  {
-            return fetch('/v1/folacin-admin/folacin-resident-info/direct-grant', params,'post', 'josn')
-        }
+        fetchAddFolviteDistribution(params)  {//叶酸发放
+            return fetch('/v1/folacin-admin/folacin-resident-info/direct-grant', params,'post', 'json')
+        },
+        fetchFolviteDistributionDetail(params)  {//叶酸发放查看详情
+            return fetch(`/v1/folacin-admin/folacin-resident-info/grant-details/${params.residentId}`)
+        },
     },
     //物资调拨管理
     allocationManagement: {

src/views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue

@@ -19,19 +19,19 @@
                 </div>
                 <a-descriptions bordered>
                 <a-descriptions-item label="姓名">
-                    {{detailInfo.medicalName || '--'}}
+                    {{detailInfo.womanName || '--'}}
                 </a-descriptions-item>
                 <a-descriptions-item label="证件类型">
-                    {{detailInfo.breedName || '--'}}
+                    {{detailInfo.womenCertificateType || '--'}}
                 </a-descriptions-item>
                 <a-descriptions-item label="证件号码">
-                    {{detailInfo.batchNumber || '--'}}
+                    {{detailInfo.womenIdCard || '--'}}
                 </a-descriptions-item>
                 <a-descriptions-item label="是否曾经怀孕">
-                    {{detailInfo.expireDate || '--'}}
+                    {{detailInfo.oncePregnant || '--'}}
                 </a-descriptions-item>
                 <a-descriptions-item label="孕次">
-                    {{detailInfo.expireDate || '--'}}
+                    {{detailInfo.pregnantNum || '--'}}
                 </a-descriptions-item>
             </a-descriptions>
                 <div class="detail_title" style="border-top: 0px">
@@ -42,13 +42,13 @@
                 </div>
                 <a-descriptions bordered>
                     <a-descriptions-item label="姓名">
-                        {{detailInfo.medicalName || '--'}}
+                        {{detailInfo.manName || '--'}}
                     </a-descriptions-item>
                     <a-descriptions-item label="证件类型">
-                        {{detailInfo.breedName || '--'}}
+                        {{detailInfo.menCertificateType || '--'}}
                     </a-descriptions-item>
                     <a-descriptions-item label="证件号码">
-                        {{detailInfo.batchNumber || '--'}}
+                        {{detailInfo.menIdCard || '--'}}
                     </a-descriptions-item>
                 </a-descriptions>
                 <div class="detail_title" style="border-top: 0px">
@@ -59,19 +59,19 @@
                 </div>
                 <a-descriptions bordered>
                     <a-descriptions-item label="联系电话">
-                        {{detailInfo.medicalName || '--'}}
+                        {{detailInfo.telephone || '--'}}
                     </a-descriptions-item>
                     <a-descriptions-item label="现在住址">
-                        {{detailInfo.breedName || '--'}}
+                        {{detailInfo.presentCode || '--'}}
                     </a-descriptions-item>
                     <a-descriptions-item label="详细地址">
-                        {{detailInfo.batchNumber || '--'}}
+                        {{detailInfo.nowAddress || '--'}}
                     </a-descriptions-item>
                     <a-descriptions-item label="签署方式">
-                        {{detailInfo.batchNumber || '--'}}
+                        {{detailInfo.signedMode || '--'}}
                     </a-descriptions-item>
                     <a-descriptions-item label="签署日期">
-                        {{detailInfo.batchNumber || '--'}}
+                        {{detailInfo.parentDate || '--'}}
                     </a-descriptions-item>
                 </a-descriptions>
                 <a-descriptions bordered layout="vertical" class="no_border">
@@ -87,13 +87,13 @@
             <div style="clear: both"></div>
             <a-descriptions bordered :column="2">
                 <a-descriptions-item label="发放日期">
-                    {{detailInfo.medicalName || '--'}}
+                    {{detailInfo.provideDate || '--'}}
                 </a-descriptions-item>
                 <a-descriptions-item label="发放医生">
-                    {{detailInfo.breedName || '--'}}
+                    {{detailInfo.provideDoctorName  || '--'}}
                 </a-descriptions-item>
                 <a-descriptions-item label="备注">
-                    {{detailInfo.breedName || '--'}}
+                    {{detailInfo.remarks  || '--'}}
                 </a-descriptions-item>
             </a-descriptions>
             <div class="detail_title" style="border-top: 0px">
@@ -102,7 +102,7 @@
                 </div>
                 <div style="clear: both"></div>
             </div>
-            <a-table :dataSource="detailInfo.tableData"
+            <a-table :dataSource="detailInfo.provideRecordList"
                      :columns="columns"
                      rowKey="id"
                      :pagination="false"
@@ -123,17 +123,17 @@
     const columns = [
         {
             title: '供应商',
-            dataIndex: 'medicineName',
+            dataIndex: 'supplierName',
             ellipsis: true
         },
         {
             title: '品牌',
-            dataIndex: 'typeName',
+            dataIndex: 'brandName',
             ellipsis: true
         },
         {
             title: '批次号',
-            dataIndex: 'factoryName',
+            dataIndex: 'batchNumber',
             ellipsis: true
         },
         {
@@ -142,8 +142,8 @@
             ellipsis: true
         },
         {
-            title: '发放数量(瓶)',
-            dataIndex: 'specs',
+            title: '发放数量',
+            dataIndex: 'sendNumber',
             ellipsis: true
         },
     ]
@@ -164,9 +164,9 @@
             getStockListDetail() {
                 this.spinning = true
                 let par = {
-                    id: this.routerParams.id
+                    residentId: this.routerParams.id
                 }
-                this.$api.stockManage.fetchInStockLisDetail(par).then(({data = [], code}) => {
+                this.$api.folviteDistributionManage.fetchFolviteDistributionDetail(par).then(({data = [], code}) => {
                     this.spinning = false
                     this.detailInfo = data
                 })

src/views/indexComponent/folviteDistribution/folviteDistribution.vue

@@ -60,7 +60,6 @@
         },
         {
             title: '证件号码',
-            width: '120px',
             dataIndex: 'womenIdCard',
             ellipsis: true
         },
@@ -69,11 +68,6 @@
             dataIndex: 'telephone',
             ellipsis: true
         },
-        {
-            title: '发放数量',
-            dataIndex: 'number',
-            ellipsis: true
-        },
        /* {
             title: '发放时期',
             width: '120px',