diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue
index d190da4..341fd54 100644
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@@ -253,13 +253,13 @@
-
+
-
+
-
+
@@ -271,6 +271,11 @@
clearable dict-type="delivery_terms" :use-default-value="modalData.flag === '1'">
+
+
+
+
+
报价专员
@@ -2385,7 +2390,8 @@ export default {
confirmInformation: '',
quotationResultStatus: 'B',
createBy: this.$store.state.user.name,
- nodeId: ''
+ nodeId: '',
+ place:'',
}
this.modalDisableFlag = false
this.modalFlag = true
@@ -2445,6 +2451,7 @@ export default {
isReject: row.isReject,
nodeId: row.nodeId,
approvalUsername: row.approvalUsername,
+ place: row.place,
}
if (this.modalData.flag !== '1'){
this.projectPartData.testPartNo = this.modalData.testPartNo
diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue
index b14a214..a7125c7 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationList.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue
@@ -1025,8 +1025,8 @@
technicalSpecificationListSearch(this.searchData).then(({data}) => {
if (data && data.code === 0) {
this.dataList1 = data.page.list
- this.pageIndex = data.page.currPage
- this.pageSize = data.page.pageSize
+ // this.pageIndex = data.page.currPage
+ // this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount
if(this.dataList1.length>0){
this.$refs.mainTable.setCurrentRow(this.dataList1[0]);
diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue
index b9b3776..d81a444 100644
--- a/src/views/modules/test/requestForTest.vue
+++ b/src/views/modules/test/requestForTest.vue
@@ -241,6 +241,11 @@
+
+
+
+
+
@@ -1105,7 +1110,8 @@
rejectFlag: '',
rejectStepId: '',
isReject: '',
- nodeId: ''
+ nodeId: '',
+ soNumber:'',
},
testDetailData: {
technicalConsiderations: '',
@@ -2544,6 +2550,7 @@
isReject: row.isReject,
nodeId: row.nodeId,
approvalUsername: row.approvalUsername,
+ soNumber: row.soNumber,
}
this.activeTabList = ['product','process','attribute','partAttribute','file']
// this.$nextTick(()=>{
diff --git a/src/views/modules/tooling/manuf_tool.vue b/src/views/modules/tooling/manuf_tool.vue
index dad4d8d..c61ad45 100644
--- a/src/views/modules/tooling/manuf_tool.vue
+++ b/src/views/modules/tooling/manuf_tool.vue
@@ -85,10 +85,10 @@
layout="total, sizes, prev, pager, next, jumper">
-
-
+
+
新增
-
+