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

2
jshERP-web/public/static/color.less
View File

@@ -5626,7 +5626,7 @@ form .ant-upload {
border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px;
} }
.ant-modal-mask { .ant-modal-mask {
background-color: rgba(0, 0, 0, 0.65); background-color: rgba(0, 0, 0, 0.1) !important;
} }
.ant-confirm-body .ant-confirm-title { .ant-confirm-body .ant-confirm-title {
color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);

8
jshERP-web/src/assets/less/common.less
View File

@@ -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 @@
} }
/*商品-列表页面弹出modal*/ /*商品-列表页面弹出modal*/
.ant-modal-material-warp { .ant-modal-material-warp {
margin-top: 101px;
margin-left: 151px;
height: 100% height: 100%
} }
/*商品-弹出modal Y轴滚动条*/ /*商品-弹出modal Y轴滚动条*/
@@ -72,3 +76,7 @@
.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;
}

74
jshERP-web/src/components/jeecg/JModal/index.vue
View File

@@ -1,44 +1,48 @@
<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"
@cancel="handleCancel"
>
<slot></slot> <slot></slot>
<template v-if="!isNoTitle" slot="title"> <template v-if="!isNoTitle" slot="title">
<a-row class="j-modal-title-row" type="flex"> <a-row class="j-modal-title-row" type="flex">
<a-col class="left"> <a-col class="left">
<slot name="title">{{ title }}</slot> <slot name="title">{{ title }}</slot>
</a-col> </a-col>
<a-col class="right"> <a-col class="right">
<a-tooltip title="新手引导"> <a-tooltip title="新手引导">
<a-button v-if="switchHelp" @click="handleHelp" style="right:112px;" 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="question-circle"/> ghost type="link" icon="question-circle"/>
</a-tooltip> </a-tooltip>
<a-button v-if="switchFullscreen" @click="toggleFullscreen" class="ant-modal-close ant-modal-close-x" <a-button v-if="switchFullscreen" @click="toggleFullscreen" class="ant-modal-close ant-modal-close-x"
ghost type="link" :icon="fullscreenButtonIcon"/> ghost type="link" :icon="fullscreenButtonIcon"/>
</a-col> </a-col>
</a-row> </a-row>
</template> </template>
<!-- 处理 scopedSlots --> <!-- 处理 scopedSlots -->
<template v-for="slotName of scopedSlotsKeys" :slot="slotName"> <template v-for="slotName of scopedSlotsKeys" :slot="slotName">
<slot :name="slotName"></slot> <slot :name="slotName"></slot>
</template> </template>
<!-- 处理 slots --> <!-- 处理 slots -->
<template v-for="slotName of slotsKeys" v-slot:[slotName]> <template v-for="slotName of slotsKeys" v-slot:[slotName]>
<slot :name="slotName"></slot> <slot :name="slotName"></slot>
</template> </template>
</a-modal> </a-modal>
</div>
</template> </template>
<script> <script>

2
jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
View File

@@ -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">

2
jshERP-web/src/components/menu/SideMenu.vue
View File

@@ -1,7 +1,7 @@
<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">

3
jshERP-web/src/components/menu/index.js
View File

@@ -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 => {

2
jshERP-web/src/components/page/GlobalHeader.vue
View File

@@ -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 {

16
jshERP-web/src/components/page/GlobalLayout.vue
View File

@@ -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 @@
@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 @@
<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 @@
/> />
<!-- 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 @@
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 @@
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 @@
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 @@
.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);

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

@@ -1,36 +1,40 @@
<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>

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

@@ -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;

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

@@ -1,28 +1,33 @@
<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>

59
jshERP-web/src/views/bill/dialog/BatchSetDepot.vue
View File

@@ -1,31 +1,36 @@
<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'

2
jshERP-web/src/views/bill/dialog/BillDetail.vue
View File

@@ -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>
<!--此处为解决缓存问题--> <!--此处为解决缓存问题-->

55
jshERP-web/src/views/bill/dialog/BillPrintIframe.vue
View File

@@ -1,30 +1,35 @@
<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>

169
jshERP-web/src/views/bill/dialog/HistoryBillList.vue
View File

@@ -1,87 +1,92 @@
<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">
<a-row :gutter="24">
<a-col :md="4" :sm="24">
<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-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 :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-button type="primary" @click="searchQuery">查询</a-button>
<a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
</a-col>
</span>
</a-row>
</a-form>
</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> </template>
</a-table> <!-- 查询区域 -->
<!-- table区域-end --> <div class="table-page-search-wrapper">
<!-- 表单区域 --> <!-- 搜索区域 -->
<bill-detail ref="billDetail"></bill-detail> <a-form layout="inline" @keyup.enter.native="searchQuery">
</a-modal> <a-row :gutter="24">
<a-col :md="4" :sm="24">
<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-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 :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-button type="primary" @click="searchQuery">查询</a-button>
<a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
</a-col>
</span>
</a-row>
</a-form>
</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>

187
jshERP-web/src/views/bill/dialog/LinkBillList.vue
View File

@@ -1,98 +1,103 @@
<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
ref="table"
size="middle"
rowKey="id"
:columns="columns"
: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 v-if="queryParam.purchaseStatus"> </a-table>
<a-tag v-if="record.purchaseStatus === '0'" color="red">未采购</a-tag> <a-table v-if="selectType === 'detail'"
<a-tag v-if="record.purchaseStatus === '2' && queryParam.subType === '销售订单'" color="cyan">完成采购</a-tag> bordered
<a-tag v-if="record.purchaseStatus === '3' && queryParam.subType === '销售订单'" color="blue">部分采购</a-tag> ref="table"
</template> size="middle"
</template> rowKey="id"
</a-table> :pagination="false"
<a-table v-if="selectType === 'detail'" :columns="columnsDetail"
bordered :dataSource="dataSourceDetail"
ref="table" :loading="loading"
size="middle" :rowSelection="{selectedRowKeys: selectedDetailRowKeys, onChange: onSelectDetailChange, type: 'checkbox'}"
rowKey="id" @change="handleTableChange">
:pagination="false" </a-table>
:columns="columnsDetail" <!-- table区域-end -->
:dataSource="dataSourceDetail" <!-- 表单区域 -->
:loading="loading" <bill-detail ref="billDetail"></bill-detail>
:rowSelection="{selectedRowKeys: selectedDetailRowKeys, onChange: onSelectDetailChange, type: 'checkbox'}" </a-modal>
@change="handleTableChange"> </div>
</a-table>
<!-- table区域-end -->
<!-- 表单区域 -->
<bill-detail ref="billDetail"></bill-detail>
</a-modal>
</template> </template>
<script> <script>

131
jshERP-web/src/views/bill/dialog/ManyAccountModal.vue
View File

@@ -1,67 +1,72 @@
<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'

2
jshERP-web/src/views/bill/modules/AllocationOutModal.vue
View File

@@ -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>

2
jshERP-web/src/views/bill/modules/AssembleModal.vue
View File

@@ -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>

2
jshERP-web/src/views/bill/modules/DisassembleModal.vue
View File

@@ -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>

2
jshERP-web/src/views/bill/modules/OtherInModal.vue
View File

@@ -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>

2
jshERP-web/src/views/bill/modules/OtherOutModal.vue
View File

@@ -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>

2
jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
View File

@@ -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>

2
jshERP-web/src/views/bill/modules/PurchaseInModal.vue
View File

@@ -13,7 +13,7 @@
@cancel="handleCancel" @cancel="handleCancel"
wrapClassName="ant-modal-cust-warp" wrapClassName="ant-modal-cust-warp"
:id="prefixNo" :id="prefixNo"
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>

2
jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
View File

@@ -13,7 +13,7 @@
@cancel="handleCancel" @cancel="handleCancel"
wrapClassName="ant-modal-cust-warp" wrapClassName="ant-modal-cust-warp"
:id="prefixNo" :id="prefixNo"
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>

2
jshERP-web/src/views/bill/modules/RetailBackModal.vue
View File

@@ -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>

2
jshERP-web/src/views/bill/modules/RetailOutModal.vue
View File

@@ -13,7 +13,7 @@
@cancel="handleCancel" @cancel="handleCancel"
wrapClassName="ant-modal-cust-warp" wrapClassName="ant-modal-cust-warp"
:id="prefixNo" :id="prefixNo"
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>

2
jshERP-web/src/views/bill/modules/SaleBackModal.vue
View File

@@ -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>

2
jshERP-web/src/views/bill/modules/SaleOrderModal.vue
View File

@@ -13,7 +13,7 @@
@cancel="handleCancel" @cancel="handleCancel"
wrapClassName="ant-modal-cust-warp" wrapClassName="ant-modal-cust-warp"
:id="prefixNo" :id="prefixNo"
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>

2
jshERP-web/src/views/bill/modules/SaleOutModal.vue
View File

@@ -13,7 +13,7 @@
@cancel="handleCancel" @cancel="handleCancel"
wrapClassName="ant-modal-cust-warp" wrapClassName="ant-modal-cust-warp"
:id="prefixNo" :id="prefixNo"
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>

145
jshERP-web/src/views/financial/dialog/DebtBillList.vue
View File

@@ -1,76 +1,81 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="1300" :title="title"
:visible="visible" :width="1300"
@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"> cancelText="关闭"
<!-- 搜索区域 --> wrapClassName="ant-modal-cust-warp"
<a-form layout="inline" @keyup.enter.native="searchQuery"> style="top:5%;height: 100%;overflow-y: hidden">
<a-row :gutter="24"> <!-- 查询区域 -->
<a-col :md="6" :sm="24"> <div class="table-page-search-wrapper">
<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 <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 @click="myHandleDetail(record)">{{record.number}}</a> <a-col :md="6" :sm="24">
</span> <a-button type="primary" @click="searchQuery">查询</a-button>
<span slot="customTitle"> <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
实际欠款 </a-col>
<a-tooltip title="实际欠款=本单欠款-退货单欠款（主要针对存在退货的情况）"> </span>
<a-icon type="question-circle" /> </a-row>
</a-tooltip> </a-form>
</span> </div>
</a-table> <!-- table区域-begin -->
<!-- table区域-end --> <a-table
<!-- 表单区域 --> bordered
<bill-detail ref="modalDetail"></bill-detail> ref="table"
</a-modal> size="middle"
rowKey="id"
:columns="columns"
: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 @click="myHandleDetail(record)">{{record.number}}</a>
</span>
<span slot="customTitle">
实际欠款
<a-tooltip title="实际欠款=本单欠款-退货单欠款（主要针对存在退货的情况）">
<a-icon type="question-circle" />
</a-tooltip>
</span>
</a-table>
<!-- table区域-end -->
<!-- 表单区域 -->
<bill-detail ref="modalDetail"></bill-detail>
</a-modal>
</div>
</template> </template>
<script> <script>

2
jshERP-web/src/views/financial/modules/AdvanceInModal.vue
View File

@@ -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>

2
jshERP-web/src/views/financial/modules/GiroModal.vue
View File

@@ -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>

2
jshERP-web/src/views/financial/modules/ItemInModal.vue
View File

@@ -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>

2
jshERP-web/src/views/financial/modules/ItemOutModal.vue
View File

@@ -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>

2
jshERP-web/src/views/financial/modules/MoneyInModal.vue
View File

@@ -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>

2
jshERP-web/src/views/financial/modules/MoneyOutModal.vue
View File

@@ -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>

123
jshERP-web/src/views/material/modules/BatchSetInfoModal.vue
View File

@@ -1,63 +1,68 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="1000" :title="title"
:visible="visible" :width="1000"
:confirm-loading="confirmLoading" :visible="visible"
@ok="handleOk" :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"
<a-spin :spinning="confirmLoading"> @ok="handleOk"
<a-form :form="form"> @cancel="handleCancel"
<a-row class="form-row" :gutter="24"> wrapClassName="ant-modal-cust-warp"
<a-col :md="8" :sm="24"> style="top:25%;height: 45%;overflow-y: hidden">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="颜色"> <a-spin :spinning="confirmLoading">
<a-input placeholder="请输入颜色" v-decorator.trim="[ 'color' ]" /> <a-form :form="form">
</a-form-item> <a-row class="form-row" :gutter="24">
</a-col> <a-col :md="8" :sm="24">
<a-col :md="8" :sm="24"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="颜色">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="基础重量"> <a-input placeholder="请输入颜色" v-decorator.trim="[ 'color' ]" />
<a-input-number style="width: 100%" placeholder="请输入基础重量(kg)" v-decorator.trim="[ 'weight' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :md="8" :sm="24">
<a-col :md="8" :sm="24"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="基础重量">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="保质期"> <a-input-number style="width: 100%" placeholder="请输入基础重量(kg)" v-decorator.trim="[ 'weight' ]" />
<a-input-number style="width: 100%" placeholder="请输入保质期(天)" v-decorator.trim="[ 'expiryNum' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :md="8" :sm="24">
<a-col :md="8" :sm="24"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="保质期">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="类别"> <a-input-number style="width: 100%" placeholder="请输入保质期(天)" v-decorator.trim="[ 'expiryNum' ]" />
<a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}" allow-clear </a-form-item>
:treeData="categoryTree" v-decorator="[ 'categoryId' ]" placeholder="请选择类别"> </a-col>
</a-tree-select> <a-col :md="8" :sm="24">
</a-form-item> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="类别">
</a-col> <a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}" allow-clear
<a-col :md="8" :sm="24"> :treeData="categoryTree" v-decorator="[ 'categoryId' ]" placeholder="请选择类别">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="序列号"> </a-tree-select>
<a-select placeholder="有无序列号" v-decorator="[ 'enableSerialNumber' ]"> </a-form-item>
<a-select-option value="1">有</a-select-option> </a-col>
<a-select-option value="0">无</a-select-option> <a-col :md="8" :sm="24">
</a-select> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="序列号">
</a-form-item> <a-select placeholder="有无序列号" v-decorator="[ 'enableSerialNumber' ]">
</a-col> <a-select-option value="1">有</a-select-option>
<a-col :md="8" :sm="24"> <a-select-option value="0">无</a-select-option>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="批号"> </a-select>
<a-select placeholder="有无批号" v-decorator="[ 'enableBatchNumber' ]"> </a-form-item>
<a-select-option value="1">有</a-select-option> </a-col>
<a-select-option value="0">无</a-select-option> <a-col :md="8" :sm="24">
</a-select> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="批号">
</a-form-item> <a-select placeholder="有无批号" v-decorator="[ 'enableBatchNumber' ]">
</a-col> <a-select-option value="1">有</a-select-option>
<a-col :md="8" :sm="24"> <a-select-option value="0">无</a-select-option>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注"> </a-select>
<a-textarea :rows="1" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :md="8" :sm="24">
</a-row> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
</a-form> <a-textarea :rows="1" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
</a-spin> </a-form-item>
</a-modal> </a-col>
</a-row>
</a-form>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>

