Skip to content

F
folacin-front
Commit 2e2c6cca 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
parents 301f7bca fbd12a95
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 20 deletions
src/views/Home.vue
View file @ 2e2c6cca
......@@ -64,7 +64,8 @@
this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => {
// window.sessionStorage.setItem('menuList', JSON.stringify(data.menuList));
window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList))
window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList));
window.sessionStorage.setItem('unitInfo', JSON.stringify(data.unitInfo));
this.setInitMenuInfo()
this.showChildren = true
})
......
src/views/indexComponent/folviteDistribution/folviteDistribution.vue
View file @ 2e2c6cca
......@@ -30,9 +30,13 @@
</template>
<template slot="action" slot-scope="record">
<!--<a-button type="link" size="small" @click="openChildModal(record)">人工发放</a-button>-->
<a-button type="link" size="small" @click="toDetail(record)">查看</a-button>
<a-button type="link" v-if="record.source===1&&record.isSigned===2" size="small"
@click="uploadConsentInfo(record)">上传线下同意书
<a-button class="ant-table-btn" size="small" @click="toDetail(record)">查看</a-button>
<a-button class="ant-table-btn" v-if="record.source===1&&record.isSigned===2" size="small"
style="margin-left: 10px"
@click="uploadConsentInfo(record)">签署知情同意书
</a-button>
<a-button class="ant-table-btn" v-else size="small" style="margin-left: 10px"
@click="showConsentInfo(record)">已签知情同意书
</a-button>
</template>
</a-table>
......@@ -66,8 +70,25 @@
<br>
</div>
</a-modal>
<a-modal :visible="previewVisible" :footer="null" @cancel="previewVisible=false">
<img alt="example" style="width: 100%" :src="imageUrl"/>
<a-modal title="查看知情同意书" :visible="showVisible" @cancel="showVisible = false" @ok="onsubmit"
loading="true"
:maskClosable="false"
width="600px">
<div v-if="currentRow.source==1">
<img style="width: 100%" :src="consentUrl" height="100%"/>
</div>
<div v-else>
<div style="float: right;white-space:pre;text-indent:2em">
<div v-html="consentInfo" style="white-space:pre">
</div>
<div style="float: right">
<div style="height: 60px">签名: <img style="width:200px;height: 40px;" :src="applySignUrl" height="100%"/></div>
<div>签署日期:{{currentRow.parentDate}}</div>
<br><br>
</div>
</div>
</div>
</a-modal>
<a-pagination
v-if="pagination.total > 0"
......@@ -130,9 +151,9 @@
},
{
title: '操作',
fixed:'right',
fixed: 'right',
align: 'left',
width: "200px",
width: "240px",
scopedSlots: {customRender: 'action'},
},
]
......@@ -140,7 +161,6 @@
components: {},
data() {
return {
// 搜索框对象
searchForm: {
womenIdCard: undefined
......@@ -155,8 +175,11 @@
tableData: [],
loading: false,
visible: false,
showVisible: false,
previewVisible: false,
imageUrl: "",
consentUrl: "",
applySignUrl:"",
consentInfo: "",
headers: {
Authorization: sessionStorage.getItem("token")
},
......@@ -165,7 +188,8 @@
formData: {
consentId: "",
id: ""
}
},
currentRow: {},
}
},
created() {
......@@ -224,20 +248,35 @@
this.formData.id = row.id;
this.visible = true;
},
showConsentInfo(row) {
this.currentRow = row;
this.showVisible = true;
this.$api.folviteDistributionManage.fetchFolviteDistributionDetail({residentId: row.id}).then(({data = [], code}) => {
this.consentUrl = data.consentUrl;
this.applySignUrl = data.applySignUrl;
})
if (row.source == 2) {
this.$api.common.fetchConsentInfo().then(({data}) => {
if (this.$api.utils.isNoBlank(data)) {
this.consentInfo = data.content;
}
})
}
},
handleChange(info) {
let fileList = [...info.fileList];
fileList = fileList.slice(-1);
fileList = fileList.map(file => {
if (file.response) {
this.imageUrl = file.response.data.trueDownloadUrl;
this.consentUrl = file.response.data.trueDownloadUrl;
this.formData.consentId = file.response.data.id;
}
return file;
});
this.fileList = fileList;
},
preview(val){
window.open(val.response.data.trueDownloadUrl)
preview(val) {
window.open(val.response.data.trueDownloadUrl)
},
onsubmit() {
if (this.$api.utils.isBlank(this.formData.consentId)) {
......
src/views/indexComponent/inStockManage/components/addMaterialDistribution.vue
View file @ 2e2c6cca
......@@ -127,7 +127,7 @@
sendUnitId: undefined,
sendUnitName: undefined,
receiveUnitId: undefined,
sendDate: undefined,
sendDate: moment(new Date()).format('yyyy-MM-DD'),
sendContact: undefined,
sendPhone: undefined,
receivePhone: undefined,
......
src/views/indexComponent/inStockManage/inStockManage.vue
View file @ 2e2c6cca
......@@ -32,10 +32,46 @@
</a-button>
</div>-->
</a-form>
<<<<<<< HEAD
<div style="display: flex;justify-content: space-between;align-items: center">
<div style="margin-bottom: 10px">
<a-button type="primary" class="search_btn btn_space" @click="openModal">库存录入</a-button>
=======
<div style="clear: both"></div>
<div style="float: right;line-height: 32px;background-color: #E6F7FF;margin-top: 16px;cursor: pointer"
@click="showSelectedMedical"
v-if="selectedRowKeys.length > 0"
>
<a-popover v-model="selectedVisible" trigger="click" placement="bottomRight">
<div slot="content" style="min-width: 300px">
<div>
<span style="padding: 5px 16px;color: #FF4D80">已选择叶酸({{selectedRowKeys.length}})</span>
</div>
<div style="margin-top: 10px">
<a-list
item-layout="horizontal"
:data-source="selectedRowList"
>
<a-list-item slot="renderItem" slot-scope="item, index">
<a slot="actions" @click="delSelectedKey(index)">删除</a>
<a-list-item-meta
:description="item.brandName"
>
</a-list-item-meta>
</a-list-item>
</a-list>
</div>
</div>
<span style="padding: 5px 16px;color: #FF4D80">已选择叶酸{{selectedRowKeys.length}}条<a-icon type="down"
style="margin-left:10px;font-size: 10px"/> </span>
</a-popover>
</div>
<div style="margin-top: 16px;margin-bottom: 10px">
<a-button type="primary" class="search_btn btn_space " @click="openModal" v-if="unitInfo.level==3">库存录入
</a-button>
>>>>>>> fbd12a958098f3e382d31073b40fdabcff46e375
<a-button type="primary" class="search_btn btn_space" :disabled="selectedRowKeys.length <= 0"
v-if="unitInfo.level==3||unitInfo.level==4"
@click="toAdd">调拨分配
</a-button>
<a-button type="primary" class="search_btn btn_space">导出Excel</a-button>
......@@ -160,7 +196,7 @@
},
{
title: '操作',
fixed:"right",
fixed: "right",
align: 'center',
scopedSlots: {customRender: 'action'},
},
......@@ -190,7 +226,8 @@
selectedRowKeys: [],
selectedVisible: false,
selectedRowList: [],
routerParams: {}
routerParams: {},
unitInfo: JSON.parse(sessionStorage.getItem("unitInfo"))
}
},
created() {
......@@ -305,7 +342,7 @@
this.$router.push({path: '/inStock/addMaterialDistribution', query: {selected: this.selectedRowKeys}})
},
toDetail(record) {
this.$router.push({path: '/inStock/inStockManageDetail', query: {id:record.id}})
this.$router.push({path: '/inStock/inStockManageDetail', query: {id: record.id}})
}
},
}
......
src/views/indexComponent/supplyManage/components/addSupply.vue
View file @ 2e2c6cca
......@@ -61,9 +61,10 @@
:labelCol="{span: 3}"
:wrapperCol="{span: 20}">
<a-textarea
placeholder="请输入备注，100字以内"
:rows="6"
v-model="formData.remarks"
placeholder="请输入备注"></a-textarea>
:maxLength="100"
v-model="formData.remarks"></a-textarea>
</a-form-model-item>
</a-col>
</a-row>
......
static/css/global.less
View file @ 2e2c6cca
......@@ -296,4 +296,9 @@ ant-pagination-item:focus, .ant-pagination-item:hover {
line-height: 24px;
transform: translateX(-50%) translateY(-50%);
}
.ant-table-btn{
color: #FF4D80;
border: 1px solid #FF4D80;
}
//---------------------------------------------------------
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