diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js
index 504d4afc..75de3c26 100644
--- a/vue/src/router/modules/vw_menu.js
+++ b/vue/src/router/modules/vw_menu.js
@@ -216,6 +216,16 @@ const vwMenudataRouter = {
roles: ['SettleAccount.Reports'],//控制页面角色(可以设置多个角色)
icon: '工厂'
}
+ },
+ {
+ path: '/bom-diffPrice',
+ component: () => import('@/views/ux/billManage/BomDiffPrice'),
+ name: 'BomDiffPrice',//命名路由
+ meta: {
+ title: 'Bom定价差异明细',
+ roles: ['SettleAccount.Reports'],//控制页面角色(可以设置多个角色)
+ icon: '看板'
+ }
}
]
diff --git a/vue/src/views/ux/billManage/BomDiffPrice/index.vue b/vue/src/views/ux/billManage/BomDiffPrice/index.vue
new file mode 100644
index 00000000..d0169e7b
--- /dev/null
+++ b/vue/src/views/ux/billManage/BomDiffPrice/index.vue
@@ -0,0 +1,839 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.column.label }}
+
+
+
+
+
+
+
+ {{ scope.row.remark }}
+
+
+ cancel
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+ 下载
+ 检验失败,下载
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vue/src/views/ux/vw/dataInput/hq_unsettle_report/index.vue b/vue/src/views/ux/vw/dataInput/hq_unsettle_report/index.vue
index 44905709..f927f3ae 100644
--- a/vue/src/views/ux/vw/dataInput/hq_unsettle_report/index.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_unsettle_report/index.vue
@@ -218,9 +218,9 @@
>
-
+
-
+
+
+ 是否过滤掉当期结算数据
+
+
@@ -345,6 +351,7 @@ export default {
{ required: true, message: "必须输入!", trigger: "change" },
],
},
+ checked: true,
showModal: false,
pickerOptionsCp5: {
disabledDate: (time) => {
@@ -442,6 +449,7 @@ export default {
warehouseDesc: undefined,
acceptNo: undefined,
kanban: undefined,
+ isContainVersion: undefined,
},
dataKenCode: "",
datachassisNumber: "",
@@ -546,7 +554,6 @@ export default {
width: 150,
});
-
return tempsTabs;
},
},
@@ -905,6 +912,12 @@ export default {
this.listExportQuery.sapCode = this.formCount.sapCode; //3厂内物料号
}
+ if (this.checked == true) {
+ this.listExportQuery.isContainVersion = "0";
+ } else {
+ this.listExportQuery.isContainVersion = "1";
+ }
+
this.listExportQuery.begin = this.startTime
? this.startTime
: undefined;