Skip to content

F
folacin-front
Commit 90618877 authored by gengchunlei's avatar gengchunlei
Browse files
Options

Merge branch 'gcl' of http://gitlab.yiboshi.com/ynby/folacin-front into gcl 

# Conflicts:
#	src/views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue
parents cf4eaa23 de349028
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 74 deletions
src/views/indexComponent/distributionWarehousing/components/addDistributionWarehousing.vue
View file @ 90618877
<template> <template>
<div style="padding: 16px"> <div style="padding: 16px">
<!-- <a-card>--> <!-- <a-card>-->
<div>
<div> <div>
<div> <span style="font-size: 18px;font-weight: 600;"> 分配入库</span>
<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>
</div> </div>
<div style="text-align: center;"> <div style="margin-top: 16px">
<a-button class="ant-table-btn" @click="goBack(1)">取消</a-button> <a-descriptions bordered :column="{ sm: 2, xs: 1 }" class="dis_title">
<a-button type="primary" @click="goBack(2)" style="margin-left: 10px">入库</a-button> <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> </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> </div>
</template> </template>
<script> <script>
...@@ -128,15 +128,17 @@ ...@@ -128,15 +128,17 @@
width: 120px; width: 120px;
} }
} }
.ready_stock { .ready_stock {
border-radius: 2px; border-radius: 2px;
width: 62px; width: 62px;
text-align: center; text-align: center;
padding: 2px 8px; padding: 2px 8px;
background:#FFF7E6; background: #FFF7E6;
border: 1px solid #FFD591; border: 1px solid #FFD591;
color: #FA8C16 color: #FA8C16
} }
.in_stock { .in_stock {
border-radius: 2px; border-radius: 2px;
width: 62px; width: 62px;
......
src/views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue
View file @ 90618877
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
</div> </div>
<div v-if="routerParams.source == 2"> <div v-if="routerParams.source == 2">
<img style="width: 100%;height: 160px" :src="detailInfo.applySignUrl"> <img style="width: 100%;height: 160px" :src="detailInfo.applySignUrl">
</div>--> </div>
<!-- <a-descriptions bordered layout="vertical" class="no_border">--> <!-- <a-descriptions bordered layout="vertical" class="no_border">-->
<!-- <a-descriptions-item label="上传照片">--> <!-- <a-descriptions-item label="上传照片">-->
<!-- {{detailInfo.batchNumber || '&#45;&#45;'}}--> <!-- {{detailInfo.batchNumber || '&#45;&#45;'}}-->
...@@ -134,6 +134,14 @@ ...@@ -134,6 +134,14 @@
</div> </div>
</a-card> </a-card>
</a-spin> </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> </div>
</template> </template>
<script> <script>
...@@ -142,11 +150,11 @@ ...@@ -142,11 +150,11 @@
import router from "../../../../router"; import router from "../../../../router";
const columns = [ const columns = [
{
title: '供应商', title: '供应商',
dataIndex: 'supplierName', dataIndex: 'supplierName',
ellipsis: true ellipsis: true
}, },
{
{ {
title: '品牌', title: '品牌',
dataIndex: 'brandName', dataIndex: 'brandName',
......
src/views/utils/common.js
View file @ 90618877
...@@ -134,9 +134,9 @@ export const checkPhone = (rule, value, callback) => { ...@@ -134,9 +134,9 @@ export const checkPhone = (rule, value, callback) => {
if (value == '' || value == undefined) { if (value == '' || value == undefined) {
callback() callback()
} }
var 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 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 cktel = /^[0][1-9]{2,3}-[0-9]{5,10}$/; let tell = /^0\d{2,3}-?\d{7,8}$/;
if (ckPhone.test(value) || cktel.test(value)) { if (ckPhone.test(value) || tell.test(value)) {
callback() callback()
} else { } else {
callback(new Error('请输入正确的手机号或座机')); callback(new Error('请输入正确的手机号或座机'));
......
src/views/utils/directives/remarkNum.js
View file @ 90618877
...@@ -14,7 +14,6 @@ Vue.directive('toRemarkNum', { ...@@ -14,7 +14,6 @@ Vue.directive('toRemarkNum', {
} }
}) })
function checkValue(el, defu) { function checkValue(el, defu) {
debugger
let len = el.value.length let len = el.value.length
if (el.value && len > defu) { if (el.value && len > defu) {
el.value = el.value.substring(0, defu); el.value = el.value.substring(0, defu);
......
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