51
jshERP-web/src/views/material/modules/BatchSetPriceModal.vue
View File

@@ -1,27 +1,32 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="500" :title="title"
:visible="visible" :width="500"
:confirm-loading="confirmLoading" :visible="visible"
@ok="handleOk" :confirm-loading="confirmLoading"
@cancel="handleCancel" :getContainer="() => $refs.container"
cancelText="关闭" :maskStyle="{'top':'101px','left':'151px'}"
wrapClassName="ant-modal-cust-warp" :maskClosable="false"
style="top:35%;height: 30%;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:35%;height: 30%;overflow-y: hidden">
</template> <template slot="footer">
<a-spin :spinning="confirmLoading"> <a-button key="back" v-if="isReadOnly" @click="handleCancel">
<a-form :form="form"> 关闭
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="请输入价格"> </a-button>
<a-input placeholder="请输入价格" v-decorator.trim="[ 'price', validatorRules.price]" /> </template>
</a-form-item> <a-spin :spinning="confirmLoading">
</a-form> <a-form :form="form">
</a-spin> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="请输入价格">
</a-modal> <a-input placeholder="请输入价格" v-decorator.trim="[ 'price', validatorRules.price]" />
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>

51
jshERP-web/src/views/material/modules/BatchSetStockModal.vue
View File

@@ -1,27 +1,32 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="500" :title="title"
:visible="visible" :width="500"
:confirm-loading="confirmLoading" :visible="visible"
@ok="handleOk" :confirm-loading="confirmLoading"
@cancel="handleCancel" :getContainer="() => $refs.container"
cancelText="关闭" :maskStyle="{'top':'101px','left':'151px'}"
wrapClassName="ant-modal-cust-warp" :maskClosable="false"
style="top:35%;height: 30%;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:35%;height: 30%;overflow-y: hidden">
</template> <template slot="footer">
<a-spin :spinning="confirmLoading"> <a-button key="back" v-if="isReadOnly" @click="handleCancel">
<a-form :form="form"> 关闭
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="请输入数量"> </a-button>
<a-input placeholder="请输入数量" v-decorator.trim="[ 'number', validatorRules.number]" /> </template>
</a-form-item> <a-spin :spinning="confirmLoading">
</a-form> <a-form :form="form">
</a-spin> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="请输入数量">
</a-modal> <a-input placeholder="请输入数量" v-decorator.trim="[ 'number', validatorRules.number]" />
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>

61
jshERP-web/src/views/material/modules/MaterialAttributeModal.vue
View File

@@ -1,32 +1,37 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="800" :title="title"
:visible="visible" :width="800"
: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: 50%;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:100px;height: 50%;overflow-y: hidden">
</template> <template slot="footer">
<a-spin :spinning="confirmLoading"> <a-button key="back" v-if="isReadOnly" @click="handleCancel">
<a-form :form="form"> 关闭
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="属性名"> </a-button>
<a-input placeholder="请输入属性名" v-decorator.trim="[ 'attributeName', validatorRules.attributeName]" /> </template>
</a-form-item> <a-spin :spinning="confirmLoading">
</a-form> <a-form :form="form">
<a-form :form="form"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="属性名">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="属性值"> <a-input placeholder="请输入属性名" v-decorator.trim="[ 'attributeName', validatorRules.attributeName]" />
<a-textarea :rows="2" placeholder="请输入属性值（用竖线隔开）" v-decorator.trim="[ 'attributeValue', validatorRules.attributeValue]" /> </a-form-item>
</a-form-item> </a-form>
</a-form> <a-form :form="form">
</a-spin> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="属性值">
</a-modal> <a-textarea :rows="2" placeholder="请输入属性值（用竖线隔开）" v-decorator.trim="[ 'attributeValue', validatorRules.attributeValue]" />
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'

74
jshERP-web/src/views/material/modules/MaterialCategoryModal.vue
View File

@@ -1,38 +1,44 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="800" :title="title"
:ok=false :width="800"
:visible="visible" :ok=false
:confirmLoading="confirmLoading" :visible="visible"
:okButtonProps="{ props: {disabled: disableSubmit} }" :confirmLoading="confirmLoading"
@ok="handleOk" :okButtonProps="{ props: {disabled: disableSubmit} }"
@cancel="handleCancel" :getContainer="() => $refs.container"
cancelText="关闭"> :maskStyle="{'top':'101px','left':'151px'}"
:maskClosable="false"
<a-spin :spinning="confirmLoading"> @ok="handleOk"
<a-form :form="form"> @cancel="handleCancel"
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称"> wrapClassName="ant-modal-cust-warp"
<a-input placeholder="请输入名称" v-decorator="['name', validatorRules.name ]"/> style="top:100px;height: 50%;overflow-y: hidden"
</a-form-item> cancelText="关闭">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="编号"> <a-spin :spinning="confirmLoading">
<a-input placeholder="请输入编号" v-decorator="['serialNo', validatorRules.serialNo ]"/> <a-form :form="form">
</a-form-item> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级目录"> <a-input placeholder="请输入名称" v-decorator="['name', validatorRules.name ]"/>
<a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}" </a-form-item>
allow-clear :treeDefaultExpandAll="true" <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="编号">
:treeData="categoryTree" v-decorator="[ 'parentId' ]" placeholder="请选择上级目录"> <a-input placeholder="请输入编号" v-decorator="['serialNo', validatorRules.serialNo ]"/>
</a-tree-select> </a-form-item>
</a-form-item> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级目录">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序"> <a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
<a-input-number v-decorator="[ 'sort' ]"/> allow-clear :treeDefaultExpandAll="true"
</a-form-item> :treeData="categoryTree" v-decorator="[ 'parentId' ]" placeholder="请选择上级目录">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注"> </a-tree-select>
<a-textarea placeholder="请输入备注":rows="2" v-decorator.trim="[ 'remark' ]" /> </a-form-item>
</a-form-item> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
</a-form> <a-input-number v-decorator="[ 'sort' ]"/>
</a-spin> </a-form-item>
</a-modal> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
<a-textarea placeholder="请输入备注":rows="2" v-decorator.trim="[ 'remark' ]" />
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>

