Skip to content

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

分配入库样式修改

parent caed2e8c
Show whitespace changes
Inline Side-by-side
Showing with 97 additions and 32 deletions
src/main.js
View file @ 301f7bca
......@@ -19,6 +19,7 @@ import './views/utils/directives/debounce'
import './views/utils/directives/throttle'
import './views/utils/directives/int'
import './views/utils/directives/price'
import './views/utils/directives/remarkNum'
import {message, modal} from 'ant-design-vue'
const {confirm} = modal
......
src/router/index.js
View file @ 301f7bca
......@@ -28,7 +28,7 @@ const routes = [
//分配入库
{path: 'distributionWarehousing', name: '分配入库列表', component: () => import('@/views/indexComponent/distributionWarehousing/distributionWarehousing.vue')},
//发货方分配记录
{path: 'sendRecord', name: '分配入库列表', component: () => import('@/views/indexComponent/distributionWarehousing/sendRecord.vue')},
{path: 'sendRecord', name: '发货方分配记录', component: () => import('@/views/indexComponent/distributionWarehousing/sendRecord.vue')},
//出入库记录
{path: 'stockTransfer', name: '出入库记录', component: () => import('@/views/indexComponent/stockTransfer/stockTransfer.vue')},
//叶酸申请管理
......
src/views/Home.vue
View file @ 301f7bca
......@@ -54,7 +54,7 @@
},
created() {
//获取妇幼权限和登录基本信息
// document.cookie = 'bGNnd3lwdF9hdA=ef814f88-005f-4820-830d-b834edb47a55;'//昆明市
document.cookie = 'bGNnd3lwdF9hdA=47ae90f0-18e0-4553-9983-22213c9d378e;'//昆明市
// document.cookie = 'bGNnd3lwdF9hdA=' + sessionStorage.getItem("loginToken") + ';'//云南省
let cookieToken = getCookie('bGNnd3lwdF9hdA');
console.log('tokenInfo',cookieToken)
......
src/views/Login.vue
View file @ 301f7bca
<!--
<template>
<div class="login_container">
<div class="login_box">
......@@ -8,9 +9,9 @@
</div>
<a-form-model :model="formData" :rules="formRules" class="login_form" ref="formRef">
<a-form-model-item prop="username">
<!-- <a-input placeholder="请输入用户名" v-model="formData.username" size="large" @keyup.enter="login">-->
<!-- <a-icon slot="prefix" type="user"/>-->
<!-- </a-input>-->
&lt;!&ndash; <a-input placeholder="请输入用户名" v-model="formData.username" size="large" @keyup.enter="login">&ndash;&gt;
&lt;!&ndash; <a-icon slot="prefix" type="user"/>&ndash;&gt;
&lt;!&ndash; </a-input>&ndash;&gt;
<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+")"}}
......@@ -156,4 +157,5 @@
}
}
</style>
&ndash;&gt;
-->
src/views/indexComponent/distributionWarehousing/components/addDistributionWarehousing.vue
View file @ 301f7bca
......@@ -56,6 +56,7 @@
:wrapperCol="{span: 15}">
<a-textarea
:rows="6"
v-toRemarkNum
v-model="formData.remarks"
placeholder="请输入备注"></a-textarea>
</a-form-model-item>
......
src/views/indexComponent/distributionWarehousing/components/distributionWarehousingDetail.vue
View file @ 301f7bca
......@@ -6,7 +6,7 @@
<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,7 +42,9 @@
</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"
......@@ -56,6 +58,7 @@
:wrapperCol="{span: 15}">
<a-textarea
:disabled="true"
v-toRemarkNum
:rows="6"
v-model="detailInfo.remarks"
placeholder="请输入备注"></a-textarea>
......@@ -97,5 +100,25 @@
}
</script>
<style lang="less" scoped>
.dis_title {
.ant-descriptions-item-label {
width: 120px;
}
}
.ready_stock {
width: 52px;
text-align: center;
padding: 3px 8px;
background:#FFF7E6;
border: 1px solid #FFD591;
color: #FA8C16
}
.in_stock {
width: 52px;
text-align: center;
padding: 3px 8px;
background: #e4e7eb;
border: 1px solid greenyellow;
color: #52C41A
}
</style>
src/views/indexComponent/distributionWarehousing/distributionWarehousing.vue
View file @ 301f7bca
......@@ -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="close" @click="restSearchForm">清空</a-button>
<a-button class="search_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>-->
......@@ -143,13 +143,13 @@
methods: {
getEnumListInfo() {
if (window.sessionStorage.getItem('allEnum')) {
this.statusList = getEnumByFlag("folacin_resident_info_status");
this.statusList = getEnumByFlag("folacin_stock_record_status");
} else {
let par = {}
this.$api.fyManage.fetchFYLoginUser(par).then(({data}) => {
window.sessionStorage.setItem('allEnum', JSON.stringify(data.enumValueList))
window.sessionStorage.setItem('userInfo', JSON.stringify(data.userInfo));
this.statusList = getEnumByFlag("folacin_resident_info_status");
this.statusList = getEnumByFlag("folacin_stock_record_status");
})
}
},
......
src/views/indexComponent/distributionWarehousing/sendRecord.vue
View file @ 301f7bca
......@@ -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="close" @click="restSearchForm">清空</a-button>
<a-button class="search_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/folviteDistribution/components/folviteDistributionDetail.vue
View file @ 301f7bca
......@@ -17,7 +17,7 @@
</div>
<div style="clear: both"></div>
</div>
<a-descriptions bordered>
<a-descriptions bordered class="folvite_title">
<a-descriptions-item label="姓名">
{{detailInfo.womanName || '--'}}
</a-descriptions-item>
......@@ -40,7 +40,7 @@
</div>
<div style="clear: both"></div>
</div>
<a-descriptions bordered>
<a-descriptions bordered class="folvite_title">
<a-descriptions-item label="姓名">
{{detailInfo.manName || '--'}}
</a-descriptions-item>
......@@ -57,7 +57,7 @@
</div>
<div style="clear: both"></div>
</div>
<a-descriptions bordered>
<a-descriptions bordered class="folvite_title">
<a-descriptions-item label="联系电话">
{{detailInfo.telephone || '--'}}
</a-descriptions-item>
......@@ -88,7 +88,7 @@
<div class="divider_my"><span class="midText">发放信息</span></div>
</div>
<div style="clear: both"></div>
<a-descriptions bordered :column="2">
<a-descriptions bordered :column="2" class="folvite_title">
<a-descriptions-item label="发放日期">
{{detailInfo.provideDate || '--'}}
</a-descriptions-item>
......@@ -195,4 +195,9 @@
.no_border {
border-top: 0px;
}
.folvite_title {
.ant-descriptions-item-label {
width: 140px;
}
}
</style>
src/views/indexComponent/inStockManage/components/addStock.vue
View file @ 301f7bca
......@@ -177,6 +177,9 @@
unitPrice: [
{required: true, message: '请输入单价'}
],
handler:[
{required: true, message: '请输入入库经手人'}
],
remarks: [
{required: false, message: '请输入备注'}
],
......
src/views/indexComponent/inStockManage/components/inStockManageDetail.vue
View file @ 301f7bca
......@@ -5,7 +5,7 @@
<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="detail_title">
<a-descriptions-item label="供应商">
{{detailInfo.supplierName || '--'}}
</a-descriptions-item>
......@@ -75,6 +75,10 @@
},
}
</script>
<style lang="less" scoped>
<style lang="less">
.detail_title{
.ant-descriptions-item-label {
width: 120px;
}
}
</style>
src/views/indexComponent/inStockManage/inStockManage.vue
View file @ 301f7bca
......@@ -20,8 +20,7 @@
<a-form-item label="入库日期">
<dateRangePicker :date.sync="searchForm.date"></dateRangePicker>
</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>
<!-- <div>
<a-button type="primary" icon="plus" class="search_btn btn_space" @click="openModal">库存录入</a-button>
......@@ -32,11 +31,15 @@
<a-button type="primary" icon="download" class="search_btn btn_space" @click="downLoadExcel">导出Excel
</a-button>
</div>-->
<div style="clear: both"></div>
</a-form>
<div style="clear: both"></div>
<div style="float: right;line-height: 32px;background-color: #E6F7FF;margin-top: 16px;cursor: pointer"
<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>
<a-button type="primary" class="search_btn btn_space" :disabled="selectedRowKeys.length <= 0"
@click="toAdd">调拨分配
</a-button>
<a-button type="primary" class="search_btn btn_space">导出Excel</a-button>
<div style="display: inline-block;line-height: 32px;background-color: #E6F7FF;cursor: pointer"
@click="showSelectedMedical"
v-if="selectedRowKeys.length > 0"
>
......@@ -64,14 +67,12 @@
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">库存录入</a-button>
<a-button type="primary" class="search_btn btn_space" :disabled="selectedRowKeys.length <= 0"
@click="toAdd">调拨分配
</a-button>
<a-button type="primary" class="search_btn btn_space">导出Excel</a-button>
</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>
</div>
</div>
<div style="clear: both"></div>
<a-table :dataSource="tableData"
:columns="columns"
......
src/views/utils/directives/remarkNum.js 0 → 100644
View file @ 301f7bca
import Vue from 'vue'
//text-area 限制输入字数
//v-toRemarkNum= {num:4}
Vue.directive('toRemarkNum', {
// 指令的定义
inserted: function(el, binding, vnode) {
el.addEventListener('keyup', function () {
if (binding.value) {
checkValue(el, binding.value.num)
} else {
checkValue(el, 200)
}
})
function checkValue(el, defu) {
debugger
let len = el.value.length
if (el.value && len > defu) {
el.value = el.value.substring(0, defu);
el.dispatchEvent(new Event("textarea"));//调用input事件使vue v-model绑定更新
}
}
}
})
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