wilson
/
ccl_plm-vue
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
ruanqi 2 years ago
parent
a4f7ab80dd 19cd441ffe
commit
bd444e356a
3 changed files with 127 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      src/views/modules/common/Chooselist.vue
  2. 61
      src/views/modules/proofing/requestForProofing.vue
  3. 61
      src/views/modules/test/requestForTest.vue

25
src/views/modules/common/Chooselist.vue
View File

@ -178,10 +178,25 @@ export default {
this.getDataList(true)
})
this.dataListLoading = false
},
getDataList (bool) {
let sql = this.baseListData.sqlcode
if (this.tagNo >= 2000) {
if (bool) {
sql += " and (a." + this.baseListData.fieldname1 + " like '%" + this.param + "%' OR a." + this.baseListData.fieldname2 + " like '%" + this.param + "%'" +" ) "
}
if (this.param1) {
sql += " and a." + this.baseListData.fieldname1 + " like '%" + this.param1 + "%'"
}
if (this.param2) {
sql += " and a." + this.baseListData.fieldname2 + " like '%" + this.param2 + "%'"
}
if (this.tagNo < 1000 && this.tagNo !== 93){
if (this.param4) {
sql += " and site = " + this.param4
}
}
} else {
if (bool) {
sql += " and (" + this.baseListData.fieldname1 + " like '%" + this.param + "%' OR "+this.baseListData.fieldname2 + " like '%" + this.param + "%'" +" ) "
}
@ -195,25 +210,27 @@ export default {
sql += " and active like '%" + this.param3 + "%'"
}
if (this.tagNo <1000 && this.tagNo !== 93){
console.log(this.tagNo)
if (this.param4) {
sql += " and site=" + this.param4
}
}
}
sql += this.conSql
getChooselistData({"sqlcode": sql}).then(({data}) => {
if (data.code == 0) {
this.dataList = data.baseListData;
this.dataList = data.baseListData
} else {
this.$message.error(data.msg)
}
})
},
getRowData (row) {
this.visible = false
this.$emit('getBaseData',row)
},
closeDialog () {
this.param1 = ''
this.param2 = ''
@ -231,7 +248,7 @@ export default {
sqlcode: '',
tagno: '',
}
this.dataList=[];
this.dataList = []
}
}
}

61
src/views/modules/proofing/requestForProofing.vue
View File

