Skip to content

S
SA-WMS
提交 49363cfc authored 作者: Ras's avatar Ras
浏览文件
操作

修复 基础管理-》价格维护 列表数据为空

修复 南非仓库管理-》收费单 客户姓名过滤功能失败 增加 中国仓库管理-》出库列表 发送消息功能 增加 南非仓库管理-》查看物流状态 最新地点和日期字段（仅添加字段，无数据） 增加 南非仓库管理-》汇总单 打印汇总单功能 增加 南非仓库管理-》收费单 打印收费单功能
上级 98a67ebb
隐藏空白字符变更
内嵌 并排
正在显示 包含 651 行增加 和 11 行删除
public/index.html
浏览文件 @ 49363cfc
......@@ -241,9 +241,11 @@
/* 滚动条优化 end */
</style>
<!-- 全局配置 -->
<!-- http://lf.lingqingkeji.com:8080 -->
<script>
window._CONFIG = {};
window._CONFIG['domianURL'] = 'http://lf.lingqingkeji.com:8080/wmssystem';
// window._CONFIG['domianURL'] = 'http://192.168.1.12:8080/wmssystem';
window._CONFIG['casPrefixUrl'] = 'http://cas.example.org:8443/cas';
window._CONFIG['onlinePreviewDomainURL'] = 'http://fileview.jeecg.com/onlinePreview'
window._CONFIG['staticDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/static';
......
src/config/router.config.js
浏览文件 @ 49363cfc
......@@ -363,5 +363,10 @@ export const constantRouterMap = [
path: '/404',
component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404')
},
{
path: '/ras',
name: 'RasTestPage',
component: () => import('@/views/test/test')
}
]
src/views/iost/basedata/IostDeliverstatusList.vue
浏览文件 @ 49363cfc
......@@ -142,6 +142,16 @@
}
},
{
title:'最新地点',
align:"center",
dataIndex: ''
},
{
title:'日期',
align:"center",
dataIndex: ''
},
{
title: '操作',
dataIndex: 'action',
align:"center",
......
src/views/iost/basedata/IostDeliveryRecordList.vue
浏览文件 @ 49363cfc
......@@ -94,6 +94,8 @@
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a @click="handleSendMessage(record)">发送消息</a>
<a-divider type="vertical" />
<a-dropdown>
......@@ -115,6 +117,7 @@
</div>
<iost-delivery-record-modal ref="modalForm" @ok="modalFormOk"/>
<iost-message-modal ref="messageModalForm" @ok="modalFormOk"/>
</a-card>
</template>
......@@ -123,6 +126,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import IostDeliveryRecordModal from './modules/IostDeliveryRecordModal'
import JDate from '@/components/jeecg/JDate.vue'
import IostMessageModal from './modules/IostMessageModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
import '@/assets/less/TableExpand.less'
......@@ -131,7 +135,8 @@
mixins:[JeecgListMixin],
components: {
JDate,
IostDeliveryRecordModal
IostDeliveryRecordModal,
IostMessageModal
},
data () {
return {
......@@ -216,7 +221,11 @@
methods: {
initDictConfig(){
},
handleSendMessage(record)
{
this.$refs.messageModalForm.add(record);
this.$refs.messageModalForm.title = "发送消息";
}
}
}
</script>
......
src/views/iost/basedata/IostPriceList.vue
浏览文件 @ 49363cfc
......@@ -157,7 +157,7 @@
{
title:'商品类别',
align:"center",
dataIndex: 'kind_dictText'
dataIndex: 'kind'
},
{
title:'商品中文名称',
......
src/views/iost/basedata/IostReceivingNoteList.vue
浏览文件 @ 49363cfc
......@@ -17,7 +17,7 @@
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="客户姓名">
<j-search-select-tag placeholder="请输入客户姓名" v-model="queryParam.customer_name" dict="iost_customer,name_chs,name_chs"/>
<j-search-select-tag placeholder="请选择客户姓名" v-model="queryParam.customerName" dict="iost_customer,name_chs,name_chs"/>
</a-form-item>
</a-col>
</template>
......@@ -90,7 +90,8 @@
<span slot="action" slot-scope="text, record">
<a @click="handleDetail(record)">详情</a>
<a-divider type="vertical" />
<a @click="handleCopy(record)">打印收费单</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
......@@ -108,6 +109,7 @@
</div>
<iost-receiving-note-modal ref="modalForm" @ok="modalFormOk"/>
<iost-receiving-note-copy-modal ref="copyModalForm" @ok="modalFormOk"></iost-receiving-note-copy-modal>
</a-card>
</template>
......@@ -115,6 +117,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import IostReceivingNoteModal from './modules/IostReceivingNoteModal'
import IostReceivingNoteCopyModal from './modules/IostReceivingNoteCopyModal'
import '@/assets/less/TableExpand.less'
import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
......@@ -123,7 +126,8 @@
mixins:[JeecgListMixin],
components: {
IostReceivingNoteModal,
JSearchSelectTag
JSearchSelectTag,
IostReceivingNoteCopyModal,
},
data () {
return {
......@@ -166,7 +170,7 @@
dataIndex: 'deliveryAddress'
},
{
title:'日期',
title:'创建日期',
align:"center",
dataIndex: 'createTime',
customRender:function (text) {
......@@ -203,7 +207,13 @@
methods: {
initDictConfig(){
},
handleCopy(record)
{
console.log(record)
this.$refs.copyModalForm.edit(record);
this.$refs.copyModalForm.title = "打印收费单";
this.$refs.copyModalForm.disableSubmit = true;
},
}
}
</script>
......
src/views/iost/basedata/IostSummarySheetList.vue
浏览文件 @ 49363cfc
......@@ -97,6 +97,8 @@
<a-divider type="vertical" />
<a @click="editPic(record)">上传送货单</a>
<a-divider type="vertical" />
<a @click="handleCopy(record)">打印汇总单</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
......@@ -114,6 +116,7 @@
<iost-summary-sheet-modal ref="modalForm" @ok="modalFormOk"></iost-summary-sheet-modal>
<iost-delivery-record-pic-modal ref="picModalForm" @ok="modalFormOk"></iost-delivery-record-pic-modal>
<iost-summary-copy-modal ref="copyModalForm" @ok="modalFormOk"></iost-summary-copy-modal>
</a-card>
</template>
......@@ -125,6 +128,7 @@
import '@/assets/less/TableExpand.less'
import { getAction } from '@/api/manage'
import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
import IostSummaryCopyModal from './modules/IostSummaryCopyModal'
export default {
name: "IostSummarySheetList",
......@@ -132,7 +136,8 @@
components: {
IostDeliveryRecordPicModal,
IostSummarySheetModal,
JSearchSelectTag
JSearchSelectTag,
IostSummaryCopyModal
},
data () {
return {
......@@ -173,6 +178,14 @@
}
},
{
title:'创建日期',
align:"center",
dataIndex: 'createTime',
customRender:function (text) {
return !text?"":(text.length>10?text.substr(0,10):text)
}
},
{
title: '操作',
dataIndex: 'action',
align:"center",
......@@ -235,7 +248,12 @@
},
initDictConfig(){
},
handleCopy(record)
{
this.$refs.copyModalForm.edit(record);
this.$refs.copyModalForm.title = "打印汇总单";
this.$refs.copyModalForm.disableSubmit = true;
},
}
}
</script>
......
src/views/iost/basedata/IostWarehouseIn.vue
浏览文件 @ 49363cfc
......@@ -11,7 +11,7 @@
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="客户姓名">
<j-search-select-tag placeholder="请输入客户姓名" v-model="queryParam.customer_name" dict="iost_customer,name_chs,name_chs"/>
<j-search-select-tag placeholder="请选择客户姓名" v-model="queryParam.customer_name" dict="iost_customer,name_chs,name_chs"/>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
......
src/views/iost/basedata/modules/IostReceivingNoteCopyForm.vue 0 → 100644
浏览文件 @ 49363cfc
<template>
<a-spin :spinning="confirmLoading">
<a-button v-print="'#printContent1'" ghost type="primary">打印</a-button>
<section ref="print" id="printContent1" class="ant-card-body">
<j-form-container :disabled="formDisabled">
<!-- 主表单区域 -->
<a-form :form="form" slot="detail">
<a-row>
<a-col :span="8" >
<span class="ant-inputlabel">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;发票号:</span>
<a-input v-model="model.bulkNo" class="ant-input"></a-input>
</a-col>
<a-col :span="8" >
<span class="ant-inputlabel">&nbsp;&nbsp;&nbsp;&nbsp;入仓号:</span>
<a-input v-model="model.warehouseName_dictText" class="ant-input"></a-input>
</a-col>
<a-col :span="8" >
<span class="ant-inputlabel">客户姓名:</span>
<a-input v-model="model.containerNo" class="ant-input"></a-input>
</a-col>
<a-col :span="8" >
<span class="ant-inputlabel">&nbsp;&nbsp;&nbsp;&nbsp;联系电话:</span>
<a-input v-model="model.loadingDate" class="ant-input"></a-input>
</a-col>
<a-col :span="8" >
<span class="ant-inputlabel">送货地址:</span>
<a-input v-model="model.createTime" class="ant-input"></a-input>
</a-col>
<a-col :span="8" >
<span class="ant-inputlabel">创建日期:</span>
<a-input v-model="model.createTime" class="ant-input"></a-input>
</a-col>
</a-row>
</a-form>
</j-form-container>
<a-row>
&nbsp;
</a-row>
<!-- 子表单区域 -->
<a-table
ref="table"
size="middle"
bordered
rowKey="id"
class="j-table-force-nowrap"
:scroll="{x:true}"
:columns="columns"
:dataSource="dataSource"
:pagination="false"
:loading="loading">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
</a-table>
</section>
</a-spin>
</template>
<script>
import pick from 'lodash.pick'
import { getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
import JFormContainer from '@/components/jeecg/JFormContainer'
import JDate from '@/components/jeecg/JDate'
import { JeecgListMixin4Entry } from '@/mixins/JeecgListMixin4Entry'
import '@/assets/less/TableExpand.less'
export default {
name: 'IostReceivingCopyForm',
mixins: [JeecgListMixin4Entry],
components: {
JFormContainer,
JDate,
},
data() {
return {
labelCol: {
xs: { span: 24 },
sm: { span: 6 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
labelCol2: {
xs: { span: 24 },
sm: { span: 3 },
},
wrapperCol2: {
xs: { span: 24 },
sm: { span: 20 },
},
form: this.$form.createForm(this),
model: {},
columns: [
{
title: '商品中文名称',
align:"center",
dataIndex: 'nameChs'
},
{
title: '商品英文名称',
align:"center",
dataIndex: 'nameEng'
},
{
title: '体积',
align:"center",
dataIndex: 'volume'
},
{
title: '重量(kg)',
align:"center",
dataIndex: 'weight',
},
{
title: '箱数',
align:"center",
dataIndex: 'packages'
},
{
title: '价格',
align:"center",
dataIndex: 'price',
}
],
confirmLoading: false,
url: {
list: '/basedata/iostReceivingNote/queryIostReceivingNoteListByMainId'
}
}
},
props: {
//流程表单data
formData: {
type: Object,
default: ()=>{},
required: false
},
//表单模式：false流程表单 true普通表单
formBpm: {
type: Boolean,
default: false,
required: false
},
//表单禁用
disabled: {
type: Boolean,
default: false,
required: false
}
},
computed: {
formDisabled(){
if(this.formBpm===true){
if(this.formData.disabled===false){
return false
}
return true
}
return this.disabled
},
showFlowSubmitButton(){
if(this.formBpm===true){
if(this.formData.disabled===false){
return true
}
}
return false
}
},
created () {
},
methods: {
edit (record) {
let params = { id: record.id }
this.queryParam = params;
this.willLoadData = true;
this.loadData(1);
this.form.resetFields();
this.model = Object.assign({}, record);
this.visible = true;
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'bulkNo','warehouseName_dictText','containerNo','loadingData'))
})
},
popupCallback(row){
this.form.setFieldsValue(pick(row,'bulkNo','warehouseName_dictText','containerNo','loadingData'))
},
}
}
</script>
<style scoped>
/*update_begin author:scott date:20191203 for:打印机打印的字体模糊问题 */
*{
color: #000000!important;
-webkit-tap-highlight-color: #000000!important;
}
/*update_end author:scott date:20191203 for:打印机打印的字体模糊问题 */
.ant-card-body{
margin-left: 0%;
margin-right: 0%;
margin-bottom: 1%;
border:0px solid black;
min-width: 800px;
color:#000000!important;
}
.ant-input{
border-left-width:0px!important;
border-top-width:0px!important;
border-right-width:0px!important;
text-align: left;
margin-left: 10px;
width: 70%;
display: inline-block;
}
.ant-inputlabel{
text-align: right;
}
</style>
\ No newline at end of file
src/views/iost/basedata/modules/IostReceivingNoteCopyModal.vue 0 → 100644
浏览文件 @ 49363cfc
<template>
<j-modal
:title="title"
:width="1200"
:visible="visible"
:maskClosable="false"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel">
<iost-receiving-note-copy-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>
</j-modal>
</template>
<script>
import IostReceivingNoteCopyForm from './IostReceivingNoteCopyForm'
export default {
name: 'IostReceivingNoteCopyModal',
components: {
IostReceivingNoteCopyForm
},
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.handleOk();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>
<style scoped>
</style>
\ No newline at end of file
src/views/iost/basedata/modules/IostSummaryCopyForm.vue 0 → 100644
浏览文件 @ 49363cfc
<template>
<a-spin :spinning="confirmLoading">
<a-button v-print="'#printContent1'" ghost type="primary">打印</a-button>
<section ref="print" id="printContent1" class="ant-card-body">
<j-form-container :disabled="formDisabled">
<!-- 主表单区域 -->
<a-form :form="form" slot="detail">
<a-row>
<a-col :span="8" >
<span class="ant-inputlabel">&nbsp;&nbsp;&nbsp;&nbsp;散货柜编号:</span>
<a-input v-model="model.bulkNo" class="ant-input"></a-input>
</a-col>
<a-col :span="8" >
<span class="ant-inputlabel">仓库名称:</span>
<a-input v-model="model.warehouseName_dictText" class="ant-input"></a-input>
</a-col>
<a-col :span="8" >
<span class="ant-inputlabel">货柜号:</span>
<a-input v-model="model.containerNo" class="ant-input"></a-input>
</a-col>
<a-col :span="8" >
<span class="ant-inputlabel">&nbsp;&nbsp;&nbsp;&nbsp;装柜日期:</span>
<a-input v-model="model.loadingDate" class="ant-input"></a-input>
</a-col>
<a-col :span="8" >
<span class="ant-inputlabel">创建日期:</span>
<a-input v-model="model.createTime" class="ant-input"></a-input>
</a-col>
</a-row>
</a-form>
</j-form-container>
<a-row>
&nbsp;
</a-row>
<!-- 子表单区域 -->
<a-table
ref="table"
size="middle"
bordered
rowKey="id"
class="j-table-force-nowrap"
:scroll="{x:true}"
:columns="columns"
:dataSource="dataSource"
:pagination="false"
:loading="loading">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
</a-table>
</section>
</a-spin>
</template>
<script>
import pick from 'lodash.pick'
import { getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
import JFormContainer from '@/components/jeecg/JFormContainer'
import JDate from '@/components/jeecg/JDate'
import { JeecgListMixin4Entry } from '@/mixins/JeecgListMixin4Entry'
import '@/assets/less/TableExpand.less'
export default {
name: 'IostReceivingCopyForm',
mixins: [JeecgListMixin4Entry],
components: {
JFormContainer,
JDate,
},
data() {
return {
labelCol: {
xs: { span: 24 },
sm: { span: 6 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
labelCol2: {
xs: { span: 24 },
sm: { span: 3 },
},
wrapperCol2: {
xs: { span: 24 },
sm: { span: 20 },
},
form: this.$form.createForm(this),
model: {},
columns: [
{
title: '客户名称',
align:"center",
dataIndex: 'customerName'
},
{
title: '体积',
align:"center",
dataIndex: 'volume'
},
{
title: '重量',
align:"center",
dataIndex: 'weight'
},
{
title: '箱数',
align:"center",
dataIndex: 'packages',
},
{
title: '金额',
align:"center",
dataIndex: 'money'
},
{
title: '入仓号',
align:"center",
dataIndex: 'receivingNo',
},
{
title: '送货状态',
align:"center",
dataIndex: 'deliverStatus',
}
],
confirmLoading: false,
url: {
// add: "/basedata/iostReceiving/add",
// edit: "/basedata/iostReceiving/edit",
// queryById: "/basedata/iostSummarySheet/queryByIdPrint",
list: '/basedata/iostSummarySheet/queryIostSummarySheetListByMainId'
}
}
},
props: {
//流程表单data
formData: {
type: Object,
default: ()=>{},
required: false
},
//表单模式：false流程表单 true普通表单
formBpm: {
type: Boolean,
default: false,
required: false
},
//表单禁用
disabled: {
type: Boolean,
default: false,
required: false
}
},
computed: {
formDisabled(){
if(this.formBpm===true){
if(this.formData.disabled===false){
return false
}
return true
}
return this.disabled
},
showFlowSubmitButton(){
if(this.formBpm===true){
if(this.formData.disabled===false){
return true
}
}
return false
}
},
created () {
},
methods: {
edit (record) {
let params = { id: record.id }
this.queryParam = params;
this.willLoadData = true;
this.loadData(1);
this.form.resetFields();
this.model = Object.assign({}, record);
this.visible = true;
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'bulkNo','warehouseName_dictText','containerNo','loadingData'))
})
},
popupCallback(row){
this.form.setFieldsValue(pick(row,'bulkNo','warehouseName_dictText','containerNo','loadingData'))
},
}
}
</script>
<style scoped>
/*update_begin author:scott date:20191203 for:打印机打印的字体模糊问题 */
* {
color: #000000!important;
-webkit-tap-highlight-color: #000000!important;
}
/*update_end author:scott date:20191203 for:打印机打印的字体模糊问题 */
.ant-card-body{
margin-left: 0%;
margin-right: 0%;
margin-bottom: 1%;
border:0px solid black;
min-width: 800px;
color:#000000!important;
}
.ant-input{
border-left-width:0px!important;
border-top-width:0px!important;
border-right-width:0px!important;
text-align: left;
margin-left: 10px;
width: 70%;
}
.ant-inputlabel{
text-align: right;
}
</style>
\ No newline at end of file
src/views/iost/basedata/modules/IostSummaryCopyModal.vue 0 → 100644
浏览文件 @ 49363cfc
<template>
<j-modal
:title="title"
:width="1200"
:visible="visible"
:maskClosable="false"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel">
<iost-summary-copy-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>
</j-modal>
</template>
<script>
import IostSummaryCopyForm from './IostSummaryCopyForm'
export default {
name: 'IostSummaryCopyModal',
components: {
IostSummaryCopyForm
},
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.handleOk();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>
<style scoped>
</style>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论