2
jshERP-web/src/views/material/modules/MaterialModal.vue
View File

@@ -13,7 +13,7 @@
cancelText="关闭" cancelText="关闭"
wrapClassName="ant-modal-material-warp" wrapClassName="ant-modal-material-warp"
:id="prefixNo" :id="prefixNo"
style="top:5%;height: 100%;overflow-y: hidden"> style="top:20px;height: 95%;overflow-y: hidden">
<template slot="footer"> <template slot="footer">
<a-button key="back" v-if="isReadOnly" @click="handleCancel"> <a-button key="back" v-if="isReadOnly" @click="handleCancel">
关闭 关闭

59
jshERP-web/src/views/material/modules/MaterialPropertyModal.vue
View File

@@ -1,31 +1,36 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="800" :title="title"
:visible="visible" :width="800"
: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: 70%;overflow-y: hidden"> @ok="handleOk"
<a-spin :spinning="confirmLoading"> @cancel="handleCancel"
<a-form :form="form"> cancelText="关闭"
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称"> wrapClassName="ant-modal-cust-warp"
<a-input placeholder="请输入名称" v-decorator.trim="[ 'nativeName' ]" :readOnly="model.id"/> style="top:20%;height: 70%;overflow-y: hidden">
</a-form-item> <a-spin :spinning="confirmLoading">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="是否启用"> <a-form :form="form">
<a-switch checked-children="启用" un-checked-children="禁用" v-model="enabledSwitch" @change="onChange"></a-switch> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
</a-form-item> <a-input placeholder="请输入名称" v-decorator.trim="[ 'nativeName' ]" :readOnly="model.id"/>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序"> </a-form-item>
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort', validatorRules.sort]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="是否启用">
</a-form-item> <a-switch checked-children="启用" un-checked-children="禁用" v-model="enabledSwitch" @change="onChange"></a-switch>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="别名"> </a-form-item>
<a-input placeholder="请输入别名" v-decorator.trim="[ 'anotherName' ]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
</a-form-item> <a-input placeholder="请输入排序" v-decorator.trim="[ 'sort', validatorRules.sort]" />
</a-form> </a-form-item>
</a-spin> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="别名">
</a-modal> <a-input placeholder="请输入别名" v-decorator.trim="[ 'anotherName' ]" />
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'

67
jshERP-web/src/views/report/modules/AccountInOutList.vue
View File

@@ -1,35 +1,40 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="1000" :title="title"
:visible="visible" :width="1000"
@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"
<!-- table区域-begin --> style="top:20px;height: 95%;overflow-y: hidden">
<a-table <template slot="footer">
bordered <a-button key="back" @click="handleCancel">取消</a-button>
ref="table" </template>
size="middle" <!-- table区域-begin -->
rowKey="id" <a-table
:columns="columns" bordered
:dataSource="dataSource" ref="table"
:pagination="ipagination" size="middle"
:loading="loading" rowKey="id"
@change="handleTableChange"> :columns="columns"
<span slot="numberCustomRender" slot-scope="text, record"> :dataSource="dataSource"
<a @click="myHandleDetail(record)">{{record.number}}</a> :pagination="ipagination"
</span> :loading="loading"
</a-table> @change="handleTableChange">
<!-- table区域-end --> <span slot="numberCustomRender" slot-scope="text, record">
<!-- 表单区域 --> <a @click="myHandleDetail(record)">{{record.number}}</a>
<bill-detail ref="billDetail"></bill-detail> </span>
<financial-detail ref="financialDetail"></financial-detail> </a-table>
</a-modal> <!-- table区域-end -->
<!-- 表单区域 -->
<bill-detail ref="billDetail"></bill-detail>
<financial-detail ref="financialDetail"></financial-detail>
</a-modal>
</div>
</template> </template>
<script> <script>
import BillDetail from '../../bill/dialog/BillDetail' import BillDetail from '../../bill/dialog/BillDetail'

127
jshERP-web/src/views/report/modules/DebtAccountList.vue
View File

@@ -1,67 +1,72 @@
<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 key="back" @click="handleCancel">取消</a-button> cancelText="关闭"
</template> wrapClassName="ant-modal-cust-warp"
<!-- 查询区域 --> style="top:20px;height: 95%;overflow-y: hidden">
<div class="table-page-search-wrapper"> <template slot="footer">
<!-- 搜索区域 --> <a-button key="back" @click="handleCancel">取消</a-button>
<a-form layout="inline" @keyup.enter.native="searchQuery"> </template>
<a-row :gutter="24"> <!-- 查询区域 -->
<a-col :md="6" :sm="8"> <div class="table-page-search-wrapper">
<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="8">
<a-col :md="6" :sm="8"> <a-form-item label="单据编号" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
<a-form-item label="商品信息" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}"> <a-input placeholder="请输入单据编号查询" v-model="queryParam.number"></a-input>
<a-input placeholder="请输入名称、规格、型号" v-model="queryParam.materialParam"></a-input> </a-form-item>
</a-form-item>
</a-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button type="primary" @click="searchQuery">查询</a-button>
<a-button style="margin-left: 8px" v-print="'#debtAccountPrint'" icon="printer">打印</a-button>
<a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
</a-col> </a-col>
<a-col :md="6" :sm="8">
<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>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button type="primary" @click="searchQuery">查询</a-button>
<a-button style="margin-left: 8px" v-print="'#debtAccountPrint'" icon="printer">打印</a-button>
<a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
</a-col>
</span>
</a-row>
</a-form>
</div>
<!-- table区域-begin -->
<section ref="debtPrint" id="debtAccountPrint">
<a-table
bordered
ref="table"
size="middle"
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="false"
:loading="loading"
@change="handleTableChange">
<span slot="numberCustomRender" slot-scope="text, record">
<a @click="myHandleDetail(record)">{{record.number}}</a>
</span> </span>
</a-row> <span slot="customTitle">
</a-form> 实际欠款
</div> <a-tooltip title="实际欠款=本单欠款-退货单欠款（主要针对存在退货的情况）">
<!-- table区域-begin --> <a-icon type="question-circle" />
<section ref="debtPrint" id="debtAccountPrint"> </a-tooltip>
<a-table </span>
bordered </a-table>
ref="table" </section>
size="middle" <!-- table区域-end -->
rowKey="id" <!-- 表单区域 -->
:columns="columns" <bill-detail ref="modalDetail"></bill-detail>
:dataSource="dataSource" </a-modal>
:pagination="false" </div>
:loading="loading"
@change="handleTableChange">
<span slot="numberCustomRender" slot-scope="text, record">
<a @click="myHandleDetail(record)">{{record.number}}</a>
</span>
<span slot="customTitle">
实际欠款
<a-tooltip title="实际欠款=本单欠款-退货单欠款（主要针对存在退货的情况）">
<a-icon type="question-circle" />
</a-tooltip>
</span>
</a-table>
</section>
<!-- table区域-end -->
<!-- 表单区域 -->
<bill-detail ref="modalDetail"></bill-detail>
</a-modal>
</template> </template>
<script> <script>

65
jshERP-web/src/views/report/modules/MaterialInOutList.vue
View File

@@ -1,34 +1,39 @@
<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 key="back" @click="handleCancel">取消</a-button> cancelText="关闭"
</template> wrapClassName="ant-modal-cust-warp"
<!-- table区域-begin --> style="top:20px;height: 95%;overflow-y: hidden">
<a-table <template slot="footer">
bordered <a-button key="back" @click="handleCancel">取消</a-button>
ref="table" </template>
size="middle" <!-- table区域-begin -->
rowKey="id" <a-table
:columns="columns" bordered
:dataSource="dataSource" ref="table"
:pagination="ipagination" size="middle"
:loading="loading" rowKey="id"
@change="handleTableChange"> :columns="columns"
<span slot="numberCustomRender" slot-scope="text, record"> :dataSource="dataSource"
<a @click="myHandleDetail(record)">{{record.number}}</a> :pagination="ipagination"
</span> :loading="loading"
</a-table> @change="handleTableChange">
<!-- table区域-end --> <span slot="numberCustomRender" slot-scope="text, record">
<!-- 表单区域 --> <a @click="myHandleDetail(record)">{{record.number}}</a>
<bill-detail ref="billDetail"></bill-detail> </span>
</a-modal> </a-table>
<!-- table区域-end -->
<!-- 表单区域 -->
<bill-detail ref="billDetail"></bill-detail>
</a-modal>
</div>
</template> </template>
<script> <script>
import BillDetail from '../../bill/dialog/BillDetail' import BillDetail from '../../bill/dialog/BillDetail'

81
jshERP-web/src/views/system/modules/AccountModal.vue
View File

@@ -1,42 +1,47 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="800" :title="title"
:visible="visible" :width="800"
: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: 65%;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:20%;height: 65%;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="accountModal"> 关闭
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称"> </a-button>
<a-input placeholder="请输入名称" v-decorator.trim="[ 'name', validatorRules.name]" /> </template>
</a-form-item> <a-spin :spinning="confirmLoading">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="编号"> <a-form :form="form" id="accountModal">
<a-input placeholder="请输入编号" v-decorator.trim="[ 'serialNo', validatorRules.serialNo]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
</a-form-item> <a-input placeholder="请输入名称" v-decorator.trim="[ 'name', validatorRules.name]" />
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期初金额"> </a-form-item>
<a-input placeholder="请输入期初金额" v-decorator.trim="[ 'initialAmount' ]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="编号">
</a-form-item> <a-input placeholder="请输入编号" v-decorator.trim="[ 'serialNo', validatorRules.serialNo]" />
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="当前余额"> </a-form-item>
<a-input placeholder="请输入当前余额" :read-only="true" v-decorator.trim="[ 'currentAmount' ]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期初金额">
</a-form-item> <a-input placeholder="请输入期初金额" v-decorator.trim="[ 'initialAmount' ]" />
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序"> </a-form-item>
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="当前余额">
</a-form-item> <a-input placeholder="请输入当前余额" :read-only="true" v-decorator.trim="[ 'currentAmount' ]" />
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注"> </a-form-item>
<a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
</a-form-item> <a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
</a-form> </a-form-item>
</a-spin> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
</a-modal> <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" />
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'

