From de349028916df39f12a8693103e678e96f5eccff Mon Sep 17 00:00:00 2001
From: TorKing <1643074784@qq.com>
Date: Mon, 2 Aug 2021 10:48:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=85=8D=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/addDistributionWarehousing.vue | 138 +++++++++---------
.../components/folviteDistributionDetail.vue | 58 +++++---
src/views/utils/directives/remarkNum.js | 1 -
3 files changed, 106 insertions(+), 91 deletions(-)
diff --git a/src/views/indexComponent/distributionWarehousing/components/addDistributionWarehousing.vue b/src/views/indexComponent/distributionWarehousing/components/addDistributionWarehousing.vue
index 7c178d5..b30de04 100644
--- a/src/views/indexComponent/distributionWarehousing/components/addDistributionWarehousing.vue
+++ b/src/views/indexComponent/distributionWarehousing/components/addDistributionWarehousing.vue
@@ -1,75 +1,75 @@
<template>
<div style="padding: 16px">
- <!-- <a-card>-->
+ <!-- <a-card>-->
+ <div>
<div>
- <div>
- <span style="font-size: 18px;font-weight: 600;"> 分配入库</span>
- </div>
- <div style="margin-top: 16px">
- <a-descriptions bordered :column="{ sm: 2, xs: 1 }" class="dis_title">
- <a-descriptions-item label="发货单位">
- {{detailInfo.sendUnitName || '--'}}
- </a-descriptions-item>
- <a-descriptions-item label="分配日期">
- {{detailInfo.sendDate || '--'}}
- </a-descriptions-item>
- <a-descriptions-item label="发货人姓名">
- {{detailInfo.sendContact || '--'}}
- </a-descriptions-item>
- <a-descriptions-item label="联系电话">
- {{detailInfo.sendPhone || '--'}}
- </a-descriptions-item>
- <a-descriptions-item label="供应商">
- {{detailInfo.supplierName || '--'}}
- </a-descriptions-item>
- <a-descriptions-item label="品牌">
- {{detailInfo.brandName || '--'}}
- </a-descriptions-item>
- <a-descriptions-item label="批次号">
- {{detailInfo.batchNumber || '--'}}
- </a-descriptions-item>
- <a-descriptions-item label="生产日期">
- {{detailInfo.produceDate || '--'}}
- </a-descriptions-item>
- <a-descriptions-item label="有效期至">
- {{detailInfo.expireDate || '--'}}
- </a-descriptions-item>
- <a-descriptions-item label="单价">
- {{detailInfo.unitPrice || '--'}}<span>元</span>
- </a-descriptions-item>
- <a-descriptions-item label="数量">
- {{detailInfo.sendNum || '--'}}
- </a-descriptions-item>
-
- <a-descriptions-item label="入库状态">
- <div :class="detailInfo.statusName == '待入库' ? 'ready_stock' : 'in_stock'">
- <span> {{detailInfo.statusName || '--'}}</span>
- </div>
- </a-descriptions-item>
- </a-descriptions>
- <a-form-model ref="formRef" :model="formData"
- :labelCol="{span: 4}"
- :wrapperCol="{span: 13}"
- style="margin-top: 20px;"
- >
- <a-form-model-item label="备注"
- prop="remarks"
- :labelCol="{span: 5}"
- :wrapperCol="{span: 12}">
- <a-textarea
- :rows="5"
- v-toRemarkNum
- v-model="formData.remarks"
- placeholder="请输入备注(最多可输入200字)"></a-textarea>
- </a-form-model-item>
- </a-form-model>
- </div>
+ <span style="font-size: 18px;font-weight: 600;"> 分配入库</span>
</div>
- <div style="text-align: center;">
- <a-button class="ant-table-btn" @click="goBack(1)">取消</a-button>
- <a-button type="primary" @click="goBack(2)" style="margin-left: 10px">入库</a-button>
+ <div style="margin-top: 16px">
+ <a-descriptions bordered :column="{ sm: 2, xs: 1 }" class="dis_title">
+ <a-descriptions-item label="发货单位">
+ {{detailInfo.sendUnitName || '--'}}
+ </a-descriptions-item>
+ <a-descriptions-item label="分配日期">
+ {{detailInfo.sendDate || '--'}}
+ </a-descriptions-item>
+ <a-descriptions-item label="发货人姓名">
+ {{detailInfo.sendContact || '--'}}
+ </a-descriptions-item>
+ <a-descriptions-item label="联系电话">
+ {{detailInfo.sendPhone || '--'}}
+ </a-descriptions-item>
+ <a-descriptions-item label="供应商">
+ {{detailInfo.supplierName || '--'}}
+ </a-descriptions-item>
+ <a-descriptions-item label="品牌">
+ {{detailInfo.brandName || '--'}}
+ </a-descriptions-item>
+ <a-descriptions-item label="批次号">
+ {{detailInfo.batchNumber || '--'}}
+ </a-descriptions-item>
+ <a-descriptions-item label="生产日期">
+ {{detailInfo.produceDate || '--'}}
+ </a-descriptions-item>
+ <a-descriptions-item label="有效期至">
+ {{detailInfo.expireDate || '--'}}
+ </a-descriptions-item>
+ <a-descriptions-item label="单价">
+ {{detailInfo.unitPrice || '--'}}<span>元</span>
+ </a-descriptions-item>
+ <a-descriptions-item label="数量">
+ {{detailInfo.sendNum || '--'}}
+ </a-descriptions-item>
+
+ <a-descriptions-item label="入库状态">
+ <div :class="detailInfo.statusName == '待入库' ? 'ready_stock' : 'in_stock'">
+ <span> {{detailInfo.statusName || '--'}}</span>
+ </div>
+ </a-descriptions-item>
+ </a-descriptions>
+ <a-form-model ref="formRef" :model="formData"
+ :labelCol="{span: 4}"
+ :wrapperCol="{span: 13}"
+ style="margin-top: 20px;"
+ >
+ <a-form-model-item label="备注"
+ prop="remarks"
+ :labelCol="{span: 5}"
+ :wrapperCol="{span: 12}">
+ <a-textarea
+ :rows="5"
+ :maxLength="200"
+ v-model="formData.remarks"
+ placeholder="请输入备注(最多可输入200字)"></a-textarea>
+ </a-form-model-item>
+ </a-form-model>
</div>
- <!-- </a-card>-->
+ </div>
+ <div style="text-align: center;">
+ <a-button class="ant-table-btn" @click="goBack(1)">取消</a-button>
+ <a-button type="primary" @click="goBack(2)" style="margin-left: 10px">入库</a-button>
+ </div>
+ <!-- </a-card>-->
</div>
</template>
<script>
@@ -128,15 +128,17 @@
width: 120px;
}
}
+
.ready_stock {
border-radius: 2px;
width: 62px;
text-align: center;
padding: 2px 8px;
- background:#FFF7E6;
+ background: #FFF7E6;
border: 1px solid #FFD591;
color: #FA8C16
}
+
.in_stock {
border-radius: 2px;
width: 62px;
diff --git a/src/views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue b/src/views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue
index e73fa11..321d7f0 100644
--- a/src/views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue
+++ b/src/views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue
@@ -74,20 +74,21 @@
{{detailInfo.parentDate || '--'}}
</a-descriptions-item>
<a-descriptions-item label="上传照片" v-if="routerParams.source != 2">
- <img width="120px" height="120px" :src="detailInfo.consentUrl"/>
+ <img style="cursor: pointer" width="120px" height="120px" :src="detailInfo.consentUrl"
+ @click="showVisible=true"/>
</a-descriptions-item>
</a-descriptions>
- <div class="card_info">
- <a-card class="book" :headStyle="{background: '#FAFAFA'}" v-if="routerParams.source == 2">
- <div slot="title" style="text-align: center;">
- <span style="color: #262626;font-size: 14px">知情同意书</span>
- </div>
- <div>
- <div v-html="bookHtmlContent.content">
+ <div class="card_info">
+ <a-card class="book" :headStyle="{background: '#FAFAFA'}" v-if="routerParams.source == 2">
+ <div slot="title" style="text-align: center;">
+ <span style="color: #262626;font-size: 14px">知情同意书</span>
</div>
- </div>
- </a-card>
- </div>
+ <div>
+ <div v-html="bookHtmlContent.content">
+ </div>
+ </div>
+ </a-card>
+ </div>
<div v-if="routerParams.source == 2">
<img style="width: 100%;height: 160px" :src="detailInfo.applySignUrl">
</div>
@@ -124,9 +125,9 @@
>
</a-table>
<a-descriptions bordered :column="1" class="remark_info folvite_title ">
- <a-descriptions-item label="备注">
- {{detailInfo.remarks || '--'}}
- </a-descriptions-item>
+ <a-descriptions-item label="备注">
+ {{detailInfo.remarks || '--'}}
+ </a-descriptions-item>
</a-descriptions>
</div>
<div style="text-align: center;margin-top: 40px">
@@ -134,6 +135,14 @@
</div>
</a-card>
</a-spin>
+ <a-modal title="查看知情同意书" :visible="showVisible" @cancel="showVisible = false" @ok="showVisible=false"
+ loading="true"
+ :maskClosable="false"
+ width="800px">
+ <div>
+ <img style="width: 100%" :src="detailInfo.consentUrl" height="100%"/>
+ </div>
+ </a-modal>
</div>
</template>
<script>
@@ -175,7 +184,8 @@
detailInfo: {},
spinning: false,
bookHtmlContent: {content: undefined},
- columns
+ columns,
+ showVisible: false
}
},
created() {
@@ -206,7 +216,7 @@
goBack() {
this.$router.push("/Home/folviteDistribution");
closedDetail('/inStock/inStockManageDetail', '/Home/folviteDistribution')
- }
+ },
},
}
</script>
@@ -228,22 +238,26 @@
width: 135px;
}
}
- .card_info{
- .ant-card-head-title{
- padding: 9px 0px!important;
+
+ .card_info {
+ .ant-card-head-title {
+ padding: 9px 0px !important;
}
+
.ant-card-head {
min-height: 32px;
}
+
.ant-card-bordered {
- border-top: 0px!important;
- border-bottom: 0px!important;
+ border-top: 0px !important;
+ border-bottom: 0px !important;
}
}
+
.remark_info {
.ant-descriptions-view {
.ant-descriptions-bordered .ant-descriptions-view {
- border: 0px!important;
+ border: 0px !important;
}
}
}
diff --git a/src/views/utils/directives/remarkNum.js b/src/views/utils/directives/remarkNum.js
index 0b33f14..0ce118e 100644
--- a/src/views/utils/directives/remarkNum.js
+++ b/src/views/utils/directives/remarkNum.js
@@ -14,7 +14,6 @@ Vue.directive('toRemarkNum', {
}
})
function checkValue(el, defu) {
- debugger
let len = el.value.length
if (el.value && len > defu) {
el.value = el.value.substring(0, defu);
--
2.18.0