Merge branch 'master' of http://182.92.169.222:3000/yu/CostumingPlatform
commit
42734f7996
36 changed files with 1481 additions and 236 deletions
@ -0,0 +1,300 @@ |
|||||||
|
<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-search-select-tag placeholder="请选择用户" v-model="queryParam.userId" dict="sys_user,realname,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.customerType" dictCode="khlx"/> |
||||||
|
</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.invoiceType" dictCode="fplx"/> |
||||||
|
</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.name"></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.bankDeposit" dict="zybank,bankname,id"/> |
||||||
|
</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"> |
||||||
|
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span> |
||||||
|
<img v-else :src="getImgView(text)" 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="up(record.id)">升序</a> |
||||||
|
<a-divider type="vertical" /> |
||||||
|
<a @click="down(record.id)">降序</a> |
||||||
|
<a-divider type="vertical" /> |
||||||
|
<a @click="handleDetail(record)">详情</a> |
||||||
|
<a-divider type="vertical" /> |
||||||
|
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> |
||||||
|
<a>删除</a> |
||||||
|
</a-popconfirm> |
||||||
|
</span> |
||||||
|
|
||||||
|
</a-table> |
||||||
|
</div> |
||||||
|
|
||||||
|
<customer-invoice-modal ref="modalForm" @ok="modalFormOk"></customer-invoice-modal> |
||||||
|
</a-card> |
||||||
|
</template> |
||||||
|
|
||||||
|
<script> |
||||||
|
|
||||||
|
import '@/assets/less/TableExpand.less' |
||||||
|
import { mixinDevice } from '@/utils/mixin' |
||||||
|
import { JeecgListMixin } from '@/mixins/JeecgListMixin' |
||||||
|
import CustomerInvoiceModal from './CustomerInvoiceModal' |
||||||
|
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' |
||||||
|
import { getAction } from '@/api/manage' |
||||||
|
|
||||||
|
export default { |
||||||
|
name: 'CustomerInvoiceList1', |
||||||
|
mixins:[JeecgListMixin, mixinDevice], |
||||||
|
components: { |
||||||
|
CustomerInvoiceModal |
||||||
|
}, |
||||||
|
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: 'userId_dictText' |
||||||
|
}, |
||||||
|
{ |
||||||
|
title:'客户类型', |
||||||
|
align:"center", |
||||||
|
dataIndex: 'customerType_dictText' |
||||||
|
}, |
||||||
|
{ |
||||||
|
title:'发票类型', |
||||||
|
align:"center", |
||||||
|
dataIndex: 'invoiceType_dictText' |
||||||
|
}, |
||||||
|
{ |
||||||
|
title:'名称/姓名', |
||||||
|
align:"center", |
||||||
|
dataIndex: 'name' |
||||||
|
}, |
||||||
|
{ |
||||||
|
title:'纳税人识别号', |
||||||
|
align:"center", |
||||||
|
dataIndex: 'taxIdentificationNumber' |
||||||
|
}, |
||||||
|
/* { |
||||||
|
title:'地址', |
||||||
|
align:"center", |
||||||
|
dataIndex: 'address' |
||||||
|
},*/ |
||||||
|
{ |
||||||
|
title:'电话', |
||||||
|
align:"center", |
||||||
|
dataIndex: 'telephone' |
||||||
|
}, |
||||||
|
{ |
||||||
|
title:'账号', |
||||||
|
align:"center", |
||||||
|
dataIndex: 'accountNumber' |
||||||
|
}, |
||||||
|
{ |
||||||
|
title:'开户行', |
||||||
|
align:"center", |
||||||
|
dataIndex: 'bankDeposit_dictText' |
||||||
|
}, |
||||||
|
|
||||||
|
{ |
||||||
|
title:'创建日期', |
||||||
|
align:"center", |
||||||
|
dataIndex: 'createTime' |
||||||
|
}, |
||||||
|
{ |
||||||
|
title:'排序', |
||||||
|
align:"center", |
||||||
|
sorter: true, |
||||||
|
dataIndex: 'sort' |
||||||
|
}, |
||||||
|
{ |
||||||
|
title: '操作', |
||||||
|
dataIndex: 'action', |
||||||
|
align:"center", |
||||||
|
fixed:"right", |
||||||
|
width:147, |
||||||
|
scopedSlots: { customRender: 'action' } |
||||||
|
} |
||||||
|
], |
||||||
|
url: { |
||||||
|
up: "/customerinvoice/customerInvoice/up", |
||||||
|
down: "/customerinvoice/customerInvoice/down", |
||||||
|
list: "/customerinvoice/customerInvoice/list1", |
||||||
|
delete: "/customerinvoice/customerInvoice/delete", |
||||||
|
deleteBatch: "/customerinvoice/customerInvoice/deleteBatch", |
||||||
|
exportXlsUrl: "/customerinvoice/customerInvoice/exportXls", |
||||||
|
importExcelUrl: "customerinvoice/customerInvoice/importExcel", |
||||||
|
|
||||||
|
}, |
||||||
|
dictOptions:{}, |
||||||
|
superFieldList:[], |
||||||
|
} |
||||||
|
}, |
||||||
|
created() { |
||||||
|
this.getSuperFieldList(); |
||||||
|
}, |
||||||
|
computed: { |
||||||
|
importExcelUrl: function(){ |
||||||
|
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; |
||||||
|
}, |
||||||
|
}, |
||||||
|
methods: { |
||||||
|
|
||||||
|
|
||||||
|
up(id){ |
||||||
|
getAction(this.url.up,{id:id}).then((res)=>{ |
||||||
|
if(res.success){ |
||||||
|
this.loadData(); |
||||||
|
this.$message.success(res.message); |
||||||
|
}else{ |
||||||
|
this.$message.warning(res.message); |
||||||
|
} |
||||||
|
})}, |
||||||
|
down(id){ |
||||||
|
getAction(this.url.down,{id:id}).then((res)=>{ |
||||||
|
if(res.success){ |
||||||
|
this.loadData(); |
||||||
|
this.$message.success(res.message); |
||||||
|
}else{ |
||||||
|
this.$message.warning(res.message); |
||||||
|
} |
||||||
|
})}, |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
edit (id) { |
||||||
|
/*this.queryParam.userId=this.id;*/ |
||||||
|
this.queryParam.userId=id, |
||||||
|
this.url.list='/customerinvoice/customerInvoice/list1' |
||||||
|
this.loadData(); |
||||||
|
this.visible = true; |
||||||
|
}, |
||||||
|
initDictConfig(){ |
||||||
|
}, |
||||||
|
getSuperFieldList(){ |
||||||
|
let fieldList=[]; |
||||||
|
fieldList.push({type:'datetime',value:'createTime',text:'创建日期'}) |
||||||
|
fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:'sys_user', dictText:'realname', dictCode:'id'}) |
||||||
|
fieldList.push({type:'popup',value:'username',text:'用户', popup:{code:'findcust',field:'id',orgFields:'id',destFields:'user_id'}}) |
||||||
|
fieldList.push({type:'string',value:'customerType',text:'客户类型',dictCode:'khlx'}) |
||||||
|
fieldList.push({type:'string',value:'invoiceType',text:'发票类型',dictCode:'fplx'}) |
||||||
|
fieldList.push({type:'string',value:'name',text:'名称/姓名',dictCode:''}) |
||||||
|
fieldList.push({type:'string',value:'taxIdentificationNumber',text:'纳税人识别号',dictCode:''}) |
||||||
|
fieldList.push({type:'string',value:'address',text:'地址',dictCode:''}) |
||||||
|
fieldList.push({type:'string',value:'telephone',text:'电话',dictCode:''}) |
||||||
|
fieldList.push({type:'string',value:'bankDeposit',text:'开户行',dictCode:''}) |
||||||
|
fieldList.push({type:'string',value:'accountNumber',text:'账号',dictCode:''}) |
||||||
|
fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''}) |
||||||
|
this.superFieldList = fieldList |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
</script> |
||||||
|
<style scoped> |
||||||
|
@import '~@assets/less/common.less'; |
||||||
|
</style> |
||||||
@ -0,0 +1,60 @@ |
|||||||
|
<template> |
||||||
|
<j-modal |
||||||
|
:title="title" |
||||||
|
:width="width" |
||||||
|
:visible="visible" |
||||||
|
switchFullscreen |
||||||
|
@ok="handleOk" |
||||||
|
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }" |
||||||
|
@cancel="handleCancel" |
||||||
|
cancelText="关闭"> |
||||||
|
<customer-invoice-list1 ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></customer-invoice-list1> |
||||||
|
</j-modal> |
||||||
|
</template> |
||||||
|
|
||||||
|
<script> |
||||||
|
|
||||||
|
import CustomerInvoiceList1 from "./CustomerInvoiceList1"; |
||||||
|
export default { |
||||||
|
name: 'CustomerInvoiceModal1', |
||||||
|
components: { |
||||||
|
CustomerInvoiceList1 |
||||||
|
}, |
||||||
|
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> |
||||||
@ -0,0 +1,279 @@ |
|||||||
|
<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-search-select-tag placeholder="请选择用户" v-model="queryParam.userId" dict="sys_user,realname,id"/> |
||||||
|
</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.receiver"></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.mobile"></a-input> |
||||||
|
</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"> |
||||||
|
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span> |
||||||
|
<img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/> |
||||||
|
</template> |
||||||
|
<template slot="pcaSlot" slot-scope="text"> |
||||||
|
<div>{{ getPcaText(text) }}</div> |
||||||
|
</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="up(record.id)">升序</a> |
||||||
|
<a-divider type="vertical" /> |
||||||
|
<a @click="down(record.id)">降序</a> |
||||||
|
<a-divider type="vertical" /> |
||||||
|
<a @click="handleDetail(record)">详情</a> |
||||||
|
<a-divider type="vertical" /> |
||||||
|
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> |
||||||
|
<a>删除</a> |
||||||
|
</a-popconfirm> |
||||||
|
</span> |
||||||
|
|
||||||
|
</a-table> |
||||||
|
</div> |
||||||
|
|
||||||
|
<customer-receiving-address-modal ref="modalForm" @ok="modalFormOk"></customer-receiving-address-modal> |
||||||
|
</a-card> |
||||||
|
</template> |
||||||
|
|
||||||
|
<script> |
||||||
|
|
||||||
|
import '@/assets/less/TableExpand.less' |
||||||
|
import { mixinDevice } from '@/utils/mixin' |
||||||
|
import { JeecgListMixin } from '@/mixins/JeecgListMixin' |
||||||
|
import CustomerReceivingAddressModal from './CustomerReceivingAddressModal' |
||||||
|
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' |
||||||
|
import Area from '@/components/_util/Area' |
||||||
|
|
||||||
|
export default { |
||||||
|
name: 'CustomerReceivingAddressList1', |
||||||
|
mixins:[JeecgListMixin, mixinDevice], |
||||||
|
components: { |
||||||
|
CustomerReceivingAddressModal |
||||||
|
}, |
||||||
|
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: 'userId_dictText' |
||||||
|
}, |
||||||
|
{ |
||||||
|
title:'城市', |
||||||
|
align:"center", |
||||||
|
dataIndex: 'cityId', |
||||||
|
scopedSlots: {customRender: 'pcaSlot'} |
||||||
|
}, |
||||||
|
{ |
||||||
|
title:'地址', |
||||||
|
align:"center", |
||||||
|
dataIndex: 'address' |
||||||
|
}, |
||||||
|
{ |
||||||
|
title:'邮编', |
||||||
|
align:"center", |
||||||
|
dataIndex: 'zipCode' |
||||||
|
}, |
||||||
|
{ |
||||||
|
title:'收货人', |
||||||
|
align:"center", |
||||||
|
dataIndex: 'receiver' |
||||||
|
}, |
||||||
|
{ |
||||||
|
title:'联系电话', |
||||||
|
align:"center", |
||||||
|
dataIndex: 'mobile' |
||||||
|
}, |
||||||
|
{ |
||||||
|
title:'排序', |
||||||
|
align:"center", |
||||||
|
dataIndex: 'sort' |
||||||
|
}, |
||||||
|
{ |
||||||
|
title:'标识', |
||||||
|
align:"center", |
||||||
|
dataIndex: 'labelcl_dictText' |
||||||
|
}, |
||||||
|
{ |
||||||
|
title: '操作', |
||||||
|
dataIndex: 'action', |
||||||
|
align:"center", |
||||||
|
fixed:"right", |
||||||
|
width:147, |
||||||
|
scopedSlots: { customRender: 'action' } |
||||||
|
} |
||||||
|
], |
||||||
|
url: { |
||||||
|
up: "/customerreceivingaddress/customerReceivingAddress/up", |
||||||
|
down: "/customerreceivingaddress/customerReceivingAddress/down", |
||||||
|
list: "/customerreceivingaddress/customerReceivingAddress/list1", |
||||||
|
delete: "/customerreceivingaddress/customerReceivingAddress/delete", |
||||||
|
deleteBatch: "/customerreceivingaddress/customerReceivingAddress/deleteBatch", |
||||||
|
exportXlsUrl: "/customerreceivingaddress/customerReceivingAddress/exportXls", |
||||||
|
importExcelUrl: "customerreceivingaddress/customerReceivingAddress/importExcel", |
||||||
|
|
||||||
|
}, |
||||||
|
dictOptions:{}, |
||||||
|
pcaData:'', |
||||||
|
superFieldList:[], |
||||||
|
} |
||||||
|
}, |
||||||
|
created() { |
||||||
|
this.pcaData = new Area() |
||||||
|
this.getSuperFieldList(); |
||||||
|
}, |
||||||
|
computed: { |
||||||
|
importExcelUrl: function(){ |
||||||
|
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; |
||||||
|
}, |
||||||
|
}, |
||||||
|
methods: { |
||||||
|
edit (id) { |
||||||
|
console.log("+++++++++") |
||||||
|
console.log("========================================") |
||||||
|
/*this.queryParam.userId=this.id;*/ |
||||||
|
this.queryParam.userId=id, |
||||||
|
this.url.list='/customerreceivingaddress/customerReceivingAddress/list1' |
||||||
|
this.loadData(); |
||||||
|
this.visible = true; |
||||||
|
}, |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
up(id){ |
||||||
|
getAction(this.url.up,{id:id}).then((res)=>{ |
||||||
|
if(res.success){ |
||||||
|
this.loadData(); |
||||||
|
this.$message.success(res.message); |
||||||
|
}else{ |
||||||
|
this.$message.warning(res.message); |
||||||
|
} |
||||||
|
})}, |
||||||
|
down(id){ |
||||||
|
getAction(this.url.down,{id:id}).then((res)=>{ |
||||||
|
if(res.success){ |
||||||
|
this.loadData(); |
||||||
|
this.$message.success(res.message); |
||||||
|
}else{ |
||||||
|
this.$message.warning(res.message); |
||||||
|
} |
||||||
|
})}, |
||||||
|
|
||||||
|
|
||||||
|
getPcaText(code){ |
||||||
|
return this.pcaData.getText(code); |
||||||
|
}, |
||||||
|
initDictConfig(){ |
||||||
|
}, |
||||||
|
getSuperFieldList(){ |
||||||
|
let fieldList=[]; |
||||||
|
fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:'sys_user', dictText:'realname', dictCode:'id'}) |
||||||
|
fieldList.push({type:'popup',value:'usernamme',text:'用户', popup:{code:'findcust',field:'id',orgFields:'id',destFields:'user_id'}}) |
||||||
|
fieldList.push({type:'pca',value:'cityId',text:'城市'}) |
||||||
|
fieldList.push({type:'string',value:'address',text:'地址',dictCode:''}) |
||||||
|
fieldList.push({type:'string',value:'zipCode',text:'邮编',dictCode:''}) |
||||||
|
fieldList.push({type:'string',value:'receiver',text:'收货人',dictCode:''}) |
||||||
|
fieldList.push({type:'string',value:'mobile',text:'联系电话',dictCode:''}) |
||||||
|
fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''}) |
||||||
|
fieldList.push({type:'string',value:'labelcl',text:'标识',dictCode:'shdzbs'}) |
||||||
|
this.superFieldList = fieldList |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
</script> |
||||||
|
<style scoped> |
||||||
|
@import '~@assets/less/common.less'; |
||||||
|
</style> |
||||||
@ -0,0 +1,61 @@ |
|||||||
|
<template> |
||||||
|
<j-modal |
||||||
|
:title="title" |
||||||
|
:width="width" |
||||||
|
:visible="visible" |
||||||
|
switchFullscreen |
||||||
|
@ok="handleOk" |
||||||
|
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }" |
||||||
|
@cancel="handleCancel" |
||||||
|
cancelText="关闭"> |
||||||
|
<customer-receiving-address-list1 ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></customer-receiving-address-list1> |
||||||
|
</j-modal> |
||||||
|
</template> |
||||||
|
|
||||||
|
<script> |
||||||
|
|
||||||
|
import CustomerReceivingAddressList1 from './CustomerReceivingAddressList1' |
||||||
|
export default { |
||||||
|
name: 'CustomerReceivingAddressModal1', |
||||||
|
components: { |
||||||
|
CustomerReceivingAddressList1 |
||||||
|
}, |
||||||
|
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> |
||||||
@ -0,0 +1,48 @@ |
|||||||
|
<template> |
||||||
|
<div class="orderDetails"> |
||||||
|
<Header fontColor="#000"></Header> |
||||||
|
<div style="padding-top: 88px"></div> |
||||||
|
<div class="orderMain"> |
||||||
|
<div class="jz"> |
||||||
|
<el-breadcrumb class="breadcrumb" separator="/"> |
||||||
|
<el-breadcrumb-item :to="{ path: '/shopping/views/clothType' }">上级页面</el-breadcrumb-item> |
||||||
|
<el-breadcrumb-item :to="{ path: '/shopping/views/clothType' }">上级页面</el-breadcrumb-item> |
||||||
|
<el-breadcrumb-item :to="{ path: '/shopping/views/clothType' }">上级页面</el-breadcrumb-item> |
||||||
|
<!-- <el-breadcrumb-item>{{this.$route.query.title }}</el-breadcrumb-item>--> |
||||||
|
</el-breadcrumb> |
||||||
|
</div> |
||||||
|
</div> |
||||||
|
<Footer></Footer> |
||||||
|
</div> |
||||||
|
</template> |
||||||
|
<script> |
||||||
|
import Header from "../components/Header/HeaderView"; |
||||||
|
import Footer from "../components/Footer/FooterView" |
||||||
|
export default { |
||||||
|
name: "orderDetails", |
||||||
|
components: { Header,Footer }, |
||||||
|
data() { |
||||||
|
return { |
||||||
|
}; |
||||||
|
}, |
||||||
|
methods: { |
||||||
|
|
||||||
|
}, |
||||||
|
}; |
||||||
|
</script> |
||||||
|
<style> |
||||||
|
.orderDetails .top .middle .router-link-exact-active.router-link-active { |
||||||
|
border-bottom: 2px solid #000; |
||||||
|
} |
||||||
|
</style> |
||||||
|
<style lang="less" scoped> |
||||||
|
@import '../assets/common.css'; |
||||||
|
.orderMain{ |
||||||
|
background: #F6F6F6; |
||||||
|
.breadcrumb{ |
||||||
|
padding-top: 50px; |
||||||
|
padding-bottom: 50px; |
||||||
|
} |
||||||
|
} |
||||||
|
</style> |
||||||
|
|
||||||
@ -1,20 +1,97 @@ |
|||||||
package org.jeecg.modules.demo.delivery.service.impl; |
package org.jeecg.modules.demo.delivery.service.impl; |
||||||
|
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
||||||
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
||||||
|
import org.jeecg.common.exception.JeecgBootException; |
||||||
|
import org.jeecg.modules.demo.accessories.entity.ZyAccessories; |
||||||
|
import org.jeecg.modules.demo.accessories.service.IZyAccessoriesService; |
||||||
import org.jeecg.modules.demo.delivery.entity.Delivery; |
import org.jeecg.modules.demo.delivery.entity.Delivery; |
||||||
import org.jeecg.modules.demo.delivery.mapper.DeliveryMapper; |
import org.jeecg.modules.demo.delivery.mapper.DeliveryMapper; |
||||||
import org.jeecg.modules.demo.delivery.service.IDeliveryService; |
import org.jeecg.modules.demo.delivery.service.IDeliveryService; |
||||||
|
import org.jeecg.modules.demo.fabric.entity.ZyFabric; |
||||||
|
import org.jeecg.modules.demo.fabric.service.IZyFabricService; |
||||||
|
import org.jeecg.modules.productplan.entity.ZyPlanAccessories; |
||||||
|
import org.jeecg.modules.productplan.entity.ZyPlanFabric; |
||||||
|
import org.jeecg.modules.productplan.entity.ZyProductPlan; |
||||||
|
import org.jeecg.modules.productplan.service.IZyPlanAccessoriesService; |
||||||
|
import org.jeecg.modules.productplan.service.IZyPlanFabricService; |
||||||
|
import org.jeecg.modules.productplan.service.IZyProductPlanService; |
||||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||||
import org.springframework.stereotype.Service; |
import org.springframework.stereotype.Service; |
||||||
|
import org.springframework.util.ObjectUtils; |
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
import java.util.LinkedList; |
||||||
|
import java.util.List; |
||||||
|
import java.util.Optional; |
||||||
|
|
||||||
/** |
/** |
||||||
* @Description: 出库表 |
* @Description: 出库表 |
||||||
* @Author: jeecg-boot |
* @Author: jeecg-boot |
||||||
* @Date: 2023-01-10 |
* @Date: 2023-01-10 |
||||||
* @Version: V1.0 |
* @Version: V1.0 |
||||||
*/ |
*/ |
||||||
@Service |
@Service |
||||||
public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> implements IDeliveryService { |
public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> implements IDeliveryService { |
||||||
|
|
||||||
|
@Autowired |
||||||
|
private IZyProductPlanService iZyProductPlanService; |
||||||
|
|
||||||
|
@Autowired |
||||||
|
private IZyPlanFabricService iZyPlanFabricService; |
||||||
|
|
||||||
|
@Autowired |
||||||
|
private IZyPlanAccessoriesService iZyPlanAccessoriesService; |
||||||
|
|
||||||
|
@Autowired |
||||||
|
IZyFabricService iZyFabricService; |
||||||
|
|
||||||
|
@Autowired |
||||||
|
private IZyAccessoriesService iZyAccessoriesService; |
||||||
|
|
||||||
|
@Override |
||||||
|
public void sendToRepository(String planId) { |
||||||
|
ZyProductPlan zyProductPlan = iZyProductPlanService.getById(planId); |
||||||
|
Optional.ofNullable(zyProductPlan).orElseThrow(() -> new JeecgBootException("生产计划不存在!")); |
||||||
|
|
||||||
|
List<ZyPlanFabric> fabricList = iZyPlanFabricService.list(new LambdaQueryWrapper<ZyPlanFabric>() |
||||||
|
.eq(ZyPlanFabric::getPlanId, planId)); |
||||||
|
List<Delivery> deliveryList4Fabric = new LinkedList<>(); |
||||||
|
Optional.ofNullable(fabricList).orElse(new LinkedList<>()).forEach(e -> { |
||||||
|
Delivery delivery = new Delivery(); |
||||||
|
delivery.setDeliveryReason("0"); |
||||||
|
delivery.setItemType("0"); |
||||||
|
delivery.setAmount(e.getAmount().doubleValue()); |
||||||
|
// delivery.setDeliveryTime(new Date());
|
||||||
|
// delivery.setCarrierId("TODO");
|
||||||
|
// delivery.setAdminId("TODO");
|
||||||
|
// delivery.setStorehouseId("TODO");
|
||||||
|
ZyFabric zyFabric = iZyFabricService.getById(e.getFabricId()); |
||||||
|
if (!ObjectUtils.isEmpty(zyFabric)) { |
||||||
|
delivery.setItemCode(zyFabric.getFabricNumber()); |
||||||
|
} |
||||||
|
deliveryList4Fabric.add(delivery); |
||||||
|
}); |
||||||
|
this.saveBatch(deliveryList4Fabric); |
||||||
|
|
||||||
|
List<ZyPlanAccessories> accessoriesList = iZyPlanAccessoriesService.list(new LambdaQueryWrapper<ZyPlanAccessories>() |
||||||
|
.eq(ZyPlanAccessories::getPlanId, planId)); |
||||||
|
List<Delivery> deliveryList4accessories = new LinkedList<>(); |
||||||
|
Optional.ofNullable(accessoriesList).orElse(new LinkedList<>()).forEach(e -> { |
||||||
|
Delivery delivery2 = new Delivery(); |
||||||
|
delivery2.setDeliveryReason("0"); |
||||||
|
delivery2.setItemType("1"); |
||||||
|
delivery2.setAmount(e.getAmount().doubleValue()); |
||||||
|
// delivery2.setDeliveryTime(new Date());
|
||||||
|
// delivery2.setCarrierId("TODO");
|
||||||
|
// delivery2.setAdminId("TODO");
|
||||||
|
// delivery2.setStorehouseId("TODO");
|
||||||
|
ZyAccessories zyAccessories = iZyAccessoriesService.getById(e.getAccessoriesId()); |
||||||
|
if (!ObjectUtils.isEmpty(zyAccessories)) { |
||||||
|
delivery2.setItemCode(zyAccessories.getNums()); |
||||||
|
} |
||||||
|
deliveryList4accessories.add(delivery2); |
||||||
|
}); |
||||||
|
this.saveBatch(deliveryList4accessories); |
||||||
|
} |
||||||
} |
} |
||||||
|
|||||||
Loading…
Reference in new issue