diff --git a/src/views/modules/cdc/collect.vue b/src/views/modules/cdc/collect.vue
index 316a5c1..3bee751 100644
--- a/src/views/modules/cdc/collect.vue
+++ b/src/views/modules/cdc/collect.vue
@@ -548,7 +548,7 @@ export default {
});
},
handleDelete(row) {
- this.$confirm('此操作将永久删除该数据标识, 是否继续?', '提示', {
+ this.$confirm('此操作将该数据标识, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
diff --git a/src/views/modules/cdc/collect/collectError.vue b/src/views/modules/cdc/collect/collectError.vue
index 99f3505..69f6349 100644
--- a/src/views/modules/cdc/collect/collectError.vue
+++ b/src/views/modules/cdc/collect/collectError.vue
@@ -142,7 +142,7 @@ export default {
this.open = true;
},
handleDelete(row) {
- this.$confirm('此操作将永久删除, 是否继续?', '提示', {
+ this.$confirm('此操作将是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
diff --git a/src/views/modules/cdc/device.vue b/src/views/modules/cdc/device.vue
index a2235bd..0b0a418 100644
--- a/src/views/modules/cdc/device.vue
+++ b/src/views/modules/cdc/device.vue
@@ -287,7 +287,7 @@ export default {
});
},
handleDelete(row) {
- this.$confirm('此操作将永久删除该设备信息, 是否继续?', '提示', {
+ this.$confirm('此操作将设备信息, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
diff --git a/src/views/modules/oss/ossComponents.vue b/src/views/modules/oss/ossComponents.vue
index efa7d92..7ae4631 100644
--- a/src/views/modules/oss/ossComponents.vue
+++ b/src/views/modules/oss/ossComponents.vue
@@ -42,6 +42,7 @@ export default {
ossVisible:false,
ossForm:{
orderRef2:'',
+ orderRef3:'',
remark:''
},
fileList:[],
@@ -209,6 +210,7 @@ export default {
params:{
handler(){
this.ossForm.orderRef2 = this.orderRef2;
+ this.ossForm.orderRef3 = this.orderRef3;
this.dataList = [];
this.handleQuery();
}
@@ -266,6 +268,7 @@ export default {
+
-
+
+
@@ -1076,9 +1077,11 @@ import proofingAttribute from "../demoComponents/orderProperties"
import ApprovalInformation from "../changeManagement/approvalInformation.vue";
import {queryCustomer} from "../../../api/customer/customerInformation";
import {queryProjectByCustomer} from "../../../api/project/project";
+import OssComponents from "../oss/ossComponents.vue";
export default {
components: {
+ OssComponents,
ApprovalInformation,
ProjectInfo
,DictDataSelect
@@ -2181,6 +2184,98 @@ export default {
columnFieldList1: [],
columnFieldList2: [],
+ ossColumns:[
+ {
+ userId: this.$store.state.user.name,
+ functionId: 103001,
+ serialNumber: '103001Table2FileName',
+ tableId: '103001Table2',
+ tableName: '文件信息表',
+ columnProp: 'fileName',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '文件名称',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 140
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 103001,
+ serialNumber: '103001Table2FileRemark',
+ tableId: '103001Table2',
+ tableName: '文件信息表',
+ columnProp: 'fileRemark',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '备注',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 240
+ },
+ // {
+ // userId: this.$store.state.user.name,
+ // functionId: 103001,
+ // serialNumber: '103001Table2OrderRef3',
+ // tableId: '103001Table2',
+ // tableName: '文件信息表',
+ // columnProp: 'orderRef3',
+ // headerAlign: 'center',
+ // align: 'center',
+ // columnLabel: '文件描述',
+ // columnHidden: false,
+ // columnImage: false,
+ // columnSortable: false,
+ // sortLv: 0,
+ // status: true,
+ // fixed: '',
+ // columnWidth: 120
+ // },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 103001,
+ serialNumber: '103001Table2CreateDate',
+ tableId: '103001Table2',
+ tableName: '文件信息表',
+ columnProp: 'createDate',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '上传时间',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 140
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 103001,
+ serialNumber: '103001Table2CreatedBy',
+ tableId: '103001Table2',
+ tableName: '文件信息表',
+ columnProp: 'createBy',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '上传人',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 140
+ }
+ ],
}
},
mounted() {
diff --git a/src/views/modules/quotation/sellForQuotation.vue b/src/views/modules/quotation/sellForQuotation.vue
index ba06553..68cada8 100644
--- a/src/views/modules/quotation/sellForQuotation.vue
+++ b/src/views/modules/quotation/sellForQuotation.vue
@@ -170,9 +170,12 @@
-
+
+
+
+
diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue
index 22090fd..f5c6b63 100644
--- a/src/views/modules/test/requestForTest.vue
+++ b/src/views/modules/test/requestForTest.vue
@@ -771,7 +771,8 @@
-
+
+
@@ -1160,6 +1161,7 @@
import ApprovalInformation from "../changeManagement/approvalInformation.vue";
import {queryCustomer} from "../../../api/customer/customerInformation";
import {queryProjectByCustomer, queryProjectPart} from "../../../api/project/project";
+ import OssComponents from "../oss/ossComponents.vue";
export default {
computed: {
testInformationFlag () {
@@ -1177,6 +1179,7 @@
},
name:"test",
components: {
+ OssComponents,
TestFile,
TestProperties,
TestAttribute,
@@ -2751,11 +2754,11 @@
return
}
if (this.modalData.tracker === '' || this.modalData.tracker == null) {
- this.$message.warning('请选择Artwork编码!')
+ this.$message.warning('请选择Artwork!')
return
}
if (this.modalData.trackerName === '' || this.modalData.trackerName == null) {
- this.$message.warning('请选择Artwork名称!')
+ this.$message.warning('请选择Artwork!')
return
}
if (this.modalData.projectId === '' || this.modalData.projectId == null) {
@@ -2767,11 +2770,11 @@
return
}
if (this.modalData.engineer === '' || this.modalData.engineer == null) {
- this.$message.warning('请选择TP工程师编码!')
+ this.$message.warning('请选择TP工程师!')
return
}
if (this.modalData.engineerName === '' || this.modalData.engineerName == null) {
- this.$message.warning('请选择TP工程师名称!')
+ this.$message.warning('请选择TP工程师!')
return
}
if (this.modalData.testPartNo === '' || this.modalData.testPartNo == null) {
diff --git a/src/views/modules/test/testSoBom/testTable.vue b/src/views/modules/test/testSoBom/testTable.vue
index 8a37dd9..e3c3d58 100644
--- a/src/views/modules/test/testSoBom/testTable.vue
+++ b/src/views/modules/test/testSoBom/testTable.vue
@@ -416,7 +416,7 @@ export default {
this.$message.warning("请勾选需要删除的信息")
return
}
- this.$confirm('此操作将永久删除材料信息, 是否继续?', '提示', {
+ this.$confirm('此操作将删除材料信息, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'