diff --git a/src/views/modules/demoComponents/orderProperties.vue b/src/views/modules/demoComponents/orderProperties.vue
index 743f84a..4ac0945 100644
--- a/src/views/modules/demoComponents/orderProperties.vue
+++ b/src/views/modules/demoComponents/orderProperties.vue
@@ -380,10 +380,10 @@ export default {
-
+
-
+
diff --git a/src/views/modules/sampleManagement/com_technical-add-or-update.vue b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
index e469d1f..2efefc5 100644
--- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue
+++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
@@ -14,7 +14,7 @@
保存后跳转至详情
- 测试料号
+ 项目料号
@@ -124,7 +124,27 @@
title="选择打样单"
:close-on-click-modal="false"
:visible.sync="proofingModelFlag">
-
+
+
+ 项目号
+
+
+
+ 打样单
+
+
+
+ 直接客户
+
+
+
+ 最终客户
+
+
+
+ {{'查询'}}
+
+
-
@@ -239,6 +258,14 @@
technicianList:[],
oriCodeNo:'',
},
+ proofingSearch:{
+ projectId:'',
+ proofingNo:'',
+ customerId:'',
+ finalCustomerId:'',
+ site:this.$store.state.user.site,
+ username:this.$store.state.user.name,
+ },
quotationOfficerList:[],
engineerList:[],
technicianList:[],
@@ -303,6 +330,22 @@
if(type==1) {
strVal = this.dataForm.customerId
}
+ if(type==2) {
+ strVal = this.proofingSearch.customerId
+ }
+ if(type==3) {
+ strVal = this.proofingSearch.finalCustomerId
+ }
+ }
+ if (val === 104) {
+ if(type==2) {
+ strVal = this.proofingSearch.projectId
+ }
+ }
+ if (val === 501) {
+ if(type==2) {
+ strVal = this.proofingSearch.proofingNo
+ }
}
if (val === 1011) {
if(type==1) {
@@ -331,6 +374,22 @@
this.dataForm.customerId = val.Customer_no
this.dataForm.customerName = val.Customer_desc
}
+ if(this.tagNo1==2) {
+ this.proofingSearch.customerId = val.Customer_no
+ }
+ if(this.tagNo1==3) {
+ this.proofingSearch.finalCustomerId = val.Customer_no
+ }
+ }
+ if (this.tagNo === 104) {
+ if(this.tagNo1==2) {
+ this.proofingSearch.projectId = val.project_id
+ }
+ }
+ if (this.tagNo === 501) {
+ if(this.tagNo1==2) {
+ this.proofingSearch.proofingNo = val.Proofing_no
+ }
}
if (this.tagNo === 1011) {
if(this.tagNo1==1) {
@@ -413,16 +472,25 @@
if(this.dataForm.id!=0){
return false;
}
- let inData={
- site:this.dataForm.site,
- username:this.$store.state.user.name,
+ this.proofingSearch={
+ projectId:'',
+ proofingNo:'',
+ customerId:'',
+ finalCustomerId:'',
+ site:this.$store.state.user.site,
+ username:this.$store.state.user.name,
}
- getProofingDataByUserRole(inData).then(({data}) => {
+ getProofingDataByUserRole(this.proofingSearch).then(({data}) => {
this.proofingList=data.rows
})
this.proofingModelFlag=true
},
+ refreshProofingList(){
+ getProofingDataByUserRole(this.proofingSearch).then(({data}) => {
+ this.proofingList=data.rows
+ })
+ },
changeProofingNoChange(){
let inData={
site:this.dataForm.site,
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingIndigo.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingIndigo.vue
index 8925134..1d800eb 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingIndigo.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_printingIndigo.vue
@@ -199,10 +199,21 @@
-
+
+
+
-
+
保存
取消
@@ -269,7 +280,7 @@
let strVal = ''
if (val === 133) {
if(type==1) {
- strVal = this.colorData.colorReference
+ strVal = this.colorData.inkCode
}
}
this.$refs.baseList.init(val, strVal)
@@ -279,7 +290,7 @@
getBaseData (val) {
if (this.tagNo === 133) {
if(this.tagNo1==1) {
- this.colorData.colorReference = val.part_no
+ this.colorData.inkCode = val.part_no
}
}
},