@ -193,7 +193,8 @@
</el-col>
<el-col :span="4">
<el-form-item prop="trackerName">
<span style="cursor: pointer" slot="label" @click="getBaseList(103,1)"><a herf="#">跟单员</a></span>
<!-- <span style="cursor: pointer" slot="label" @click="getBaseList(103,1)"><a herf="#">跟单员</a></span>-->
<span style="cursor: pointer" slot="label" @click="getBaseList(2000)"><a herf="#">跟单员</a></span>
<el-input v-model="modalData.trackerName"></el-input>
</el-form-item>
</el-col>
@ -232,7 +233,8 @@
</el-col>
<el-col :span="4">
<el-form-item prop="engineerName">
<span style="cursor: pointer" slot="label" @click="getBaseList(103,2)"><a herf="#">工程师</a></span>
<!-- <span style="cursor: pointer" slot="label" @click="getBaseList(103,2)"><a herf="#">工程师</a></span>-->
<span style="cursor: pointer" slot="label" @click="getBaseList(2001)"><a herf="#">工程师</a></span>
<el-input v-model="modalData.engineerName"></el-input>
</el-form-item>
</el-col>
@ -2852,25 +2854,34 @@
this.tagNo1 = type
this.$nextTick(() => {
let strVal = ''
let conSql = ''
if (val === 102) {
if(type === 1) {
strVal = this.modalData.customerNo
}
}
if (val === 103) {
if(type === 1) {
strVal = this.modalData.tracker
}
if(type === 2) {
strVal = this.modalData.engineer
}
}
// if (val === 103) {
// if(type === 1) {
// strVal = this.modalData.tracker
// }
// if(type === 2) {
// strVal = this.modalData.engineer
// }
// }
if (val === 104) {
if(type === 1) {
strVal = this.modalData.projectId
}
}
this.$refs.baseList.init(val, strVal)
if (val === 2000) {
strVal = this.modalData.trackerName
conSql = " and b.site = '" + this.$store.state.user.site + "'"
}
if (val === 2001) {
strVal = this.modalData.engineerName
conSql = " and b.site = '" + this.$store.state.user.site + "'"
}
this.$refs.baseList.init(val, strVal, conSql)
})
},
/**
@ -2890,16 +2901,16 @@
this.projectPartList = []
}
}
if (this.tagNo === 103) {
if(this.tagNo1 === 1) {
this.modalData.tracker = val.username
this.modalData.trackerName = val.user_display
}
if(this.tagNo1 === 2) {
this.modalData.engineer = val.username
this.modalData.engineerName = val.user_display
}
}
// if (this.tagNo === 103) {
// if(this.tagNo1 === 1) {
// this.modalData.tracker = val.username
// this.modalData.trackerName = val.user_display
// }
// if(this.tagNo1 === 2) {
// this.modalData.engineer = val.username
// this.modalData.engineerName = val.user_display
// }
// }
if (this.tagNo === 104) {
if(this.tagNo1 === 1) {
this.modalData.projectId = val.project_id
@ -2907,6 +2918,14 @@
this.getProjectPartList();
}
}
if (this.tagNo === 2000) {
this.modalData.tracker = val.username
this.modalData.trackerName = val.user_display
}
if (this.tagNo === 2001) {
this.modalData.engineer = val.username
this.modalData.engineerName = val.user_display
}
},
// ======== 导出相关方法 ========

61
src/views/modules/test/requestForTest.vue
View File

@ -193,7 +193,8 @@
</el-col>
<el-col :span="4">
<el-form-item prop="trackerName">
<span slot="label" @click="getBaseList(103,1)"><a herf="#">跟单员</a></span>
<!-- <span slot="label" @click="getBaseList(103,1)"><a herf="#">跟单员</a></span>-->
<span style="cursor: pointer" slot="label" @click="getBaseList(2000)"><a herf="#">跟单员</a></span>
<el-input v-model="modalData.trackerName"></el-input>
</el-form-item>
</el-col>
@ -232,7 +233,8 @@
</el-col>
<el-col :span="4">
<el-form-item prop="engineerName">
<span slot="label" @click="getBaseList(103,2)"><a herf="#">工程师</a></span>
<!-- <span slot="label" @click="getBaseList(103,2)"><a herf="#">工程师</a></span>-->
<span slot="label" @click="getBaseList(2001)"><a herf="#">工程师</a></span>
<el-input v-model="modalData.engineerName"></el-input>
</el-form-item>
</el-col>
@ -2733,25 +2735,34 @@
this.tagNo1 = type
this.$nextTick(() => {
let strVal = ''
let conSql = ''
if (val === 102) {
if(type === 1) {
strVal = this.modalData.customerNo
}
}
if (val === 103) {
if(type === 1) {
strVal = this.modalData.tracker
}
if(type === 2) {
strVal = this.modalData.engineer
}
}
// if (val === 103) {
// if(type === 1) {
// strVal = this.modalData.tracker
// }
// if(type === 2) {
// strVal = this.modalData.engineer
// }
// }
if (val === 104) {
if(type === 1) {
strVal = this.modalData.projectId
}
}
this.$refs.baseList.init(val, strVal)
if (val === 2000) {
strVal = this.modalData.trackerName
conSql = " and b.site = '" + this.$store.state.user.site + "'"
}
if (val === 2001) {
strVal = this.modalData.engineerName
conSql = " and b.site = '" + this.$store.state.user.site + "'"
}
this.$refs.baseList.init(val, strVal, conSql)
})
},
/**
@ -2771,16 +2782,16 @@
this.projectPartList = [];
}
}
if (this.tagNo === 103) {
if(this.tagNo1 === 1) {
this.modalData.tracker = val.username
this.modalData.trackerName = val.user_display
}
if(this.tagNo1 === 2) {
this.modalData.engineer = val.username
this.modalData.engineerName = val.user_display
}
}
// if (this.tagNo === 103) {
// if(this.tagNo1 === 1) {
// this.modalData.tracker = val.username
// this.modalData.trackerName = val.user_display
// }
// if(this.tagNo1 === 2) {
// this.modalData.engineer = val.username
// this.modalData.engineerName = val.user_display
// }
// }
if (this.tagNo === 104) {
if(this.tagNo1 === 1) {
this.modalData.projectId = val.project_id
@ -2788,6 +2799,14 @@
this.getProjectPartList();
}
}
if (this.tagNo === 2000) {
this.modalData.tracker = val.username
this.modalData.trackerName = val.user_display
}
if (this.tagNo === 2001) {
this.modalData.engineer = val.username
this.modalData.engineerName = val.user_display
}
},
// ======== 导出相关方法 ========

Write Preview
Loading…
Cancel
Save