wilson
/
xujiecloud-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

关务修改

java8
han\hanst 7 months ago
parent
93dafb2589
commit
08021725f0
8 changed files with 210 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/utils/export-options.js
  2. 93
      src/views/modules/ecss/codelnotify.vue
  3. 2
      src/views/modules/ecss/codelnotifyConfirm.vue
  4. 12
      src/views/modules/ecss/createDeclaration.vue
  5. 63
      src/views/modules/ecss/declaration.vue
  6. 39
      src/views/modules/ecss/del_upload_excel.vue
  7. 9
      src/views/modules/ecss/ecssTemplate.vue
  8. 14
      src/views/modules/oss/ossComponents.vue

2
src/utils/export-options.js
View File

@ -29,7 +29,7 @@ const PalletSku = {
columnLabel: "箱数",
},
{
columnProp: "Rolls",
columnProp: "rolls",
columnLabel: "Rolls",
},
{

93
src/views/modules/ecss/codelnotify.vue
View File

@ -207,6 +207,12 @@
</el-table>
</el-tab-pane>
<el-tab-pane label="相关文档" name="codelnotifyDocument">
<oss-components label="申请单号" style="margin-top: 5px" height="44vh" :columns="ossColumns"
:order-ref1="currentRow.site" :order-ref2="currentRow.delNo" :codelnotifyFlag="'1'"
:rfq-no="currentRow.delNo">
</oss-components>
</el-tab-pane>
</el-tabs>
<el-dialog title="编辑发货通知单" :close-on-click-modal="false" v-drag :visible.sync="updateHeaderModelFlag" width="672px">
<el-form label-position="top" style="margin-left: 5px;margin-top: -5px;">
@ -531,6 +537,11 @@
<el-input v-model="exportInvoice.origin"></el-input>
</el-form-item>
</el-col>
<el-col :span="24" style="">
<el-form-item :label="'备注'" >
<el-input type="textarea" :rows="3" v-model="exportInvoice.fpremark"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-table v-show="currentRow.buNo==='03-RFID'"
@ -539,7 +550,7 @@
stripe
highlight-current-row
border :row-style="{ height: '30px' }"
style="width: 100%;">
style="width: 100%;margin-top: 60px">
<el-table-column
prop="pn"
header-align="center"
@ -688,9 +699,11 @@
}from "@/api/ecss/ecss.js"
import {getBuList}from '@/api/factory/site.js'
import ExportUtil from "@/utils/export";
import OssComponents from '../oss/ossComponents.vue'
export default {
name: "null",
components:{
OssComponents,
delUploadExcel,
delDetailUploadExcel,
Chooselist,
@ -1776,6 +1789,80 @@
columnWidth: 50
},
],
ossColumns:[
{
userId: this.$store.state.user.name,
functionId: 103001,
serialNumber: '103001Table2FileName',
tableId: '103001Table2',
tableName: '文件信息表',
columnProp: 'fileName',
headerAlign: 'center',
align: 'center',
columnLabel: '文件名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 140
},
{
userId: this.$store.state.user.name,
functionId: 103001,
serialNumber: '103001Table2FileRemark',
tableId: '103001Table2',
tableName: '文件信息表',
columnProp: 'fileRemark',
headerAlign: 'center',
align: 'center',
columnLabel: '备注',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 240
},
{
userId: this.$store.state.user.name,
functionId: 103001,
serialNumber: '103001Table2CreateDate',
tableId: '103001Table2',
tableName: '文件信息表',
columnProp: 'createDate',
headerAlign: 'center',
align: 'center',
columnLabel: '上传时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 140
},
{
userId: this.$store.state.user.name,
functionId: 103001,
serialNumber: '103001Table2CreatedBy',
tableId: '103001Table2',
tableName: '文件信息表',
columnProp: 'createdBy',
headerAlign: 'center',
align: 'center',
columnLabel: '上传人',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 140
}
],
currentRow:{},
// 导出 start
exportData: [],
@ -1797,6 +1884,7 @@
goodsLabel:true,
overseasShipper:'',
overseasAddress:'',
fpremark:'',
},
exportGoodsFlag:false,
exportGoods:{
@ -2378,6 +2466,7 @@
this.$message.warning('请选择发货通知单！')
return
}
this.exportGoods.hsCodeDescType = 'N'
this.exportGoods.salesMethod = 'EXW'
this.exportGoods.currency = 'USD'
this.exportGoods.madeArea = 'Shanghai, China'
@ -2457,6 +2546,7 @@
this.exportInvoice.material=this.currentRow.material?this.currentRow.material:row.material
this.exportInvoice.hsCodeDescType=this.currentRow.hsCodeDescType?this.currentRow.hsCodeDescType:row.hsCodeDescType
this.exportInvoice.goodsLabel=this.currentRow.goodsLabel?this.currentRow.goodsLabel:row.goodsLabel
this.exportInvoice.fpremark=row.remark
} else if (this.templateData.type=='出口货物委托书'){
this.exportGoods.salesMethod = row.salesMethod
this.exportGoods.currency = row.currency
@ -2466,6 +2556,7 @@
this.exportGoods.voyage = this.currentRow.buNo==='01-Label' || this.currentRow.buNo==='03-RFID'?this.currentRow.cmcInvoice:row.voyage
this.exportGoods.shippingDate = row.shippingDate;
this.exportGoods.shipper=row.shipper
this.exportGoods.remark=row.remark
}
if (this.templateData.type!=='出口货物委托书') {
this.notifyPartDetailList.forEach(o => {

2
src/views/modules/ecss/codelnotifyConfirm.vue
View File

@ -2235,7 +2235,7 @@
createBy: this.$store.state.user.name,
}
excel.exportTable({
url: "/select/ecssMapper/searchEcssCoDelNotifyDetail/list",
url: "/ecss/coDel/searchCoDelPalletList",
columnMapping: excelOpts.PalletSku.columnMapping,//可以直接用table，不需要的列就剔除
mergeSetting: [],//需要合并的列
params: searchData,

12
src/views/modules/ecss/createDeclaration.vue
View File

@ -308,6 +308,11 @@
<el-input v-model="declarationData.packageQty" ></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'箱数'" >
<el-input v-model="declarationData.boxQty" ></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="'毛重（KG）'" >
<el-input v-model="declarationData.grossWeight" ></el-input>
@ -392,6 +397,13 @@
label="数量"
min-width="60">
</el-table-column>
<el-table-column
prop="unit"
header-align="center"
align="left"
label="单位"
min-width="60">
</el-table-column>
<el-table-column
prop="netWeight"
header-align="center"

63
src/views/modules/ecss/declaration.vue
View File

@ -147,6 +147,12 @@
<el-radio style="margin-left: 50px;" v-model="hsCodeDescType" label="N">英文</el-radio>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'托/箱'" >
<el-radio v-model="packageUnit" label="托">托</el-radio>
<el-radio v-model="packageUnit" label="箱">箱</el-radio>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<div class="custom-divider"><span class="text">发票</span></div>
@ -161,9 +167,14 @@
<el-checkbox v-model="exportInvoice.contractFlag">合同</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="24" style="">
<el-form-item :label="'发票备注'" >
<el-input type="textarea" :rows="2" v-model="exportInvoice.fpremark"></el-input>
</el-form-item>
</el-col>
<!-- 箱单-->
</el-row>
<el-row :gutter="20">
<el-row :gutter="20" style="margin-top: 30px">
<div class="custom-divider"><span class="text">箱单</span></div>
<el-col :span="8" >
<el-form-item :label="''" >
@ -221,8 +232,13 @@
<el-input :disabled="!exportPaking.packaging" v-model="exportPaking.kgs"></el-input>
</el-form-item>
</el-col>
<el-col :span="24" style="">
<el-form-item :label="'箱单备注'" >
<el-input type="textarea" :rows="2" v-model="exportPaking.xdremark"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-row :gutter="20" style="margin-top: 30px">
<!-- 出口货物委托书-->
<div class="custom-divider"><span class="text" style="left: 25%">出口货物委托书</span></div>
<el-col :span="8">
@ -402,6 +418,12 @@
<el-radio v-model="hsCodeDescType" label="N">英文</el-radio>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="'托/箱'" >
<el-radio v-model="packageUnit" label="托">托</el-radio>
<el-radio v-model="packageUnit" label="箱">箱</el-radio>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
@ -469,6 +491,11 @@
<el-input v-model="exportInvoice.origin"></el-input>
</el-form-item>
</el-col>
<el-col :span="24" style="">
<el-form-item :label="'备注'" >
<el-input type="textarea" :rows="3" v-model="exportInvoice.fpremark"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-table v-show="currentRow.buNo==='03-RFID'"
@ -477,7 +504,7 @@
stripe class="expClass"
highlight-current-row
border :row-style="{ height: '30px' }"
style="width: 100%;">
style="width: 100%;margin-top: 60px">
<el-table-column
prop="pn"
header-align="center"
@ -590,6 +617,11 @@
<el-input :disabled="!exportPaking.packaging" v-model="exportPaking.kgs"></el-input>
</el-form-item>
</el-col>
<el-col :span="24" style="">
<el-form-item :label="'备注'" >
<el-input type="textarea" :rows="3" v-model="exportPaking.xdremark"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-table v-show="currentRow.buNo==='03-RFID'"
@ -598,7 +630,7 @@
stripe class="expClass"
highlight-current-row
border :row-style="{ height: '30px' }"
style="width: 100%;">
style="width: 100%;margin-top: 60px">
<el-table-column
prop="pn"
header-align="center"
@ -764,7 +796,7 @@
deliveryGoodsDate:'',
voyage :'',
shippingDate:'',
hsCodeDescType:'Y',
hsCodeDescType:'N',
shipper:'Checkpoint Commercial (Shanghai) Co., Ltd. 保点贸易（上海）有限公司\t\t\t\t\t\t\n' +
'Room 1411, No. 31, Lane 2419, Hunan Road, Pudong New Area, Shanghai\t\t\t\t\t\t\n' +
'电话/Tel: (86-21)38112888 传真/Fax: (86-21)38112990\t\t\t\t\t\t\n' +
@ -784,6 +816,7 @@
material:'',
hsCodeDescType:'',
goodsLabel:true,
fpremark:''
},
exportPakingFlag:false,
exportPaking:{
@ -802,10 +835,12 @@
material:'',
hsCodeDescType:'',
goodsLabel:true,
boxChange:''
boxChange:'',
xdremark:''
},
brandType:'',
hsCodeDescType:'Y',
hsCodeDescType:'N',
packageUnit: '',
exportParam: {},
pageIndex: 1,
pageSize: 100,
@ -1942,6 +1977,7 @@
this.$message.warning('请选择报关单！')
return
}
this.exportGoods.hsCodeDescType = 'N'
this.exportGoods.salesMethod = 'EXW'
this.exportGoods.currency = 'USD'
this.exportGoods.madeArea = 'Shanghai, China'
@ -1980,11 +2016,16 @@
this.$message.warning('请选择报关单！')
return
}
if (!this.packageUnit ) {
this.$message.warning('请选择托/箱！')
return
}
let exportParam={}
exportParam.declarationNo = this.currentRow.declarationNo
exportParam.site = this.currentRow.site
exportParam.delNo = this.currentRow.delNo
exportParam.hsCodeDescType=this.hsCodeDescType
exportParam.packageUnit=this.packageUnit
ExportUtil.export(
"/ecss/coDel/downloadDeclaration",
exportParam, this.currentRow.declarationNo+"报关单.xlsx"
@ -2079,6 +2120,10 @@
this.$message.warning('请选择报关单！')
return
}
if (!this.packageUnit ) {
this.$message.warning('请选择托/箱！')
return
}
let exportParam=this.exportPaking
exportParam.salesMethod=this.exportGoods.salesMethod
exportParam.currency=this.exportGoods.currency
@ -2092,6 +2137,7 @@
exportParam.brandType = this.brandType
exportParam.hsCodeDescType=this.hsCodeDescType
exportParam.packageUnit=this.packageUnit
if (this.propertiesList.length>0) {
this.currentRow.brand='品牌'
exportParam.brand = '品牌'
@ -2099,6 +2145,7 @@
}
exportParam.hsCodeDesc = this.exportInvoice.hsCodeDesc
exportParam.contractFlag = this.exportInvoice.contractFlag
exportParam.fpremark = this.exportInvoice.fpremark
exportParam.declarationNo = this.currentRow.declarationNo
exportParam.site = this.currentRow.site
@ -2287,6 +2334,7 @@
this.exportInvoice.material=this.currentRow.material?this.currentRow.material:row.material
this.exportInvoice.hsCodeDescType=this.currentRow.hsCodeDescType?this.currentRow.hsCodeDescType:row.hsCodeDescType
this.exportInvoice.goodsLabel=this.currentRow.goodsLabel?this.currentRow.goodsLabel:row.goodsLabel
this.exportInvoice.fpremark = row.remark
} else if (this.templateData.type=='箱单'){
this.exportPaking.templateName=row.name
this.exportPaking.upc=row.upc
@ -2303,6 +2351,7 @@
this.exportPaking.material=this.currentRow.material?this.currentRow.material:row.material
this.exportPaking.hsCodeDescType=this.currentRow.hsCodeDescType?this.currentRow.hsCodeDescType:row.hsCodeDescType
this.exportPaking.goodsLabel=this.currentRow.goodsLabel?this.currentRow.goodsLabel:row.goodsLabel
this.exportPaking.xdremark = row.remark
} else if (this.templateData.type=='出口货物委托书'){
this.exportGoods.salesMethod = row.salesMethod
this.exportGoods.currency = row.currency

39
src/views/modules/ecss/del_upload_excel.vue
View File

@ -4,15 +4,24 @@
width="600px" class="customer-dialog" @close="deleteFile">
<el-form label-position="top" >
<el-row :gutter="16">
<el-col :span="12">
<el-col :span="6" >
<el-form-item label=" ">
<el-button type="primary" @click="downloadFile()">下载文件模板</el-button>
</el-form-item> </el-col>
<el-col :span="6">
<el-form-item label="BU">
<el-select v-model="pageData.buNo" placeholder="请选择" style="width: 100%">
<el-option v-for = "i in buList" :key = "i.buNo" :label = "i.buDesc" :value = "i.buNo"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="'国家'" >
<el-col :span="6">
<el-form-item :label="'贸易国'" >
<el-input v-model="pageData.salesArea"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="'运抵国'" >
<el-input v-model="pageData.cnative"></el-input>
</el-form-item>
</el-col>
@ -64,7 +73,7 @@
</el-col>
<el-col :span="24" style="margin-top: 30px">
<el-form-item label=" ">
<el-button type="primary" @click="downloadFile()">下载文件模板</el-button>
</el-form-item> </el-col>
<el-col :span="24">
<el-upload class="customer-upload" drag action="javascript:void(0);" ref="uploadFile" :limit="1" accept=".xlsx,.xls"
@ -167,11 +176,17 @@
align="left"
label="收货单位">
</el-table-column>
<el-table-column
prop="deliverycountry"
header-align="center"
align="left"
label="贸易国">
</el-table-column>
<el-table-column
prop="country"
header-align="center"
align="left"
label="国家">
label="运抵国">
</el-table-column>
</el-table>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
@ -202,7 +217,8 @@
localShipAddress:'',
overseasShipper:'',
overseasAddress:'',
cnative:''
cnative:'',
salesArea:'',
},
customSearchData: {},
customerList : [],//所有客户
@ -300,7 +316,8 @@
},
rowDblclick4 (row) {
this.pageData.overseasShipper=row.cDeliverUnit
this.pageData.cnative=row.country
this.pageData.cnative=row.deliverycountry
this.pageData.salesArea = row.country
this.overseasShipperFlag = false
},
@ -356,7 +373,7 @@
return false
}
if (null == this.pageData.cnative || this.pageData.cnative=='') {
this.$message.error("请先填写收货单位国家!")
this.$message.error("请先填写收货单位运抵国!")
return false
}
// 判断文件是否上传
@ -373,6 +390,7 @@
formData.append("overseasShipper", this.pageData.overseasShipper)
formData.append("overseasAddress", this.pageData.overseasAddress)
formData.append("cnative", this.pageData.cnative)
formData.append("salesArea", this.pageData.salesArea)
saveEcssCoDelNotifyByExcel(formData).then(({data}) => {
if (data.code === 0) {
this.$message.success(data.msg)
@ -431,3 +449,8 @@
}
}
</script>
<style scoped>
/deep/ .customer-upload .el-upload .el-upload-dragger {
width: 580px;
}
</style>

9
src/views/modules/ecss/ecssTemplate.vue
View File

@ -239,9 +239,14 @@
<el-input type="textarea" :rows="4" v-model="addModel.shipper"></el-input>
</el-form-item>
</el-col>
<el-col :span="24" v-show="addModel.type!=='出口货物委托书'" :style="addModel.type=='出口货物委托书'?'margin-top: 60px':''">
<el-form-item :label="'备注'" >
<el-input type="textarea" :rows="3" v-model="addModel.remark"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-footer :style="addModel.type=='出口货物委托书'?'height:40px;margin-top: 80px;text-align:center':'height:40px;margin-top: 10px;text-align:center'">
<el-footer :style="'height:40px;margin-top: 70px;text-align:center'">
<el-button type="primary" @click="saveEcssTemplate()">保存</el-button>
<el-button type="primary" @click="addModelFlag=false">关闭</el-button>
</el-footer>
@ -350,7 +355,7 @@
shipper:'Checkpoint Commercial (Shanghai) Co., Ltd. 保点贸易（上海）有限公司\t\t\t\t\t\t\n' +
'Room 1411, No. 31, Lane 2419, Hunan Road, Pudong New Area, Shanghai\t\t\t\t\t\t\n' +
'电话/Tel: (86-21)38112888 传真/Fax: (86-21)38112990\t\t\t\t\t\t\n' +
'上海市浦东新区沪南路2419弄31号1411室\t\t\t\t\t\t\n'
'上海市浦东新区沪南路2419弄31号1411室\t\t\t\t\t\t\n',
},
addDisabledFlag:true,
activeName:'attribute',

