From b985d1084338e6511213f1d2ff6d14d599de3b96 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 14 Oct 2024 12:29:56 +0800
Subject: [PATCH] plm BMM

---
 src/views/modules/tooling/searchToolApply.vue | 59 +++----------------
 src/views/modules/tooling_old/toolingInfo.vue |  2 +-
 2 files changed, 10 insertions(+), 51 deletions(-)

diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue
index 0b17099..7ed13ba 100644
--- a/src/views/modules/tooling/searchToolApply.vue
+++ b/src/views/modules/tooling/searchToolApply.vue
@@ -138,59 +138,10 @@
 <!--          </el-table-column>-->
         </el-table>
 
-      </el-tab-pane>
-      <!-- 审批信息 -->
-      <el-tab-pane label="审批信息" name="approvalInformation">
-        <approval-information ref="approvalTable" v-model:data-list="approvalList" :height="240"></approval-information>
-      </el-tab-pane>
-      <el-tab-pane label="附件信息" name="down">
-        <oss-components height="25vh" label="附件" :columns="ossColumns" :order-ref1="currentRow.site" :order-ref2="currentRow.applyNo"></oss-components>
-
-        <!--文件上传-->
-<!--        <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">-->
-<!--          <el-form :inline="true" label-position="top" style="margin-top: 0px">-->
-<!--            <el-button type="primary" @click="addUploadFileModal()">上传文件</el-button>-->
-<!--          </el-form>-->
-<!--        </el-form>-->
-<!--        <el-table-->
-<!--          :data="fileContentList"-->
-<!--          height="240"-->
-<!--          border-->
-<!--          v-loading="dataListLoading"-->
-<!--          style="width: 100%; ">-->
-<!--          <el-table-column-->
-<!--            v-for="(item,index) in columnFileContentArray" :key="index"-->
-<!--            :sortable="item.columnSortable"-->
-<!--            :prop="item.columnProp"-->
-<!--            :header-align="item.headerAlign"-->
-<!--            :show-overflow-tooltip="item.showOverflowTooltip"-->
-<!--            :align="item.align"-->
-<!--            :fixed="item.fixed==''?false:item.fixed"-->
-<!--            :min-width="item.columnWidth"-->
-<!--            :label="item.columnLabel">-->
-<!--            <template slot-scope="scope">-->
-<!--              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>-->
-<!--              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"-->
-<!--                                                 style="width: 100px; height: 80px"/></span>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            fixed="right"-->
-<!--            header-align="center"-->
-<!--            align="center"-->
-<!--            width="100"-->
-<!--            label="操作">-->
-<!--            <template slot-scope="scope">-->
-<!--              &lt;!&ndash;              <a :href="'http://192.168.1.130:80/file/'+scope.row.url" :download="scope.row.fileName">下载</a>&ndash;&gt;-->
-<!--              <a  @click="downloadFile(scope.row)" >下载</a>-->
-<!--              <a type="text" size="small"  @click="deleteFile(scope.row)">删除</a>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
-<!--        </el-table>-->
       </el-tab-pane>
       <el-tab-pane label="处理信息" name="tab4">
         <el-form :inline="true" label-position="top" style="margin-top: 0px">
-<!--          <el-button type="primary" :disabled="!(currentRow.statusCode==='50'||currentRow.statusCode==='60')" @click="openMassageModel()">申请信息录入</el-button>-->
+          <!--          <el-button type="primary" :disabled="!(currentRow.statusCode==='50'||currentRow.statusCode==='60')" @click="openMassageModel()">申请信息录入</el-button>-->
           <el-button type="primary"  @click="openMassageModel()">申请信息录入</el-button>
         </el-form>
         <el-form label-position="top"  :model="currentRow" >
@@ -232,6 +183,14 @@
           </el-row>
         </el-form>
       </el-tab-pane>
+      <el-tab-pane label="附件信息" name="down">
+        <oss-components height="25vh" label="附件" :columns="ossColumns" :order-ref1="currentRow.site" :order-ref2="currentRow.applyNo"></oss-components>
+
+      </el-tab-pane>
+      <!-- 审批信息 -->
+      <el-tab-pane label="审批信息" name="approvalInformation">
+        <approval-information ref="approvalTable" v-model:data-list="approvalList" :height="240"></approval-information>
+      </el-tab-pane>
     </el-tabs>
     <el-dialog
       width="800px" v-drag
diff --git a/src/views/modules/tooling_old/toolingInfo.vue b/src/views/modules/tooling_old/toolingInfo.vue
index 95fc81d..6f5e891 100644
--- a/src/views/modules/tooling_old/toolingInfo.vue
+++ b/src/views/modules/tooling_old/toolingInfo.vue
@@ -675,7 +675,7 @@
       },
       applyModel() {
         if(this.dataListSelections.length===0){
-          this.$alert('请选择报价单！', '错误', {
+          this.$alert('请选择项目！', '错误', {
             confirmButtonText: '确定'
           })
           return false;