Skip to content

F
folacin-front
Commit f257321a 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/inStockManage/inStockManage.vue
parent 7bd4310d
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 44 deletions
src/views/indexComponent/distributionWarehousing/components/addDistributionWarehousing.vue
View file @ f257321a
<template>
<div>
<a-card>
<div style="padding: 15px">
<!-- <a-card>-->
<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 }">
<a-descriptions bordered :column="{ sm: 2, xs: 1 }" class="dis_title">
<a-descriptions-item label="发货单位">
{{detailInfo.sendUnitName || '--'}}
</a-descriptions-item>
......@@ -42,23 +42,25 @@
</a-descriptions-item>
<a-descriptions-item label="入库状态">
{{detailInfo.statusName || '--'}}
<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: 16}"
:wrapperCol="{span: 13}"
style="margin-top: 20px"
>
<a-form-model-item label="备注"
prop="remarks"
:labelCol="{span: 6}"
:wrapperCol="{span: 15}">
:wrapperCol="{span: 12}">
<a-textarea
:rows="6"
:rows="5"
v-toRemarkNum
v-model="formData.remarks"
placeholder="请输入备注"></a-textarea>
placeholder="请输入备注(最多可输入200字)"></a-textarea>
</a-form-model-item>
</a-form-model>
</div>
......@@ -67,7 +69,7 @@
<a-button @click="goBack(1)">取消</a-button>
<a-button type="primary" @click="goBack(2)" style="margin-left: 10px">入库</a-button>
</div>
</a-card>
<!-- </a-card>-->
</div>
</template>
<script>
......@@ -121,6 +123,28 @@
},
}
</script>
<style lang="less" scoped>
<style lang="less">
.dis_title {
.ant-descriptions-item-label {
width: 120px;
}
}
.ready_stock {
border-radius: 2px;
width: 62px;
text-align: center;
padding: 2px 8px;
background:#FFF7E6;
border: 1px solid #FFD591;
color: #FA8C16
}
.in_stock {
border-radius: 2px;
width: 62px;
text-align: center;
padding: 2px 8px;
/*background: lightgreen;*/
border: 1px solid #52C41A;
color: #52C41A
}
</style>
src/views/indexComponent/distributionWarehousing/components/distributionWarehousingDetail.vue
View file @ f257321a
......@@ -106,19 +106,21 @@
}
}
.ready_stock {
width: 52px;
border-radius: 2px;
width: 62px;
text-align: center;
padding: 3px 8px;
padding: 2px 8px;
background:#FFF7E6;
border: 1px solid #FFD591;
color: #FA8C16
}
.in_stock {
width: 52px;
border-radius: 2px;
width: 62px;
text-align: center;
padding: 3px 8px;
background: #e4e7eb;
border: 1px solid greenyellow;
padding: 2px 8px;
/*background: lightgreen;*/
border: 1px solid #52C41A;
color: #52C41A
}
</style>
src/views/indexComponent/distributionWarehousing/distributionWarehousing.vue
View file @ f257321a
......@@ -14,7 +14,7 @@
<date-range-picker :date.sync="searchForm.date"></date-range-picker>
</a-form-item>
<a-button type="primary" class="search_btn" icon="search" @click="searchList">搜索</a-button>
<a-button class="search_btn" style="margin-left: 10px" icon="sync" @click="restSearchForm">清空</a-button>
<a-button class="search_btn ant-table-btn" style="margin-left: 10px" icon="sync" @click="restSearchForm">清空</a-button>
<!-- <a-button type="primary" class="search_btn" icon="download" style="float: right" @click="downloadExcel">-->
<!-- 导出Excel-->
<!-- </a-button>-->
......
src/views/indexComponent/distributionWarehousing/sendRecord.vue
View file @ f257321a
......@@ -14,7 +14,7 @@
<dateRangePicker :date.sync="searchForm.date"></dateRangePicker>
</a-form-item>
<a-button type="primary" class="search_btn" icon="search" @click="searchList">搜索</a-button>
<a-button class="search_btn" style="margin-left: 10px" icon="sync" @click="restSearchForm">清空</a-button>
<a-button class="search_btn ant-table-btn" style="margin-left: 10px" icon="sync" @click="restSearchForm">清空</a-button>
<!-- <a-button type="primary" class="search_btn" icon="download" style="float: right" @click="downloadExcel">-->
<!-- 导出Excel-->
<!-- </a-button>-->
......
src/views/indexComponent/folviteApply/folviteApply.vue
View file @ f257321a
......@@ -18,7 +18,7 @@
<a-input v-model="searchForm.telephone" placeholder="请输入联系电话" style="width: 250px"></a-input>
</a-form-item>
<a-button type="primary" icon="search" class="search_btn" @click="searchList">搜索</a-button>
<a-button class="search_btn" icon="close" style="margin-left: 10px" @click="restSearchForm">清空</a-button>
<a-button class="search_btn ant-table-btn" icon="sync" style="margin-left: 10px" @click="restSearchForm">清空</a-button>
<div style="clear: both"></div>
</a-form>
......
src/views/indexComponent/folviteDistribution/components/addFolviteDistribution.vue
View file @ f257321a
......@@ -149,7 +149,6 @@
</div>
<div>
<div v-html="bookHtmlContent.content">
</div>
</div>
</a-card>
......@@ -253,7 +252,7 @@
v-if="readyGetChecked"></in-stock-manage-info>
</div>
<div style="text-align: center;margin-top: 16px">
<a-button @click="goBack">取消</a-button>
<a-button class="ant-table-btn" @click="goBack">取消</a-button>
<a-button type="primary" :loading="spinning" @click="addMaterialDis" style="margin-left: 8px">发放
</a-button>
</div>
......@@ -290,7 +289,7 @@
presentCode: undefined,
nowAddress: undefined,
signedMode: '2',
parentDate: undefined,
parentDate: moment(new Date()).format('yyyy-MM-DD'),
provideDate: moment(new Date()).format('yyyy-MM-DD'),
provideDoctorId: undefined,
provideRecordList: [],
......
src/views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue
View file @ f257321a
......@@ -67,16 +67,30 @@
<a-descriptions-item label="详细地址">
{{detailInfo.nowAddress || '--'}}
</a-descriptions-item>
<a-descriptions-item label="签署方式">
<a-descriptions-item label="签署方式" :span="routerParams.source == 2 ? 2: 1">
{{detailInfo.signedModeName || '--'}}
</a-descriptions-item>
<a-descriptions-item label="签署日期">
<a-descriptions-item label="签署日期" :span="routerParams.source == 2 ? 2: 1">
{{detailInfo.parentDate || '--'}}
</a-descriptions-item>
<a-descriptions-item label="上传照片">
<a-descriptions-item label="上传照片" v-if="routerParams.source != 2">
<img width="120px" height="120px" :src="detailInfo.consentUrl"/>
</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>
</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;'}}-->
......@@ -95,9 +109,6 @@
<a-descriptions-item label="发放医生">
{{detailInfo.provideDoctorName || '--'}}
</a-descriptions-item>
<a-descriptions-item label="备注">
{{detailInfo.remarks || '--'}}
</a-descriptions-item>
</a-descriptions>
<div class="detail_title" style="border-top: 0px">
<div class="divider_my_dashed">
......@@ -112,6 +123,11 @@
bordered
>
</a-table>
<a-descriptions bordered :column="1" class="remark_info folvite_title ">
<a-descriptions-item label="备注">
{{detailInfo.remarks || '--'}}
</a-descriptions-item>
</a-descriptions>
</div>
<div style="text-align: center;margin-top: 40px">
<a-button @click="goBack">关闭</a-button>
......@@ -158,14 +174,25 @@
routerParams: {},
detailInfo: {},
spinning: false,
bookHtmlContent: {content: undefined},
columns
}
},
created() {
this.routerParams = this.$route.query
this.getStockListDetail()
this.getBookHtmlContent()
},
methods: {
getBookHtmlContent() {//获取用户知情书模板
this.$api.common.fetchConsentInfo().then(({data}) => {
if (this.$api.utils.isBlank(data)) {
this.bookHtmlContent = {content: ""}
} else {
this.bookHtmlContent = data;
}
})
},
getStockListDetail() {
this.spinning = true
let par = {
......@@ -195,9 +222,29 @@
.no_border {
border-top: 0px;
}
.folvite_title {
.ant-descriptions-item-label {
width: 140px;
width: 135px;
}
}
.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;
}
}
.remark_info {
.ant-descriptions-view {
.ant-descriptions-bordered .ant-descriptions-view {
border: 0px!important;
}
}
}
</style>
src/views/indexComponent/folviteDistribution/folviteDistribution.vue
View file @ f257321a
......@@ -10,7 +10,7 @@
<a-button type="primary" icon="search" class="search_btn" style="margin-left: 10px" @click="searchList">
搜索
</a-button>
<a-button class="search_btn" icon="close" style="margin-left: 10px" @click="restSearchForm">清空
<a-button class="search_btn ant-table-btn" icon="sync" style="margin-left: 10px" @click="restSearchForm">清空
</a-button>
</a-form-item>
<a-button type="primary" icon="plus" class="search_btn" style="float: right" @click="toAdd">发放登记</a-button>
......@@ -78,14 +78,14 @@
<img style="width: 100%" :src="consentUrl" height="100%"/>
</div>
<div v-else>
<div style="float: right;white-space:pre;text-indent:2em">
<div style="white-space:pre;text-indent:2em">
<div v-html="consentInfo" style="white-space:pre">
</div>
<div style="float: right">
<div style="float: right;margin: 0px 10px">
<div style="height: 60px">签名: <img style="width:200px;height: 40px;" :src="applySignUrl" height="100%"/></div>
<div>签署日期:{{currentRow.parentDate}}</div>
<br><br>
</div>
<div style="clear: both"></div>
</div>
</div>
......@@ -242,7 +242,7 @@
this.$router.push({path: '/folviteDistribution/add', query: {routerFlag: 'add'}})
},
toDetail(record) {
this.$router.push({path: '/folviteDistribution/detail', query: {id: record.id}})
this.$router.push({path: '/folviteDistribution/detail', query: record})
},
uploadConsentInfo(row) {
this.formData.id = row.id;
......
src/views/indexComponent/inStockManage/components/addMaterialDistribution.vue
View file @ f257321a
......@@ -255,6 +255,11 @@
</script>
<style lang="less">
.detail_title {
padding: .1px 16px;
border: 1px solid #F0F0F0;
border-bottom: 0px
}
.addMaterialDistribution {
.ant-table-thead > tr > th, .ant-table-tbody > tr > td {
padding: 10px !important;
......
src/views/indexComponent/inStockManage/components/addStock.vue
View file @ f257321a
<template>
<div class="inStockAdd">
<a-card style="height: 100vh">
<a-divider orientation="left">
<span style="font-size: 16px;">叶酸库存录入</span>
</a-divider>
<div style="width:90%;margin: 0 auto;margin-top: 20px">
<div style="height: 100vh;margin: 0 auto;padding: 16px">
<div style="margin: 30px 0px">
<div class="divider_my"><span class="midText">叶酸库存录入</span></div>
</div>
<div style="margin-top: 20px">
<a-form-model ref="formRef" :model="formData" :rules="formRules"
:labelCol="{span: 6}"
:wrapperCol="{span: 16}"
......@@ -120,7 +120,7 @@
@click="submitForm">库存录入
</a-button>
</div>
</a-card>
</div>
</div>
</template>
<script>
......
src/views/indexComponent/inStockManage/inStockManage.vue
View file @ f257321a
......@@ -73,7 +73,7 @@
</div>
<div>
<a-button type="primary" icon="search" class="search_btn" @click="searchList">搜索</a-button>
<a-button class="search_btn" icon="sync" style="margin-left: 10px" @click="restSearchForm">清空</a-button>
<a-button class="search_btn ant-table-btn" icon="sync" style="margin-left: 10px" @click="restSearchForm">清空</a-button>
</div>
</div>
<div style="clear: both"></div>
......
src/views/indexComponent/stockTransfer/stockTransfer.vue
View file @ f257321a
......@@ -29,7 +29,7 @@
<dateRangePicker :date.sync="searchForm.date"></dateRangePicker>
</a-form-item>
<a-button type="primary" class="search_btn" icon="search" @click="searchList">搜索</a-button>
<a-button class="search_btn" style="margin-left: 10px" icon="close" @click="restSearchForm">清空</a-button>
<a-button class="search_btn ant-table-btn" style="margin-left: 10px" icon="sync" @click="restSearchForm">清空</a-button>
<!-- <a-button type="primary" class="search_btn" icon="download" style="float: right" @click="downloadExcel">-->
<!-- 导出Excel-->
<!-- </a-button>-->
......
src/views/indexComponent/supplyManage/supplyManage.vue
View file @ f257321a
......@@ -14,7 +14,7 @@
</a-form-item>
<a-form-item>
<a-button type="primary" icon="search" class="search_btn" style="margin-left: 10px" @click="searchList">搜索</a-button>
<a-button class="search_btn" icon="close" style="margin-left: 10px" @click="restSearchForm">清空</a-button>
<a-button class="search_btn ant-table-btn" icon="sync" style="margin-left: 10px" @click="restSearchForm">清空</a-button>
</a-form-item>
<a-button type="primary" icon="plus" class="search_btn" style="float: right" @click="toAdd">添加供应商</a-button>
<div style="clear: both"></div>
......
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