合并
This commit is contained in:
		| @ -5,7 +5,7 @@ VITE_APP_TITLE = 煤科建管平台 | |||||||
| VITE_APP_ENV = 'development' | VITE_APP_ENV = 'development' | ||||||
|  |  | ||||||
| # 开发环境 | # 开发环境 | ||||||
| VITE_APP_BASE_API = 'http://192.168.110.180:8899' | VITE_APP_BASE_API = 'http://192.168.110.213:8899' | ||||||
|  |  | ||||||
| # 无人机接口地址 | # 无人机接口地址 | ||||||
|  |  | ||||||
|  | |||||||
| @ -44,7 +44,11 @@ | |||||||
|               </el-select> |               </el-select> | ||||||
|             </el-form-item> |             </el-form-item> | ||||||
|             <el-form-item> |             <el-form-item> | ||||||
|               <el-button v-if="Object.keys(state.versionsData).length === 0 || state.versionsData.status == 'cancel'" type="primary">导入excel</el-button> |               <el-upload ref="uploadRef" class="upload-demo" :http-request="importExcel" :show-file-list="false" style="margin-right: 10px;"> | ||||||
|  |                 <template #trigger> | ||||||
|  |                   <el-button type="primary">导入excel</el-button> | ||||||
|  |                 </template> | ||||||
|  |               </el-upload> | ||||||
|               <el-button v-if="state.versionsData.status == 'draft'" type="primary" con="edit" |               <el-button v-if="state.versionsData.status == 'draft'" type="primary" con="edit" | ||||||
|                 @click="clickApprovalSheet()">审核</el-button> |                 @click="clickApprovalSheet()">审核</el-button> | ||||||
|               <el-button v-if="state.versionsData.status == 'waiting' || state.versionsData.status == 'finish'" |               <el-button v-if="state.versionsData.status == 'waiting' || state.versionsData.status == 'finish'" | ||||||
| @ -129,6 +133,7 @@ const handleTabChange = (tab) => { | |||||||
|   state.queryForm.sheet = ''; |   state.queryForm.sheet = ''; | ||||||
|   state.queryForm.versions = ''; |   state.queryForm.versions = ''; | ||||||
|   state.work_order_type = tab; |   state.work_order_type = tab; | ||||||
|  |   state.versionsData = {}; | ||||||
|   if (tab <= 2) { |   if (tab <= 2) { | ||||||
|     getVersionNums(); |     getVersionNums(); | ||||||
|   } else { |   } else { | ||||||
| @ -158,6 +163,7 @@ async function getVersionNums(isSheet = true) { | |||||||
|         state.queryForm.versions = state.options[0].versions; |         state.queryForm.versions = state.options[0].versions; | ||||||
|         // if (state.work_order_type == 3) { |         // if (state.work_order_type == 3) { | ||||||
|         state.versionsData = state.options[0] || []; |         state.versionsData = state.options[0] || []; | ||||||
|  |         console.log('state.versionsData', state.versionsData); | ||||||
|           // console.log('state.versionsData', state.versionsData); |           // console.log('state.versionsData', state.versionsData); | ||||||
|         // } |         // } | ||||||
|         // 等待表名加载完成 |         // 等待表名加载完成 | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user