diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue index b3767cd..75483c4 100644 --- a/src/views/modules/quotation/requestForQuote.vue +++ b/src/views/modules/quotation/requestForQuote.vue @@ -2200,6 +2200,34 @@ export default { } } }) + } else if (this.$route.params.quotationBatchNo) { + this.searchData.quotationBatchNo = this.$route.params.quotationBatchNo + this.searchData.limit = this.pageSize + this.searchData.page = this.pageIndex + let params = { + ...this.searchData, + createBy: this.$store.state.user.name + } + quotationInformationSearch(params).then(({data}) => { + if (data.code === 0) { + this.dataList = data.page.list + this.pageIndex = data.page.currPage + this.pageSize = data.page.pageSize + this.totalPage = data.page.totalCount + this.$refs.selectDiv.setLengthAll(this.dataList.length) + this.searchData.quotationNo = '' + //判断是否全部存在数据 + if (this.dataList.length > 0) { + //设置选中行 + // this.$refs.quotationTable.setCurrentRow(this.dataList[0]) + // this.refreshCurrentTabTable() //加载当前的页签的table + this.quotationClickRow(this.dataList[0]) + // this.updateModal(this.dataList[0]) + } else { + this.quotationCurrentRow = {} + } + } + }) } else { this.getDataList() } diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue index 4f68b35..9b0554e 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue @@ -215,10 +215,11 @@ label="参数卡编码" height="150px" style="margin-top: 5px" - :save-visible="isAuth('103002:upload')&&!readonly" + :save-visible="isAuth('103002:upload')" :download-visible="isAuth('103002:download')" - :remove-visible="isAuth('103002:remove')&&!readonly" + :remove-visible="isAuth('103002:remove')" :preview-visible="isAuth('103002:preview')" + :readonly=" readonly" :disabled="ifDisableFlag" :columns="ossColumns" :order-ref1="dataForm.site?dataForm.site:''" @@ -249,10 +250,11 @@ style="margin-top: 5px" :disabled="ifDisableFlag" :columns="ossColumns" - :save-visible="isAuth('103002:upload')&&!readonly" + :save-visible="isAuth('103002:upload')" :download-visible="isAuth('103002:download')" - :remove-visible="isAuth('103002:remove')&&!readonly" + :remove-visible="isAuth('103002:remove')" :preview-visible="isAuth('103002:preview')" + :readonly="readonly" :order-ref1="dataForm.site?dataForm.site:''" :order-ref2="dataForm.codeNo?dataForm.codeNo:''" order-ref3="productionFileComments"> @@ -462,10 +464,11 @@ label="参数卡编码" height="150px" style="margin-top: 5px" - :save-visible="isAuth('103002:upload')&&!readonly" + :save-visible="isAuth('103002:upload')" :download-visible="isAuth('103002:download')" - :remove-visible="isAuth('103002:remove')&&!readonly" + :remove-visible="isAuth('103002:remove')" :preview-visible="isAuth('103002:preview')" + :readonly="readonly" :disabled="ifDisableFlag" :columns="ossColumns" :order-ref1="dataForm.site?dataForm.site:''" @@ -496,10 +499,11 @@ style="margin-top: 5px" :disabled="ifDisableFlag" :columns="ossColumns" - :save-visible="isAuth('103002:upload')&&!readonly" + :save-visible="isAuth('103002:upload')" :download-visible="isAuth('103002:download')" - :remove-visible="isAuth('103002:remove')&&!readonly" + :remove-visible="isAuth('103002:remove')" :preview-visible="isAuth('103002:preview')" + :readonly="readonly" :order-ref1="dataForm.site?dataForm.site:''" :order-ref2="dataForm.codeNo?dataForm.codeNo:''" order-ref3="productionFileComments"> @@ -709,10 +713,11 @@ label="参数卡编码" height="150px" style="margin-top: 5px" - :save-visible="isAuth('103002:upload')&&!readonly" + :save-visible="isAuth('103002:upload')" :download-visible="isAuth('103002:download')" - :remove-visible="isAuth('103002:remove')&&!readonly" + :remove-visible="isAuth('103002:remove')" :preview-visible="isAuth('103002:preview')" + :readonly="readonly" :disabled="ifDisableFlag" :columns="ossColumns" :order-ref1="dataForm.site?dataForm.site:''" @@ -743,10 +748,11 @@ style="margin-top: 5px" :disabled="ifDisableFlag" :columns="ossColumns" - :save-visible="isAuth('103002:upload')&&!readonly" + :save-visible="isAuth('103002:upload')" :download-visible="isAuth('103002:download')" - :remove-visible="isAuth('103002:remove')&&!readonly" + :remove-visible="isAuth('103002:remove')" :preview-visible="isAuth('103002:preview')" + :readonly="readonly" :order-ref1="dataForm.site?dataForm.site:''" :order-ref2="dataForm.codeNo?dataForm.codeNo:''" order-ref3="productionFileComments"> @@ -956,10 +962,11 @@ label="参数卡编码" height="150px" style="margin-top: 5px" - :save-visible="isAuth('103002:upload')&&!readonly" + :save-visible="isAuth('103002:upload')" :download-visible="isAuth('103002:download')" - :remove-visible="isAuth('103002:remove')&&!readonly" + :remove-visible="isAuth('103002:remove')" :preview-visible="isAuth('103002:preview')" + :readonly="readonly" :disabled="ifDisableFlag" :columns="ossColumns" :order-ref1="dataForm.site?dataForm.site:''" @@ -990,10 +997,11 @@ style="margin-top: 5px" :disabled="ifDisableFlag" :columns="ossColumns" - :save-visible="isAuth('103002:upload')&&!readonly" + :save-visible="isAuth('103002:upload')" :download-visible="isAuth('103002:download')" - :remove-visible="isAuth('103002:remove')&&!readonly" + :remove-visible="isAuth('103002:remove')" :preview-visible="isAuth('103002:preview')" + :readonly="readonly" :order-ref1="dataForm.site?dataForm.site:''" :order-ref2="dataForm.codeNo?dataForm.codeNo:''" order-ref3="productionFileComments"> diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue index f958301..fa254c9 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue @@ -234,7 +234,7 @@
- 数据录入 + 数据录入
diff --git a/src/views/modules/tooling/toolingInfo.vue b/src/views/modules/tooling/toolingInfo.vue index a7e57a9..08b6685 100644 --- a/src/views/modules/tooling/toolingInfo.vue +++ b/src/views/modules/tooling/toolingInfo.vue @@ -583,11 +583,18 @@ export default { this.isFilterSearch = true this.filterVisible = false }, + handleRouteQuery() { + if (this.$route.params.toolId) { + this.queryParams.toolNo = this.$route.params.toolId + this.queryDataList() + } + } }, created() { // 初始化Site this.queryParams.site = this.$store.state.user.site; + this.handleRouteQuery() }, watch:{