19 changed files with 1234 additions and 124 deletions
Unified View
Diff Options
-
+1 -1admin-pc/.env.development
-
+1 -1admin-pc/.env.production
-
+309 -0admin-pc/src/views/orderList/CommonOrderList.vue
-
+179 -0admin-pc/src/views/orderList/modules/CommonOrderForm.vue
-
+84 -0admin-pc/src/views/orderList/modules/CommonOrderModal.Style#Drawer.vue
-
+60 -0admin-pc/src/views/orderList/modules/CommonOrderModal.vue
-
+252 -0admin-pc/src/views/waterList/CommonMoneyLogList.vue
-
+139 -0admin-pc/src/views/waterList/modules/CommonMoneyLogForm.vue
-
+84 -0admin-pc/src/views/waterList/modules/CommonMoneyLogModal.Style#Drawer.vue
-
+60 -0admin-pc/src/views/waterList/modules/CommonMoneyLogModal.vue
-
+1 -1module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java
-
+10 -5module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java
-
+1 -1module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java
-
+1 -1module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java
-
+1 -1module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java
-
+17 -34module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue
-
+4 -24module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderForm.vue
-
+28 -53module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts
-
+2 -2module-system/src/main/resources/application-dev.yml
+ 1
- 1
admin-pc/.env.development
View File
+ 1
- 1
admin-pc/.env.production
View File
| @ -1,4 +1,4 @@ | |||||
| NODE_ENV=production | NODE_ENV=production | ||||
| VUE_APP_API_BASE_URL=http://localhost:8001/jewelry-admin/ | |||||
| VUE_APP_API_BASE_URL=https://jewelry-admin.hhlm1688.com/jewelry-admin/ | |||||
| VUE_APP_CAS_BASE_URL=http://localhost:8888/cas | VUE_APP_CAS_BASE_URL=http://localhost:8888/cas | ||||
| VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview | VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview | ||||
+ 309
- 0
admin-pc/src/views/orderList/CommonOrderList.vue
View File
| @ -0,0 +1,309 @@ | |||||
| <template> | |||||
| <a-card :bordered="false"> | |||||
| <!-- 查询区域 --> | |||||
| <div class="table-page-search-wrapper"> | |||||
| <a-form layout="inline" @keyup.enter.native="searchQuery"> | |||||
| <a-row :gutter="24"> | |||||
| <a-col :xl="6" :lg="7" :md="8" :sm="24"> | |||||
| <a-form-item label="订单状态"> | |||||
| <j-dict-select-tag placeholder="请选择订单状态" v-model="queryParam.state" dictCode="order_state"/> | |||||
| </a-form-item> | |||||
| </a-col> | |||||
| <a-col :xl="6" :lg="7" :md="8" :sm="24"> | |||||
| <a-form-item label="标题"> | |||||
| <a-input placeholder="请输入标题" v-model="queryParam.title"></a-input> | |||||
| </a-form-item> | |||||
| </a-col> | |||||
| <template v-if="toggleSearchStatus"> | |||||
| <a-col :xl="6" :lg="7" :md="8" :sm="24"> | |||||
| <a-form-item label="姓名"> | |||||
| <a-input placeholder="请输入姓名" v-model="queryParam.name"></a-input> | |||||
| </a-form-item> | |||||
| </a-col> | |||||
| <a-col :xl="6" :lg="7" :md="8" :sm="24"> | |||||
| <a-form-item label="电话"> | |||||
| <a-input placeholder="请输入电话" v-model="queryParam.phone"></a-input> | |||||
| </a-form-item> | |||||
| </a-col> | |||||
| <a-col :xl="6" :lg="7" :md="8" :sm="24"> | |||||
| <a-form-item label="用户"> | |||||
| <j-search-select-tag placeholder="请选择用户" v-model="queryParam.userId" dict="han_hai_member,nick_name,id"/> | |||||
| </a-form-item> | |||||
| </a-col> | |||||
| <a-col :xl="6" :lg="7" :md="8" :sm="24"> | |||||
| <a-form-item label="商品标识"> | |||||
| <j-search-select-tag placeholder="请选择商品标识" v-model="queryParam.shopId" dict="common_shop,title,id"/> | |||||
| </a-form-item> | |||||
| </a-col> | |||||
| <a-col :xl="6" :lg="7" :md="8" :sm="24"> | |||||
| <a-form-item label="商品类型"> | |||||
| <j-dict-select-tag placeholder="请选择商品类型" v-model="queryParam.shopState" dictCode="shop_type"/> | |||||
| </a-form-item> | |||||
| </a-col> | |||||
| </template> | |||||
| <a-col :xl="6" :lg="7" :md="8" :sm="24"> | |||||
| <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> | |||||
| <a-button type="primary" @click="searchQuery" icon="search">查询</a-button> | |||||
| <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> | |||||
| <a @click="handleToggleSearch" style="margin-left: 8px"> | |||||
| {{ toggleSearchStatus ? '收起' : '展开' }} | |||||
| <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/> | |||||
| </a> | |||||
| </span> | |||||
| </a-col> | |||||
| </a-row> | |||||
| </a-form> | |||||
| </div> | |||||
| <!-- 查询区域-END --> | |||||
| <!-- 操作按钮区域 --> | |||||
| <div class="table-operator"> | |||||
| <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>--> | |||||
| <a-button type="primary" icon="download" @click="handleExportXls('订单信息表')">导出</a-button> | |||||
| <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">--> | |||||
| <!-- <a-button type="primary" icon="import">导入</a-button>--> | |||||
| <!-- </a-upload>--> | |||||
| <!-- <!– 高级查询区域 –>--> | |||||
| <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>--> | |||||
| <a-dropdown v-if="selectedRowKeys.length > 0"> | |||||
| <a-menu slot="overlay"> | |||||
| <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> | |||||
| </a-menu> | |||||
| <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button> | |||||
| </a-dropdown> | |||||
| </div> | |||||
| <!-- table区域-begin --> | |||||
| <div> | |||||
| <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> | |||||
| <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 | |||||
| <a style="margin-left: 24px" @click="onClearSelected">清空</a> | |||||
| </div> | |||||
| <a-table | |||||
| ref="table" | |||||
| size="middle" | |||||
| :scroll="{x:true}" | |||||
| bordered | |||||
| rowKey="id" | |||||
| :columns="columns" | |||||
| :dataSource="dataSource" | |||||
| :pagination="ipagination" | |||||
| :loading="loading" | |||||
| :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" | |||||
| class="j-table-force-nowrap" | |||||
| @change="handleTableChange"> | |||||
| <template slot="htmlSlot" slot-scope="text"> | |||||
| <div v-html="text"></div> | |||||
| </template> | |||||
| <template slot="imgSlot" slot-scope="text,record"> | |||||
| <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span> | |||||
| <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/> | |||||
| </template> | |||||
| <template slot="fileSlot" slot-scope="text"> | |||||
| <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> | |||||
| <a-button | |||||
| v-else | |||||
| :ghost="true" | |||||
| type="primary" | |||||
| icon="download" | |||||
| size="small" | |||||
| @click="downloadFile(text)"> | |||||
| 下载 | |||||
| </a-button> | |||||
| </template> | |||||
| <span slot="action" slot-scope="text, record"> | |||||
| <a @click="handleEdit(record)" v-if="record.state =='1' ">发货</a> | |||||
| <!-- <a-divider type="vertical" />--> | |||||
| <!-- <a-dropdown>--> | |||||
| <!-- <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>--> | |||||
| <!-- <a-menu slot="overlay">--> | |||||
| <!-- <a-menu-item>--> | |||||
| <!-- <a @click="handleDetail(record)">详情</a>--> | |||||
| <!-- </a-menu-item>--> | |||||
| <!-- <a-menu-item>--> | |||||
| <!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">--> | |||||
| <!-- <a>删除</a>--> | |||||
| <!-- </a-popconfirm>--> | |||||
| <!-- </a-menu-item>--> | |||||
| <!-- </a-menu>--> | |||||
| <!-- </a-dropdown>--> | |||||
| </span> | |||||
| </a-table> | |||||
| </div> | |||||
| <common-order-modal ref="modalForm" @ok="modalFormOk"></common-order-modal> | |||||
| </a-card> | |||||
| </template> | |||||
| <script> | |||||
| import '@/assets/less/TableExpand.less' | |||||
| import { mixinDevice } from '@/utils/mixin' | |||||
| import { JeecgListMixin } from '@/mixins/JeecgListMixin' | |||||
| import CommonOrderModal from './modules/CommonOrderModal' | |||||
| import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' | |||||
| export default { | |||||
| name: 'CommonOrderList', | |||||
| mixins:[JeecgListMixin, mixinDevice], | |||||
| components: { | |||||
| CommonOrderModal | |||||
| }, | |||||
| data () { | |||||
| return { | |||||
| description: '订单信息表管理页面', | |||||
| // 表头 | |||||
| columns: [ | |||||
| { | |||||
| title: '#', | |||||
| dataIndex: '', | |||||
| key:'rowIndex', | |||||
| width:60, | |||||
| align:"center", | |||||
| customRender:function (t,r,index) { | |||||
| return parseInt(index)+1; | |||||
| } | |||||
| }, | |||||
| { | |||||
| title:'订单状态', | |||||
| align:"center", | |||||
| dataIndex: 'state_dictText' | |||||
| }, | |||||
| { | |||||
| title:'标题', | |||||
| align:"center", | |||||
| dataIndex: 'title' | |||||
| }, | |||||
| { | |||||
| title:'价格', | |||||
| align:"center", | |||||
| dataIndex: 'price' | |||||
| }, | |||||
| { | |||||
| title:'数量', | |||||
| align:"center", | |||||
| dataIndex: 'num' | |||||
| }, | |||||
| { | |||||
| title:'规格', | |||||
| align:"center", | |||||
| dataIndex: 'sku' | |||||
| }, | |||||
| { | |||||
| title:'姓名', | |||||
| align:"center", | |||||
| dataIndex: 'name' | |||||
| }, | |||||
| { | |||||
| title:'电话', | |||||
| align:"center", | |||||
| dataIndex: 'phone' | |||||
| }, | |||||
| { | |||||
| title:'地址', | |||||
| align:"center", | |||||
| dataIndex: 'address' | |||||
| }, | |||||
| { | |||||
| title:'详细地址', | |||||
| align:"center", | |||||
| dataIndex: 'addressDetails' | |||||
| }, | |||||
| { | |||||
| title:'用户', | |||||
| align:"center", | |||||
| dataIndex: 'userId_dictText' | |||||
| }, | |||||
| { | |||||
| title:'商品标识', | |||||
| align:"center", | |||||
| dataIndex: 'shopId_dictText' | |||||
| }, | |||||
| // { | |||||
| // title:'商品类型', | |||||
| // align:"center", | |||||
| // dataIndex: 'shopState_dictText' | |||||
| // }, | |||||
| // { | |||||
| // title:'推荐购买会员', | |||||
| // align:"center", | |||||
| // dataIndex: 'shareId' | |||||
| // }, | |||||
| // { | |||||
| // title:'第几次推荐购买', | |||||
| // align:"center", | |||||
| // dataIndex: 'shareNum' | |||||
| // }, | |||||
| { | |||||
| title:'快递公司', | |||||
| align:"center", | |||||
| dataIndex: 'kuai' | |||||
| }, | |||||
| { | |||||
| title:'物流订单', | |||||
| align:"center", | |||||
| dataIndex: 'wuliu' | |||||
| }, | |||||
| { | |||||
| title: '操作', | |||||
| dataIndex: 'action', | |||||
| align:"center", | |||||
| fixed:"right", | |||||
| width:147, | |||||
| scopedSlots: { customRender: 'action' } | |||||
| } | |||||
| ], | |||||
| url: { | |||||
| list: "/commonOrder/commonOrder/list", | |||||
| delete: "/commonOrder/commonOrder/delete", | |||||
| deleteBatch: "/commonOrder/commonOrder/deleteBatch", | |||||
| exportXlsUrl: "/commonOrder/commonOrder/exportXls", | |||||
| importExcelUrl: "commonOrder/commonOrder/importExcel", | |||||
| }, | |||||
| dictOptions:{}, | |||||
| superFieldList:[], | |||||
| } | |||||
| }, | |||||
| created() { | |||||
| this.getSuperFieldList(); | |||||
| }, | |||||
| computed: { | |||||
| importExcelUrl: function(){ | |||||
| return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; | |||||
| }, | |||||
| }, | |||||
| methods: { | |||||
| initDictConfig(){ | |||||
| }, | |||||
| getSuperFieldList(){ | |||||
| let fieldList=[]; | |||||
| fieldList.push({type:'int',value:'state',text:'订单状态',dictCode:'order_state'}) | |||||
| fieldList.push({type:'string',value:'title',text:'标题',dictCode:''}) | |||||
| fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''}) | |||||
| fieldList.push({type:'int',value:'num',text:'数量',dictCode:''}) | |||||
| fieldList.push({type:'string',value:'sku',text:'规格',dictCode:''}) | |||||
| fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''}) | |||||
| fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''}) | |||||
| fieldList.push({type:'string',value:'address',text:'地址',dictCode:''}) | |||||
| fieldList.push({type:'string',value:'addressDetails',text:'详细地址',dictCode:''}) | |||||
| fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) | |||||
| fieldList.push({type:'sel_search',value:'shopId',text:'商品标识',dictTable:"common_shop", dictText:'title', dictCode:'id'}) | |||||
| fieldList.push({type:'int',value:'shopState',text:'商品类型',dictCode:'shop_type'}) | |||||
| fieldList.push({type:'string',value:'shareId',text:'推荐购买会员',dictCode:''}) | |||||
| fieldList.push({type:'int',value:'shareNum',text:'第几次推荐购买',dictCode:''}) | |||||
| fieldList.push({type:'string',value:'kuai',text:'快递公司',dictCode:''}) | |||||
| fieldList.push({type:'string',value:'wuliu',text:'物流订单',dictCode:''}) | |||||
| this.superFieldList = fieldList | |||||
| } | |||||
| } | |||||
| } | |||||
| </script> | |||||
| <style scoped> | |||||
| @import '~@assets/less/common.less'; | |||||
| </style> | |||||
+ 179
- 0
admin-pc/src/views/orderList/modules/CommonOrderForm.vue
View File
| @ -0,0 +1,179 @@ | |||||
| <template> | |||||
| <a-spin :spinning="confirmLoading"> | |||||
| <j-form-container :disabled="formDisabled"> | |||||
| <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> | |||||
| <a-row> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="订单状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state"> | |||||
| <j-dict-select-tag type="list" v-model="model.state" dictCode="order_state" placeholder="请选择订单状态" disabled /> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <!-- <a-col :span="24">--> | |||||
| <!-- <a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">--> | |||||
| <!-- <a-input v-model="model.title" placeholder="请输入标题" ></a-input>--> | |||||
| <!-- </a-form-model-item>--> | |||||
| <!-- </a-col>--> | |||||
| <!-- <a-col :span="24">--> | |||||
| <!-- <a-form-model-item label="价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">--> | |||||
| <!-- <a-input-number v-model="model.price" placeholder="请输入价格" style="width: 100%" />--> | |||||
| <!-- </a-form-model-item>--> | |||||
| <!-- </a-col>--> | |||||
| <!-- <a-col :span="24">--> | |||||
| <!-- <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">--> | |||||
| <!-- <a-input-number v-model="model.num" placeholder="请输入数量" style="width: 100%" />--> | |||||
| <!-- </a-form-model-item>--> | |||||
| <!-- </a-col>--> | |||||
| <!-- <a-col :span="24">--> | |||||
| <!-- <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sku">--> | |||||
| <!-- <a-input v-model="model.sku" placeholder="请输入规格" ></a-input>--> | |||||
| <!-- </a-form-model-item>--> | |||||
| <!-- </a-col>--> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name"> | |||||
| <a-input v-model="model.name" placeholder="请输入姓名" disabled ></a-input> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone"> | |||||
| <a-input v-model="model.phone" placeholder="请输入电话" disabled ></a-input> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address"> | |||||
| <a-input v-model="model.address" placeholder="请输入地址" disabled></a-input> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="详细地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addressDetails"> | |||||
| <a-input v-model="model.addressDetails" placeholder="请输入详细地址" disabled></a-input> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <!-- <a-col :span="24">--> | |||||
| <!-- <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">--> | |||||
| <!-- <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id" />--> | |||||
| <!-- </a-form-model-item>--> | |||||
| <!-- </a-col>--> | |||||
| <!-- <a-col :span="24">--> | |||||
| <!-- <a-form-model-item label="商品标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopId">--> | |||||
| <!-- <j-search-select-tag v-model="model.shopId" dict="common_shop,title,id" />--> | |||||
| <!-- </a-form-model-item>--> | |||||
| <!-- </a-col>--> | |||||
| <!-- <a-col :span="24">--> | |||||
| <!-- <a-form-model-item label="商品类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopState">--> | |||||
| <!-- <j-dict-select-tag type="list" v-model="model.shopState" dictCode="shop_type" placeholder="请选择商品类型" />--> | |||||
| <!-- </a-form-model-item>--> | |||||
| <!-- </a-col>--> | |||||
| <!-- <a-col :span="24">--> | |||||
| <!-- <a-form-model-item label="推荐购买会员" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shareId">--> | |||||
| <!-- <a-input v-model="model.shareId" placeholder="请输入推荐购买会员" ></a-input>--> | |||||
| <!-- </a-form-model-item>--> | |||||
| <!-- </a-col>--> | |||||
| <!-- <a-col :span="24">--> | |||||
| <!-- <a-form-model-item label="第几次推荐购买" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shareNum">--> | |||||
| <!-- <a-input-number v-model="model.shareNum" placeholder="请输入第几次推荐购买" style="width: 100%" />--> | |||||
| <!-- </a-form-model-item>--> | |||||
| <!-- </a-col>--> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="快递公司" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kuai"> | |||||
| <a-input v-model="model.kuai" placeholder="请输入快递公司" ></a-input> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="物流订单" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wuliu"> | |||||
| <a-input v-model="model.wuliu" placeholder="请输入物流订单" ></a-input> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| </a-row> | |||||
| </a-form-model> | |||||
| </j-form-container> | |||||
| </a-spin> | |||||
| </template> | |||||
| <script> | |||||
| import { httpAction, getAction } from '@/api/manage' | |||||
| import { validateDuplicateValue } from '@/utils/util' | |||||
| export default { | |||||
| name: 'CommonOrderForm', | |||||
| components: { | |||||
| }, | |||||
| props: { | |||||
| //表单禁用 | |||||
| disabled: { | |||||
| type: Boolean, | |||||
| default: false, | |||||
| required: false | |||||
| } | |||||
| }, | |||||
| data () { | |||||
| return { | |||||
| model:{ | |||||
| }, | |||||
| labelCol: { | |||||
| xs: { span: 24 }, | |||||
| sm: { span: 5 }, | |||||
| }, | |||||
| wrapperCol: { | |||||
| xs: { span: 24 }, | |||||
| sm: { span: 16 }, | |||||
| }, | |||||
| confirmLoading: false, | |||||
| validatorRules: { | |||||
| }, | |||||
| url: { | |||||
| add: "/commonOrder/commonOrder/add", | |||||
| edit: "/commonOrder/commonOrder/edit", | |||||
| queryById: "/commonOrder/commonOrder/queryById" | |||||
| } | |||||
| } | |||||
| }, | |||||
| computed: { | |||||
| formDisabled(){ | |||||
| return this.disabled | |||||
| }, | |||||
| }, | |||||
| created () { | |||||
| //备份model原始值 | |||||
| this.modelDefault = JSON.parse(JSON.stringify(this.model)); | |||||
| }, | |||||
| methods: { | |||||
| add () { | |||||
| this.edit(this.modelDefault); | |||||
| }, | |||||
| edit (record) { | |||||
| this.model = Object.assign({}, record); | |||||
| this.visible = true; | |||||
| }, | |||||
| submitForm () { | |||||
| const that = this; | |||||
| // 触发表单验证 | |||||
| this.$refs.form.validate(valid => { | |||||
| if (valid) { | |||||
| that.confirmLoading = true; | |||||
| let httpurl = ''; | |||||
| let method = ''; | |||||
| if(!this.model.id){ | |||||
| httpurl+=this.url.add; | |||||
| method = 'post'; | |||||
| }else{ | |||||
| httpurl+=this.url.edit; | |||||
| method = 'put'; | |||||
| } | |||||
| httpAction(httpurl,this.model,method).then((res)=>{ | |||||
| if(res.success){ | |||||
| that.$message.success(res.message); | |||||
| that.$emit('ok'); | |||||
| }else{ | |||||
| that.$message.warning(res.message); | |||||
| } | |||||
| }).finally(() => { | |||||
| that.confirmLoading = false; | |||||
| }) | |||||
| } | |||||
| }) | |||||
| }, | |||||
| } | |||||
| } | |||||
| </script> | |||||
+ 84
- 0
admin-pc/src/views/orderList/modules/CommonOrderModal.Style#Drawer.vue
View File
| @ -0,0 +1,84 @@ | |||||
| <template> | |||||
| <a-drawer | |||||
| :title="title" | |||||
| :width="width" | |||||
| placement="right" | |||||
| :closable="false" | |||||
| @close="close" | |||||
| destroyOnClose | |||||
| :visible="visible"> | |||||
| <common-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></common-order-form> | |||||
| <div class="drawer-footer"> | |||||
| <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button> | |||||
| <a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button> | |||||
| </div> | |||||
| </a-drawer> | |||||
| </template> | |||||
| <script> | |||||
| import CommonOrderForm from './CommonOrderForm' | |||||
| export default { | |||||
| name: 'CommonOrderModal', | |||||
| components: { | |||||
| CommonOrderForm | |||||
| }, | |||||
| data () { | |||||
| return { | |||||
| title:"操作", | |||||
| width:800, | |||||
| visible: false, | |||||
| disableSubmit: false | |||||
| } | |||||
| }, | |||||
| methods: { | |||||
| add () { | |||||
| this.visible=true | |||||
| this.$nextTick(()=>{ | |||||
| this.$refs.realForm.add(); | |||||
| }) | |||||
| }, | |||||
| edit (record) { | |||||
| this.visible=true | |||||
| this.$nextTick(()=>{ | |||||
| this.$refs.realForm.edit(record); | |||||
| }); | |||||
| }, | |||||
| close () { | |||||
| this.$emit('close'); | |||||
| this.visible = false; | |||||
| }, | |||||
| submitCallback(){ | |||||
| this.$emit('ok'); | |||||
| this.visible = false; | |||||
| }, | |||||
| handleOk () { | |||||
| this.$refs.realForm.submitForm(); | |||||
| }, | |||||
| handleCancel () { | |||||
| this.close() | |||||
| } | |||||
| } | |||||
| } | |||||
| </script> | |||||
| <style lang="less" scoped> | |||||
| /** Button按钮间距 */ | |||||
| .ant-btn { | |||||
| margin-left: 30px; | |||||
| margin-bottom: 30px; | |||||
| float: right; | |||||
| } | |||||
| .drawer-footer{ | |||||
| position: absolute; | |||||
| bottom: -8px; | |||||
| width: 100%; | |||||
| border-top: 1px solid #e8e8e8; | |||||
| padding: 10px 16px; | |||||
| text-align: right; | |||||
| left: 0; | |||||
| background: #fff; | |||||
| border-radius: 0 0 2px 2px; | |||||
| } | |||||
| </style> | |||||
+ 60
- 0
admin-pc/src/views/orderList/modules/CommonOrderModal.vue
View File
| @ -0,0 +1,60 @@ | |||||
| <template> | |||||
| <j-modal | |||||
| :title="title" | |||||
| :width="width" | |||||
| :visible="visible" | |||||
| switchFullscreen | |||||
| @ok="handleOk" | |||||
| :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" | |||||
| @cancel="handleCancel" | |||||
| cancelText="关闭"> | |||||
| <common-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></common-order-form> | |||||
| </j-modal> | |||||
| </template> | |||||
| <script> | |||||
| import CommonOrderForm from './CommonOrderForm' | |||||
| export default { | |||||
| name: 'CommonOrderModal', | |||||
| components: { | |||||
| CommonOrderForm | |||||
| }, | |||||
| data () { | |||||
| return { | |||||
| title:'', | |||||
| width:800, | |||||
| visible: false, | |||||
| disableSubmit: false | |||||
| } | |||||
| }, | |||||
| methods: { | |||||
| add () { | |||||
| this.visible=true | |||||
| this.$nextTick(()=>{ | |||||
| this.$refs.realForm.add(); | |||||
| }) | |||||
| }, | |||||
| edit (record) { | |||||
| this.visible=true | |||||
| this.$nextTick(()=>{ | |||||
| this.$refs.realForm.edit(record); | |||||
| }) | |||||
| }, | |||||
| close () { | |||||
| this.$emit('close'); | |||||
| this.visible = false; | |||||
| }, | |||||
| handleOk () { | |||||
| this.$refs.realForm.submitForm(); | |||||
| }, | |||||
| submitCallback(){ | |||||
| this.$emit('ok'); | |||||
| this.visible = false; | |||||
| }, | |||||
| handleCancel () { | |||||
| this.close() | |||||
| } | |||||
| } | |||||
| } | |||||
| </script> | |||||
+ 252
- 0
admin-pc/src/views/waterList/CommonMoneyLogList.vue
View File
| @ -0,0 +1,252 @@ | |||||
| <template> | |||||
| <a-card :bordered="false"> | |||||
| <!-- 查询区域 --> | |||||
| <div class="table-page-search-wrapper"> | |||||
| <a-form layout="inline" @keyup.enter.native="searchQuery"> | |||||
| <a-row :gutter="24"> | |||||
| <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">--> | |||||
| <!-- <a-form-item label="流水标题">--> | |||||
| <!-- <a-input placeholder="请输入流水标题" v-model="queryParam.title"></a-input>--> | |||||
| <!-- </a-form-item>--> | |||||
| <!-- </a-col>--> | |||||
| <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">--> | |||||
| <!-- <a-form-item label="类型">--> | |||||
| <!-- <j-dict-select-tag placeholder="请选择类型" v-model="queryParam.type" dictCode="pay_type"/>--> | |||||
| <!-- </a-form-item>--> | |||||
| <!-- </a-col>--> | |||||
| <!-- <template v-if="toggleSearchStatus">--> | |||||
| <a-col :xl="6" :lg="7" :md="8" :sm="24"> | |||||
| <a-form-item label="状态"> | |||||
| <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.state" dictCode="pay_state"/> | |||||
| </a-form-item> | |||||
| </a-col> | |||||
| <a-col :xl="6" :lg="7" :md="8" :sm="24"> | |||||
| <a-form-item label="用户标识"> | |||||
| <j-search-select-tag placeholder="请选择用户标识" v-model="queryParam.userId" dict="han_hai_member,nick_name,id"/> | |||||
| </a-form-item> | |||||
| </a-col> | |||||
| <a-col :xl="6" :lg="7" :md="8" :sm="24"> | |||||
| <a-form-item label="提现状态"> | |||||
| <j-dict-select-tag placeholder="请选择提现状态" v-model="queryParam.txState" dictCode="tx_state_sub"/> | |||||
| </a-form-item> | |||||
| </a-col> | |||||
| <!-- </template>--> | |||||
| <a-col :xl="6" :lg="7" :md="8" :sm="24"> | |||||
| <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> | |||||
| <a-button type="primary" @click="searchQuery" icon="search">查询</a-button> | |||||
| <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> | |||||
| <a @click="handleToggleSearch" style="margin-left: 8px"> | |||||
| {{ toggleSearchStatus ? '收起' : '展开' }} | |||||
| <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/> | |||||
| </a> | |||||
| </span> | |||||
| </a-col> | |||||
| </a-row> | |||||
| </a-form> | |||||
| </div> | |||||
| <!-- 查询区域-END --> | |||||
| <!-- 操作按钮区域 --> | |||||
| <div class="table-operator"> | |||||
| <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>--> | |||||
| <a-button type="primary" icon="download" @click="handleExportXls('流水日志表')">导出</a-button> | |||||
| <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">--> | |||||
| <!-- <a-button type="primary" icon="import">导入</a-button>--> | |||||
| <!-- </a-upload>--> | |||||
| <!-- <!– 高级查询区域 –>--> | |||||
| <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>--> | |||||
| <a-dropdown v-if="selectedRowKeys.length > 0"> | |||||
| <a-menu slot="overlay"> | |||||
| <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> | |||||
| </a-menu> | |||||
| <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button> | |||||
| </a-dropdown> | |||||
| </div> | |||||
| <!-- table区域-begin --> | |||||
| <div> | |||||
| <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> | |||||
| <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 | |||||
| <a style="margin-left: 24px" @click="onClearSelected">清空</a> | |||||
| </div> | |||||
| <a-table | |||||
| ref="table" | |||||
| size="middle" | |||||
| :scroll="{x:true}" | |||||
| bordered | |||||
| rowKey="id" | |||||
| :columns="columns" | |||||
| :dataSource="dataSource" | |||||
| :pagination="ipagination" | |||||
| :loading="loading" | |||||
| :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" | |||||
| class="j-table-force-nowrap" | |||||
| @change="handleTableChange"> | |||||
| <template slot="htmlSlot" slot-scope="text"> | |||||
| <div v-html="text"></div> | |||||
| </template> | |||||
| <template slot="imgSlot" slot-scope="text,record"> | |||||
| <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span> | |||||
| <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/> | |||||
| </template> | |||||
| <template slot="fileSlot" slot-scope="text"> | |||||
| <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> | |||||
| <a-button | |||||
| v-else | |||||
| :ghost="true" | |||||
| type="primary" | |||||
| icon="download" | |||||
| size="small" | |||||
| @click="downloadFile(text)"> | |||||
| 下载 | |||||
| </a-button> | |||||
| </template> | |||||
| <span slot="action" slot-scope="text, record"> | |||||
| <a @click="handleDelete(record.id)">审核通过</a> | |||||
| <a-divider type="vertical" /> | |||||
| <a @click="handleDelete(record.id)">驳回申请</a> | |||||
| <!-- <a-dropdown>--> | |||||
| <!-- <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>--> | |||||
| <!-- <a-menu slot="overlay">--> | |||||
| <!-- <a-menu-item>--> | |||||
| <!-- <a @click="handleDetail(record)">详情</a>--> | |||||
| <!-- </a-menu-item>--> | |||||
| <!-- <a-menu-item>--> | |||||
| <!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">--> | |||||
| <!-- <a>删除</a>--> | |||||
| <!-- </a-popconfirm>--> | |||||
| <!-- </a-menu-item>--> | |||||
| <!-- </a-menu>--> | |||||
| <!-- </a-dropdown>--> | |||||
| </span> | |||||
| </a-table> | |||||
| </div> | |||||
| <common-money-log-modal ref="modalForm" @ok="modalFormOk"></common-money-log-modal> | |||||
| </a-card> | |||||
| </template> | |||||
| <script> | |||||
| import '@/assets/less/TableExpand.less' | |||||
| import { mixinDevice } from '@/utils/mixin' | |||||
| import { JeecgListMixin } from '@/mixins/JeecgListMixin' | |||||
| import CommonMoneyLogModal from './modules/CommonMoneyLogModal' | |||||
| import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' | |||||
| export default { | |||||
| name: 'CommonMoneyLogList', | |||||
| mixins:[JeecgListMixin, mixinDevice], | |||||
| components: { | |||||
| CommonMoneyLogModal | |||||
| }, | |||||
| data () { | |||||
| return { | |||||
| description: '流水日志表管理页面', | |||||
| // 表头 | |||||
| columns: [ | |||||
| { | |||||
| title: '#', | |||||
| dataIndex: '', | |||||
| key:'rowIndex', | |||||
| width:60, | |||||
| align:"center", | |||||
| customRender:function (t,r,index) { | |||||
| return parseInt(index)+1; | |||||
| } | |||||
| }, | |||||
| { | |||||
| title:'创建日期', | |||||
| align:"center", | |||||
| sorter: true, | |||||
| dataIndex: 'createTime' | |||||
| }, | |||||
| { | |||||
| title:'流水标题', | |||||
| align:"center", | |||||
| dataIndex: 'title' | |||||
| }, | |||||
| { | |||||
| title:'提现金额', | |||||
| align:"center", | |||||
| dataIndex: 'money' | |||||
| }, | |||||
| { | |||||
| title:'姓名', | |||||
| align:"center", | |||||
| dataIndex: 'name' | |||||
| }, | |||||
| { | |||||
| title:'开户行', | |||||
| align:"center", | |||||
| dataIndex: 'bankName' | |||||
| }, | |||||
| { | |||||
| title:'银行卡号', | |||||
| align:"center", | |||||
| dataIndex: 'bankNo' | |||||
| }, | |||||
| // { | |||||
| // title:'提现状态', | |||||
| // align:"center", | |||||
| // dataIndex: 'txStateSub' | |||||
| // }, | |||||
| { | |||||
| title:'用户标识', | |||||
| align:"center", | |||||
| dataIndex: 'userId_dictText' | |||||
| }, | |||||
| { | |||||
| title: '操作', | |||||
| dataIndex: 'action', | |||||
| align:"center", | |||||
| fixed:"right", | |||||
| width:147, | |||||
| scopedSlots: { customRender: 'action' } | |||||
| } | |||||
| ], | |||||
| url: { | |||||
| list: "/commonMoneyLog/commonMoneyLog/list", | |||||
| delete: "/commonMoneyLog/commonMoneyLog/delete", | |||||
| deleteBatch: "/commonMoneyLog/commonMoneyLog/deleteBatch", | |||||
| exportXlsUrl: "/commonMoneyLog/commonMoneyLog/exportXls", | |||||
| importExcelUrl: "commonMoneyLog/commonMoneyLog/importExcel", | |||||
| }, | |||||
| dictOptions:{}, | |||||
| superFieldList:[], | |||||
| } | |||||
| }, | |||||
| created() { | |||||
| this.getSuperFieldList(); | |||||
| }, | |||||
| computed: { | |||||
| importExcelUrl: function(){ | |||||
| return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; | |||||
| }, | |||||
| }, | |||||
| methods: { | |||||
| initDictConfig(){ | |||||
| }, | |||||
| getSuperFieldList(){ | |||||
| let fieldList=[]; | |||||
| fieldList.push({type:'datetime',value:'createTime',text:'创建日期'}) | |||||
| fieldList.push({type:'string',value:'title',text:'流水标题',dictCode:''}) | |||||
| fieldList.push({type:'BigDecimal',value:'money',text:'变动金额',dictCode:''}) | |||||
| fieldList.push({type:'BigDecimal',value:'oldMoney',text:'原钱包金额',dictCode:''}) | |||||
| fieldList.push({type:'int',value:'type',text:'类型',dictCode:'pay_type'}) | |||||
| fieldList.push({type:'int',value:'state',text:'状态',dictCode:'pay_state'}) | |||||
| fieldList.push({type:'sel_search',value:'userId',text:'用户标识',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) | |||||
| fieldList.push({type:'string',value:'isGet',text:'是否提现',dictCode:''}) | |||||
| this.superFieldList = fieldList | |||||
| } | |||||
| } | |||||
| } | |||||
| </script> | |||||
| <style scoped> | |||||
| @import '~@assets/less/common.less'; | |||||
| </style> | |||||
+ 139
- 0
admin-pc/src/views/waterList/modules/CommonMoneyLogForm.vue
View File
| @ -0,0 +1,139 @@ | |||||
| <template> | |||||
| <a-spin :spinning="confirmLoading"> | |||||
| <j-form-container :disabled="formDisabled"> | |||||
| <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> | |||||
| <a-row> | |||||
| <!-- <a-col :span="24">--> | |||||
| <!-- <a-form-model-item label="流水标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">--> | |||||
| <!-- <a-input v-model="model.title" placeholder="请输入流水标题" ></a-input>--> | |||||
| <!-- </a-form-model-item>--> | |||||
| <!-- </a-col>--> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="提现金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="money"> | |||||
| <a-input-number v-model="model.money" placeholder="请输入提现金额" style="width: 100%" disabled /> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldMoney"> | |||||
| <a-input-number v-model="model.name" placeholder="请输入姓名" style="width: 100%" /> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="开户行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldMoney"> | |||||
| <a-input-number v-model="model.bankName" placeholder="请输入开户行" style="width: 100%" /> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="银行卡号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldMoney"> | |||||
| <a-input-number v-model="model.bankNo" placeholder="请输入银行卡号" style="width: 100%" /> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <!-- <a-col :span="24">--> | |||||
| <!-- <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">--> | |||||
| <!-- <j-dict-select-tag type="list" v-model="model.type" dictCode="pay_type" placeholder="请选择类型" />--> | |||||
| <!-- </a-form-model-item>--> | |||||
| <!-- </a-col>--> | |||||
| <!-- <a-col :span="24">--> | |||||
| <!-- <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">--> | |||||
| <!-- <j-dict-select-tag type="list" v-model="model.state" dictCode="pay_state" placeholder="请选择状态" />--> | |||||
| <!-- </a-form-model-item>--> | |||||
| <!-- </a-col>--> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="用户标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId"> | |||||
| <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id" /> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| </a-row> | |||||
| </a-form-model> | |||||
| </j-form-container> | |||||
| </a-spin> | |||||
| </template> | |||||
| <script> | |||||
| import { httpAction, getAction } from '@/api/manage' | |||||
| import { validateDuplicateValue } from '@/utils/util' | |||||
| export default { | |||||
| name: 'CommonMoneyLogForm', | |||||
| components: { | |||||
| }, | |||||
| props: { | |||||
| //表单禁用 | |||||
| disabled: { | |||||
| type: Boolean, | |||||
| default: false, | |||||
| required: false | |||||
| } | |||||
| }, | |||||
| data () { | |||||
| return { | |||||
| model:{ | |||||
| }, | |||||
| labelCol: { | |||||
| xs: { span: 24 }, | |||||
| sm: { span: 5 }, | |||||
| }, | |||||
| wrapperCol: { | |||||
| xs: { span: 24 }, | |||||
| sm: { span: 16 }, | |||||
| }, | |||||
| confirmLoading: false, | |||||
| validatorRules: { | |||||
| }, | |||||
| url: { | |||||
| add: "/commonMoneyLog/commonMoneyLog/add", | |||||
| edit: "/commonMoneyLog/commonMoneyLog/edit", | |||||
| queryById: "/commonMoneyLog/commonMoneyLog/queryById" | |||||
| } | |||||
| } | |||||
| }, | |||||
| computed: { | |||||
| formDisabled(){ | |||||
| return this.disabled | |||||
| }, | |||||
| }, | |||||
| created () { | |||||
| //备份model原始值 | |||||
| this.modelDefault = JSON.parse(JSON.stringify(this.model)); | |||||
| }, | |||||
| methods: { | |||||
| add () { | |||||
| this.edit(this.modelDefault); | |||||
| }, | |||||
| edit (record) { | |||||
| this.model = Object.assign({}, record); | |||||
| this.visible = true; | |||||
| }, | |||||
| submitForm () { | |||||
| const that = this; | |||||
| // 触发表单验证 | |||||
| this.$refs.form.validate(valid => { | |||||
| if (valid) { | |||||
| that.confirmLoading = true; | |||||
| let httpurl = ''; | |||||
| let method = ''; | |||||
| if(!this.model.id){ | |||||
| httpurl+=this.url.add; | |||||
| method = 'post'; | |||||
| }else{ | |||||
| httpurl+=this.url.edit; | |||||
| method = 'put'; | |||||
| } | |||||
| httpAction(httpurl,this.model,method).then((res)=>{ | |||||
| if(res.success){ | |||||
| that.$message.success(res.message); | |||||
| that.$emit('ok'); | |||||
| }else{ | |||||
| that.$message.warning(res.message); | |||||
| } | |||||
| }).finally(() => { | |||||
| that.confirmLoading = false; | |||||
| }) | |||||
| } | |||||
| }) | |||||
| }, | |||||
| } | |||||
| } | |||||
| </script> | |||||
+ 84
- 0
admin-pc/src/views/waterList/modules/CommonMoneyLogModal.Style#Drawer.vue
View File
| @ -0,0 +1,84 @@ | |||||
| <template> | |||||
| <a-drawer | |||||
| :title="title" | |||||
| :width="width" | |||||
| placement="right" | |||||
| :closable="false" | |||||
| @close="close" | |||||
| destroyOnClose | |||||
| :visible="visible"> | |||||
| <common-money-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></common-money-log-form> | |||||
| <div class="drawer-footer"> | |||||
| <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button> | |||||
| <a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button> | |||||
| </div> | |||||
| </a-drawer> | |||||
| </template> | |||||
| <script> | |||||
| import CommonMoneyLogForm from './CommonMoneyLogForm' | |||||
| export default { | |||||
| name: 'CommonMoneyLogModal', | |||||
| components: { | |||||
| CommonMoneyLogForm | |||||
| }, | |||||
| data () { | |||||
| return { | |||||
| title:"操作", | |||||
| width:800, | |||||
| visible: false, | |||||
| disableSubmit: false | |||||
| } | |||||
| }, | |||||
| methods: { | |||||
| add () { | |||||
| this.visible=true | |||||
| this.$nextTick(()=>{ | |||||
| this.$refs.realForm.add(); | |||||
| }) | |||||
| }, | |||||
| edit (record) { | |||||
| this.visible=true | |||||
| this.$nextTick(()=>{ | |||||
| this.$refs.realForm.edit(record); | |||||
| }); | |||||
| }, | |||||
| close () { | |||||
| this.$emit('close'); | |||||
| this.visible = false; | |||||
| }, | |||||
| submitCallback(){ | |||||
| this.$emit('ok'); | |||||
| this.visible = false; | |||||
| }, | |||||
| handleOk () { | |||||
| this.$refs.realForm.submitForm(); | |||||
| }, | |||||
| handleCancel () { | |||||
| this.close() | |||||
| } | |||||
| } | |||||
| } | |||||
| </script> | |||||
| <style lang="less" scoped> | |||||
| /** Button按钮间距 */ | |||||
| .ant-btn { | |||||
| margin-left: 30px; | |||||
| margin-bottom: 30px; | |||||
| float: right; | |||||
| } | |||||
| .drawer-footer{ | |||||
| position: absolute; | |||||
| bottom: -8px; | |||||
| width: 100%; | |||||
| border-top: 1px solid #e8e8e8; | |||||
| padding: 10px 16px; | |||||
| text-align: right; | |||||
| left: 0; | |||||
| background: #fff; | |||||
| border-radius: 0 0 2px 2px; | |||||
| } | |||||
| </style> | |||||
+ 60
- 0
admin-pc/src/views/waterList/modules/CommonMoneyLogModal.vue
View File
| @ -0,0 +1,60 @@ | |||||
| <template> | |||||
| <j-modal | |||||
| :title="title" | |||||
| :width="width" | |||||
| :visible="visible" | |||||
| switchFullscreen | |||||
| @ok="handleOk" | |||||
| :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" | |||||
| @cancel="handleCancel" | |||||
| cancelText="关闭"> | |||||
| <common-money-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></common-money-log-form> | |||||
| </j-modal> | |||||
| </template> | |||||
| <script> | |||||
| import CommonMoneyLogForm from './CommonMoneyLogForm' | |||||
| export default { | |||||
| name: 'CommonMoneyLogModal', | |||||
| components: { | |||||
| CommonMoneyLogForm | |||||
| }, | |||||
| data () { | |||||
| return { | |||||
| title:'', | |||||
| width:800, | |||||
| visible: false, | |||||
| disableSubmit: false | |||||
| } | |||||
| }, | |||||
| methods: { | |||||
| add () { | |||||
| this.visible=true | |||||
| this.$nextTick(()=>{ | |||||
| this.$refs.realForm.add(); | |||||
| }) | |||||
| }, | |||||
| edit (record) { | |||||
| this.visible=true | |||||
| this.$nextTick(()=>{ | |||||
| this.$refs.realForm.edit(record); | |||||
| }) | |||||
| }, | |||||
| close () { | |||||
| this.$emit('close'); | |||||
| this.visible = false; | |||||
| }, | |||||
| handleOk () { | |||||
| this.$refs.realForm.submitForm(); | |||||
| }, | |||||
| submitCallback(){ | |||||
| this.$emit('ok'); | |||||
| this.visible = false; | |||||
| }, | |||||
| handleCancel () { | |||||
| this.close() | |||||
| } | |||||
| } | |||||
| } | |||||
| </script> | |||||