203
jshERP-web/src/views/system/modules/CustomerModal.vue
View File

@@ -1,103 +1,108 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="1200" :title="title"
:visible="visible" :width="1200"
: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:10%;height: 80%;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:10%;height: 80%;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="customerModal"> 关闭
<a-row class="form-row" :gutter="24"> </a-button>
<a-col :span="24/2"> </template>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称"> <a-spin :spinning="confirmLoading">
<a-input placeholder="请输入名称" v-decorator.trim="[ 'supplier', validatorRules.supplier]" /> <a-form :form="form" id="customerModal">
</a-form-item> <a-row class="form-row" :gutter="24">
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系人"> <a-input placeholder="请输入名称" v-decorator.trim="[ 'supplier', validatorRules.supplier]" />
<a-input placeholder="请输入联系人" v-decorator.trim="[ 'contacts' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
</a-row> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系人">
<a-row class="form-row" :gutter="24"> <a-input placeholder="请输入联系人" v-decorator.trim="[ 'contacts' ]" />
<a-col :span="24/2"> </a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号码"> </a-col>
<a-input placeholder="请输入手机号码" v-decorator.trim="[ 'telephone' ]" /> </a-row>
</a-form-item> <a-row class="form-row" :gutter="24">
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号码">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系电话"> <a-input placeholder="请输入手机号码" v-decorator.trim="[ 'telephone' ]" />
<a-input placeholder="请输入联系电话" v-decorator.trim="[ 'phoneNum' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系电话">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电子邮箱"> <a-input placeholder="请输入联系电话" v-decorator.trim="[ 'phoneNum' ]" />
<a-input placeholder="请输入电子邮箱" v-decorator.trim="[ 'email' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电子邮箱">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="传真"> <a-input placeholder="请输入电子邮箱" v-decorator.trim="[ 'email' ]" />
<a-input placeholder="请输入传真" v-decorator.trim="[ 'fax' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="传真">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期初应收"> <a-input placeholder="请输入传真" v-decorator.trim="[ 'fax' ]" />
<a-input placeholder="请输入期初应收" v-decorator.trim="[ 'beginNeedGet' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期初应收">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期末应收"> <a-input placeholder="请输入期初应收" v-decorator.trim="[ 'beginNeedGet' ]" />
<a-input v-decorator.trim="[ 'allNeedGet' ]" :readOnly="true" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期末应收">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="纳税人识别号"> <a-input v-decorator.trim="[ 'allNeedGet' ]" :readOnly="true" />
<a-input placeholder="请输入纳税人识别号" v-decorator.trim="[ 'taxNum' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="纳税人识别号">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="税率(%)"> <a-input placeholder="请输入纳税人识别号" v-decorator.trim="[ 'taxNum' ]" />
<a-input-number style="width:100%" placeholder="请输入税率" v-decorator.trim="[ 'taxRate' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="税率(%)">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开户行"> <a-input-number style="width:100%" placeholder="请输入税率" v-decorator.trim="[ 'taxRate' ]" />
<a-input placeholder="请输入开户行" v-decorator.trim="[ 'bankName' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开户行">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="账号"> <a-input placeholder="请输入开户行" v-decorator.trim="[ 'bankName' ]" />
<a-input placeholder="请输入账号" v-decorator.trim="[ 'accountNumber' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="账号">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="地址"> <a-input placeholder="请输入账号" v-decorator.trim="[ 'accountNumber' ]" />
<a-input placeholder="请输入地址" v-decorator.trim="[ 'address' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="地址">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序"> <a-input placeholder="请输入地址" v-decorator.trim="[ 'address' ]" />
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注"> <a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
<a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
</a-row> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
</a-form> <a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" />
</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'

95
jshERP-web/src/views/system/modules/DepotModal.vue
View File

@@ -1,49 +1,54 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="800" :title="title"
:visible="visible" :width="800"
: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:15%;height: 70%;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:15%;height: 70%;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="depotModal"> 关闭
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="仓库名称"> </a-button>
<a-input placeholder="请输入仓库名称" v-decorator.trim="[ 'name', validatorRules.name]" /> </template>
</a-form-item> <a-spin :spinning="confirmLoading">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="仓库地址"> <a-form :form="form" id="depotModal">
<a-input placeholder="请输入仓库地址" v-decorator.trim="[ 'address' ]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="仓库名称">
</a-form-item> <a-input placeholder="请输入仓库名称" v-decorator.trim="[ 'name', validatorRules.name]" />
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="仓储费"> </a-form-item>
<a-input placeholder="请输入仓储费" v-decorator.trim="[ 'warehousing' ]" suffix="元/天/KG"/> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="仓库地址">
</a-form-item> <a-input placeholder="请输入仓库地址" v-decorator.trim="[ 'address' ]" />
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="搬运费"> </a-form-item>
<a-input placeholder="请输入搬运费" v-decorator.trim="[ 'truckage' ]" suffix="元"/> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="仓储费">
</a-form-item> <a-input placeholder="请输入仓储费" v-decorator.trim="[ 'warehousing' ]" suffix="元/天/KG"/>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="负责人"> </a-form-item>
<a-select placeholder="选择负责人" v-decorator="[ 'principal' ]" :dropdownMatchSelectWidth="false"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="搬运费">
<a-select-option v-for="(item,index) in userList" :key="index" :value="item.id"> <a-input placeholder="请输入搬运费" v-decorator.trim="[ 'truckage' ]" suffix="元"/>
{{ item.userName }} </a-form-item>
</a-select-option> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="负责人">
</a-select> <a-select placeholder="选择负责人" v-decorator="[ 'principal' ]" :dropdownMatchSelectWidth="false">
</a-form-item> <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序"> {{ item.userName }}
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" /> </a-select-option>
</a-form-item> </a-select>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注"> </a-form-item>
<a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'remark' ]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
</a-form-item> <a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
</a-form> </a-form-item>
</a-spin> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
</a-modal> <a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'remark' ]" />
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'

109
jshERP-web/src/views/system/modules/FunctionModal.vue
View File

@@ -1,56 +1,61 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="800" :title="title"
:visible="visible" :width="800"
: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:10%;height: 90%;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:10%;height: 90%;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="functionModal"> 关闭
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="编号"> </a-button>
<a-input placeholder="请输入编号" v-decorator.trim="[ 'number', validatorRules.number]" /> </template>
</a-form-item> <a-spin :spinning="confirmLoading">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称"> <a-form :form="form" id="functionModal">
<a-input placeholder="请输入名称" v-decorator.trim="[ 'name', validatorRules.name]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="编号">
</a-form-item> <a-input placeholder="请输入编号" v-decorator.trim="[ 'number', validatorRules.number]" />
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级编号"> </a-form-item>
<a-input-search placeholder="请选择上级编号" v-decorator.trim="[ 'parentNumber', validatorRules.parentNumber ]" <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
@search="onSearchParentNumber" :readOnly="true" /> <a-input placeholder="请输入名称" v-decorator.trim="[ 'name', validatorRules.name]" />
</a-form-item> </a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级名称"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级编号">
<a-input v-decorator.trim="[ 'parentName' ]" :readOnly="true" /> <a-input-search placeholder="请选择上级编号" v-decorator.trim="[ 'parentNumber', validatorRules.parentNumber ]"
</a-form-item> @search="onSearchParentNumber" :readOnly="true" />
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="链接"> </a-form-item>
<a-input placeholder="请输入链接" v-decorator.trim="[ 'url', validatorRules.url ]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级名称">
</a-form-item> <a-input v-decorator.trim="[ 'parentName' ]" :readOnly="true" />
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="组件"> </a-form-item>
<a-input placeholder="请输入组件" v-decorator.trim="[ 'component', validatorRules.component ]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="链接">
</a-form-item> <a-input placeholder="请输入链接" v-decorator.trim="[ 'url', validatorRules.url ]" />
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序"> </a-form-item>
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort', validatorRules.sort ]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="组件">
</a-form-item> <a-input placeholder="请输入组件" v-decorator.trim="[ 'component', validatorRules.component ]" />
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="功能按钮"> </a-form-item>
<j-select-multiple placeholder="请选择功能按钮" v-model="jselectMultiple.value" :options="jselectMultiple.options"/> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
</a-form-item> <a-input placeholder="请输入排序" v-decorator.trim="[ 'sort', validatorRules.sort ]" />
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="图标"> </a-form-item>
<a-input placeholder="请输入图标" v-decorator.trim="[ 'icon', validatorRules.icon ]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="功能按钮">
</a-form-item> <j-select-multiple placeholder="请选择功能按钮" v-model="jselectMultiple.value" :options="jselectMultiple.options"/>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="是否启用"> </a-form-item>
<a-switch checked-children="启用" un-checked-children="禁用" v-model="enabledSwitch" @change="onChange"/> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="图标">
</a-form-item> <a-input placeholder="请输入图标" v-decorator.trim="[ 'icon', validatorRules.icon ]" />
</a-form> </a-form-item>
</a-spin> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="是否启用">
<function-tree-modal ref="functionTreeModal" @ok="functionTreeModalOk"></function-tree-modal> <a-switch checked-children="启用" un-checked-children="禁用" v-model="enabledSwitch" @change="onChange"/>
</a-modal> </a-form-item>
</a-form>
</a-spin>
<function-tree-modal ref="functionTreeModal" @ok="functionTreeModalOk"></function-tree-modal>
</a-modal>
</div>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'

65
jshERP-web/src/views/system/modules/FunctionTreeModal.vue
View File

@@ -1,34 +1,39 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="width" :title="title"
:visible="visible" :width="width"
:confirmLoading="confirmLoading" :visible="visible"
@cancel="handleCancel" :confirmLoading="confirmLoading"
cancelText="关闭" :getContainer="() => $refs.container"
wrapClassName="ant-modal-cust-warp" :maskStyle="{'top':'101px','left':'151px'}"
style="top:10%;height: 90%;overflow-y: hidden"> :maskClosable="false"
<template slot="footer"> @cancel="handleCancel"
<a-button key="back" @click="handleCancel"> cancelText="关闭"
关闭 wrapClassName="ant-modal-cust-warp"
</a-button> style="top:10%;height: 90%;overflow-y: hidden">
</template> <template slot="footer">
<a-spin :spinning="confirmLoading"> <a-button key="back" @click="handleCancel">
<a-col :md="10" :sm="24"> 关闭
<template> </a-button>
<a-tree </template>
multiple <a-spin :spinning="confirmLoading">
@select='onSelect' <a-col :md="10" :sm="24">
:selectedKeys="selectedKeys" <template>
:checkedKeys="checkedKeys" <a-tree
:treeData="roleFunctionTree" multiple
:checkStrictly="checkStrictly" @select='onSelect'
:expandedKeys="iExpandedKeys" :selectedKeys="selectedKeys"
:autoExpandParent="true" /> :checkedKeys="checkedKeys"
</template> :treeData="roleFunctionTree"
</a-col> :checkStrictly="checkStrictly"
</a-spin> :expandedKeys="iExpandedKeys"
</a-modal> :autoExpandParent="true" />
</template>
</a-col>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'

