diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js
index bd7a116..098a775 100644
--- a/src/api/sampleManagement/technicalSpecificationList.js
+++ b/src/api/sampleManagement/technicalSpecificationList.js
@@ -18,3 +18,5 @@ export const searchPartDataForSelect= data => createAPI(`/technicalSpecification
export const saveBMBom= data => createAPI(`/technicalSpecification/saveBMBom`,'post',data)
export const searchBMBom= data => createAPI(`/technicalSpecification/searchBMBom`,'post',data)
export const deleteBMBom= data => createAPI(`/technicalSpecification/deleteBMBom`,'post',data)
+export const searchBMRoutingDetail= data => createAPI(`/technicalSpecification/searchBMRoutingDetail`,'post',data)
+export const updateBMRoutingDetail= data => createAPI(`/technicalSpecification/updateBMRoutingDetail`,'post',data)
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
index dfe419b..e201d30 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
@@ -358,7 +358,7 @@
});
},
deleteData(row){
- this.$confirm(`是否删除这条代理商信息?`, '提示', {
+ this.$confirm(`是否删除这条信息?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
index f0debb3..c5d7323 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
@@ -249,7 +249,13 @@
},
searchTable(){
searchBMcustomerInfo(this.searchData).then(({data}) => {
- this.dataForm = data.rows[0];
+ if(data.rows.length>0){
+ this.dataForm = data.rows[0];
+ }else {
+ this.dataForm.site=this.searchData.site
+ this.dataForm.codeNo=this.searchData.codeNo
+ }
+
});
},
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue
index 9df609a..876f038 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_packageInfo.vue
@@ -79,12 +79,8 @@
-
- 保存
-
-
@@ -382,7 +378,13 @@
},
searchTable(){
searchBMPackageInfo(this.searchData).then(({data}) => {
- this.dataForm = data.rows[0];
+ if(data.rows.length>0){
+ this.dataForm = data.rows[0];
+ }else {
+ this.dataForm.site=this.searchData.site;
+ this.dataForm.codeNo=this.searchData.codeNo;
+ }
+
});
},
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue
new file mode 100644
index 0000000..02b9618
--- /dev/null
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue
@@ -0,0 +1,133 @@
+
+
+
+
+ 刷新
+ 新增
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -34,7 +34,7 @@
-
+
@@ -61,37 +61,46 @@
maxlength="255"
show-word-limit
:disabled="ifDisableFlag"
- style="height: 60px" disabled>
+ style="height: 60px" >
-
+
-
-
+
+
+
@@ -106,7 +115,7 @@
maxlength="255"
show-word-limit
:disabled="ifDisableFlag"
- style="height: 60px" disabled>
+ style="height: 60px" >
@@ -122,13 +131,13 @@
maxlength="255"
show-word-limit
:disabled="ifDisableFlag"
- style="height: 60px" disabled>
+ style="height: 60px" >
- 保存
+ 保存
@@ -298,6 +307,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -308,8 +367,14 @@
saveBMBom,
searchPartDataForSelect,
deleteBMBom,
+ searchTechnicalSpecificationTeamStr,
+ searchBMRoutingDetail,
+ updateBMRoutingDetail,
} from "@/api/sampleManagement/technicalSpecificationList.js"
import Chooselist from '@/views/modules/common/Chooselist'
+ import {
+ searchOperatorWithSite,
+ } from "@/api/project/project.js"
export default {
components: {
Chooselist
@@ -336,34 +401,33 @@
partList:[],
ifDisableFlag:false,
dataForm:{
- addId:'',
site: '',
codeNo:'',
- erpPartNo:'',
- familyId: '',
- familyName:'',
- partDesc:'',
- quantity:'',
- spec:'',
- remark:'',
+ processDetail:'',
+ supplyAdhesiveTape: '',
+ routingDrawing:'',
+ drawingRevison:'',
+ drawingDate:'',
+ workInfo:'',
+ wiRevison:'',
+ wiDate:'',
+ reviewEngineer: '',
+ routingRemark:'',
+ routingAction:'',
username:this.$store.state.user.name,
+ peEngineer:'',
+ cqe:'',
+ reviewEngineerList:[],
+ peEngineerList:[],
+ cqeList:[],
},
- dataRole: {
- partTypeDesc: [
- {
- required: true,
- message: ' ',
- trigger: 'change'
- }
- ],
- partName: [
- {
- required: true,
- message: ' ',
- trigger: 'change'
- }
- ],
- }
+ reviewEngineerFlag:false,
+ peEngineerFlag:false,
+ cqeFlag:false,
+ operatorList:[],
+ reviewEngineerList:[],
+ peEngineerList:[],
+ cqeList:[],
}
},
mounted () {
@@ -484,10 +548,47 @@
},
searchTable(){
- searchBMBom(this.searchData).then(({data}) => {
- this.tableData = data.rows;
+ if(this.searchData.buNo!='DBE'){
+ searchBMRoutingDetail(this.searchData).then(({data}) => {
+ if(data.rows.length>0){
+ this.dataForm=data.rows[0]
+ }else {
+ this.dataForm.site=this.searchData.site
+ this.dataForm.codeNo=this.searchData.codeNo
+ }
- });
+ });
+ let inData = {
+ site: this.searchData.site,
+ codeNo: this.searchData.codeNo,
+ type: 'reviewEngineer',
+ }
+ searchTechnicalSpecificationTeamStr(inData).then(({data}) => {
+ this.dataForm.reviewEngineerList = data.rows
+ })
+ let inData2 = {
+ site: this.searchData.site,
+ codeNo: this.searchData.codeNo,
+ type: 'cqe',
+ }
+ searchTechnicalSpecificationTeamStr(inData2).then(({data}) => {
+ this.dataForm.cqeList = data.rows
+ })
+ let inData3 = {
+ site: this.searchData.site,
+ codeNo: this.searchData.codeNo,
+ type: 'peEngineer',
+ }
+ searchTechnicalSpecificationTeamStr(inData3).then(({data}) => {
+ this.dataForm.peEngineerList = data.rows
+ })
+
+ }else {
+ searchBMBom(this.searchData).then(({data}) => {
+ this.tableData = data.rows;
+
+ });
+ }
},
deleteData(row){
this.$confirm(`是否删除这条代理商信息?`, '提示', {
@@ -514,6 +615,100 @@
}).catch(() => {
})
},
+ reviewEngineerChooseModal(){
+ if(this.ifDisableFlag){
+ return false
+ }
+ let inData={
+ site:this.searchData.site,
+ }
+ searchOperatorWithSite(inData).then(({data}) => {
+ this.operatorList=data.rows
+ })
+ this.reviewEngineerList = JSON.parse(JSON.stringify(this.dataForm.reviewEngineerList));
+ this.reviewEngineerFlag=true
+ },
+
+ savereviewEngineerList(){
+ let reviewEngineerName='';
+ for (let i = 0; i < this.reviewEngineerList.length; i++) {
+ let select= this.operatorList.filter(item => item.operatorId === this.reviewEngineerList[i])
+ if(select.length>0){
+ reviewEngineerName+=select[0].operatorName+';'
+ }
+ }
+ this.dataForm.reviewEngineer=reviewEngineerName
+ this.dataForm.reviewEngineerList=JSON.parse(JSON.stringify(this.reviewEngineerList));
+ this.reviewEngineerFlag=false
+ },
+
+ peEngineerChooseModal(){
+ if(this.ifDisableFlag){
+ return false
+ }
+ let inData={
+ site:this.searchData.site,
+ }
+ searchOperatorWithSite(inData).then(({data}) => {
+ this.operatorList=data.rows
+ })
+ this.peEngineerList = JSON.parse(JSON.stringify(this.dataForm.peEngineerList));
+ this.peEngineerFlag=true
+ },
+
+ savepeEngineerList(){
+ let peEngineerName='';
+ for (let i = 0; i < this.peEngineerList.length; i++) {
+ let select= this.operatorList.filter(item => item.operatorId === this.peEngineerList[i])
+ if(select.length>0){
+ peEngineerName+=select[0].operatorName+';'
+ }
+ }
+ this.dataForm.peEngineer=peEngineerName
+ this.dataForm.peEngineerList=JSON.parse(JSON.stringify(this.peEngineerList));
+ this.peEngineerFlag=false
+ },
+ cqeModal(){
+ if(this.ifDisableFlag){
+ return false
+ }
+ let inData={
+ site:this.searchData.site,
+ }
+ searchOperatorWithSite(inData).then(({data}) => {
+ this.operatorList=data.rows
+ })
+ this.cqeList = JSON.parse(JSON.stringify(this.dataForm.cqeList));
+ this.cqeFlag=true
+ },
+ savecqeList(){
+ let cqeName='';
+ for (let i = 0; i < this.cqeList.length; i++) {
+ let select= this.operatorList.filter(item => item.operatorId === this.cqeList[i])
+ if(select.length>0){
+ cqeName+=select[0].operatorName+';'
+ }
+ }
+ this.dataForm.cqe=cqeName
+ this.dataForm.cqeList=JSON.parse(JSON.stringify(this.cqeList));
+ this.cqeFlag=false
+ },
+ saveData(){
+ this.$confirm("是否保存基本信息？", '保存提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ }).then(() => {
+ updateBMRoutingDetail(this.dataForm).then(({data}) => {
+ if (data && data.code === 0) {
+ this.$message.success( '操作成功')
+ } else {
+ this.$message.error(data.msg)
+ }
+ })
+ }).catch(() => {
+ return
+ })
+ },
},
}
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
index 83a9d48..49af439 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
@@ -16,6 +16,9 @@
+
+
+
@@ -26,6 +29,7 @@
import packageInfo from "./com_bm_packageInfo";/*包装信息*/
import bom from "./com_bm_bom";/*BOM*/
import routing from "./com_bm_routing";/*工艺*/
+ import prepress from "./com_bm_prepress";/*印前*/
export default {
name: "technicalSpecificationDetail",
components: {
@@ -34,6 +38,7 @@
packageInfo,
bom,
routing,
+ prepress,
},
data() {
return {
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/tsdzujian.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/tsdzujian.vue
deleted file mode 100644
index 2d24a3b..0000000
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/tsdzujian.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
- 新增
-
-
-
-
-
-
-
-
-
-