purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整页面布局（初稿）

Browse Source
This commit is contained in:
季圣华
2022-12-09 01:24:15 +08:00
parent e26e7991d9
commit f163150761
68 changed files with 9656 additions and 9452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
jshERP-web/src/components/tools/ImportFileModal.vue
View File

@@ -1,36 +1,40 @@
<template>
<a-modal
:title="title"
:width="500"
:visible="visible"
:confirm-loading="confirmLoading"
:maskClosable="false"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:25%;height: 45%;overflow-y: hidden">
<template slot="footer">
<a-button key="back" @click="handleCancel">取消</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-row class="form-row" :gutter="24">
<a-col :md="24" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="第一步：">
<a target="_blank" :href="templateUrl"><b>{{templateName}}</b></a>
<p>提示：模板中的第一行请勿删除</p>
</a-form-item>
</a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :md="24" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="第二步：">
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
</a-form-item>
</a-col>
</a-row>
</a-spin>
</a-modal>
<div ref="container">
<a-modal
:title="title"
:width="500"
:visible="visible"
:confirm-loading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:25%;height: 45%;overflow-y: hidden">
<template slot="footer">
<a-button key="back" @click="handleCancel">取消</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-row class="form-row" :gutter="24">
<a-col :md="24" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="第一步：">
<a target="_blank" :href="templateUrl"><b>{{templateName}}</b></a>
<p>提示：模板中的第一行请勿删除</p>
</a-form-item>
</a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :md="24" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="第二步：">
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
</a-form-item>
</a-col>
</a-row>
</a-spin>
</a-modal>
</div>
</template>
<script>

2
jshERP-web/src/components/tools/Logo.vue
View File

@@ -26,7 +26,7 @@
</script>
<style lang="less" scoped>
/*缩小首页布 局顶部的高度*/
@height: 59px;
@height: 49px;
.sider {
box-shadow: none !important;

53
jshERP-web/src/components/tools/UserPassword.vue
View File

@@ -1,28 +1,33 @@
<template>
<a-modal
:title="title"
:width="modalWidth"
:visible="visible"
:confirmLoading="confirmLoading"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:25%;height: 50%;overflow-y: hidden">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-form-item label="旧密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input type="password" placeholder="请输入旧密码" v-decorator="[ 'oldpassword', validatorRules.oldpassword]" />
</a-form-item>
<a-form-item label="新密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input type="password" placeholder="新密码至少6位，区分大小写" v-decorator="[ 'password', validatorRules.password]" />
</a-form-item>
<a-form-item label="确认新密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input type="password" placeholder="请确认新密码" v-decorator="[ 'confirmPassword', validatorRules.confirmPassword]"/>
</a-form-item>
</a-form>
</a-spin>
</a-modal>
<div ref="container">
<a-modal
:title="title"
:width="modalWidth"
:visible="visible"
:confirmLoading="confirmLoading"
:getContainer="() => $refs.container"
:maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
style="top:20%;height: 50%;overflow-y: hidden">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-form-item label="旧密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input type="password" placeholder="请输入旧密码" v-decorator="[ 'oldpassword', validatorRules.oldpassword]" />
</a-form-item>
<a-form-item label="新密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input type="password" placeholder="新密码至少6位，区分大小写" v-decorator="[ 'password', validatorRules.password]" />
</a-form-item>
<a-form-item label="确认新密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input type="password" placeholder="请确认新密码" v-decorator="[ 'confirmPassword', validatorRules.confirmPassword]"/>
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</div>
</template>
<script>