75
jshERP-web/src/views/system/modules/InOutItemModal.vue
View File

@@ -1,39 +1,44 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="800" :title="title"
:visible="visible" :width="800"
: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"
<template slot="footer"> @cancel="handleCancel"
<a-button key="back" v-if="isReadOnly" @click="handleCancel"> cancelText="关闭"
关闭 wrapClassName="ant-modal-cust-warp"
</a-button> style="top:25%;height: 50%;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="inOutItemModal"> 关闭
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称"> </a-button>
<a-input placeholder="请输入名称" v-decorator.trim="[ 'name', validatorRules.name]" /> </template>
</a-form-item> <a-spin :spinning="confirmLoading">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="类型"> <a-form :form="form" id="inOutItemModal">
<a-select placeholder="请选择类型" v-decorator="[ 'type', validatorRules.type]"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
<a-select-option value="收入">收入</a-select-option> <a-input placeholder="请输入名称" v-decorator.trim="[ 'name', validatorRules.name]" />
<a-select-option value="支出">支出</a-select-option> </a-form-item>
</a-select> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="类型">
</a-form-item> <a-select placeholder="请选择类型" v-decorator="[ 'type', validatorRules.type]">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序"> <a-select-option value="收入">收入</a-select-option>
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" /> <a-select-option value="支出">支出</a-select-option>
</a-form-item> </a-select>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注"> </a-form-item>
<a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
</a-form-item> <a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
</a-form> </a-form-item>
</a-spin> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
</a-modal> <a-textarea :rows="2" placeholder="请输入备注" v-decorator="[ 'remark' ]" />
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'

123
jshERP-web/src/views/system/modules/MemberModal.vue
View File

@@ -1,63 +1,68 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="1200" :title="title"
:visible="visible" :width="1200"
: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"
<template slot="footer"> @cancel="handleCancel"
<a-button key="back" v-if="isReadOnly" @click="handleCancel"> cancelText="关闭"
关闭 wrapClassName="ant-modal-cust-warp"
</a-button> style="top:20%;height: 60%;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="memberModal"> 关闭
<a-row class="form-row" :gutter="24"> </a-button>
<a-col :span="24/2"> </template>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号"> <a-spin :spinning="confirmLoading">
<a-input placeholder="请输入会员卡号" v-decorator.trim="[ 'supplier', validatorRules.supplier]" /> <a-form :form="form" id="memberModal">
</a-form-item> <a-row class="form-row" :gutter="24">
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会员卡号">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系人"> <a-input placeholder="请输入会员卡号" v-decorator.trim="[ 'supplier', validatorRules.supplier]" />
<a-input placeholder="请输入联系人" v-decorator.trim="[ 'contacts' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
</a-row> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系人">
<a-row class="form-row" :gutter="24"> <a-input placeholder="请输入联系人" v-decorator.trim="[ 'contacts' ]" />
<a-col :span="24/2"> </a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号码"> </a-col>
<a-input placeholder="请输入手机号码" v-decorator.trim="[ 'telephone' ]" /> </a-row>
</a-form-item> <a-row class="form-row" :gutter="24">
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号码">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系电话"> <a-input placeholder="请输入手机号码" v-decorator.trim="[ 'telephone' ]" />
<a-input placeholder="请输入联系电话" v-decorator.trim="[ 'phoneNum' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系电话">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电子邮箱"> <a-input placeholder="请输入联系电话" v-decorator.trim="[ 'phoneNum' ]" />
<a-input placeholder="请输入电子邮箱" v-decorator.trim="[ 'email' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电子邮箱">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序"> <a-input placeholder="请输入电子邮箱" v-decorator.trim="[ 'email' ]" />
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注"> <a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
<a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
</a-row> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
</a-form> <a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" />
</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'

76
jshERP-web/src/views/system/modules/OrganizationModal.vue
View File

@@ -1,38 +1,44 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="800" :title="title"
:ok=false :width="800"
:visible="visible" :ok=false
:confirmLoading="confirmLoading" :visible="visible"
:okButtonProps="{ props: {disabled: disableSubmit} }" :confirmLoading="confirmLoading"
@ok="handleOk" :getContainer="() => $refs.container"
@cancel="handleCancel" :maskStyle="{'top':'101px','left':'151px'}"
cancelText="关闭"> :maskClosable="false"
:okButtonProps="{ props: {disabled: disableSubmit} }"
<a-spin :spinning="confirmLoading"> @ok="handleOk"
<a-form :form="form" id="organizationModal"> @cancel="handleCancel"
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称"> cancelText="关闭"
<a-input placeholder="请输入名称" v-decorator="['orgAbr', validatorRules.orgAbr ]"/> wrapClassName="ant-modal-cust-warp"
</a-form-item> style="top:50px;height: 80%;overflow-y: hidden">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="编号"> <a-spin :spinning="confirmLoading">
<a-input placeholder="请输入编号" v-decorator="['orgNo', validatorRules.orgNo ]"/> <a-form :form="form" id="organizationModal">
</a-form-item> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级机构"> <a-input placeholder="请输入名称" v-decorator="['orgAbr', validatorRules.orgAbr ]"/>
<a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}" </a-form-item>
allow-clear :treeDefaultExpandAll="true" <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="编号">
:treeData="departTree" v-decorator="[ 'parentId' ]" placeholder="请选择上级机构"> <a-input placeholder="请输入编号" v-decorator="['orgNo', validatorRules.orgNo ]"/>
</a-tree-select> </a-form-item>
</a-form-item> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级机构">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序"> <a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
<a-input-number v-decorator="[ 'sort' ]"/> allow-clear :treeDefaultExpandAll="true"
</a-form-item> :treeData="departTree" v-decorator="[ 'parentId' ]" placeholder="请选择上级机构">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注"> </a-tree-select>
<a-textarea placeholder="请输入备注":rows="2" v-decorator.trim="[ 'remark' ]" /> </a-form-item>
</a-form-item> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
</a-form> <a-input-number v-decorator="[ 'sort' ]"/>
</a-spin> </a-form-item>
</a-modal> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
<a-textarea placeholder="请输入备注":rows="2" v-decorator.trim="[ 'remark' ]" />
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
@@ -165,5 +171,5 @@
</script> </script>
<style scoped> <style scoped>
@import '~@assets/less/common.less'
</style> </style>

71
jshERP-web/src/views/system/modules/PersonModal.vue
View File

@@ -1,37 +1,42 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="800" :title="title"
:visible="visible" :width="800"
: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: 45%;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: 45%;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="personModal"> 关闭
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="姓名"> </a-button>
<a-input placeholder="请输入姓名" v-decorator.trim="[ 'name', validatorRules.name]" /> </template>
</a-form-item> <a-spin :spinning="confirmLoading">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="类型"> <a-form :form="form" id="personModal">
<a-select placeholder="请选择类型" v-decorator="[ 'type', validatorRules.type]"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="姓名">
<a-select-option value="业务员">业务员</a-select-option> <a-input placeholder="请输入姓名" v-decorator.trim="[ 'name', validatorRules.name]" />
<a-select-option value="仓管员">仓管员</a-select-option> </a-form-item>
<a-select-option value="财务员">财务员</a-select-option> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="类型">
</a-select> <a-select placeholder="请选择类型" v-decorator="[ 'type', validatorRules.type]">
</a-form-item> <a-select-option value="业务员">业务员</a-select-option>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序"> <a-select-option value="仓管员">仓管员</a-select-option>
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" /> <a-select-option value="财务员">财务员</a-select-option>
</a-form-item> </a-select>
</a-form> </a-form-item>
</a-spin> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
</a-modal> <a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'

47
jshERP-web/src/views/system/modules/PlatformConfigModal.vue
View File

@@ -1,25 +1,30 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="800" :title="title"
:visible="visible" :width="800"
: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: 40%;overflow-y: hidden"> @ok="handleOk"
<a-spin :spinning="confirmLoading"> @cancel="handleCancel"
<a-form :form="form" id="platformConfigModal"> cancelText="关闭"
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="配置名称"> wrapClassName="ant-modal-cust-warp"
<a-input placeholder="请输入配置名称" v-decorator.trim="[ 'platformKeyInfo' ]" :readOnly="true" /> style="top:30%;height: 40%;overflow-y: hidden">
</a-form-item> <a-spin :spinning="confirmLoading">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="配置值"> <a-form :form="form" id="platformConfigModal">
<a-input placeholder="请输入配置值" v-decorator.trim="[ 'platformValue' ]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="配置名称">
</a-form-item> <a-input placeholder="请输入配置名称" v-decorator.trim="[ 'platformKeyInfo' ]" :readOnly="true" />
</a-form> </a-form-item>
</a-spin> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="配置值">
</a-modal> <a-input placeholder="请输入配置值" v-decorator.trim="[ 'platformValue' ]" />
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'

47
jshERP-web/src/views/system/modules/PluginAppModal.vue
View File

@@ -1,25 +1,30 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="800" :title="title"
:visible="visible" :width="800"
: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 :labelCol="labelCol" :wrapperCol="wrapperCol" label="机器码"> wrapClassName="ant-modal-cust-warp"
<a-input v-decorator.trim="[ 'platformKey' ]" :readOnly="true"/> style="top:25%;height: 50%;overflow-y: hidden">
</a-form-item> <a-spin :spinning="confirmLoading">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机端激活码"> <a-form :form="form">
<a-textarea :rows="2" placeholder="请输入手机端激活码" v-decorator="[ 'platformValue' ]"/> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="机器码">
</a-form-item> <a-input v-decorator.trim="[ 'platformKey' ]" :readOnly="true"/>
</a-form> </a-form-item>
</a-spin> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机端激活码">
</a-modal> <a-textarea :rows="2" placeholder="请输入手机端激活码" v-decorator="[ 'platformValue' ]"/>
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'

