diff --git a/src/api/tool/toolApply.js b/src/api/tool/toolApply.js
index 9ae2d31..5fb4ce4 100644
--- a/src/api/tool/toolApply.js
+++ b/src/api/tool/toolApply.js
@@ -18,6 +18,7 @@ export const searchProjectToolApplyHeader = data => createAPI(`/plm/projectTooli
 export const searchProjectToolApplyHeaderByAnyField = data => createAPI(`/plm/projectToolingApplication/searchProjectToolApplyHeader/any`,'post',data)
 
 export const searchProjectToolApplyDetail = data => createAPI(`/plm/projectToolingApplication/searchProjectToolApplyDetail`,'post',data)
+export const toolDetailBatchDelete = data => createAPI(`/plm/projectToolingApplication/toolDetailBatchDelete`,'post',data)
 
 export const comfirmProjectToolApply = data => createAPI(`/plm/projectToolingApplication/comfirmProjectToolApply`,'post',data)
 
diff --git a/src/views/modules/oss/ossComponents.vue b/src/views/modules/oss/ossComponents.vue
index d5dadef..1b99881 100644
--- a/src/views/modules/oss/ossComponents.vue
+++ b/src/views/modules/oss/ossComponents.vue
@@ -65,6 +65,7 @@ export default {
         orderRef3:'',
         remark:''
       },
+      operatorFlag: true,
       fileList:[],
     }
   },
@@ -272,7 +273,7 @@ export default {
 <template>
 <div>
   <template v-if="saveVisible">
-    <el-button type="primary" v-if="this.orderRef1 && this.orderRef2 && !disabled" @click="handleUpload">上传附件</el-button>
+    <el-button type="primary" v-if="this.orderRef1 && this.orderRef2 && !disabled && operatorFlag" @click="handleUpload">上传附件</el-button>
   </template>
   <template v-if="downloadVisible">
     <el-button type="primary" @click="handleDownload">下载</el-button>
@@ -308,7 +309,7 @@ export default {
       width="120"
       label="操作" v-if="removeVisible || previewVisible">
       <template slot-scope="{row,$index}">
-        <template v-if="removeVisible">
+        <template v-if="removeVisible&&operatorFlag">
           <el-link style="cursor:pointer;" v-if="!disabled" @click="handleRemove(row)">删除</el-link>
         </template>
         <template v-if="previewVisible">
diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue
index 340403a..791d2a2 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationList.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue
@@ -1125,6 +1125,7 @@
       })
     },
     activated () {
+      console.log(this.$route.params.type)
       if (this.$route.params.type === 'tokenLogin') {
         if (this.$route.params.docNo) {
           // this.searchData.applyNo = this.$route.params.docNo
diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue
index 1aba01c..8c13626 100644
--- a/src/views/modules/tooling/searchToolApply.vue
+++ b/src/views/modules/tooling/searchToolApply.vue
@@ -226,7 +226,7 @@
         </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>
+        <oss-components height="25vh" ref="oss" :operatorFlag="operatorFlag" :dataList="fileList" label="附件" :columns="ossColumns" :order-ref1="currentRow.site" :order-ref2="currentRow.applyNo"></oss-components>
       </el-tab-pane>
       <!-- 审批信息 -->
       <el-tab-pane label="审批信息" name="approvalInformation">
@@ -291,15 +291,34 @@
         </el-form-item>
       </el-form>
       <el-tabs style="font-size: 12px;min-height: 330px;margin-top: 60px" class="customer-tab" v-model="activeModelName" type="border-card">
+        <el-tab-pane label="基本信息" name="attribute">
+          <order-attribute
+            :disabled="currentRow.status === '已完成'"
+            :order-no="currentRow.applyNo"
+            :approval-username="currentRow.sp"
+            :proofing-status="currentRow.status"
+            :super-admin="superAdmin"
+            :code-no="'toolApply'"
+            :function-type="'TL_Receipt'">
+          </order-attribute>
+        </el-tab-pane>
         <el-tab-pane label="工具明细" name="detail">
           <div class="rq">
+<!--            <el-button type="primary" @click="toolDetailFlag = true" >新增</el-button>-->
+<!--            <el-button type="primary" @click="toolDetailBatchDelete" >删除</el-button>-->
             <el-table
               height="278"
               :data="toolData"
               border
+              @selection-change="selectionChangeHandle"
               ref="toolTable"
               v-loading="dataListLoading"
               style="width: 100%;">
+              <el-table-column
+                type="selection"
+                align="center"
+                width="55">
+              </el-table-column>
               <el-table-column
                 v-for="(item,index) in columnList2" :key="index"
                 :sortable="item.columnSortable"
@@ -331,12 +350,12 @@
             <el-row :gutter="15">
               <el-col :span="6">
                 <el-form-item label="IFS PR编号">
-                  <el-input v-model="modelData.prNo" :disabled="$store.state.user.name!==dataForm.tp"></el-input>
+                  <el-input v-model="modelData.prNo" :disabled="$store.state.user.name!==dataForm.tp&&!superAdmin"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="备注" style="height: 80px">
-                  <el-input type="textarea" v-model="modelData.remark1" :rows="3" style="height: 60px" :disabled="$store.state.user.name!==dataForm.tp"></el-input>
+                <el-form-item label="备注" style="height: 240px">
+                  <el-input type="textarea" v-model="modelData.remark1" :rows="3" style="height: 60px" :disabled="$store.state.user.name!==dataForm.tp&&!superAdmin"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -347,31 +366,35 @@
             <el-row :gutter="15" style="margin-top: 0px">
               <el-col :span="6">
                 <el-form-item label="采购订单号">
-                  <el-input v-model="modelData.poNo" :disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
+                  <el-input v-model="modelData.poNo" :disabled="$store.state.user.name!==dataForm.purchaser&&!superAdmin"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="厂商名称">
-                  <el-input v-model="modelData.supplierName" :disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
+                  <el-input v-model="modelData.supplierName" :disabled="$store.state.user.name!==dataForm.purchaser&&!superAdmin"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="总成本(元)">
-                  <el-input v-model="modelData.allCost" type="number" :disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
+                  <el-input v-model="modelData.allCost" type="number" :disabled="$store.state.user.name!==dataForm.purchaser&&!superAdmin"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="15" style="margin-top: 0px">
               <el-col :span="24">
-                <el-form-item label="备注" style="height: 80px">
-                  <el-input type="textarea" v-model="modelData.remark2" :rows="3" style="height: 60px" :disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
+                <el-form-item label="备注" style="height: 240px">
+                  <el-input type="textarea" v-model="modelData.remark2" :rows="3" style="height: 60px" :disabled="$store.state.user.name!==dataForm.purchaser&&!superAdmin"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </el-tab-pane>
+        <el-tab-pane label="附件信息" name="down">
+          <oss-components height="25vh" :operatorFlag="operatorFlag" :dataList="fileList" label="附件" :columns="ossColumns" :order-ref1="currentRow.site" :order-ref2="currentRow.applyNo"></oss-components>
+        </el-tab-pane>
       </el-tabs>
       <el-footer style="height:35px;margin-top:15px;text-align:center">
+        <el-button type="primary" @click="apply()" class="bigButton">{{ '应用' }}</el-button>
         <el-button type="primary" @click="saveData()" class="bigButton">{{ '保存' }}</el-button>
         <el-button type="primary" @click="visibleU = false" class="bigButton">{{ '取消' }}</el-button>
       </el-footer>
@@ -429,15 +452,32 @@
         </el-form-item>
       </el-form>
       <el-tabs style="font-size: 12px;min-height: 330px;margin-top: 60px" class="customer-tab" v-model="activeModelName" type="border-card">
+        <el-tab-pane label="基本信息" name="attribute">
+          <order-attribute
+            :disabled="currentRow.status === '已完成'"
+            :order-no="currentRow.applyNo"
+            :approval-username="currentRow.sp"
+            :proofing-status="currentRow.status"
+            :super-admin="superAdmin"
+            :code-no="'toolApply'"
+            :function-type="'TL_Receipt'">
+          </order-attribute>
+        </el-tab-pane>
         <el-tab-pane label="工具明细" name="detail">
           <div class="rq">
             <el-table
               height="278"
               :data="toolData"
               border
+              @selection-change="selectionChangeHandle"
               ref="toolTable"
               v-loading="dataListLoading"
               style="width: 100%;">
+              <el-table-column
+                type="selection"
+                align="center"
+                width="55">
+              </el-table-column>
               <el-table-column
                 v-for="(item,index) in columnList2" :key="index"
                 :sortable="item.columnSortable"
@@ -469,12 +509,12 @@
             <el-row :gutter="15">
               <el-col :span="6">
                 <el-form-item label="IFS PR编号">
-                  <el-input v-model="modelData.prNo" :disabled="$store.state.user.name !== dataForm.tp"></el-input>
+                  <el-input v-model="modelData.prNo" :disabled="$store.state.user.name !== dataForm.tp&&!superAdmin"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item label="备注" style="height: 100px">
-                  <el-input type="textarea" v-model="modelData.remark1" :rows="3" :disabled="$store.state.user.name !== dataForm.tp"></el-input>
+                <el-form-item label="备注" style="height: 240px">
+                  <el-input type="textarea" v-model="modelData.remark1" :rows="3" :disabled="$store.state.user.name !== dataForm.tp&&!superAdmin"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -485,30 +525,33 @@
             <el-row :gutter="15">
               <el-col :span="6">
                 <el-form-item label="采购订单号">
-                  <el-input v-model="modelData.poNo" :disabled="$store.state.user.name !== dataForm.purchaser"></el-input>
+                  <el-input v-model="modelData.poNo" :disabled="$store.state.user.name !== dataForm.purchaser&&!superAdmin"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="厂商名称">
-                  <el-input v-model="modelData.supplierName" :disabled="$store.state.user.name !== dataForm.purchaser"></el-input>
+                  <el-input v-model="modelData.supplierName" :disabled="$store.state.user.name !== dataForm.purchaser&&!superAdmin"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="总成本(元)">
-                  <el-input v-if="accessField('10601001')" v-model="modelData.allCost" type="number" :disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
+                  <el-input v-if="accessField('10601001')" v-model="modelData.allCost" type="number" :disabled="$store.state.user.name!==dataForm.purchaser&&!superAdmin"></el-input>
                   <el-input v-if="!accessField('10601001')" v-model="valueNull" style="width: 130px" disabled></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="15">
               <el-col :span="24">
-                <el-form-item label="备注" style="height: 100px">
-                  <el-input type="textarea" v-model="modelData.remark2" :rows="3" :disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
+                <el-form-item label="备注" style="height: 240px">
+                  <el-input type="textarea" v-model="modelData.remark2" :rows="3" :disabled="$store.state.user.name!==dataForm.purchaser&&!superAdmin"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </el-tab-pane>
+        <el-tab-pane label="附件信息" name="down">
+          <oss-components height="25vh" :dataList="fileList" :operatorFlag="operatorFlag" label="附件" :columns="ossColumns" :order-ref1="currentRow.site" :order-ref2="currentRow.applyNo"></oss-components>
+        </el-tab-pane>
       </el-tabs>
       <el-footer style="height:35px;margin-top:15px;text-align:center">
         <template v-if="dataForm.status === '草稿' || (dataForm.status === '审批中' && ((dataForm.sp && dataForm.sp.split(';').includes(sp)) || superAdmin))">
@@ -589,6 +632,38 @@
       </el-footer>
     </el-dialog>
 
+    <el-dialog title="新增工具明细" top="30vh" :close-on-click-modal="false" v-drag :visible.sync="toolDetailFlag">
+      <el-form :inline="true"  label-position="top" :model="toolDetailData" :rules="toolDetailRules">
+        <el-form-item label="项目号">
+          <el-input v-model="toolDetailData.orderRef1" style=""></el-input>
+        </el-form-item>
+        <el-form-item label="项目名称">
+          <el-input v-model="toolDetailData.projectName"></el-input>
+        </el-form-item>
+        <el-form-item label="客户名称">
+          <el-input v-model="toolDetailData.customerName"></el-input>
+        </el-form-item>
+        <el-form-item label="PLM物料编码">
+          <el-input v-model="toolDetailData.plmPartNo"></el-input>
+        </el-form-item>
+        <el-form-item label="IFS物料编码">
+          <el-input v-model="toolDetailData.ifsPartNo"></el-input>
+        </el-form-item>
+        <el-form-item label="物料名称">
+          <el-input v-model="toolDetailData.partDesc"></el-input>
+        </el-form-item>
+        <el-form-item label="客户料号">
+          <el-input v-model="toolDetailData.customerPartNo"></el-input>
+        </el-form-item>
+        <el-form-item label="工具编码">
+          <el-input v-model="toolDetailData.toolId"></el-input>
+        </el-form-item>
+        <el-form-item label="工具描述">
+          <el-input v-model="toolDetailData.toolDesc"></el-input>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+
     <!-- 上传文件的modal -->
     <projectUploadFile ref="projectUploadFile" @refreshPageTables="getFileContentData()" v-drag></projectUploadFile>
 
@@ -633,7 +708,7 @@ import DictDataSelect from "../sys/dict-data-select.vue"
 import orderAttribute from "../demoComponents/orderProperties"
 import FilterSearch from "../../common/filterSearch.vue";
 import {technicalSpecificationListSearchByAnyField} from "../../../api/sampleManagement/technicalSpecificationList";
-import {searchProjectToolApplyHeaderByAnyField} from "../../../api/tool/toolApply";
+import {searchProjectToolApplyHeaderByAnyField, toolDetailBatchDelete} from "../../../api/tool/toolApply";
 import {isAuth} from "../../../utils";
 /*組件*/
 export default {
@@ -678,6 +753,7 @@ export default {
       visible: false,
       filterVisible: false,
       isFilterSearch: false,
+      operatorFlag: false,
       filterSearchData: {},
       fileContentList: [],
       activeName: 'detail',
@@ -696,6 +772,8 @@ export default {
       },
       nodeOptions: [],
       toolData: [],
+      fileList: [],
+      selectionDataList: [],
       visibleU: false,
       plmChangeApplyHeaderArr: [],
       plmChangeApplyDetailArr: [],
@@ -735,8 +813,12 @@ export default {
         supplierName: '',
         allCost: '',
         remark2: '',
+      },
+      toolDetailData:{
+
       },
       modelFlag: false,
+      toolDetailFlag: false,
       currentRow: {},
       currentRow2: {},
       height: 200,
@@ -1162,6 +1244,24 @@ export default {
           fixed: '',
           columnWidth: 40
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 106002,
+          serialNumber: '106002Table2SeqNo',
+          tableId: '106002Table2',
+          tableName: '工具申请明细',
+          columnProp: 'customerName',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '客户名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 170
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 106002,
@@ -1180,6 +1280,24 @@ export default {
           fixed: '',
           columnWidth: 100
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 106002,
+          serialNumber: '106002Table2QuotationNo',
+          tableId: '106002Table2',
+          tableName: '工具申请明细',
+          columnProp: 'projectName',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '项目名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 220
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 106002,
@@ -1442,6 +1560,29 @@ export default {
           fixed: false
         },
       ],
+      toolDetailRules:{
+        agentId:[
+          {
+            required: true,
+            message: ' ',
+            trigger: 'change'
+          }
+        ],
+        agentName:[
+          {
+            required: true,
+            message: ' ',
+            trigger: 'change'
+          }
+        ],
+        active:[
+          {
+            required: true,
+            message: ' ',
+            trigger: 'change'
+          }
+        ],
+      },
       approvalList: [],
       rejectOpinion: '',
       submitModalFlag: false,
@@ -1458,6 +1599,15 @@ export default {
     //
     //   }
     // }
+    visibleU (newV, oldV) {
+      this.$refs.oss.handleQuery()
+      this.$refs.dialogAttribute.getProperties()
+    },
+
+    visible(newV, oldV){
+      this.$refs.oss.handleQuery()
+      this.$refs.dialogAttribute.getProperties()
+    }
   },
 
   mounted() {
@@ -1656,6 +1806,7 @@ export default {
     },
     //单击切换订单
     changeData(row) {
+      this.operatorFlag = this.superAdmin || (this.dataForm.sp && this.dataForm.sp.split(';').includes(sp))
       this.currentRow = JSON.parse(JSON.stringify(row));
       this.currentRow2 = row;
       this.refreshCurrentTabTable();
@@ -2157,7 +2308,7 @@ export default {
           //区分请求成功和失败的状况
           if (data && data.code === 0) {
             if (data.rows == null || data.rows.length === 0) {
-              this.$alert('该物料未创建技术参数卡', '警告', {confirmButtonText: '确定',});
+              this.$alert('该物料未创建技术参数卡！', '警告', {confirmButtonText: '确定',});
             }
             this.$router.push({
               name: `sampleManagement-technicalSpecificationList`,
@@ -2220,9 +2371,82 @@ export default {
       this.isFilterSearch = true
       this.filterVisible = false
     },
+
+    selectionChangeHandle(val){
+      this.selectionDataList = val;
+    },
+
+    toolDetailBatchDelete(){
+      if (this.selectionDataList.length === 0) {
+        this.$message.warning('请勾选要删除的工具明细信息！')
+        return
+      }
+      this.$confirm(`是否删除这 ` + this.selectionDataList.length + ` 条工具明细信息?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        // let tempData = {
+        //   ____: this.selectionDataList
+        // }
+        toolDetailBatchDelete(this.selectionDataList).then(({data}) => {
+          if (data && data.code === 0) {
+            this.searchToolApplyDetail()
+            this.selectionDataList = []
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+              }
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      })
+    },
+
+    apply(){
+      this.dataForm.detailList = this.toolData
+      editToolApplication(this.dataForm).then(({data}) => {
+        if (data && data.code === 0) {
+          this.saveHeaderMessage2()
+          for (let i = 0; i < this.dataList1.length; i++) {
+            if (this.dataList1[i].applyNo === this.dataForm.applyNo) {
+              this.dataList1[i].remark = this.dataForm.remark
+              this.dataList1[i].applySumQty = this.dataForm.applySumQty
+              this.dataList1[i].applyReason = this.dataForm.applyReason
+              this.dataList1[i].quoter = this.dataForm.quoter
+              this.dataList1[i].tp = this.dataForm.tp
+              this.dataList1[i].totalCost = this.dataForm.totalCost
+              this.dataList1[i].purchaser = this.dataForm.purchaser
+              this.dataList1[i].quoterName = this.dataForm.quoterName
+              this.dataList1[i].tpName = this.dataForm.tpName
+              this.dataList1[i].purchaserName = this.dataForm.purchaserName
+            }
+          }
+          this.refreshCurrentTabTable()
+          // this.$message({
+          //   message: '操作成功',
+          //   type: 'success',
+          //   duration: 1500,
+          //   onClose: () => {
+          //   }
+          // })
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
+        }
+      })
+    }
   },
 
   activated() {
+    this.checkSuperAdmin()
     if (this.$route.params.type === 'tokenLogin') {
       console.log("进来啦")
       if (this.$route.params.docNo) {