Skip to content

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

送货管理新增打印送货单选项,重新提交

上级 25ec684c
隐藏空白字符变更
内嵌 并排
正在显示 包含 406 行增加 和 10 行删除
public/index.html
浏览文件 @ 25c2ebc8
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
window._CONFIG = {}; window._CONFIG = {};
window._CONFIG['domianURL'] = 'http://lf.lingqingkeji.com:8080/wmssystem'; window._CONFIG['domianURL'] = 'http://lf.lingqingkeji.com:8080/wmssystem';
// window._CONFIG['domianURL'] = 'http://nf.lingqingkeji.com:8080/wmssystem'; // window._CONFIG['domianURL'] = 'http://nf.lingqingkeji.com:8080/wmssystem';
// window._CONFIG['domianURL'] = 'http://192.168.1.33:8080/wmssystem'; // window._CONFIG['domianURL'] = 'http://192.168.2.209:8080/wmssystem';
window._CONFIG['casPrefixUrl'] = 'http://cas.example.org:8443/cas'; window._CONFIG['casPrefixUrl'] = 'http://cas.example.org:8443/cas';
window._CONFIG['onlinePreviewDomainURL'] = 'http://fileview.jeecg.com/onlinePreview' window._CONFIG['onlinePreviewDomainURL'] = 'http://fileview.jeecg.com/onlinePreview'
window._CONFIG['staticDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/static'; window._CONFIG['staticDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/static';
......
src/views/iost/basedata/IostDeliveryManagementList.vue
浏览文件 @ 25c2ebc8
...@@ -95,6 +95,8 @@ ...@@ -95,6 +95,8 @@
<a-divider type="vertical" /> <a-divider type="vertical" />
<a @click="exportReceivingNotePdf(record)">查看收费单</a> <a @click="exportReceivingNotePdf(record)">查看收费单</a>
<a-divider type="vertical" /> <a-divider type="vertical" />
<a @click="handlePrint(record)">打印全部送货单</a>
<a-divider type="vertical" />
</span> </span>
...@@ -102,7 +104,8 @@ ...@@ -102,7 +104,8 @@
</div> </div>
<iost-deliverstatus-modal ref="statusModalForm" @ok="modalFormOk"/> <iost-deliverstatus-modal ref="statusModalForm" @ok="modalFormOk"/>
<iost-delivery-management-modal ref="modalForm" @ok="modalFormOk"></iost-delivery-management-modal> <!-- <iost-delivery-management-modal ref="modalForm" @ok="modalFormOk"></iost-delivery-management-modal> -->
<iost-delivery-management-p-modal ref="modalForm" @ok="modalFormOk"/>
</a-card> </a-card>
</template> </template>
...@@ -113,6 +116,7 @@ ...@@ -113,6 +116,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import IostDeliveryManagementModal from './modules/IostDeliveryManagementModal' import IostDeliveryManagementModal from './modules/IostDeliveryManagementModal'
import IostDeliverstatusModal from './modules/IostDeliverstatusModal' import IostDeliverstatusModal from './modules/IostDeliverstatusModal'
import IostDeliveryManagementPModal from './modules/IostDeliveryManagementPModal'
import { getAction, downFile } from '@/api/manage' import { getAction, downFile } from '@/api/manage'
import JSearchSelectTag from '@/components/dict/JSearchSelectTag' import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
...@@ -122,7 +126,8 @@ ...@@ -122,7 +126,8 @@
components: { components: {
IostDeliveryManagementModal, IostDeliveryManagementModal,
IostDeliverstatusModal, IostDeliverstatusModal,
JSearchSelectTag JSearchSelectTag,
IostDeliveryManagementPModal
}, },
data () { data () {
return { return {
...@@ -192,8 +197,6 @@ ...@@ -192,8 +197,6 @@
} }
], ],
url: { url: {
///basedata/iostDeliveryRecord/list 原本
///basedata/iostDeliveryManagement/list 测试
list: "/basedata/iostDeliveryRecord/list", list: "/basedata/iostDeliveryRecord/list",
exportXlsUrl: "/basedata/iostDeliveryRecord/exportXls", exportXlsUrl: "/basedata/iostDeliveryRecord/exportXls",
}, },
...@@ -295,6 +298,12 @@ ...@@ -295,6 +298,12 @@
this.$refs.copyModalForm.title = "打印收费单"; this.$refs.copyModalForm.title = "打印收费单";
this.$refs.copyModalForm.disableSubmit = true; this.$refs.copyModalForm.disableSubmit = true;
}, },
handlePrint(record)
{
this.$refs.modalForm.edit(record);
this.$refs.modalForm.title = "打印";
this.$refs.modalForm.disableSubmit = true;
},
initDictConfig(){ initDictConfig(){
} }
} }
......
src/views/iost/basedata/modules/IostDeliveryManagementForm.vue
浏览文件 @ 25c2ebc8
...@@ -20,17 +20,17 @@ ...@@ -20,17 +20,17 @@
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-item label="总体积" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="总体积" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-number v-decorator="['volumeTotal']" placeholder="请输入总体积" style="width: 100%"/> <a-input-number v-decorator="['volumeTotals']" placeholder="请输入总体积" style="width: 100%"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-item label="总装箱数" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="总装箱数" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-number v-decorator="['packagesTotal']" placeholder="请输入总装箱数" style="width: 100%"/> <a-input-number v-decorator="['packagesTotals']" placeholder="请输入总装箱数" style="width: 100%"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-item label="总重量" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="总重量" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-number v-decorator="['weightTotal']" placeholder="请输入总重量" style="width: 100%"/> <a-input-number v-decorator="['weightTotals']" placeholder="请输入总重量" style="width: 100%"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
...@@ -139,8 +139,9 @@ ...@@ -139,8 +139,9 @@
this.form.resetFields(); this.form.resetFields();
this.model = Object.assign({}, record); this.model = Object.assign({}, record);
this.visible = true; this.visible = true;
console.log(record)
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'bulkNo','warehouseName','containerNo','volumeTotal','packagesTotal','weightTotal','moneyTotal','loadingDate')) this.form.setFieldsValue(pick(this.model,'bulkNo','warehouseName','containerNo','volumeTotals','packagesTotals','weightTotals','moneyTotal','loadingDate'))
}) })
}, },
//渲染流程表单数据 //渲染流程表单数据
...@@ -186,7 +187,7 @@ ...@@ -186,7 +187,7 @@
}) })
}, },
popupCallback(row){ popupCallback(row){
this.form.setFieldsValue(pick(row,'bulkNo','warehouseName','containerNo','volumeTotal','packagesTotal','weightTotal','moneyTotal','loadingDate')) this.form.setFieldsValue(pick(row,'bulkNo','warehouseName','containerNo','volumeTotals','packagesTotals','weightTotals','moneyTotal','loadingDate'))
}, },
} }
} }
......
src/views/iost/basedata/modules/IostDeliveryManagementPForm.vue 0 → 100644
浏览文件 @ 25c2ebc8
<template>
<a-spin :spinning="confirmLoading">
<a-button v-print="'#printContent'" ghost type="primary">打印</a-button>
<section ref="print" id="printContent" class="ant-card-body">
<j-form-container :disabled="formDisabled">
<!-- 主表单区域 -->
<a-form :form="form" slot="detail">
<a-row>
<a-col :span="12" >
<a-row>
<span style="font-size:24px;font-style:italic;font-weight:bold;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;LINKEDNET</span>
</a-row>
<a-row>
<span style="font-size:24px;font-style:italic;font-weight:bold;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;FREIGHT</span>
</a-row>
</a-col>
<a-col :span="12" >
<a-row>
1404 BEDFORD OFFICE TOWER, BEDFORD CENTER, 12
</a-row>
<a-row>
&nbsp;&nbsp;&nbsp;&nbsp;SMITH ROAD,BEDFORD GARDEN,JOHANNESBURG
</a-row>
<a-row>
&nbsp;
</a-row>
<a-row>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
Tel no: 011-6151570 011-0297650
</a-row>
</a-col>
</a-row>
<hr />
<a-row style="font-size:24px;font-weight:bold;text-align:center;">
Delivery Note
</a-row>
<a-row>
&nbsp;
</a-row>
<a-row>
<a-col :span="12" >
<span class="ant-inputlabel">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;散货柜编号:</span>
<a-input v-model="model.bulkNo" class="ant-input"></a-input>
</a-col>
<a-col :span="12" >
<span class="ant-inputlabel">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;装柜日期:</span>
<a-input v-model="model.loadingDate" class="ant-input"></a-input>
</a-col>
<a-col :span="12" >
<span class="ant-inputlabel">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;仓库名称:</span>
<a-input v-model="model.warehouseName_dictText" class="ant-input"></a-input>
</a-col>
<a-col :span="12" >
<span class="ant-inputlabel">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;货柜号:</span>
<a-input v-model="model.containerNo" class="ant-input"></a-input>
</a-col>
<!-- <a-col :span="24" >
<span class="ant-inputlabel">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Company:</span>
<a-input v-model="model.company" class="ant-input"></a-input>
</a-col>
<a-col :span="24">
<span class="ant-inputlabel">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Address:</span>
<a-input v-model="model.address" class="ant-input"></a-input>
</a-col> -->
</a-row>
<a-row>
&nbsp;
</a-row>
</a-form>
</j-form-container>
<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>
<a-row>
&nbsp;
</a-row>
<a-row>
&nbsp;
</a-row>
<a-row>
<a-col :span="12" >
<span class="ant-inputlabel">Deliver Print Name:</span>
</a-col>
<a-col :span="12" >
<span class="ant-inputlabel">Receiver Print Name:</span>
</a-col>
</a-row>
<a-row>
&nbsp;
</a-row>
<a-row>
<a-col :span="12" >
<span class="ant-inputlabel">Signature:</span>
</a-col>
<a-col :span="12" >
<span class="ant-inputlabel">Signature:</span>
</a-col>
</a-row>
<a-row>
&nbsp;
</a-row>
<a-row>
<a-col :span="12" >
<span class="ant-inputlabel">Phone No.</span>
</a-col>
<a-col :span="12" >
<span class="ant-inputlabel">Phone No.</span>
</a-col>
</a-row>
<a-row>
&nbsp;
</a-row>
<a-row>
<a-col :span="12" >
<span class="ant-inputlabel">Date:</span>
</a-col>
<a-col :span="12" >
<span class="ant-inputlabel">Date:</span>
</a-col>
</a-row>
<a-row>
&nbsp;
</a-row>
</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: 'IostDeliveryManagementPForm',
mixins:[JeecgListMixin4Entry],
components: {
JFormContainer,
JDate,
},
data() {
return {
columns: [
{
title:'Description',
align:"center",
dataIndex: 'description'
},
{
title:'CTNS',
align:"center",
dataIndex: 'ctns'
},
{
title:'Length(kg)',
align:"center",
dataIndex: 'length'
},
{
title:'Width(kg)',
align:"center",
dataIndex: 'width'
},
{
title:'Height(kg)',
align:"center",
dataIndex: 'height'
},
{
title:'CBM',
align:"center",
dataIndex: 'cbm'
},
{
title:'Weight(kg)',
align:"center",
dataIndex: 'weight',
statistics: "true",
},
{
title:'MARK',
align:"center",
dataIndex: 'mark'
},
],
form: this.$form.createForm(this),
model: {},
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 },
},
confirmLoading: false,
url: {
add: "/basedata/iostDeliveryNote/add",
edit: "/basedata/iostDeliveryNote/edit",
queryById: "/basedata/iostDeliveryNote/queryById",
list: '/basedata/iostDeliveryNote/listDeliveryNoteList'
// list: '/basedata/iostDeliveryRecord/list'
}
}
},
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 }
console.log("当前列的id",params)
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,'contactName','createTime','phoneNo','reference','company','address'))
})
},
popupCallback(row){
this.form.setFieldsValue(pick(row,'contactName','createTime','phoneNo','reference','company','address'))
},
}
}
</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/IostDeliveryManagementPModal.vue 0 → 100644
浏览文件 @ 25c2ebc8
<template>
<j-modal
:title="title"
:width="1200"
:visible="visible"
:maskClosable="false"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel">
<iost-delivery-management-p-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>
</j-modal>
</template>
<script>
import IostDeliveryManagementPForm from './IostDeliveryManagementPForm.vue'
export default {
name: 'IostDeliveryManagementPModal',
components: {
IostDeliveryManagementPForm,
},
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 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论