47
jshERP-web/src/views/system/modules/PluginModal.vue
View File

@@ -1,25 +1,30 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="800" :title="title"
:visible="visible" :width="800"
: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 :labelCol="labelCol" :wrapperCol="wrapperCol" label="机器码"> wrapClassName="ant-modal-cust-warp"
<a-input v-decorator.trim="[ 'platformKey' ]" :readOnly="true"/> style="top:25%;height: 50%;overflow-y: hidden">
</a-form-item> <a-spin :spinning="confirmLoading">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="插件激活码"> <a-form :form="form">
<a-textarea :rows="2" placeholder="请输入插件激活码" v-decorator="[ 'platformValue' ]"/> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="机器码">
</a-form-item> <a-input v-decorator.trim="[ 'platformKey' ]" :readOnly="true"/>
</a-form> </a-form-item>
</a-spin> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="插件激活码">
</a-modal> <a-textarea :rows="2" placeholder="请输入插件激活码" v-decorator="[ 'platformValue' ]"/>
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'

91
jshERP-web/src/views/system/modules/RoleFunctionModal.vue
View File

@@ -1,47 +1,52 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="width" :title="title"
:visible="visible" :width="width"
: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:5%;height: 95%;overflow-y: hidden"> @ok="handleOk"
<a-spin :spinning="confirmLoading"> @cancel="handleCancel"
<div class="drawer-bootom-button"> cancelText="关闭"
<a-dropdown :trigger="['click']" placement="topCenter"> wrapClassName="ant-modal-cust-warp"
<a-menu slot="overlay"> style="top:5%;height: 95%;overflow-y: hidden">
<a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item> <a-spin :spinning="confirmLoading">
<a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item> <div class="drawer-bootom-button">
<a-menu-item key="3" @click="checkALL">全部勾选</a-menu-item> <a-dropdown :trigger="['click']" placement="topCenter">
<a-menu-item key="4" @click="cancelCheckALL">取消全选</a-menu-item> <a-menu slot="overlay">
<a-menu-item key="5" @click="expandAll">展开所有</a-menu-item> <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
<a-menu-item key="6" @click="closeAll">合并所有</a-menu-item> <a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item>
</a-menu> <a-menu-item key="3" @click="checkALL">全部勾选</a-menu-item>
<a-button> <a-menu-item key="4" @click="cancelCheckALL">取消全选</a-menu-item>
树操作 <a-icon type="up" /> <a-menu-item key="5" @click="expandAll">展开所有</a-menu-item>
</a-button> <a-menu-item key="6" @click="closeAll">合并所有</a-menu-item>
</a-dropdown> </a-menu>
</div> <a-button>
<a-col :md="10" :sm="24"> 树操作 <a-icon type="up" />
<template> </a-button>
<a-tree </a-dropdown>
checkable </div>
multiple <a-col :md="10" :sm="24">
@check="onCheck" <template>
:selectedKeys="selectedKeys" <a-tree
:checkedKeys="checkedKeys" checkable
:treeData="roleFunctionTree" multiple
:checkStrictly="checkStrictly" @check="onCheck"
:expandedKeys="iExpandedKeys" :selectedKeys="selectedKeys"
:autoExpandParent="true" :checkedKeys="checkedKeys"
@expand="onExpand"/> :treeData="roleFunctionTree"
</template> :checkStrictly="checkStrictly"
</a-col> :expandedKeys="iExpandedKeys"
</a-spin> :autoExpandParent="true"
</a-modal> @expand="onExpand"/>
</template>
</a-col>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'

97
jshERP-web/src/views/system/modules/RoleModal.vue
View File

@@ -1,50 +1,55 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="800" :title="title"
:visible="visible" :width="800"
: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"
<template slot="footer"> @cancel="handleCancel"
<a-button key="back" v-if="isReadOnly" @click="handleCancel"> cancelText="关闭"
关闭 wrapClassName="ant-modal-cust-warp"
</a-button> style="top:20%;height: 60%;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="roleModal"> 关闭
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="角色名称"> </a-button>
<a-input placeholder="请输入角色名称" v-decorator.trim="[ 'name', validatorRules.name]" /> </template>
</a-form-item> <a-spin :spinning="confirmLoading">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="数据类型"> <a-form :form="form" id="roleModal">
<a-select placeholder="请选择数据类型" v-decorator="[ 'type', validatorRules.type]" style="width:94%"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="角色名称">
<a-select-option value="全部数据">全部数据</a-select-option> <a-input placeholder="请输入角色名称" v-decorator.trim="[ 'name', validatorRules.name]" />
<a-select-option value="本机构数据">本机构数据</a-select-option> </a-form-item>
<a-select-option value="个人数据">个人数据</a-select-option> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="数据类型">
</a-select> <a-select placeholder="请选择数据类型" v-decorator="[ 'type', validatorRules.type]" style="width:94%">
<a-tooltip title="1、全部数据-该角色对应的用户可以看到全部单据；2、本机构数据-该角色对应的用户可以看到自己所在机构的全部单据； <a-select-option value="全部数据">全部数据</a-select-option>
3、个人数据-该角色对应的用户只可以看到自己的单据。单据是指采购入库、销售出库等"> <a-select-option value="本机构数据">本机构数据</a-select-option>
<a-icon type="question-circle" style="width:6%; padding-left: 5px; font-size: 18px;" /> <a-select-option value="个人数据">个人数据</a-select-option>
</a-tooltip> </a-select>
</a-form-item> <a-tooltip title="1、全部数据-该角色对应的用户可以看到全部单据；2、本机构数据-该角色对应的用户可以看到自己所在机构的全部单据；
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="价格屏蔽"> 3、个人数据-该角色对应的用户只可以看到自己的单据。单据是指采购入库、销售出库等">
<j-select-multiple style="width:94%" placeholder="请选择价格屏蔽" v-model="priceLimitList.value" :options="priceLimitList.options"/> <a-icon type="question-circle" style="width:6%; padding-left: 5px; font-size: 18px;" />
<a-tooltip title="价格屏蔽支持多选，主要用于控制首页界面和物料的价格屏蔽"> </a-tooltip>
<a-icon type="question-circle" style="width:6%; padding-left: 5px; font-size: 18px;" /> </a-form-item>
</a-tooltip> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="价格屏蔽">
</a-form-item> <j-select-multiple style="width:94%" placeholder="请选择价格屏蔽" v-model="priceLimitList.value" :options="priceLimitList.options"/>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="描述"> <a-tooltip title="价格屏蔽支持多选，主要用于控制首页界面和物料的价格屏蔽">
<a-textarea :rows="1" placeholder="请输入描述" v-decorator="[ 'description', validatorRules.description ]" /> <a-icon type="question-circle" style="width:6%; padding-left: 5px; font-size: 18px;" />
</a-form-item> </a-tooltip>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序"> </a-form-item>
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="描述">
</a-form-item> <a-textarea :rows="1" placeholder="请输入描述" v-decorator="[ 'description', validatorRules.description ]" />
</a-form> </a-form-item>
</a-spin> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
</a-modal> <a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'

119
jshERP-web/src/views/system/modules/RolePushBtnModal.vue
View File

@@ -1,62 +1,67 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="width" :title="title"
:visible="visible" :width="width"
: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:5%;height: 95%;overflow-y: hidden"> @ok="handleOk"
<a-spin :spinning="confirmLoading"> @cancel="handleCancel"
<div class="table-page-search-wrapper"> cancelText="关闭"
<!-- 按钮区域 --> wrapClassName="ant-modal-cust-warp"
<a-form layout="inline"> style="top:5%;height: 95%;overflow-y: hidden">
<a-row :gutter="24"> <a-spin :spinning="confirmLoading">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <div class="table-page-search-wrapper">
<a-col :md="12" :sm="24"> <!-- 按钮区域 -->
<a-button @click="toggleChecked"> <a-form layout="inline">
{{ !checked ? '全选' : '全取消' }} <a-row :gutter="24">
</a-button> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button @click="editToggleChecked" style="margin-left: 8px"> <a-col :md="12" :sm="24">
{{ !editChecked ? '全选-编辑' : '全取消-编辑' }} <a-button @click="toggleChecked">
</a-button> {{ !checked ? '全选' : '全取消' }}
<a-button @click="auditToggleChecked" style="margin-left: 8px"> </a-button>
{{ !auditChecked ? '全选-审核' : '全取消-审核' }} <a-button @click="editToggleChecked" style="margin-left: 8px">
</a-button> {{ !editChecked ? '全选-编辑' : '全取消-编辑' }}
<a-button @click="unAuditToggleChecked" style="margin-left: 8px"> </a-button>
{{ !unAuditChecked ? '全选-反审核' : '全取消-反审核' }} <a-button @click="auditToggleChecked" style="margin-left: 8px">
</a-button> {{ !auditChecked ? '全选-审核' : '全取消-审核' }}
</a-col> </a-button>
<a-button @click="unAuditToggleChecked" style="margin-left: 8px">
{{ !unAuditChecked ? '全选-反审核' : '全取消-反审核' }}
</a-button>
</a-col>
</span>
</a-row>
</a-form>
</div>
<!-- table区域-begin -->
<div>
<a-table
ref="table"
size="middle"
bordered
rowKey="id"
:pagination="false"
:columns="columns"
:dataSource="dataSource"
:loading="loading">
<span slot="action" slot-scope="text, record">
<a-checkbox v-if="record.pushBtn.indexOf(1)>-1" value="1" :checked="record.btnStr?record.btnStr.indexOf(1)>-1:false" @change="onChange(record,'1')">编辑</a-checkbox>
<a-checkbox v-if="record.pushBtn.indexOf(2)>-1" value="2" :checked="record.btnStr?record.btnStr.indexOf(2)>-1:false" @change="onChange(record,'2')">审核</a-checkbox>
<a-checkbox v-if="record.pushBtn.indexOf(7)>-1" value="7" :checked="record.btnStr?record.btnStr.indexOf(7)>-1:false" @change="onChange(record,'7')">反审核</a-checkbox>
<a-checkbox v-if="record.pushBtn.indexOf(3)>-1" value="3" :checked="record.btnStr?record.btnStr.indexOf(3)>-1:false" @change="onChange(record,'3')">导入导出</a-checkbox>
<a-checkbox v-if="record.pushBtn.indexOf(4)>-1" value="4" :checked="record.btnStr?record.btnStr.indexOf(4)>-1:false" @change="onChange(record,'4')">启用禁用</a-checkbox>
<a-checkbox v-if="record.pushBtn.indexOf(5)>-1" value="5" :checked="record.btnStr?record.btnStr.indexOf(5)>-1:false" @change="onChange(record,'5')">打印</a-checkbox>
<a-checkbox v-if="record.pushBtn.indexOf(6)>-1" value="6" :checked="record.btnStr?record.btnStr.indexOf(6)>-1:false" @change="onChange(record,'6')">作废</a-checkbox>
</span> </span>
</a-row> </a-table>
</a-form> </div>
</div> </a-spin>
<!-- table区域-begin --> </a-modal>
<div> </div>
<a-table
ref="table"
size="middle"
bordered
rowKey="id"
:pagination="false"
:columns="columns"
:dataSource="dataSource"
:loading="loading">
<span slot="action" slot-scope="text, record">
<a-checkbox v-if="record.pushBtn.indexOf(1)>-1" value="1" :checked="record.btnStr?record.btnStr.indexOf(1)>-1:false" @change="onChange(record,'1')">编辑</a-checkbox>
<a-checkbox v-if="record.pushBtn.indexOf(2)>-1" value="2" :checked="record.btnStr?record.btnStr.indexOf(2)>-1:false" @change="onChange(record,'2')">审核</a-checkbox>
<a-checkbox v-if="record.pushBtn.indexOf(7)>-1" value="7" :checked="record.btnStr?record.btnStr.indexOf(7)>-1:false" @change="onChange(record,'7')">反审核</a-checkbox>
<a-checkbox v-if="record.pushBtn.indexOf(3)>-1" value="3" :checked="record.btnStr?record.btnStr.indexOf(3)>-1:false" @change="onChange(record,'3')">导入导出</a-checkbox>
<a-checkbox v-if="record.pushBtn.indexOf(4)>-1" value="4" :checked="record.btnStr?record.btnStr.indexOf(4)>-1:false" @change="onChange(record,'4')">启用禁用</a-checkbox>
<a-checkbox v-if="record.pushBtn.indexOf(5)>-1" value="5" :checked="record.btnStr?record.btnStr.indexOf(5)>-1:false" @change="onChange(record,'5')">打印</a-checkbox>
<a-checkbox v-if="record.pushBtn.indexOf(6)>-1" value="6" :checked="record.btnStr?record.btnStr.indexOf(6)>-1:false" @change="onChange(record,'6')">作废</a-checkbox>
</span>
</a-table>
</div>
</a-spin>
</a-modal>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'

