diff --git a/.env.development b/.env.development index b59befd..8849f99 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE = 煤科建管平台 VITE_APP_ENV = 'development' # 开发环境 -VITE_APP_BASE_API = 'http://192.168.110.180:8899' +VITE_APP_BASE_API = 'http://192.168.110.213:8899' # 无人机接口地址 diff --git a/src/views/design/billofQuantities/index.vue b/src/views/design/billofQuantities/index.vue index d359bf0..79241ba 100644 --- a/src/views/design/billofQuantities/index.vue +++ b/src/views/design/billofQuantities/index.vue @@ -7,8 +7,7 @@ - + @@ -25,13 +24,23 @@ - 审核 - 查看流程 + 审核 + 查看流程 @@ -39,36 +48,47 @@ - + - + - 审核 - 查看流程 + 审核 + 查看流程 - + - + - + @@ -126,7 +146,7 @@ const state = reactive({ }); // tab切换 const handleTabChange = (tab) => { - console.log('tab',tab); + console.log('tab', tab); state.tableData = []; state.options = []; state.sheets = []; @@ -164,7 +184,7 @@ async function getVersionNums(isSheet = true) { // if (state.work_order_type == 3) { state.versionsData = state.options[0] || []; console.log('state.versionsData', state.versionsData); - // console.log('state.versionsData', state.versionsData); + // console.log('state.versionsData', state.versionsData); // } // 等待表名加载完成 console.log(isSheet, state.sheets.length); @@ -308,7 +328,7 @@ function handleArr(arr, flag, table) { function clickApprovalSheet(row) { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/approval/billofQuantities/indexEdit`+state.work_order_type, + path: `/approval/billofQuantities/indexEdit` + state.work_order_type, query: { id: state.queryForm.versions, type: 'update' @@ -318,7 +338,7 @@ function clickApprovalSheet(row) { // 审核流程 function lookApprovalFlow(row) { proxy.$router.push({ - path: `/approval/billofQuantities/indexEdit`+state.work_order_type, + path: `/approval/billofQuantities/indexEdit` + state.work_order_type, query: { id: state.queryForm.versions, type: 'view' diff --git a/src/views/formalities/formalitiesAreConsolidated/index.vue b/src/views/formalities/formalitiesAreConsolidated/index.vue index 0b05cc5..ebeda55 100644 --- a/src/views/formalities/formalitiesAreConsolidated/index.vue +++ b/src/views/formalities/formalitiesAreConsolidated/index.vue @@ -31,9 +31,9 @@ placeholder="请选择实际完成时间" /> - + 搜索 重置 diff --git a/src/views/materials/materialsEquipment/materialIssue/word/index.vue b/src/views/materials/materialsEquipment/materialIssue/word/index.vue index c560a8c..4cfb5d9 100644 --- a/src/views/materials/materialsEquipment/materialIssue/word/index.vue +++ b/src/views/materials/materialsEquipment/materialIssue/word/index.vue @@ -25,7 +25,7 @@ - + @@ -79,7 +79,7 @@ @@ -90,10 +90,10 @@ @@ -248,11 +248,10 @@ defineExpose({ } } } -.file_detail{ - - >span{ - width: 40%; - display: inline-block; +.file_detail { + > span { + width: 40%; + display: inline-block; } } table { diff --git a/src/views/materials/materialsEquipment/materialReceive/word/index.vue b/src/views/materials/materialsEquipment/materialReceive/word/index.vue index 01c096a..d717d19 100644 --- a/src/views/materials/materialsEquipment/materialReceive/word/index.vue +++ b/src/views/materials/materialsEquipment/materialReceive/word/index.vue @@ -81,10 +81,10 @@ diff --git a/src/views/materials/materialsInventory/index.vue b/src/views/materials/materialsInventory/index.vue index b6adb46..dc7b9ec 100644 --- a/src/views/materials/materialsInventory/index.vue +++ b/src/views/materials/materialsInventory/index.vue @@ -56,6 +56,7 @@ +
设备材料名称设备材料名称 {{ formData.materialName }} 规格及数量 见下表
-
缺陷情况:
+
缺陷情况:
{{ formData.defectDescription }}
是否附带以下随机资料
- (1) 合格证 {{ formData.certCountFile ? formData.certCountFile.length : 0 }} 份 - (2) 出厂报告 {{ formData.reportCountFileId ? formData.reportCountFileId.length : 0 }} 份 - (3) 技术资料文件 {{ formData.techDocCountFileId ? formData.techDocCountFileId.length : 0 }} 份 - (4) 厂家资质文件 {{ formData.licenseCountFileId ? formData.licenseCountFileId.length : 0 }} 份 + (1) 合格证 {{ formData.certCount ? formData.certCount : 0 }} 份 + (2) 出厂报告 {{ formData.reportCount ? formData.reportCount : 0 }} 份 + (3) 技术资料文件 {{ formData.techDocCount ? formData.techDocCount : 0 }} 份 + (4) 厂家资质文件 {{ formData.licenseCount ? formData.licenseCount : 0 }} 份
是否附带以下随机资料
- (1) 合格证 {{ formData.certCountFile ? formData.certCountFile.length : 0 }} 份 - (2) 出厂报告 {{ formData.reportCountFileId ? formData.reportCountFile.length : 0 }} 份 - (3) 技术资料文件 {{ formData.techDocCountFileId ? formData.techDocCountFile.length : 0 }} 份 - (4) 厂家资质文件 {{ formData.licenseCountFileId ? formData.licenseCountFile.length : 0 }} 份 + (1) 合格证 {{ formData.certCount ? formData.certCount : 0 }} 份 + (2) 出厂报告 {{ formData.reportCount ? formData.reportCount : 0 }} 份 + (3) 技术资料文件 {{ formData.techDocCount ? formData.techDocCount : 0 }} 份 + (4) 厂家资质文件 {{ formData.licenseCount ? formData.licenseCount : 0 }} 份