测试BU修改

.env.test

 NODE_ENV = test
-VUE_APP_BASE_URL = http://123.56.183.13:8083
+VUE_APP_BASE_URL1 = http://123.56.183.13:8083
+VUE_APP_BASE_URL = https://beta-ysservice.yiboshi.com
+VUE_APP_LOCATION = https://beta-yesuan.yiboshi.com/#/
 VUE_APP_BASE_PATH = https://beta-yac.yiboshi.com
 VUE_APP_KEY_WORD = 'XwKsGlMcdPMEhR1B'

package.json

@@ -10,7 +10,7 @@
     "build:yueyang": "vue-cli-service build --mode yueyang"
   },
   "dependencies": {
-    "ant-design-vue": "^1.6.4",
+    "ant-design-vue": "^1.7.8",
     "axios": "^0.19.2",
     "compression-webpack-plugin": "5.0.0",
     "core-js": "^3.6.5",

src/api/index.js

@@ -53,6 +53,9 @@ export default {
         fetchConsentInfo(params) {//查询单位的知情同意书
             return fetch(`/v1/folacin-admin/folacin-consent-info/consent`, params)
         },
+        fetchConsentInfoShow(params) {//查询单位的知情同意书
+            return fetch(`/v1/folacin-admin/folacin-consent-info/consent-info`, params)
+        },
         fetchAddConsentInfo(params) {//新增单位的知情同意书
             return fetch(`/v1/folacin-admin/folacin-consent-info`, params, "post", "json")
         },

src/main.js

@@ -13,7 +13,7 @@ import 'ant-design-vue/dist/antd.less'
 // import 'nprogress/nprogress.css'
 import './antd/register'
 import api from './api'
-import {optionalChaining} from "./views/utils/common";
+// import {optionalChaining} from "./views/utils/common";
 import Moment from 'moment';
 import './views/utils/directives/debounce'
 import './views/utils/directives/throttle'
@@ -25,7 +25,7 @@ import {message, modal} from 'ant-design-vue'
 const {confirm} = modal
 
 Vue.prototype.$api = api;
-Vue.prototype.$isNot = optionalChaining; // 非空判断，为空返回 "未知"
+// Vue.prototype.$isNot = optionalChaining; // 非空判断，为空返回 "未知"
 Vue.prototype.$message= message
 Vue.prototype.$confirm= confirm
 Vue.filter('formatDate', function(value) {// 定义全局时间戳过滤器

src/views/Login.vue

@@ -11,11 +11,6 @@
                         <a-input placeholder="请输入用户名" v-model="formData.username" size="large" @keyup.enter="login">
                             <a-icon slot="prefix" type="user"/>
                         </a-input>
-                        <!--                        <a-select v-model="formData.username" size="large" @change="userChange">-->
-                        <!--                            <a-select-option v-for="(i,index) in userList" :key="i.userName" :value="index">-->
-                        <!--                                {{ i.unitName + "(" + i.userName + ")" }}-->
-                        <!--                            </a-select-option>-->
-                        <!--                        </a-select>-->
                     </a-form-model-item>
                     <a-form-model-item prop="password">
                         <a-input-password placeholder="请输入密码" v-model="formData.password" size="large"
@@ -60,7 +55,9 @@ export default {
     data() {
         return {
             userList: [],
-            formData: {},
+            formData: {
+                password:"YNybs2021?"
+            },
             formRules: {},
             captchaVerificationVis: true,
             captchaVerification: {},
@@ -70,9 +67,6 @@ export default {
     created() {
     },
     methods: {
-        userChange(value) {
-            this.formData.password = "YNybs2021?";
-        },
         login() {
             this.loading = true;
             let fromData = new FormData();

src/views/indexComponent/InformedConsent/InformedConsent.vue

@@ -89,20 +89,11 @@
                             title: '确定提交吗？',
                             okType: 'success',
                             onOk: () => {
-                                if (this.modeType === "add") {
                                     vm.$api.common.fetchAddConsentInfo(this.formData).then(res => {
                                         if (res.code === 'SUCCESS') {
                                             vm.$message.success('操作成功！')
                                         }
                                     })
-                                } else {
-                                    vm.$api.common.fetchUpdateConsentInfo(this.formData).then(res => {
-                                        if (res.code === 'SUCCESS') {
-                                            vm.$message.success('操作成功！')
-                                        }
-                                    })
-                                }
-
                             },
                             onCancel: () => {
                             },

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

@@ -37,10 +37,10 @@
 <!--                                {{detailInfo.pregnantNum || '&#45;&#45;'}}-->
 <!--                            </a-descriptions-item>-->
                             <a-descriptions-item label="身高">
-                                {{detailInfo.height || '--'}}
+                                {{detailInfo.height?detailInfo.height+"cm":'--'}}
                             </a-descriptions-item>
                             <a-descriptions-item label="体重">
-                                {{detailInfo.weight || '--'}}
+                                {{detailInfo.weight?detailInfo.weight+"kg":'--'}}
                             </a-descriptions-item>
                         </a-descriptions>
 <!--                        <div class="detail_title" style="border-top: 0px">-->
@@ -73,6 +73,7 @@
                             <a-descriptions-item label="现在住址">
                                 {{detailInfo.presentCodeName || '--'}}
                             </a-descriptions-item>
+
                             <a-descriptions-item label="详细地址">
                                 {{detailInfo.nowAddress || '--'}}
                             </a-descriptions-item>
@@ -86,6 +87,9 @@
                                 <img style="cursor: pointer" width="120px" height="120px" :src="detailInfo.consentUrl"
                                      @click="showVisible=true"/>
                             </a-descriptions-item>
+                            <a-descriptions-item label="签名" v-if="routerParams.source == 2">
+                                <img style="width: auto;height: 80px" :src="detailInfo.applySignUrl">
+                            </a-descriptions-item>
                         </a-descriptions>
                    <!--     <div class="card_info">
                             <a-card class="book" :headStyle="{background: '#FAFAFA'}" v-if="routerParams.source == 2">
@@ -98,9 +102,6 @@
                                 </div>
                             </a-card>
                         </div>-->
-                        <div v-if="routerParams.source == 2">
-                            <img style="width: 100%;height: 160px" :src="detailInfo.applySignUrl">
-                        </div>
                         <!--                <a-descriptions bordered layout="vertical" class="no_border">-->
                         <!--                    <a-descriptions-item label="上传照片">-->
                         <!--                        {{detailInfo.batchNumber || '&#45;&#45;'}}-->
@@ -112,8 +113,8 @@
                         <div class="divider_my"><span class="midText">发放信息</span></div>
                     </div>
                     <div style="clear: both"></div>
-                    <a-descriptions bordered :column="2" class="folvite_title">
-                        <a-descriptions-item label="发放日期">
+                    <a-descriptions bordered :column="3" class="folvite_title">
+                        <a-descriptions-item label="发放日期" >
                             {{detailInfo.provideDate || '--'}}
                         </a-descriptions-item>
                         <a-descriptions-item label="发放医生">

src/views/utils/common.js

@@ -119,20 +119,20 @@ export const timeFormat = (time, format = 'YYYY-MM-DD') => {
  let b = this.$isNot(ces, 'data', 'data1', 'name') //测试
  {{$isNot(ces, 'data', 'data1', 'name')}} //测试
  */
-export const optionalChaining = (obj, ...rest) => {
-    let tmp = obj;
-    for (let key in rest) {
-        let name = rest[key];
-        tmp = tmp?.[name]; //es11可选链
-    }
-    return tmp ?? "未知";
-};
+// export const optionalChaining = (obj, ...rest) => {
+//     let tmp = obj;
+//     for (let key in rest) {
+//         let name = rest[key];
+//         tmp = tmp?.[name]; //es11可选链
+//     }
+//     return tmp ?? "未知";
+// };
 
 
 // 校验手机号
 export const checkPhone = (rule, value, callback) => {
     if (value == '' || value == undefined) {
-        callback()
+        callback();
     }
     let ckPhone = /^1(?:3[0-9]|4[5-9]|5[0-9]|6[12456]|7[0-8]|8[0-9]|9[0-9])[0-9]{8}$/;
     let tell = /^0\d{2,3}-?\d{7,8}$/;