73
jshERP-web/src/views/system/modules/TenantModal.vue
View File

@@ -1,38 +1,43 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="600" :title="title"
:visible="visible" :width="600"
: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-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="登录名称"> wrapClassName="ant-modal-cust-warp"
<a-input placeholder="请输入登录名称" v-decorator.trim="[ 'loginName', validatorRules.loginName]" :readOnly="!!model.id" style="top:20%;height: 60%;overflow-y: hidden">
suffix="初始密码：123456" /> <a-spin :spinning="confirmLoading">
</a-form-item> <a-form :form="form">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="用户数量限制"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="登录名称">
<a-input-number style="width:100%" placeholder="请输入用户数量限制" v-decorator.trim="[ 'userNumLimit' ]" /> <a-input placeholder="请输入登录名称" v-decorator.trim="[ 'loginName', validatorRules.loginName]" :readOnly="!!model.id"
</a-form-item> suffix="初始密码：123456" />
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="租户类型"> </a-form-item>
<a-select style="width:100%" placeholder="请选择租户类型" v-decorator.trim="[ 'type' ]"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="用户数量限制">
<a-select-option value="0">试用租户</a-select-option> <a-input-number style="width:100%" placeholder="请输入用户数量限制" v-decorator.trim="[ 'userNumLimit' ]" />
<a-select-option value="1">付费租户</a-select-option> </a-form-item>
</a-select> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="租户类型">
</a-form-item> <a-select style="width:100%" placeholder="请选择租户类型" v-decorator.trim="[ 'type' ]">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="到期时间"> <a-select-option value="0">试用租户</a-select-option>
<j-date style="width:100%" placeholder="请选择到期时间" v-decorator.trim="[ 'expireTime' ]" :show-time="true"/> <a-select-option value="1">付费租户</a-select-option>
</a-form-item> </a-select>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="描述"> </a-form-item>
<a-textarea :rows="2" placeholder="请输入描述" v-decorator.trim="[ 'remark' ]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="到期时间">
</a-form-item> <j-date style="width:100%" placeholder="请选择到期时间" v-decorator.trim="[ 'expireTime' ]" :show-time="true"/>
</a-form> </a-form-item>
</a-spin> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="描述">
</a-modal> <a-textarea :rows="2" placeholder="请输入描述" v-decorator.trim="[ 'remark' ]" />
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'

93
jshERP-web/src/views/system/modules/UnitModal.vue
View File

@@ -1,48 +1,53 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="700" :title="title"
:visible="visible" :width="700"
: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"
<template slot="footer"> @cancel="handleCancel"
<a-button key="back" v-if="isReadOnly" @click="handleCancel"> cancelText="关闭"
关闭 wrapClassName="ant-modal-cust-warp"
</a-button> style="top:100px; height:50%;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="unitModal"> 关闭
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="基本单位"> </a-button>
<a-input placeholder="请输入基本单位(小单位)" v-decorator.trim="[ 'basicUnit', validatorRules.basicUnit]" /> </template>
</a-form-item> <a-spin :spinning="confirmLoading">
</a-form> <a-form :form="form" id="unitModal">
<a-form :form="form"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="基本单位">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="副单位"> <a-input placeholder="请输入基本单位(小单位)" v-decorator.trim="[ 'basicUnit', validatorRules.basicUnit]" />
<a-input placeholder="请输入副单位(大单位)" style="width:48%" v-decorator.trim="[ 'otherUnit' ]" /> </a-form-item>
= </a-form>
<a-input suffix="基本单位" placeholder="请输入比例" style="width:48%" v-decorator.trim="[ 'ratio' ]" /> <a-form :form="form">
</a-form-item> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="副单位">
</a-form> <a-input placeholder="请输入副单位(大单位)" style="width:48%" v-decorator.trim="[ 'otherUnit' ]" />
<a-form :form="form"> =
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="副单位2"> <a-input suffix="基本单位" placeholder="请输入比例" style="width:48%" v-decorator.trim="[ 'ratio' ]" />
<a-input placeholder="请输入副单位2(大单位)" style="width:48%" v-decorator.trim="[ 'otherUnitTwo' ]" /> </a-form-item>
= </a-form>
<a-input suffix="基本单位" placeholder="请输入比例2" style="width:48%" v-decorator.trim="[ 'ratioTwo' ]" /> <a-form :form="form">
</a-form-item> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="副单位2">
</a-form> <a-input placeholder="请输入副单位2(大单位)" style="width:48%" v-decorator.trim="[ 'otherUnitTwo' ]" />
<a-form :form="form"> =
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="副单位3"> <a-input suffix="基本单位" placeholder="请输入比例2" style="width:48%" v-decorator.trim="[ 'ratioTwo' ]" />
<a-input placeholder="请输入副单位3(大单位)" style="width:48%" v-decorator.trim="[ 'otherUnitThree' ]" /> </a-form-item>
= </a-form>
<a-input suffix="基本单位" placeholder="请输入比例3" style="width:48%" v-decorator.trim="[ 'ratioThree' ]" /> <a-form :form="form">
</a-form-item> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="副单位3">
</a-form> <a-input placeholder="请输入副单位3(大单位)" style="width:48%" v-decorator.trim="[ 'otherUnitThree' ]" />
</a-spin> =
</a-modal> <a-input suffix="基本单位" placeholder="请输入比例3" style="width:48%" v-decorator.trim="[ 'ratioThree' ]" />
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'

91
jshERP-web/src/views/system/modules/UserCustomerModal.vue
View File

@@ -1,47 +1,52 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="800" :title="title"
:visible="visible" :width="800"
: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:5%;height: 95%;overflow-y: hidden"> @ok="handleOk"
<a-spin :spinning="confirmLoading"> @cancel="handleCancel"
<div class="drawer-bootom-button"> cancelText="关闭"
<a-dropdown :trigger="['click']" placement="topCenter"> wrapClassName="ant-modal-cust-warp"
<a-menu slot="overlay"> style="top:5%;height: 95%;overflow-y: hidden">
<a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item> <a-spin :spinning="confirmLoading">
<a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item> <div class="drawer-bootom-button">
<a-menu-item key="3" @click="checkALL">全部勾选</a-menu-item> <a-dropdown :trigger="['click']" placement="topCenter">
<a-menu-item key="4" @click="cancelCheckALL">取消全选</a-menu-item> <a-menu slot="overlay">
<a-menu-item key="5" @click="expandAll">展开所有</a-menu-item> <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
<a-menu-item key="6" @click="closeAll">合并所有</a-menu-item> <a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item>
</a-menu> <a-menu-item key="3" @click="checkALL">全部勾选</a-menu-item>
<a-button> <a-menu-item key="4" @click="cancelCheckALL">取消全选</a-menu-item>
树操作 <a-icon type="up" /> <a-menu-item key="5" @click="expandAll">展开所有</a-menu-item>
</a-button> <a-menu-item key="6" @click="closeAll">合并所有</a-menu-item>
</a-dropdown> </a-menu>
</div> <a-button>
<a-col :md="10" :sm="24"> 树操作 <a-icon type="up" />
<template> </a-button>
<a-tree </a-dropdown>
checkable </div>
multiple <a-col :md="10" :sm="24">
@check="onCheck" <template>
:selectedKeys="selectedKeys" <a-tree
:checkedKeys="checkedKeys" checkable
:treeData="roleFunctionTree" multiple
:checkStrictly="checkStrictly" @check="onCheck"
:expandedKeys="iExpandedKeys" :selectedKeys="selectedKeys"
:autoExpandParent="true" :checkedKeys="checkedKeys"
@expand="onExpand"/> :treeData="roleFunctionTree"
</template> :checkStrictly="checkStrictly"
</a-col> :expandedKeys="iExpandedKeys"
</a-spin> :autoExpandParent="true"
</a-modal> @expand="onExpand"/>
</template>
</a-col>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'

