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

托盘重量

java8
han\hanst 4 months ago
parent
fbd25ef2b5
commit
15e79821f8
3 changed files with 57 additions and 32 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. 15
      src/views/modules/ecss/codelnotify.vue
  2. 45
      src/views/modules/ecss/declaration.vue
  3. 29
      src/views/modules/ecss/pallet.vue

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

@ -84,9 +84,6 @@
<template slot-scope="scope">
<a type="text" size="small" @click="updateHeaderModelDo(scope.row)">修改</a>
<a type="text" style="color: green" size="small" v-if="scope.row.notifyStatus==='已计划' && scope.row.notifyStatus!=='订单取消' && !xiadaLoading" @click="xiadaChoose(scope.row)">下达</a>
<span v-if="scope.row.notifyStatus==='已计划' && scope.row.notifyStatus!=='订单取消' && xiadaLoading && currentRow && currentRow.delNo === scope.row.delNo" style="color: green; font-size: 12px;">
<i class="el-icon-loading"></i> 下达中...
</span>
<a type="text" style="color: orange" size="small" v-if="scope.row.notifyStatus==='已下达'&& scope.row.notifyStatus!=='订单取消'" @click="jihuaEcssDel(scope.row)">取消下达</a>
<a type="text" style="color: green" size="small" v-if="scope.row.notifyStatus==='已下达' && scope.row.walMartOrderFlag==='Y'" @click="declarationCompleted(scope.row)">一键结单</a>
<a type="text" style="color: red" size="small" v-if="scope.row.notifyStatus!=='订单取消'" @click="cancelDelHeader(scope.row)">废弃</a>
@ -575,7 +572,7 @@
</template>
</el-table-column>
</el-table>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-footer style="height:40px;margin-top: 60px;text-align:center">
<el-button type="primary" @click="downloadInvoice()">确定</el-button>
<el-button type="primary" @click="exportInvoiceFlag=false">关闭</el-button>
</el-footer>
@ -1889,7 +1886,7 @@
xiadaChoose(row){
// 设置当前行
this.currentRow = row;
if (this.dataList2.length===0) {
this.$alert('该发货通知单下没有明细无法下达！', '错误', {
confirmButtonText: '确定'
@ -1959,8 +1956,8 @@
}
this.$confirm('确认下达吗？', '提示').then(() => {
// 开始加载
this.xiadaLoading = true;
this.dataListLoading = true;
changeEcssDelStatus(inData).then(({data}) => {
if (data && data.code === 0) {
this.searchTable()
@ -1982,11 +1979,11 @@
})
}).finally(() => {
// 无论成功还是失败都要恢复加载状态
this.xiadaLoading = false;
this.dataListLoading = false;
})
}).catch(() => {
// 用户取消确认时也要确保加载状态正常
this.xiadaLoading = false;
this.dataListLoading = false;
})
this.walMartOrderDialog=false;
},

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

@ -203,16 +203,11 @@
<el-radio v-model="exportPaking.itemNo" label="N">栈板号</el-radio>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'Shipping Mark'" >
<el-input v-model="exportPaking.shippingMark"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" v-show="currentRow.buNo==='01-Label' || currentRow.buNo==='03-RFID'">
<!-- <el-col :span="8" v-show="currentRow.buNo==='01-Label' || currentRow.buNo==='03-RFID'">
<el-form-item :label="'栈板重量参数'" >
<el-input v-model="exportPaking.palletWeight"></el-input>
</el-form-item>
</el-col>
</el-col>-->
<el-col :span="8">
<el-form-item :label="'RFID Base Material'" >
<el-checkbox v-model="exportPaking.material"></el-checkbox>
@ -223,11 +218,7 @@
<el-input :disabled="!exportPaking.material" v-model="exportPaking.hsCode"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" v-show="currentRow.buNo==='01-Label' || currentRow.buNo==='03-RFID'">
<el-form-item :label="'制造地'" >
<el-input v-model="exportPaking.origin"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'Non-reusable plastic packaging'" >
<el-checkbox v-model="exportPaking.packaging"></el-checkbox>
@ -238,6 +229,16 @@
<el-input :disabled="!exportPaking.packaging" v-model="exportPaking.kgs"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'Shipping Mark'" >
<el-input v-model="exportPaking.shippingMark"></el-input>
</el-form-item>
</el-col>
<el-col :span="8" v-show="currentRow.buNo==='01-Label' || currentRow.buNo==='03-RFID'">
<el-form-item :label="'制造地'" >
<el-input v-model="exportPaking.origin"></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>
@ -604,16 +605,11 @@
<el-input v-model="exportPaking.shippingMark"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-show="currentRow.buNo==='01-Label' || currentRow.buNo==='03-RFID'">
<el-form-item :label="'制造地'" >
<el-input v-model="exportPaking.origin"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-show="currentRow.buNo==='01-Label' || currentRow.buNo==='03-RFID'">
<!-- <el-col :span="12" v-show="currentRow.buNo==='01-Label' || currentRow.buNo==='03-RFID'">
<el-form-item :label="'栈板重量参数'" >
<el-input v-model="exportPaking.palletWeight"></el-input>
</el-form-item>
</el-col>
</el-col>-->
<el-col :span="12">
<el-form-item :label="'RFID Base Material'" >
<el-checkbox v-model="exportPaking.material"></el-checkbox>
@ -634,6 +630,11 @@
<el-input :disabled="!exportPaking.packaging" v-model="exportPaking.kgs"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-show="currentRow.buNo==='01-Label' || currentRow.buNo==='03-RFID'">
<el-form-item :label="'制造地'" >
<el-input v-model="exportPaking.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="exportPaking.xdremark"></el-input>
@ -863,7 +864,7 @@
xdremark:''
},
brandType:'',
hsCodeDescType:'N',
hsCodeDescType:'Y',
packageUnit: '',
declarationWeight: '不显示',
exportParam: {},
@ -2086,11 +2087,11 @@
this.$message.warning('请填写制造地！')
return
}
if ((this.currentRow.buNo==='01-Label' || this.currentRow.buNo==='03-RFID')
/* if ((this.currentRow.buNo==='01-Label' || this.currentRow.buNo==='03-RFID')
&& !this.exportPaking.palletWeight) {
this.$message.warning('请填写栈板重量！')
return
}
}*/
if (this.exportPaking.material && !this.exportPaking.hsCode) {
this.$message.warning('请填写hsCode！')
return

29
src/views/modules/ecss/pallet.vue
View File

@ -125,7 +125,12 @@
<el-input v-model="addModel.height" ></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-col :span="8">
<el-form-item label="栈板重量(KG)">
<el-input v-model="addModel.palletWeight" type="number" ></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'备注'" >
<el-input v-model="addModel.remark" ></el-input>
</el-form-item>
@ -173,6 +178,7 @@
limit: 100,
buNo:'',
palletType:'',
palletWeight:'',
codeNo:'',
username:this.$store.state.user.name,
},
@ -190,6 +196,7 @@
width:'',
height:'',
applicationArea:'',
palletWeight:'',
remark:'',
},
addDisabledFlag:true,
@ -321,6 +328,24 @@
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 801003,
serialNumber: '801007Table1PalletWeight',
tableId: "801007Table1",
tableName: "pallet基础信息",
columnProp: "palletWeight",
headerAlign: "center",
align: "center",
columnLabel: "栈板重量(KG)",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
},
{
userId: this.$store.state.user.name,
functionId: 801003,
@ -519,6 +544,7 @@
width:'',
height:'',
applicationArea:'',
palletWeight:'',
remark:'',
}
this.addModelFlag=true
@ -536,6 +562,7 @@
width:row.width,
height:row.height,
applicationArea:row.applicationArea,
palletWeight:row.palletWeight,
remark:row.remark,
}
this.addModelFlag=true

Write Preview
Loading…
Cancel
Save