diff --git a/src/api/oem/settleCategories.js b/src/api/oem/settleCategories.js
new file mode 100644
index 00000000..eabec208
--- /dev/null
+++ b/src/api/oem/settleCategories.js
@@ -0,0 +1,18 @@
+// 结算大类
+import request from '@/axios';
+
+// 列表
+export const getList = (params) =>
+ request({
+ url: '/api/blade-desk/mesOemStatementCategory/page',
+ method: 'get',
+ params,
+ });
+
+// 删除
+export const deleteData = (params) =>
+ request({
+ url: '/api/blade-desk/mesOemStatementCategory/remove',
+ method: 'post',
+ params,
+ });
\ No newline at end of file
diff --git a/src/views/oem/oemOrderSettlement/components/inReview.vue b/src/views/oem/oemOrderSettlement/components/inReview.vue
index 68de6cb2..bcfc48d5 100644
--- a/src/views/oem/oemOrderSettlement/components/inReview.vue
+++ b/src/views/oem/oemOrderSettlement/components/inReview.vue
@@ -6,23 +6,37 @@
@row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange">
+
+ 校对
+ 审核
+
+
diff --git a/src/views/oem/oemOrderSettlement/components/proofreadingAndReview.vue b/src/views/oem/oemOrderSettlement/components/proofreadingAndReview.vue
new file mode 100644
index 00000000..64723dd4
--- /dev/null
+++ b/src/views/oem/oemOrderSettlement/components/proofreadingAndReview.vue
@@ -0,0 +1,151 @@
+
+
+
+
+
校对/审核结果
+
+
+ 通过
+ 不通过
+
+
+
+
+
+
+
结算总批数:{{totalCount}}
+
结算总面积(dm²):{{totalArea}}
+
结算总金额(元):{{totalMoney}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/oem/oemOrderSettlement/components/underReview.vue b/src/views/oem/oemOrderSettlement/components/underReview.vue
index 9bc3b872..5e808669 100644
--- a/src/views/oem/oemOrderSettlement/components/underReview.vue
+++ b/src/views/oem/oemOrderSettlement/components/underReview.vue
@@ -457,7 +457,7 @@ export default {
},
{
label: '外协厂商',
- prop: 'ocId',
+ prop: 'ocIds',
sortable: true,
filter: true,
span: 24,
@@ -489,6 +489,9 @@ export default {
this.query = {
rosStatusList:2
}
+ this.searchParams = {
+ rosStatusList:2
+ }
this.onLoad()
},
selectionChange(list){
@@ -522,7 +525,7 @@ export default {
this.$message.error('请先查询数据!')
return
}
- this.re
+ this.reviewForm = {}
this.isReview = true
},
changeResult(val){
diff --git a/src/views/oem/oemOrderSettlement/components/unsettled.vue b/src/views/oem/oemOrderSettlement/components/unsettled.vue
index 461b119b..9ce7c6bb 100644
--- a/src/views/oem/oemOrderSettlement/components/unsettled.vue
+++ b/src/views/oem/oemOrderSettlement/components/unsettled.vue
@@ -207,7 +207,7 @@ export default {
},
{
label: '质量等级',
- prop: 'prodIdent',
+ prop: 'productIdent',
// sortable: 'custom',
filter: true,
span: 24,
@@ -447,7 +447,7 @@ export default {
{
label: '外协厂商',
- prop: 'ocId',
+ prop: 'ocIds',
sortable: 'custom',
filter: true,
span: 24,
@@ -514,9 +514,11 @@ export default {
},
searchReset() {
this.query = {
- rosStatusList:'1',
+ rosStatusList:1,
};
- this.page.currentPage = 1;
+ this.searchParams = {
+ rosStatusList:1,
+ }
this.onLoad();
},
currentChange(currentPage) {
@@ -746,10 +748,6 @@ export default {
getStatement(params).then(res =>{
this.data = res.data.data.records
this.page.total = res.data.data.total
- console.log('返回的数据:', this.data)
- if (this.data && this.data.length > 0) {
- console.log('第一条数据:', JSON.stringify(this.data[0], null, 2))
- }
this.loading = false
})
// this.data = [
diff --git a/src/views/oem/oemProcess/index.vue b/src/views/oem/oemProcess/index.vue
index 5ea71837..1ba07013 100644
--- a/src/views/oem/oemProcess/index.vue
+++ b/src/views/oem/oemProcess/index.vue
@@ -89,6 +89,7 @@ export default {
searchSpan: 6,
menuAlign: "center",
gridBtn: false,
+ labelWidth: 110,
searchMenuPosition: "right",
addBtnIcon: " ",
viewBtnIcon: " ",
@@ -133,7 +134,7 @@ export default {
}
},
{
- label: "工艺能力",
+ label: "需结算工艺能力",
prop: "craftIds",
search: false,
sortable: 'custom',
@@ -150,7 +151,29 @@ export default {
rules: [
{
required: true,
- message: "请输入工艺能力",
+ message: "请输入需结算工艺能力",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "工序大类",
+ prop: "statementCategoryId",
+ search: false,
+ sortable: 'custom',
+ filter: true,
+ span: 24,
+ type: "select",
+ filterable: true,
+ dicUrl:"/api/blade-desk/mesOemStatementCategory/listForSelect",
+ props:{
+ label:'statementCategory',
+ value:"id"
+ },
+ rules: [
+ {
+ required: true,
+ message: "请选择工序大类",
trigger: "blur",
},
],
diff --git a/src/views/oem/settleCategories/index.vue b/src/views/oem/settleCategories/index.vue
new file mode 100644
index 00000000..19a6fb27
--- /dev/null
+++ b/src/views/oem/settleCategories/index.vue
@@ -0,0 +1,211 @@
+
+
+
+
+
+ 删除
+
+
+ 导入
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file