Skip to content
GitLab
Commit f1631507 authored by 季圣华's avatar 季圣华
Browse files

调整页面布局（初稿）

parent e26e7991
Hide whitespace changes
Inline Side-by-side
jshERP-web/public/static/color.less
View file @ f1631507
This source diff could not be displayed because it is too large. You can view the blob instead.
jshERP-web/src/assets/less/common.less
View file @ f1631507
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
} }
/*列表页面弹出modal*/ /*列表页面弹出modal*/
.ant-modal-cust-warp { .ant-modal-cust-warp {
margin-top: 101px;
margin-left: 151px;
height: 100% height: 100%
} }
/*弹出modal Y轴滚动条*/ /*弹出modal Y轴滚动条*/
...@@ -38,6 +40,8 @@ ...@@ -38,6 +40,8 @@
} }
/*商品-列表页面弹出modal*/ /*商品-列表页面弹出modal*/
.ant-modal-material-warp { .ant-modal-material-warp {
margin-top: 101px;
margin-left: 151px;
height: 100% height: 100%
} }
/*商品-弹出modal Y轴滚动条*/ /*商品-弹出modal Y轴滚动条*/
...@@ -71,4 +75,8 @@ ...@@ -71,4 +75,8 @@
/* 内嵌子表背景颜色 */ /* 内嵌子表背景颜色 */
.j-inner-table-wrapper /deep/ .ant-table-expanded-row .ant-table-wrapper .ant-table-tbody .ant-table-row { .j-inner-table-wrapper /deep/ .ant-table-expanded-row .ant-table-wrapper .ant-table-tbody .ant-table-row {
background-color: #FFFFFF; background-color: #FFFFFF;
}
.ant-modal-mask {
background-color: rgba(0, 0, 0, 0.1) !important;
} }
\ No newline at end of file
jshERP-web/src/components/jeecg/JModal/index.vue
View file @ f1631507
<template> <template>
<a-modal <div ref="container">
ref="modal" <a-modal
:class="getClass(modalClass)" ref="modal"
:style="getStyle(modalStyle)" :class="getClass(modalClass)"
:visible="visible" :style="getStyle(modalStyle)"
v-bind="_attrs" :visible="visible"
v-on="$listeners" :maskStyle="{'top':'101px','left':'151px'}"
@ok="handleOk" :getContainer="() => $refs.container"
@cancel="handleCancel" v-bind="_attrs"
> v-on="$listeners"
@ok="handleOk"
<slot></slot> @cancel="handleCancel"
>
<template v-if="!isNoTitle" slot="title">
<a-row class="j-modal-title-row" type="flex"> <slot></slot>
<a-col class="left">
<slot name="title">{{ title }}</slot> <template v-if="!isNoTitle" slot="title">
</a-col> <a-row class="j-modal-title-row" type="flex">
<a-col class="right"> <a-col class="left">
<a-tooltip title="新手引导"> <slot name="title">{{ title }}</slot>
<a-button v-if="switchHelp" @click="handleHelp" style="right:112px;" class="ant-modal-close ant-modal-close-x" </a-col>
ghost type="link" icon="question-circle"/> <a-col class="right">
</a-tooltip> <a-tooltip title="新手引导">
<a-button v-if="switchFullscreen" @click="toggleFullscreen" class="ant-modal-close ant-modal-close-x" <a-button v-if="switchHelp" @click="handleHelp" style="right:112px;" class="ant-modal-close ant-modal-close-x"
ghost type="link" :icon="fullscreenButtonIcon"/> ghost type="link" icon="question-circle"/>
</a-col> </a-tooltip>
</a-row> <a-button v-if="switchFullscreen" @click="toggleFullscreen" class="ant-modal-close ant-modal-close-x"
</template> ghost type="link" :icon="fullscreenButtonIcon"/>
</a-col>
<!-- 处理 scopedSlots --> </a-row>
<template v-for="slotName of scopedSlotsKeys" :slot="slotName"> </template>
<slot :name="slotName"></slot>
</template> <!-- 处理 scopedSlots -->
<template v-for="slotName of scopedSlotsKeys" :slot="slotName">
<!-- 处理 slots --> <slot :name="slotName"></slot>
<template v-for="slotName of slotsKeys" v-slot:[slotName]> </template>
<slot :name="slotName"></slot>
</template> <!-- 处理 slots -->
<template v-for="slotName of slotsKeys" v-slot:[slotName]>
</a-modal> <slot :name="slotName"></slot>
</template>
</a-modal>
</div>
</template> </template>
<script> <script>
......
jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
View file @ f1631507
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
@ok="handleSubmit" @ok="handleSubmit"
@cancel="close" @cancel="close"
cancelText="关闭" cancelText="关闭"
style="top:5%;height: 100%;overflow-y: hidden" style="top:5%;height: 90%;overflow-y: hidden"
wrapClassName="ant-modal-cust-warp" wrapClassName="ant-modal-cust-warp"
> >
<a-row :gutter="10" style="padding: 10px; margin: -10px"> <a-row :gutter="10" style="padding: 10px; margin: -10px">
......
jshERP-web/src/components/menu/SideMenu.vue
View file @ f1631507
<template> <template>
<a-layout-sider <a-layout-sider
:class="['sider', isDesktop() ? null : 'shadow', theme, fixSiderbar ? 'ant-fixed-sidemenu' : null ]" :class="['sider', isDesktop() ? null : 'shadow', theme, fixSiderbar ? 'ant-fixed-sidemenu' : null ]"
width="200px" width="150px"
:collapsible="collapsible" :collapsible="collapsible"
v-model="collapsed" v-model="collapsed"
:trigger="null"> :trigger="null">
......
jshERP-web/src/components/menu/index.js
View file @ f1631507
...@@ -172,7 +172,8 @@ export default { ...@@ -172,7 +172,8 @@ export default {
const props = { const props = {
mode: mode, mode: mode,
theme: theme, theme: theme,
openKeys: this.openKeys openKeys: this.openKeys,
inlineIndent: 12,
} }
const on = { const on = {
select: obj => { select: obj => {
......
jshERP-web/src/components/page/GlobalHeader.vue
View file @ f1631507
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
<style lang="less" scoped> <style lang="less" scoped>
/* update_begin author:scott date:20190220 for: 缩小首页布局顶部的高度*/ /* update_begin author:scott date:20190220 for: 缩小首页布局顶部的高度*/
@height: 59px; @height: 49px;
.layout { .layout {
......
jshERP-web/src/components/page/GlobalLayout.vue
View file @ f1631507
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
@close="() => this.collapsed = false" @close="() => this.collapsed = false"
:closable="false" :closable="false"
:visible="collapsed" :visible="collapsed"
width="200px" width="150px"
> >
<side-menu <side-menu
mode="inline" mode="inline"
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
@close="() => this.collapsed = false" @close="() => this.collapsed = false"
:closable="false" :closable="false"
:visible="collapsed" :visible="collapsed"
width="200px" width="150px"
> >
<side-menu <side-menu
mode="inline" mode="inline"
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<a-layout <a-layout
:class="[layoutMode, `content-width-${contentWidth}`]" :class="[layoutMode, `content-width-${contentWidth}`]"
:style="{ paddingLeft: fixSiderbar && isDesktop() ? `${sidebarOpened ? 200 : 80}px` : '0' }"> :style="{ paddingLeft: fixSiderbar && isDesktop() ? `${sidebarOpened ? 150 : 80}px` : '0' }">
<!-- layout header --> <!-- layout header -->
<global-header <global-header
:mode="layoutMode" :mode="layoutMode"
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
/> />
<!-- layout content --> <!-- layout content -->
<a-layout-content :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' }"> <a-layout-content :style="{ height: '100%', paddingTop: fixedHeader ? '49px' : '0' }">
<slot></slot> <slot></slot>
</a-layout-content> </a-layout-content>
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
transition: width .2s; transition: width .2s;
&.ant-header-side-opened { &.ant-header-side-opened {
width: calc(100% - 200px) width: calc(100% - 150px)
} }
&.ant-header-side-closed { &.ant-header-side-closed {
...@@ -322,7 +322,7 @@ ...@@ -322,7 +322,7 @@
transition: all .3s; transition: all .3s;
height: 70%; height: 70%;
line-height: 46px; line-height: 36px;
&.action-full { &.action-full {
height: 100%; height: 100%;
...@@ -435,7 +435,7 @@ ...@@ -435,7 +435,7 @@
margin: auto; margin: auto;
padding: 0 20px 0 0; padding: 0 20px 0 0;
display: flex; display: flex;
height: 59px; height: 49px;
.ant-menu.ant-menu-horizontal { .ant-menu.ant-menu-horizontal {
border: none; border: none;
...@@ -474,7 +474,7 @@ ...@@ -474,7 +474,7 @@
.header-index-right { .header-index-right {
float: right; float: right;
height: 59px; height: 49px;
overflow: hidden; overflow: hidden;
.action:hover { .action:hover {
background-color: rgba(0, 0, 0, 0.05); background-color: rgba(0, 0, 0, 0.05);
......
jshERP-web/src/components/tools/ImportFileModal.vue
View file @ f1631507
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="500" :title="title"
:visible="visible" :width="500"
:confirm-loading="confirmLoading" :visible="visible"
:maskClosable="false" :confirm-loading="confirmLoading"
@cancel="handleCancel" :getContainer="() => $refs.container"
wrapClassName="ant-modal-cust-warp" :maskStyle="{'top':'101px','left':'151px'}"
style="top:25%;height: 45%;overflow-y: hidden"> :maskClosable="false"
<template slot="footer"> @cancel="handleCancel"
<a-button key="back" @click="handleCancel">取消</a-button> wrapClassName="ant-modal-cust-warp"
</template> style="top:25%;height: 45%;overflow-y: hidden">
<a-spin :spinning="confirmLoading"> <template slot="footer">
<a-row class="form-row" :gutter="24"> <a-button key="back" @click="handleCancel">取消</a-button>
<a-col :md="24" :sm="24"> </template>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="第一步："> <a-spin :spinning="confirmLoading">
<a target="_blank" :href="templateUrl"><b>{{templateName}}</b></a> <a-row class="form-row" :gutter="24">
<p>提示：模板中的第一行请勿删除</p> <a-col :md="24" :sm="24">
</a-form-item> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="第一步：">
</a-col> <a target="_blank" :href="templateUrl"><b>{{templateName}}</b></a>
</a-row> <p>提示：模板中的第一行请勿删除</p>
<a-row class="form-row" :gutter="24"> </a-form-item>
<a-col :md="24" :sm="24"> </a-col>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="第二步："> </a-row>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <a-row class="form-row" :gutter="24">
<a-button type="primary" icon="import">导入</a-button> <a-col :md="24" :sm="24">
</a-upload> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="第二步：">
</a-form-item> <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
</a-col> <a-button type="primary" icon="import">导入</a-button>
</a-row> </a-upload>
</a-spin> </a-form-item>
</a-modal> </a-col>
</a-row>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
......
jshERP-web/src/components/tools/Logo.vue
View file @ f1631507
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
/*缩小首页布 局顶部的高度*/ /*缩小首页布 局顶部的高度*/
@height: 59px; @height: 49px;
.sider { .sider {
box-shadow: none !important; box-shadow: none !important;
......
jshERP-web/src/components/tools/UserPassword.vue
View file @ f1631507
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="modalWidth" :title="title"
:visible="visible" :width="modalWidth"
:confirmLoading="confirmLoading" :visible="visible"
@ok="handleOk" :confirmLoading="confirmLoading"
@cancel="handleCancel" :getContainer="() => $refs.container"
cancelText="关闭" :maskStyle="{'top':'101px','left':'151px'}"
wrapClassName="ant-modal-cust-warp" :maskClosable="false"
style="top:25%;height: 50%;overflow-y: hidden"> @ok="handleOk"
<a-spin :spinning="confirmLoading"> @cancel="handleCancel"
<a-form :form="form"> cancelText="关闭"
<a-form-item label="旧密码" :labelCol="labelCol" :wrapperCol="wrapperCol"> wrapClassName="ant-modal-cust-warp"
<a-input type="password" placeholder="请输入旧密码" v-decorator="[ 'oldpassword', validatorRules.oldpassword]" /> style="top:20%;height: 50%;overflow-y: hidden">
</a-form-item> <a-spin :spinning="confirmLoading">
<a-form-item label="新密码" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form :form="form">
<a-input type="password" placeholder="新密码至少6位，区分大小写" v-decorator="[ 'password', validatorRules.password]" /> <a-form-item label="旧密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
</a-form-item> <a-input type="password" placeholder="请输入旧密码" v-decorator="[ 'oldpassword', validatorRules.oldpassword]" />
<a-form-item label="确认新密码" :labelCol="labelCol" :wrapperCol="wrapperCol"> </a-form-item>
<a-input type="password" placeholder="请确认新密码" v-decorator="[ 'confirmPassword', validatorRules.confirmPassword]"/> <a-form-item label="新密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
</a-form-item> <a-input type="password" placeholder="新密码至少6位，区分大小写" v-decorator="[ 'password', validatorRules.password]" />
</a-form> </a-form-item>
</a-spin> <a-form-item label="确认新密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
</a-modal> <a-input type="password" placeholder="请确认新密码" v-decorator="[ 'confirmPassword', validatorRules.confirmPassword]"/>
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
......
jshERP-web/src/views/bill/dialog/BatchSetDepot.vue
View file @ f1631507
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="500" :title="title"
:visible="visible" :width="500"
:confirmLoading="confirmLoading" :visible="visible"
@ok="handleOk" :confirmLoading="confirmLoading"
@cancel="handleCancel" :getContainer="() => $refs.container"
cancelText="关闭" :maskStyle="{'top':'101px','left':'151px'}"
wrapClassName="ant-modal-cust-warp" :maskClosable="false"
style="top:30%;height: 35%;overflow-y: hidden"> @ok="handleOk"
<template slot="footer"> @cancel="handleCancel"
<a-button key="back" v-if="isReadOnly" @click="handleCancel"> cancelText="关闭"
关闭 wrapClassName="ant-modal-cust-warp"
</a-button> style="top:30%;height: 35%;overflow-y: hidden">
</template> <template slot="footer">
<a-spin :spinning="confirmLoading"> <a-button key="back" v-if="isReadOnly" @click="handleCancel">
<a-form :form="form" id="batchSetDepot"> 关闭
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="仓库名称"> </a-button>
<a-select placeholder="请选择仓库" v-decorator="[ 'depotId', validatorRules.depotId ]" showSearch optionFilterProp="children"> </template>
<a-select-option v-for="(depot,index) in depotList" :value="depot.id"> <a-spin :spinning="confirmLoading">
{{ depot.depotName }} <a-form :form="form" id="batchSetDepot">
</a-select-option> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="仓库名称">
</a-select> <a-select placeholder="请选择仓库" v-decorator="[ 'depotId', validatorRules.depotId ]" showSearch optionFilterProp="children">
</a-form-item> <a-select-option v-for="(depot,index) in depotList" :value="depot.id">
</a-form> {{ depot.depotName }}
</a-spin> </a-select-option>
</a-modal> </a-select>
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'
......
jshERP-web/src/views/bill/dialog/BillDetail.vue
View file @ f1631507
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
:forceRender="true" :forceRender="true"
@cancel="handleCancel" @cancel="handleCancel"
wrapClassName="ant-modal-cust-warp" wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden"> style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer"> <template slot="footer">
<a-button v-if="billPrintFlag" @click="handlePrint">三联打印预览</a-button> <a-button v-if="billPrintFlag" @click="handlePrint">三联打印预览</a-button>
<!--此处为解决缓存问题--> <!--此处为解决缓存问题-->
......
jshERP-web/src/views/bill/dialog/BillPrintIframe.vue
View file @ f1631507
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="width" :title="title"
:visible="visible" :width="width"
@cancel="handleCancel" :visible="visible"
cancelText="关闭" :getContainer="() => $refs.container"
wrapClassName="ant-modal-cust-warp" :maskStyle="{'top':'101px','left':'151px'}"
style="top:5%;height: 100%;overflow-y: hidden"> :maskClosable="false"
<template slot="footer"> @cancel="handleCancel"
<a-button key="back" @click="handleCancel">取消</a-button> cancelText="关闭"
</template> wrapClassName="ant-modal-cust-warp"
<a-form :form="form"> style="top:20px;height: 95%;overflow-y: hidden">
<template> <template slot="footer">
<iframe :src="billPrintUrl" width="100%" :height="height" frameborder="0" scrolling="no"></iframe> <a-button key="back" @click="handleCancel">取消</a-button>
</template> </template>
<template> <a-form :form="form">
<a-row> <template>
<a-col> <iframe :src="billPrintUrl" width="100%" :height="height" frameborder="0" scrolling="no"></iframe>
<a-form-item> </template>
<a-input v-decorator="['id']" hidden/> <template>
</a-form-item> <a-row>
</a-col> <a-col>
</a-row> <a-form-item>
</template> <a-input v-decorator="['id']" hidden/>
</a-form> </a-form-item>
</a-modal> </a-col>
</a-row>
</template>
</a-form>
</a-modal>
</div>
</template> </template>
<script> <script>
......
jshERP-web/src/views/bill/dialog/HistoryBillList.vue
View file @ f1631507
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="1250" :title="title"
:visible="visible" :width="1250"
@cancel="handleCancel" :visible="visible"
cancelText="关闭" :getContainer="() => $refs.container"
wrapClassName="ant-modal-cust-warp" :maskStyle="{'top':'101px','left':'151px'}"
style="top:5%;height: 100%;overflow-y: hidden"> :maskClosable="false"
<template slot="footer"> @cancel="handleCancel"
<a-button @click="handleCancel">关闭</a-button> cancelText="关闭"
</template> wrapClassName="ant-modal-cust-warp"
<!-- 查询区域 --> style="top:50px;height: 90%;overflow-y: hidden">
<div class="table-page-search-wrapper"> <template slot="footer">
<!-- 搜索区域 --> <a-button @click="handleCancel">关闭</a-button>
<a-form layout="inline" @keyup.enter.native="searchQuery"> </template>
<a-row :gutter="24"> <!-- 查询区域 -->
<a-col :md="4" :sm="24"> <div class="table-page-search-wrapper">
<a-form-item :label="organLabel" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}"> <!-- 搜索区域 -->
<a-select v-model="queryParam.organId" :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-select-option v-for="(item,index) in supplierList" :key="index" :value="item.id"> <a-row :gutter="24">
{{ item.supplier }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="5" :sm="24">
<a-form-item label="单号" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
<a-input placeholder="请输入单据编号" v-model="queryParam.number"></a-input>
</a-form-item>
</a-col>
<a-col :md="5" :sm="24">
<a-form-item label="商品" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
<a-input placeholder="条码|名称|规格|型号" v-model="queryParam.materialParam"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item label="单据日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-range-picker
style="width: 100%"
v-model="queryParam.createTimeRange"
format="YYYY-MM-DD"
:placeholder="['开始时间', '结束时间']"
@change="onDateChange"
@ok="onDateOk"
/>
</a-form-item>
</a-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="4" :sm="24"> <a-col :md="4" :sm="24">
<a-button type="primary" @click="searchQuery">查询</a-button> <a-form-item :label="organLabel" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
<a-button style="margin-left: 8px" @click="searchReset">重置</a-button> <a-select v-model="queryParam.organId" :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
<a-select-option v-for="(item,index) in supplierList" :key="index" :value="item.id">
{{ item.supplier }}
</a-select-option>
</a-select>
</a-form-item>
</a-col> </a-col>
</span> <a-col :md="5" :sm="24">
</a-row> <a-form-item label="单号" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
</a-form> <a-input placeholder="请输入单据编号" v-model="queryParam.number"></a-input>
</div> </a-form-item>
<!-- table区域-begin --> </a-col>
<a-table <a-col :md="5" :sm="24">
bordered <a-form-item label="商品" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
ref="table" <a-input placeholder="条码|名称|规格|型号" v-model="queryParam.materialParam"></a-input>
size="middle" </a-form-item>
rowKey="id" </a-col>
:columns="columns" <a-col :md="6" :sm="24">
:dataSource="dataSource" <a-form-item label="单据日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
:pagination="ipagination" <a-range-picker
:loading="loading" style="width: 100%"
@change="handleTableChange"> v-model="queryParam.createTimeRange"
<span slot="numberCustomRender" slot-scope="text, record"> format="YYYY-MM-DD"
<a @click="myHandleDetail(record)">{{record.number}}</a> :placeholder="['开始时间', '结束时间']"
</span> @change="onDateChange"
<template slot="customRenderStatus" slot-scope="text, record"> @ok="onDateOk"
<a-tag v-if="record.status === '0'" color="red">未审核</a-tag> />
<a-tag v-if="record.status === '1'" color="green">已审核</a-tag> </a-form-item>
<a-tag v-if="record.status === '2' && queryParam.subType === '采购订单'" color="cyan">完成采购</a-tag> </a-col>
<a-tag v-if="record.status === '2' && queryParam.subType === '销售订单'" color="cyan">完成销售</a-tag> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-tag v-if="record.status === '3' && queryParam.subType === '采购订单'" color="blue">部分采购</a-tag> <a-col :md="4" :sm="24">
<a-tag v-if="record.status === '3' && queryParam.subType === '销售订单'" color="blue">部分销售</a-tag> <a-button type="primary" @click="searchQuery">查询</a-button>
</template> <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
</a-table> </a-col>
<!-- table区域-end --> </span>
<!-- 表单区域 --> </a-row>
<bill-detail ref="billDetail"></bill-detail> </a-form>
</a-modal> </div>
<!-- table区域-begin -->
<a-table
bordered
ref="table"
size="middle"
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
@change="handleTableChange">
<span slot="numberCustomRender" slot-scope="text, record">
<a @click="myHandleDetail(record)">{{record.number}}</a>
</span>
<template slot="customRenderStatus" slot-scope="text, record">
<a-tag v-if="record.status === '0'" color="red">未审核</a-tag>
<a-tag v-if="record.status === '1'" color="green">已审核</a-tag>
<a-tag v-if="record.status === '2' && queryParam.subType === '采购订单'" color="cyan">完成采购</a-tag>
<a-tag v-if="record.status === '2' && queryParam.subType === '销售订单'" color="cyan">完成销售</a-tag>
<a-tag v-if="record.status === '3' && queryParam.subType === '采购订单'" color="blue">部分采购</a-tag>
<a-tag v-if="record.status === '3' && queryParam.subType === '销售订单'" color="blue">部分销售</a-tag>
</template>
</a-table>
<!-- table区域-end -->
<!-- 表单区域 -->
<bill-detail ref="billDetail"></bill-detail>
</a-modal>
</div>
</template> </template>
<script> <script>
......
jshERP-web/src/views/bill/dialog/LinkBillList.vue
View file @ f1631507
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="1250" :title="title"
:visible="visible" :width="1250"
@ok="handleOk" :visible="visible"
@cancel="handleCancel" :getContainer="() => $refs.container"
cancelText="关闭" :maskStyle="{'top':'101px','left':'151px'}"
wrapClassName="ant-modal-cust-warp" :maskClosable="false"
style="top:5%;height: 100%;overflow-y: hidden"> @ok="handleOk"
<!-- 查询区域 --> @cancel="handleCancel"
<div class="table-page-search-wrapper" v-if="selectType === 'list'"> cancelText="关闭"
<!-- 搜索区域 --> wrapClassName="ant-modal-cust-warp"
<a-form layout="inline" @keyup.enter.native="searchQuery"> style="top:20px;height: 95%;overflow-y: hidden">
<a-row :gutter="24"> <!-- 查询区域 -->
<a-col :md="6" :sm="24"> <div class="table-page-search-wrapper" v-if="selectType === 'list'">
<a-form-item label="单据编号" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}"> <!-- 搜索区域 -->
<a-input placeholder="请输入单据编号查询" v-model="queryParam.number"></a-input> <a-form layout="inline" @keyup.enter.native="searchQuery">
</a-form-item> <a-row :gutter="24">
</a-col>
<a-col :md="6" :sm="24">
<a-form-item label="商品信息" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
<a-input placeholder="条码|名称|规格|型号" v-model="queryParam.materialParam"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item label="单据日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-range-picker
style="width: 100%"
v-model="queryParam.createTimeRange"
format="YYYY-MM-DD"
:placeholder="['开始时间', '结束时间']"
@change="onDateChange"
@ok="onDateOk"
/>
</a-form-item>
</a-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-button type="primary" @click="searchQuery">查询</a-button> <a-form-item label="单据编号" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
<a-button style="margin-left: 8px" @click="searchReset">重置</a-button> <a-input placeholder="请输入单据编号查询" v-model="queryParam.number"></a-input>
</a-form-item>
</a-col> </a-col>
</span> <a-col :md="6" :sm="24">
</a-row> <a-form-item label="商品信息" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
</a-form> <a-input placeholder="条码|名称|规格|型号" v-model="queryParam.materialParam"></a-input>
</div> </a-form-item>
<!-- table区域-begin --> </a-col>
<a-table v-if="selectType === 'list'" <a-col :md="6" :sm="24">
bordered <a-form-item label="单据日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
ref="table" <a-range-picker
size="middle" style="width: 100%"
rowKey="id" v-model="queryParam.createTimeRange"
:columns="columns" format="YYYY-MM-DD"
:dataSource="dataSource" :placeholder="['开始时间', '结束时间']"
:pagination="ipagination" @change="onDateChange"
:loading="loading" @ok="onDateOk"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: getType}" />
:customRow="rowAction" </a-form-item>
@change="handleTableChange"> </a-col>
<span slot="numberCustomRender" slot-scope="text, record"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a v-if="!queryParam.purchaseStatus" @click="myHandleDetail(record)">{{record.number}}</a> <a-col :md="6" :sm="24">
<span v-if="queryParam.purchaseStatus">{{record.number}}</span> <a-button type="primary" @click="searchQuery">查询</a-button>
</span> <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
<template slot="customRenderStatus" slot-scope="text, record"> </a-col>
<template v-if="!queryParam.purchaseStatus"> </span>
<a-tag v-if="record.status === '0'" color="red">未审核</a-tag> </a-row>
<a-tag v-if="record.status === '1'" color="green">已审核</a-tag> </a-form>
<a-tag v-if="record.status === '2' && queryParam.subType === '采购订单'" color="cyan">完成采购</a-tag> </div>
<a-tag v-if="record.status === '2' && queryParam.subType === '销售订单'" color="cyan">完成销售</a-tag> <!-- table区域-begin -->
<a-tag v-if="record.status === '3' && queryParam.subType === '采购订单'" color="blue">部分采购</a-tag> <a-table v-if="selectType === 'list'"
<a-tag v-if="record.status === '3' && queryParam.subType === '销售订单'" color="blue">部分销售</a-tag> bordered
</template> ref="table"
<template v-if="queryParam.purchaseStatus"> size="middle"
<a-tag v-if="record.purchaseStatus === '0'" color="red">未采购</a-tag> rowKey="id"
<a-tag v-if="record.purchaseStatus === '2' && queryParam.subType === '销售订单'" color="cyan">完成采购</a-tag> :columns="columns"
<a-tag v-if="record.purchaseStatus === '3' && queryParam.subType === '销售订单'" color="blue">部分采购</a-tag> :dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: getType}"
:customRow="rowAction"
@change="handleTableChange">
<span slot="numberCustomRender" slot-scope="text, record">
<a v-if="!queryParam.purchaseStatus" @click="myHandleDetail(record)">{{record.number}}</a>
<span v-if="queryParam.purchaseStatus">{{record.number}}</span>
</span>
<template slot="customRenderStatus" slot-scope="text, record">
<template v-if="!queryParam.purchaseStatus">
<a-tag v-if="record.status === '0'" color="red">未审核</a-tag>
<a-tag v-if="record.status === '1'" color="green">已审核</a-tag>
<a-tag v-if="record.status === '2' && queryParam.subType === '采购订单'" color="cyan">完成采购</a-tag>
<a-tag v-if="record.status === '2' && queryParam.subType === '销售订单'" color="cyan">完成销售</a-tag>
<a-tag v-if="record.status === '3' && queryParam.subType === '采购订单'" color="blue">部分采购</a-tag>
<a-tag v-if="record.status === '3' && queryParam.subType === '销售订单'" color="blue">部分销售</a-tag>
</template>
<template v-if="queryParam.purchaseStatus">
<a-tag v-if="record.purchaseStatus === '0'" color="red">未采购</a-tag>
<a-tag v-if="record.purchaseStatus === '2' && queryParam.subType === '销售订单'" color="cyan">完成采购</a-tag>
<a-tag v-if="record.purchaseStatus === '3' && queryParam.subType === '销售订单'" color="blue">部分采购</a-tag>
</template>
</template> </template>
</template> </a-table>
</a-table> <a-table v-if="selectType === 'detail'"
<a-table v-if="selectType === 'detail'" bordered
bordered ref="table"
ref="table" size="middle"
size="middle" rowKey="id"
rowKey="id" :pagination="false"
:pagination="false" :columns="columnsDetail"
:columns="columnsDetail" :dataSource="dataSourceDetail"
:dataSource="dataSourceDetail" :loading="loading"
:loading="loading" :rowSelection="{selectedRowKeys: selectedDetailRowKeys, onChange: onSelectDetailChange, type: 'checkbox'}"
:rowSelection="{selectedRowKeys: selectedDetailRowKeys, onChange: onSelectDetailChange, type: 'checkbox'}" @change="handleTableChange">
@change="handleTableChange"> </a-table>
</a-table> <!-- table区域-end -->
<!-- table区域-end --> <!-- 表单区域 -->
<!-- 表单区域 --> <bill-detail ref="billDetail"></bill-detail>
<bill-detail ref="billDetail"></bill-detail> </a-modal>
</a-modal> </div>
</template> </template>
<script> <script>
......
jshERP-web/src/views/bill/dialog/ManyAccountModal.vue
View file @ f1631507
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="650" :title="title"
:visible="visible" :width="650"
:confirmLoading="confirmLoading" :visible="visible"
@ok="handleOk" :confirmLoading="confirmLoading"
@cancel="handleCancel" :getContainer="() => $refs.container"
cancelText="关闭" :maskStyle="{'top':'101px','left':'151px'}"
wrapClassName="ant-modal-cust-warp" :maskClosable="false"
style="top:20%;height: 60%;overflow-y: hidden"> @ok="handleOk"
<a-spin :spinning="confirmLoading"> @cancel="handleCancel"
<a-form :form="form"> cancelText="关闭"
<a-row class="form-row" :gutter="24"> wrapClassName="ant-modal-cust-warp"
<a-col :lg="12" :md="12" :sm="24"> style="top:20%;height: 60%;overflow-y: hidden">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户1"> <a-spin :spinning="confirmLoading">
<a-select style="width:185px;" placeholder="请选择结算账户" v-decorator="[ 'oneAccountId' ]" :dropdownMatchSelectWidth="false" allowClear> <a-form :form="form">
<a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id"> <a-row class="form-row" :gutter="24">
{{ item.name }} <a-col :lg="12" :md="12" :sm="24">
</a-select-option> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户1">
</a-select> <a-select style="width:185px;" placeholder="请选择结算账户" v-decorator="[ 'oneAccountId' ]" :dropdownMatchSelectWidth="false" allowClear>
</a-form-item> <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
</a-col> {{ item.name }}
<a-col :lg="12" :md="12" :sm="24"> </a-select-option>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算金额"> </a-select>
<a-input-number placeholder="请输入金额" v-decorator.trim="[ 'oneAccountPrice' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :lg="12" :md="12" :sm="24">
</a-row> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算金额">
<a-row class="form-row" :gutter="24"> <a-input-number placeholder="请输入金额" v-decorator.trim="[ 'oneAccountPrice' ]" />
<a-col :lg="12" :md="12" :sm="24"> </a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户2"> </a-col>
<a-select style="width:185px;" placeholder="请选择结算账户" v-decorator="[ 'twoAccountId' ]" :dropdownMatchSelectWidth="false" allowClear> </a-row>
<a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id"> <a-row class="form-row" :gutter="24">
{{ item.name }} <a-col :lg="12" :md="12" :sm="24">
</a-select-option> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户2">
</a-select> <a-select style="width:185px;" placeholder="请选择结算账户" v-decorator="[ 'twoAccountId' ]" :dropdownMatchSelectWidth="false" allowClear>
</a-form-item> <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
</a-col> {{ item.name }}
<a-col :lg="12" :md="12" :sm="24"> </a-select-option>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算金额"> </a-select>
<a-input-number placeholder="请输入金额" v-decorator.trim="[ 'twoAccountPrice' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :lg="12" :md="12" :sm="24">
</a-row> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算金额">
<a-row class="form-row" :gutter="24"> <a-input-number placeholder="请输入金额" v-decorator.trim="[ 'twoAccountPrice' ]" />
<a-col :lg="12" :md="12" :sm="24"> </a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户3"> </a-col>
<a-select style="width:185px;" placeholder="请选择结算账户" v-decorator="[ 'threeAccountId' ]" :dropdownMatchSelectWidth="false" allowClear> </a-row>
<a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id"> <a-row class="form-row" :gutter="24">
{{ item.name }} <a-col :lg="12" :md="12" :sm="24">
</a-select-option> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户3">
</a-select> <a-select style="width:185px;" placeholder="请选择结算账户" v-decorator="[ 'threeAccountId' ]" :dropdownMatchSelectWidth="false" allowClear>
</a-form-item> <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
</a-col> {{ item.name }}
<a-col :lg="12" :md="12" :sm="24"> </a-select-option>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算金额"> </a-select>
<a-input-number placeholder="请输入金额" v-decorator.trim="[ 'threeAccountPrice' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :lg="12" :md="12" :sm="24">
</a-row> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算金额">
</a-form> <a-input-number placeholder="请输入金额" v-decorator.trim="[ 'threeAccountPrice' ]" />
</a-spin> </a-form-item>
</a-modal> </a-col>
</a-row>
</a-form>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'
......
jshERP-web/src/views/bill/modules/AllocationOutModal.vue
View file @ f1631507
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
switchFullscreen switchFullscreen
@cancel="handleCancel" @cancel="handleCancel"
wrapClassName="ant-modal-cust-warp" wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden"> style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer"> <template slot="footer">
<a-button @click="handleCancel">取消</a-button> <a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button> <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
......
jshERP-web/src/views/bill/modules/AssembleModal.vue
View file @ f1631507
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
switchFullscreen switchFullscreen
@cancel="handleCancel" @cancel="handleCancel"
wrapClassName="ant-modal-cust-warp" wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden"> style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer"> <template slot="footer">
<a-button @click="handleCancel">取消</a-button> <a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button> <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
......
jshERP-web/src/views/bill/modules/DisassembleModal.vue
View file @ f1631507
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
switchFullscreen switchFullscreen
@cancel="handleCancel" @cancel="handleCancel"
wrapClassName="ant-modal-cust-warp" wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden"> style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer"> <template slot="footer">
<a-button @click="handleCancel">取消</a-button> <a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button> <a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
......
Supports Markdown
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