diff --git a/src/views/modules/project/projectInfo/com_project_info_part.vue b/src/views/modules/project/projectInfo/com_project_info_part.vue
index 10fb3f2..1c03680 100644
--- a/src/views/modules/project/projectInfo/com_project_info_part.vue
+++ b/src/views/modules/project/projectInfo/com_project_info_part.vue
@@ -897,102 +897,6 @@
fixed: '',
columnWidth: 100
},
- // {
- // userId: this.$store.state.user.name,
- // functionId: 101002001,
- // serialNumber: '101002001Table4GroupName',
- // tableId: "101002001Table4",
- // tableName: "项目物料",
- // columnProp: "groupId",
- // headerAlign: "center",
- // align: "center",
- // columnLabel: "产品代码编码",
- // columnHidden: false,
- // columnImage: false,
- // status: true,
- // fixed: '',
- // columnWidth: 100
- // },
- // {
- // userId: this.$store.state.user.name,
- // functionId: 101002001,
- // serialNumber: '101002001Table4GroupName',
- // tableId: "101002001Table4",
- // tableName: "项目物料",
- // columnProp: "groupName",
- // headerAlign: "center",
- // align: "left",
- // columnLabel: "产品代码名称",
- // columnHidden: false,
- // columnImage: false,
- // status: true,
- // fixed: '',
- // columnWidth: 200
- // },
- // {
- // userId: this.$store.state.user.name,
- // functionId: 101002001,
- // serialNumber: '101002001Table4PartTypeDesc',
- // tableId: "101002001Table4",
- // tableName: "项目物料",
- // columnProp: "partType",
- // headerAlign: "center",
- // align: "center",
- // columnLabel: "产品大类编码",
- // columnHidden: false,
- // columnImage: false,
- // status: true,
- // fixed: '',
- // columnWidth: 100
- // },
- // {
- // userId: this.$store.state.user.name,
- // functionId: 101002001,
- // serialNumber: '101002001Table4PartTypeDesc',
- // tableId: "101002001Table4",
- // tableName: "项目物料",
- // columnProp: "partTypeDesc",
- // headerAlign: "center",
- // align: "left",
- // columnLabel: "产品大类名称",
- // columnHidden: false,
- // columnImage: false,
- // status: true,
- // fixed: '',
- // columnWidth: 200
- // },
- // {
- // userId: this.$store.state.user.name,
- // functionId: 101002001,
- // serialNumber: '101002001Table4CodeNo',
- // tableId: "101002001Table4",
- // tableName: "项目物料",
- // columnProp: "codeNo",
- // headerAlign: "center",
- // align: "center",
- // columnLabel: "属性模板编码",
- // columnHidden: false,
- // columnImage: false,
- // status: true,
- // fixed: '',
- // columnWidth: 100
- // },
- // {
- // userId: this.$store.state.user.name,
- // functionId: 101002001,
- // serialNumber: '101002001Table4CodeDesc',
- // tableId: "101002001Table4",
- // tableName: "项目物料",
- // columnProp: "codeDesc",
- // headerAlign: "center",
- // align: "left",
- // columnLabel: "属性模板名称",
- // columnHidden: false,
- // columnImage: false,
- // status: true,
- // fixed: '',
- // columnWidth: 200
- // },
{
userId: this.$store.state.user.name,
functionId: 101002001,
@@ -1009,70 +913,6 @@
fixed: '',
columnWidth: 100
},
- // {
- // userId: this.$store.state.user.name,
- // functionId: 101002001,
- // serialNumber: '101002001Table4UnitPrice',
- // tableId: "101002001Table4",
- // tableName: "项目物料",
- // columnProp: "unitPrice",
- // headerAlign: "center",
- // align: "right",
- // columnLabel: "未税单价",
- // columnHidden: false,
- // columnImage: false,
- // status: true,
- // fixed: '',
- // columnWidth: 100
- // },
- // {
- // userId: this.$store.state.user.name,
- // functionId: 101002001,
- // serialNumber: '101002001Table4TaxUnitPrice',
- // tableId: "101002001Table4",
- // tableName: "项目物料",
- // columnProp: "taxUnitPrice",
- // headerAlign: "center",
- // align: "right",
- // columnLabel: "含税单价",
- // columnHidden: false,
- // columnImage: false,
- // status: true,
- // fixed: '',
- // columnWidth: 100
- // },
- // {
- // userId: this.$store.state.user.name,
- // functionId: 101002001,
- // serialNumber: '101002001Table4Remark',
- // tableId: "101002001Table4",
- // tableName: "项目物料",
- // columnProp: "remark",
- // headerAlign: "center",
- // align: "left",
- // columnLabel: "备注",
- // columnHidden: false,
- // columnImage: false,
- // status: true,
- // fixed: '',
- // columnWidth: 200
- // },
- // {
- // userId: this.$store.state.user.name,
- // functionId: 101002001,
- // serialNumber: '101002001Table4PlmPartNo',
- // tableId: "101002001Table4",
- // tableName: "项目物料",
- // columnProp: "plmPartNo",
- // headerAlign: "center",
- // align: "center",
- // columnLabel: "PLM料号",
- // columnHidden: false,
- // columnImage: false,
- // status: true,
- // fixed: '',
- // columnWidth: 120
- // },
{
userId: this.$store.state.user.name,
functionId: 101002001,
@@ -1089,22 +929,6 @@
fixed: '',
columnWidth: 170
},
- // {
- // userId: this.$store.state.user.name,
- // functionId: 101002001,
- // serialNumber: '101002001Table4CreateBy',
- // tableId: "101002001Table4",
- // tableName: "项目物料",
- // columnProp: "createBy",
- // headerAlign: "center",
- // align: "left",
- // columnLabel: "创建人",
- // columnHidden: false,
- // columnImage: false,
- // status: true,
- // fixed: '',
- // columnWidth: 100
- // },
{
userId: this.$store.state.user.name,
functionId: 101002001,
@@ -1121,22 +945,6 @@
fixed: '',
columnWidth: 170
},
- // {
- // userId: this.$store.state.user.name,
- // functionId: 101002001,
- // serialNumber: '101002001Table4UpdateBy',
- // tableId: "101002001Table4",
- // tableName: "项目物料",
- // columnProp: "updateBy",
- // headerAlign: "center",
- // align: "left",
- // columnLabel: "修改人",
- // columnHidden: false,
- // columnImage: false,
- // status: true,
- // fixed: '',
- // columnWidth: 100
- // },
],
dataForm: {
id:'',
diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue
index e1b8aea..3613646 100644
--- a/src/views/modules/project/projectInfo/projectInfo.vue
+++ b/src/views/modules/project/projectInfo/projectInfo.vue
@@ -162,98 +162,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -302,7 +210,6 @@
-
diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue
index bb41808..fcc8b42 100644
--- a/src/views/modules/proofing/requestForProofing.vue
+++ b/src/views/modules/proofing/requestForProofing.vue
@@ -267,7 +267,7 @@
-
+
@@ -307,8 +307,13 @@
:min-width="item.columnWidth"
:label="item.columnLabel">
- {{ scope.row[item.columnProp] }}
- ![]()
+
+ {{ scope.row[item.columnProp] }}
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
@@ -2384,6 +2389,11 @@ export default {
if (this.modalData.proofingNo) {
this.searchDelegateAccess();
}
+ if (this.modalData.flag !== '1'){
+ this.projectPartData.testPartNo = this.modalData.testPartNo;
+ }else {
+ this.projectPartData.testPartNo = '';
+ }
this.getProjectPartList();
},
getProjectPartList() {
@@ -3272,6 +3282,7 @@ export default {
nodeId: ''
};
this.selectionDelegateAccess = [];
+ this.projectPartList = [];
this.activeName = 'part'
Object.keys(this.proofingDelegateAccess).forEach(key => {
this.proofingDelegateAccess[key] = '';
@@ -3536,6 +3547,14 @@ export default {
}
})
},
+ handleRouter(row){
+ this.modalFlag = false
+ if (this.$router.resolve(`/part-partInformation`).resolved.name === '404') {
+ this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',})
+ } else {
+ this.$router.push({name:`part-partInformation`,params:{partNo:row.testPartNo},})
+ }
+ }
}
}
diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue
index 4e07468..368efdf 100644
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@@ -210,7 +210,7 @@
项目编码
+ @click="chooseProjectListFlag = true">项目编码
-
-
- 客户负责人
-
-
-
-
-
-
-
-
@@ -307,7 +296,7 @@
-
+
@@ -347,9 +336,13 @@
:min-width="item.columnWidth"
:label="item.columnLabel">
- {{ scope.row[item.columnProp] }}
- ![]()
+
+ {{ scope.row[item.columnProp] }}
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
@@ -2294,6 +2287,9 @@ export default {
isReject: row.isReject,
nodeId: row.nodeId
}
+ if (this.modalData.flag !== '1'){
+ this.projectPartData.testPartNo = this.modalData.testPartNo
+ }
this.priceCheckDetail = row.priceCheckDetail
this.modalDisableFlag = true
this.modalFlag = true
@@ -3133,6 +3129,7 @@ export default {
this.priceCheckDetail = JSON.parse(JSON.stringify(this.copyPriceCheckDetail))
if (this.modalData.flag === '1'){
this.$refs.saveDetailForm.resetFields();
+ this.projectPartDetailList = []
}
},
// 保存弹框打开事件
@@ -3369,6 +3366,14 @@ export default {
}
})
},
+ handleRouter(row){
+ this.modalFlag = false
+ if (this.$router.resolve(`/part-partInformation`).resolved.name === '404') {
+ this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',})
+ } else {
+ this.$router.push({name:`part-partInformation`,params:{partNo:row.testPartNo},})
+ }
+ }
}
}