91
jshERP-web/src/views/system/modules/UserDepotModal.vue
View File

@@ -1,47 +1,52 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="800" :title="title"
:visible="visible" :width="800"
: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:5%;height: 95%;overflow-y: hidden"> @ok="handleOk"
<a-spin :spinning="confirmLoading"> @cancel="handleCancel"
<div class="drawer-bootom-button"> cancelText="关闭"
<a-dropdown :trigger="['click']" placement="topCenter"> wrapClassName="ant-modal-cust-warp"
<a-menu slot="overlay"> style="top:5%;height: 95%;overflow-y: hidden">
<a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item> <a-spin :spinning="confirmLoading">
<a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item> <div class="drawer-bootom-button">
<a-menu-item key="3" @click="checkALL">全部勾选</a-menu-item> <a-dropdown :trigger="['click']" placement="topCenter">
<a-menu-item key="4" @click="cancelCheckALL">取消全选</a-menu-item> <a-menu slot="overlay">
<a-menu-item key="5" @click="expandAll">展开所有</a-menu-item> <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
<a-menu-item key="6" @click="closeAll">合并所有</a-menu-item> <a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item>
</a-menu> <a-menu-item key="3" @click="checkALL">全部勾选</a-menu-item>
<a-button> <a-menu-item key="4" @click="cancelCheckALL">取消全选</a-menu-item>
树操作 <a-icon type="up" /> <a-menu-item key="5" @click="expandAll">展开所有</a-menu-item>
</a-button> <a-menu-item key="6" @click="closeAll">合并所有</a-menu-item>
</a-dropdown> </a-menu>
</div> <a-button>
<a-col :md="10" :sm="24"> 树操作 <a-icon type="up" />
<template> </a-button>
<a-tree </a-dropdown>
checkable </div>
multiple <a-col :md="10" :sm="24">
@check="onCheck" <template>
:selectedKeys="selectedKeys" <a-tree
:checkedKeys="checkedKeys" checkable
:treeData="roleFunctionTree" multiple
:checkStrictly="checkStrictly" @check="onCheck"
:expandedKeys="iExpandedKeys" :selectedKeys="selectedKeys"
:autoExpandParent="true" :checkedKeys="checkedKeys"
@expand="onExpand"/> :treeData="roleFunctionTree"
</template> :checkStrictly="checkStrictly"
</a-col> :expandedKeys="iExpandedKeys"
</a-spin> :autoExpandParent="true"
</a-modal> @expand="onExpand"/>
</template>
</a-col>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'

115
jshERP-web/src/views/system/modules/UserModal.vue
View File

@@ -1,59 +1,64 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="800" :title="title"
:visible="visible" :width="800"
: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:10%;height: 85%;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:10%;height: 85%;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="userModal"> 关闭
<a-form-item label="登录名称" :labelCol="labelCol" :wrapperCol="wrapperCol"> </a-button>
<a-input placeholder="请输入登录名称" v-decorator.trim="[ 'loginName', validatorRules.loginName]" :readOnly="!!model.id" </template>
suffix="初始密码：123456" /> <a-spin :spinning="confirmLoading">
</a-form-item> <a-form :form="form" id="userModal">
<a-form-item label="用户姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" > <a-form-item label="登录名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入用户姓名" v-decorator.trim="[ 'username', validatorRules.username]" /> <a-input placeholder="请输入登录名称" v-decorator.trim="[ 'loginName', validatorRules.loginName]" :readOnly="!!model.id"
</a-form-item> suffix="初始密码：123456" />
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="角色"> </a-form-item>
<a-select v-if="model.roleName!='租户'" placeholder="选择角色" v-decorator="[ 'roleId', validatorRules.roleId]" :dropdownMatchSelectWidth="false"> <a-form-item label="用户姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" >
<a-select-option v-for="(item,index) in roleList" :key="index" :value="item.id"> <a-input placeholder="请输入用户姓名" v-decorator.trim="[ 'username', validatorRules.username]" />
{{ item.name }} </a-form-item>
</a-select-option> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="角色">
</a-select> <a-select v-if="model.roleName!='租户'" placeholder="选择角色" v-decorator="[ 'roleId', validatorRules.roleId]" :dropdownMatchSelectWidth="false">
<a-col v-if="model.roleName=='租户'"><a-row>租户</a-row></a-col> <a-select-option v-for="(item,index) in roleList" :key="index" :value="item.id">
</a-form-item> {{ item.name }}
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="机构"> </a-select-option>
<a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}" allow-clear </a-select>
:treeData="orgaTree" v-decorator="[ 'orgaId' ]" placeholder="请选择机构"> <a-col v-if="model.roleName=='租户'"><a-row>租户</a-row></a-col>
</a-tree-select> </a-form-item>
</a-form-item> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="机构">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="职位"> <a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}" allow-clear
<a-input placeholder="请输入职位" v-decorator.trim="[ 'position' ]" /> :treeData="orgaTree" v-decorator="[ 'orgaId' ]" placeholder="请选择机构">
</a-form-item> </a-tree-select>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电话号码"> </a-form-item>
<a-input placeholder="请输入电话号码" v-decorator.trim="[ 'phonenum' ]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="职位">
</a-form-item> <a-input placeholder="请输入职位" v-decorator.trim="[ 'position' ]" />
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电子邮箱"> </a-form-item>
<a-input placeholder="请输入电子邮箱" v-decorator.trim="[ 'email' ]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电话号码">
</a-form-item> <a-input placeholder="请输入电话号码" v-decorator.trim="[ 'phonenum' ]" />
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序"> </a-form-item>
<a-input placeholder="请输入排序" v-decorator.trim="[ 'userBlngOrgaDsplSeq' ]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电子邮箱">
</a-form-item> <a-input placeholder="请输入电子邮箱" v-decorator.trim="[ 'email' ]" />
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="描述"> </a-form-item>
<a-textarea :rows="2" placeholder="请输入描述" v-decorator="[ 'description' ]" /> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
</a-form-item> <a-input placeholder="请输入排序" v-decorator.trim="[ 'userBlngOrgaDsplSeq' ]" />
</a-form> </a-form-item>
</a-spin> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="描述">
</a-modal> <a-textarea :rows="2" placeholder="请输入描述" v-decorator="[ 'description' ]" />
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</div>
</template> </template>
<script> <script>
import pick from 'lodash.pick' import pick from 'lodash.pick'

203
jshERP-web/src/views/system/modules/VendorModal.vue
View File

@@ -1,103 +1,108 @@
<template> <template>
<a-modal <div ref="container">
:title="title" <a-modal
:width="1200" :title="title"
:visible="visible" :width="1200"
: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:10%;height: 80%;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:100px; height: 80%;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="vendorModal"> 关闭
<a-row class="form-row" :gutter="24"> </a-button>
<a-col :span="24/2"> </template>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称"> <a-spin :spinning="confirmLoading">
<a-input placeholder="请输入名称" v-decorator.trim="[ 'supplier', validatorRules.supplier]" /> <a-form :form="form" id="vendorModal">
</a-form-item> <a-row class="form-row" :gutter="24">
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系人"> <a-input placeholder="请输入名称" v-decorator.trim="[ 'supplier', validatorRules.supplier]" />
<a-input placeholder="请输入联系人" v-decorator.trim="[ 'contacts' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
</a-row> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系人">
<a-row class="form-row" :gutter="24"> <a-input placeholder="请输入联系人" v-decorator.trim="[ 'contacts' ]" />
<a-col :span="24/2"> </a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号码"> </a-col>
<a-input placeholder="请输入手机号码" v-decorator.trim="[ 'telephone' ]" /> </a-row>
</a-form-item> <a-row class="form-row" :gutter="24">
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="手机号码">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系电话"> <a-input placeholder="请输入手机号码" v-decorator.trim="[ 'telephone' ]" />
<a-input placeholder="请输入联系电话" v-decorator.trim="[ 'phoneNum' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系电话">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电子邮箱"> <a-input placeholder="请输入联系电话" v-decorator.trim="[ 'phoneNum' ]" />
<a-input placeholder="请输入电子邮箱" v-decorator.trim="[ 'email' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="电子邮箱">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="传真"> <a-input placeholder="请输入电子邮箱" v-decorator.trim="[ 'email' ]" />
<a-input placeholder="请输入传真" v-decorator.trim="[ 'fax' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="传真">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期初应付"> <a-input placeholder="请输入传真" v-decorator.trim="[ 'fax' ]" />
<a-input placeholder="请输入期初应付" v-decorator.trim="[ 'beginNeedPay' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期初应付">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期末应付"> <a-input placeholder="请输入期初应付" v-decorator.trim="[ 'beginNeedPay' ]" />
<a-input v-decorator.trim="[ 'allNeedPay' ]" :readOnly="true" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="期末应付">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="纳税人识别号"> <a-input v-decorator.trim="[ 'allNeedPay' ]" :readOnly="true" />
<a-input placeholder="请输入纳税人识别号" v-decorator.trim="[ 'taxNum' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="纳税人识别号">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="税率(%)"> <a-input placeholder="请输入纳税人识别号" v-decorator.trim="[ 'taxNum' ]" />
<a-input-number style="width:100%" placeholder="请输入税率" v-decorator.trim="[ 'taxRate' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="税率(%)">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开户行"> <a-input-number style="width:100%" placeholder="请输入税率" v-decorator.trim="[ 'taxRate' ]" />
<a-input placeholder="请输入开户行" v-decorator.trim="[ 'bankName' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开户行">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="账号"> <a-input placeholder="请输入开户行" v-decorator.trim="[ 'bankName' ]" />
<a-input placeholder="请输入账号" v-decorator.trim="[ 'accountNumber' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="账号">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="地址"> <a-input placeholder="请输入账号" v-decorator.trim="[ 'accountNumber' ]" />
<a-input placeholder="请输入地址" v-decorator.trim="[ 'address' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="地址">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序"> <a-input placeholder="请输入地址" v-decorator.trim="[ 'address' ]" />
<a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
<a-col :span="24/2"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注"> <a-input placeholder="请输入排序" v-decorator.trim="[ 'sort' ]" />
<a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" /> </a-form-item>
</a-form-item> </a-col>
</a-col> <a-col :span="24/2">
</a-row> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
</a-form> <a-textarea :rows="2" placeholder="请输入备注" v-decorator.trim="[ 'description' ]" />
</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'