diff --git a/src/views/modules/ecss/codelnotify.vue b/src/views/modules/ecss/codelnotify.vue
index 7db7c0a..930990e 100644
--- a/src/views/modules/ecss/codelnotify.vue
+++ b/src/views/modules/ecss/codelnotify.vue
@@ -139,6 +139,21 @@
{{!!scope.row[item.columnProp]?scope.row[item.columnProp].toFixed(2):''}}
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+
+
+ {{ scope.row[item.columnProp] }}
+
{{ scope.row[item.columnProp] }}
![]()
@@ -1633,6 +1648,24 @@
})
},
methods: {
+ isPnDataIncomplete(row) {
+ const hsCodeDesc = row.hsCodeDesc !== null && row.hsCodeDesc !== undefined && row.hsCodeDesc !== ''&& row.hsCodeDesc !== '*';
+ return !hsCodeDesc;
+ },
+
+ // 跳转到PN维护页面
+ navigateToPartHsCode(pn) {
+ if (!pn) {
+ this.$message.warning('PN不能为空');
+ return;
+ }
+ this.$router.push({
+ path: '/ecss-partHsCode',
+ query: {
+ sku: pn
+ }
+ });
+ },
// 获取基础数据列表S
getBaseList(val, type) {
this.tagNo = val
@@ -1822,6 +1855,14 @@
if ((column.property === 'pn' || column.property === 'qty') && row.modifyFlag===true) { // 根据列属性判断
return { color: '#ff5d03' };
}
+ // 检查 pn 列，当 boxrolls、rollqty、boxweight 其中任意一个没有值时，将 pn 颜色改成橙色
+ if (column.property === 'pn') {
+ const hsCodeDesc = row.hsCodeDesc !== null && row.hsCodeDesc !== undefined && row.hsCodeDesc !== ''&& row.hsCodeDesc !== '*';
+
+ if (!hsCodeDesc) {
+ return { color: '#ff8c00' }; // 橙色
+ }
+ }
return {};
},
xiadaEcssDel(){
@@ -2336,4 +2377,13 @@
font-size: 12px;
height: 24px;
}
+/* 可点击的PN样式 */
+.clickable-pn {
+ cursor: pointer;
+ text-decoration: underline;
+}
+
+.clickable-pn:hover {
+ opacity: 0.8;
+}
diff --git a/src/views/modules/ecss/codelnotifyConfirm.vue b/src/views/modules/ecss/codelnotifyConfirm.vue
index a053e81..35193d0 100644
--- a/src/views/modules/ecss/codelnotifyConfirm.vue
+++ b/src/views/modules/ecss/codelnotifyConfirm.vue
@@ -163,10 +163,10 @@
{{'导入装箱单'}}
{{'栈板维护'}}
{{'导出模版'}}
-
{
+ if (index === 0) {
+ sums[index] = '合计';
+ return;
+ }
+ let sumDataList = this.dataList4.filter(item => item.palletQty>0);
+ const values = sumDataList.map(item => Number(item[column.property]));
+ if (!values.every(value => isNaN(value))) {
+ switch(column.property) {
+ case 'palletQty':
+ sums[index] = `${values.reduce((a, b) => a + b, 0)}`;
+ break;
+ default:
+ sums[index] = '';
+ }
+ } else {
+ sums[index] = '';
+ }
+ });
+ this.$nextTick(() => this.$refs.detailTable.doLayout());// 强制刷新布局, 否则会被表格覆盖
+ return sums;
+ },
diff --git a/src/views/modules/ecss/createDeclaration.vue b/src/views/modules/ecss/createDeclaration.vue
index d8e23dd..bb9e2e9 100644
--- a/src/views/modules/ecss/createDeclaration.vue
+++ b/src/views/modules/ecss/createDeclaration.vue
@@ -278,10 +278,7 @@
-
-
-
-
+
diff --git a/src/views/modules/ecss/declaration.vue b/src/views/modules/ecss/declaration.vue
index ee007f6..123b059 100644
--- a/src/views/modules/ecss/declaration.vue
+++ b/src/views/modules/ecss/declaration.vue
@@ -135,24 +135,30 @@
报关要素
-
+
境外品牌（其他）
无品牌
-
+
中文
英文
-
+
托
箱
+
+
+ 不显示
+ 显示
+
+
发票
@@ -424,6 +430,12 @@
箱
+
+
+ 不显示
+ 显示
+
+
@@ -853,6 +865,7 @@
brandType:'',
hsCodeDescType:'N',
packageUnit: '',
+ declarationWeight: '不显示',
exportParam: {},
pageIndex: 1,
pageSize: 100,
@@ -2039,6 +2052,7 @@
exportParam.delNo = this.currentRow.delNo
exportParam.hsCodeDescType=this.hsCodeDescType
exportParam.packageUnit=this.packageUnit
+ exportParam.declarationWeight = this.declarationWeight
ExportUtil.export(
"/ecss/coDel/downloadDeclaration",
exportParam, this.currentRow.declarationNo+"报关单.xlsx"
@@ -2151,6 +2165,7 @@
exportParam.brandType = this.brandType
exportParam.hsCodeDescType=this.hsCodeDescType
exportParam.packageUnit=this.packageUnit
+ exportParam.declarationWeight = this.declarationWeight
if (this.propertiesList.length>0) {
this.currentRow.brand='品牌'
exportParam.brand = '品牌'
diff --git a/src/views/modules/ecss/ecssTemplate.vue b/src/views/modules/ecss/ecssTemplate.vue
index a4dbe37..457d70e 100644
--- a/src/views/modules/ecss/ecssTemplate.vue
+++ b/src/views/modules/ecss/ecssTemplate.vue
@@ -15,6 +15,12 @@
+
+
+
+
+
+