diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue
index 341fd54..9f56175 100644
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@@ -272,7 +272,7 @@
-
+
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
index 2d56eee..a26d6ba 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
@@ -879,24 +879,33 @@
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
+ this.dataForm.engineerList = [];
+ this.dataForm.engineerList.push(this.dataForm.engineerNo);
+ this.dataForm.technicianList = [];
+ this.dataForm.technicianList.push(this.dataForm.technicianNo);
let tempData = {
+ ...this.dataForm,
site: this.searchData.site,
userName: this.$store.state.user.name,
codeNo: this.searchData.codeNo,
- menuId: '103002',
- nodeConclusion: 'Y'
+ menuId: '103002'
}
this.submitData(tempData)
})
},
// 下达
- issueModal (row) {
+ issueModal () {
this.$confirm(`是否确认下达?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
+ this.dataForm.engineerList = [];
+ this.dataForm.engineerList.push(this.dataForm.engineerNo);
+ this.dataForm.technicianList = [];
+ this.dataForm.technicianList.push(this.dataForm.technicianNo);
let tempData = {
+ ...this.dataForm,
site: this.searchData.site,
userName: this.$store.state.user.name,
codeNo: this.searchData.codeNo,
@@ -928,7 +937,12 @@
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
+ this.dataForm.engineerList = [];
+ this.dataForm.engineerList.push(this.dataForm.engineerNo);
+ this.dataForm.technicianList = [];
+ this.dataForm.technicianList.push(this.dataForm.technicianNo);
let tempData = {
+ ...this.dataForm,
site: this.searchData.site,
userName: this.$store.state.user.name,
codeNo: this.searchData.codeNo,
diff --git a/src/views/modules/sys/role.vue b/src/views/modules/sys/role.vue
index 1e57443..cbcc75e 100644
--- a/src/views/modules/sys/role.vue
+++ b/src/views/modules/sys/role.vue
@@ -21,6 +21,13 @@
align="center"
:label="buttons.roleName||'权限集名称'">
+
+
-
@@ -242,7 +241,7 @@
-
+
@@ -2647,10 +2646,10 @@
this.$message.warning('请选择客户名称!')
return
}
- if (this.modalData.tracker === '' || this.modalData.tracker == null) {
- this.$message.warning('请选择Artwork!')
- return
- }
+ // if (this.modalData.tracker === '' || this.modalData.tracker == null) {
+ // this.$message.warning('请选择Artwork!')
+ // return
+ // }
// if (this.modalData.trackerName === '' || this.modalData.trackerName == null) {
// this.$message.warning('请选择Artwork!')
// return
diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue
index 3322af3..2a064fb 100644
--- a/src/views/modules/tooling/searchToolApply.vue
+++ b/src/views/modules/tooling/searchToolApply.vue
@@ -2117,7 +2117,7 @@
this.searchData.page = this.pageIndex
searchProjectToolApplyHeader(this.searchData).then(({data}) => {
- if (data.code == 0) {
+ if (data && data.code === 0) {
this.dataList1 = data.page.list
this.pageIndex = data.page.currPage
this.pageSize = data.page.pageSize
@@ -2136,14 +2136,14 @@
})
}
- if (localStorage.getItem('ToolApplyData') != null&&localStorage.getItem('ToolApplyData') != undefined) {
+ if (localStorage.getItem('ToolApplyData') != null && localStorage.getItem('ToolApplyData') !== undefined) {
let data = JSON.parse(localStorage.getItem('ToolApplyData'));
if (data){
this.searchData.applyNo = data.applyNo
}
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
- console.log(this.searchData)
+ // console.log(this.searchData)
searchProjectToolApplyHeader(this.searchData).then(({data}) => {
if (data.code == 0) {
this.dataList1 = data.page.list
@@ -2154,7 +2154,7 @@
this.$refs.mainTable.setCurrentRow(this.dataList1[0]);
this.currentRow = JSON.parse( JSON.stringify(this.dataList1[0]));
//进入编辑界面
- this.editModalU(this.dataList1[0])
+ // this.editModalU(this.dataList1[0])
}else {
this.currentRow ={}
}