14
src/views/modules/oss/ossComponents.vue
View File

@ -19,6 +19,10 @@ export default {
type:String,
default:''
},
codelnotifyFlag:{
type:String,
default:''
},
columns:{
type:Array,
required:true
@ -210,15 +214,17 @@ export default {
this.$message.warning('请选择要下载的附件');
return;
}
for (let i = 0; i < this.selectionDataList.length; i++) {
// 之前代码多选时只能下载一个，因为下载第一个后this.$refs.table.clearSelection()会清空选中项
let selectList = this.selectionDataList.map(item => ({ ...item }));
for (let i = 0; i < selectList.length; i++) {
let params = {
id:this.selectionDataList[i].id,
id:selectList[i].id,
}
previewOssFileById(params).then((response) => {
const blob = new Blob([response.data], { type: response.headers['content-type'] });
const link = document.createElement('a');
link.href = URL.createObjectURL(blob);
link.setAttribute('download', this.selectionDataList[i].fileName);
link.setAttribute('download', selectList[i].fileName);
link.target = '_blank'; // 打开新窗口预览
link.click();
URL.revokeObjectURL(link.href);
@ -295,7 +301,7 @@ export default {
<el-form ref="form" :model="ossForm" label-width="80px" label-position="top">
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="询价单号">
<el-form-item :label="!!codelnotifyFlag?'发货通知单号':'询价单号'">
<el-input v-model="ossForm.rfqNo" readonly></el-input>
</el-form-item>
</el-col>

Write Preview
Loading…
Cancel
Save