From 3782280cf6de3c0d4fb136c2433f911d100daf1d Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 24 Jun 2025 14:55:23 +0800
Subject: [PATCH] =?UTF-8?q?2025-06-24=20=E6=8C=89=E9=92=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=EF=BC=9A=E5=8C=85=E6=8B=AC=E8=AF=A2=E4=BB=B7=E3=80=81?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E3=80=81=E6=89=93=E6=A0=B7=E3=80=81=E5=88=80?=
 =?UTF-8?q?=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/changeManagement/changeRecord.vue |  82 ++++---------
 .../demoComponents/orderProperties.vue        | 107 ++++++++--------
 .../modules/proofing/requestForProofing.vue   |  26 ++--
 .../quotation/priceCheckProperties.vue        |  63 ++++++----
 .../modules/quotation/requestForQuote.vue     |  21 +++-
 src/views/modules/test/requestForTest.vue     |  29 +++--
 .../test/testAttribute/testProperties.vue     |  45 ++++---
 src/views/modules/tooling/searchToolApply.vue | 114 +++++++-----------
 8 files changed, 241 insertions(+), 246 deletions(-)

diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue
index ad654ea..7aee47b 100644
--- a/src/views/modules/changeManagement/changeRecord.vue
+++ b/src/views/modules/changeManagement/changeRecord.vue
@@ -221,7 +221,7 @@
               <div class="rq">
                 <el-table
                   :data="chooseDataList"
-                  height="320px"
+                  height="345px"
                   border
                   style="width:100%">
 <!--                  <el-table-column-->
@@ -335,20 +335,6 @@
               </div>
             </el-form>
           </div>
-          <el-footer style="height:25px;text-align:center">
-            <template v-if="modalData.changeStatus === '草稿' || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2) && modalData.changeStatus === '审批中')">
-              <el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
-            </template>
-            <el-button type="primary" @click="modalFlag = false">关闭</el-button>
-            <template v-if="superAdmin || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2))">
-              <template v-if="authSubmit">
-                <el-button v-if="modalData.changeStatus === '审批中' && modalData.tpProcessControl !== 'Y' && modalData.csProcessControl !== 'Y'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
-              </template>
-              <template v-if="authReject">
-                <el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
-              </template>
-            </template>
-          </el-footer>
         </el-tab-pane>
 
         <el-tab-pane label="库存成本影响" name="inventoryCostImpact" v-loading="submitLoading">
@@ -442,20 +428,6 @@
               </el-form-item>
             </el-form>
           </div>
-          <el-footer style="height:25px;text-align:center">
-            <template v-if="modalData.changeStatus === '草稿' || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2) && modalData.changeStatus === '审批中')">
-              <el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
-            </template>
-            <el-button type="primary" @click="modalFlag = false">关闭</el-button>
-            <template v-if="superAdmin || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2))">
-              <template v-if="authSubmit">
-                <el-button v-if="modalData.changeStatus === '审批中' && modalData.tpProcessControl !== 'Y' && modalData.csProcessControl !== 'Y'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
-              </template>
-              <template v-if="authReject">
-                <el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
-              </template>
-            </template>
-          </el-footer>
         </el-tab-pane >
 
         <el-tab-pane label="TP&执行信息" name="actionInformation" v-loading="submitLoading">
@@ -464,7 +436,7 @@
             <div class="rq">
               <el-table
                 :data="chooseItemList2"
-                height="230px"
+                height="232px"
                 border
                 style="width: 100%">
                 <el-table-column
@@ -549,7 +521,7 @@
             <div class="rq">
               <el-table
                 :data="chooseItemList"
-                height="230px"
+                height="265px"
                 border
                 style="width: 100%">
                 <el-table-column
@@ -600,29 +572,15 @@
               </el-table>
             </div>
           </div>
-          <el-footer style="height:25px;text-align:center">
-            <template v-if="modalData.changeStatus === '草稿' || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2) && modalData.changeStatus === '审批中')">
-              <el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
-            </template>
-            <el-button type="primary" @click="modalFlag = false">关闭</el-button>
-            <template v-if="superAdmin || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2))">
-              <template v-if="authSubmit">
-                <el-button v-if="modalData.changeStatus === '审批中' && modalData.tpProcessControl !== 'Y' && modalData.csProcessControl !== 'Y'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
-              </template>
-              <template v-if="authReject">
-                <el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
-              </template>
-            </template>
-          </el-footer>
         </el-tab-pane>
 
         <el-tab-pane label="会签信息" name="countersignature" v-loading="submitLoading">
-          <div style="height: 670px">
+          <div style="height: 705px">
             <el-button type="primary" @click="chooseCSModel">选择会签信息</el-button>
             <div class="rq">
               <el-table
                 :data="chooseCSItemList"
-                height="600px"
+                height="675px"
                 border
                 style="width: 100%">
                 <el-table-column
@@ -662,22 +620,24 @@
               </el-table>
             </div>
           </div>
-          <el-footer style="height:25px;text-align:center">
-            <template v-if="modalData.changeStatus === '草稿' || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2) && modalData.changeStatus === '审批中')">
-              <el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
-            </template>
-            <el-button type="primary" @click="modalFlag = false">关闭</el-button>
-            <template v-if="superAdmin || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2))">
-              <template v-if="authSubmit">
-                <el-button v-if="modalData.changeStatus === '审批中' && modalData.tpProcessControl !== 'Y' && modalData.csProcessControl !== 'Y'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
-              </template>
-              <template v-if="authReject">
-                <el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
-              </template>
-            </template>
-          </el-footer>
         </el-tab-pane>
       </el-tabs>
+      <el-footer style="height:35px;margin-top: 15px;text-align:center">
+        <template v-if="modalData.changeStatus === '草稿' || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2) && modalData.changeStatus === '审批中')">
+          <el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
+        </template>
+        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+        <template v-if="authSubmit">
+          <template v-if="superAdmin || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2))">
+            <el-button v-if="modalData.changeStatus === '审批中' && modalData.tpProcessControl !== 'Y' && modalData.csProcessControl !== 'Y'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
+          </template>
+        </template>
+        <template v-if="authReject">
+          <template v-if="superAdmin || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2))">
+            <el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
+          </template>
+        </template>
+      </el-footer>
     </el-dialog>
 
     <!-- 页签 -->
diff --git a/src/views/modules/demoComponents/orderProperties.vue b/src/views/modules/demoComponents/orderProperties.vue
index 5cfe634..e62aaeb 100644
--- a/src/views/modules/demoComponents/orderProperties.vue
+++ b/src/views/modules/demoComponents/orderProperties.vue
@@ -1,25 +1,20 @@
 <template>
   <div>
     <div style="margin-top: 5px">
-<!--      <template v-if="approvalUsername && approvalUsername.split(';').includes($store.state.user.name)">-->
-<!--        <template v-if="isAuth('103001:tab1:save')">-->
-<!--          <el-button type="primary" @click="clickSaveBtn" v-if="orderNo && proofingStatus === '审批中'" :disabled="disabled">新增</el-button>-->
-<!--        </template>-->
-<!--        <template v-if="isAuth('103001:tab1:update')">-->
-<!--          <el-button type="primary" :loading="loading" v-if="orderNo && proofingStatus === '审批中'" :disabled="disabled" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>-->
-<!--        </template>-->
-<!--        <template v-if="isAuth('103001:tab1:save')">-->
-<!--          <el-button type="primary" @click="refreshPropertiesModal" :disabled="disabled" v-if="attributeDialog && orderNo && proofingStatus === '审批中'">刷新属性模板</el-button>-->
-<!--        </template>-->
-<!--      </template>-->
       <template v-if="isAuth('103001:tab1:save')">
-        <el-button type="primary" @click="clickSaveBtn" v-if="orderNo" :disabled="disabled">新增</el-button>
+        <template v-if="proofingStatus === '草稿' || superAdmin || (approvalUsername && approvalUsername.split(';').includes(sp) && proofingStatus === '审批中')">
+          <el-button type="primary" @click="clickSaveBtn" v-if="orderNo && !disabled">新增</el-button>
+        </template>
       </template>
       <template v-if="isAuth('103001:tab1:update')">
-        <el-button type="primary" :loading="loading" v-if="orderNo" :disabled="disabled" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>
+        <template v-if="proofingStatus === '草稿' || superAdmin || (approvalUsername && approvalUsername.split(';').includes(sp) && proofingStatus === '审批中')">
+          <el-button type="primary" :loading="loading" v-if="orderNo && !disabled" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>
+        </template>
       </template>
       <template v-if="isAuth('103001:tab1:save')">
-        <el-button type="primary" @click="refreshPropertiesModal" :disabled="disabled" v-if="attributeDialog && orderNo">刷新属性模板</el-button>
+        <template v-if="proofingStatus === '草稿' || superAdmin || (approvalUsername && approvalUsername.split(';').includes(sp) && proofingStatus === '审批中')">
+          <el-button type="primary" v-if="attributeDialog && orderNo && !disabled" @click="refreshPropertiesModal">刷新属性模板</el-button>
+        </template>
       </template>
     </div>
     <div class="rq " v-if="attributeDialog">
@@ -140,15 +135,19 @@ export default {
     disabled: {
       type:Boolean,
       default:false,
+    },
+    superAdmin: {
+      type: Boolean,
+      default: false
     }
   },
-  data(){
-    return{
-      height:320,
-      loading:false,
-      attributeDialog:true,
-      copyAttributeList:[],
-      attributeSaveDialog:false,
+  data () {
+    return {
+      height: 320,
+      loading: false,
+      attributeDialog: true,
+      copyAttributeList: [],
+      attributeSaveDialog: false,
       productColumnList: [
         {
           userId: this.$store.state.user.name,
@@ -290,21 +289,22 @@ export default {
         //   fixed: '',
         // },
       ],
-      searchDataList:[],
-      dataList:[],
-      dataList2:[],
+      searchDataList: [],
+      dataList: [],
+      dataList2: [],
+      sp: this.$store.state.user.name,
     }
   },
-  watch:{
-    orderNo(newValue,oldValue){
-      if (newValue){
-        this.getProperties();
+  watch: {
+    orderNo (newValue, oldValue) {
+      if (newValue) {
+        this.getProperties()
       }
     },
   },
   methods:{
 
-    refreshPropertiesModal(){
+    refreshPropertiesModal () {
       this.$confirm(`是否刷新至最新模板界面，已填数据会更新到新模板中，若旧属性在新模板中被删除，该条数据会消失。`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -318,11 +318,11 @@ export default {
         }
         refreshPropertiesModal(params).then(({data}) => {
           if (data && data.code === 0) {
-            this.$message.success('操作成功');
-            this.getProperties();
-            this.attributeDialog = true;
+            this.$message.success('操作成功')
+            this.getProperties()
+            this.attributeDialog = true
           } else {
-            this.$message.warning(data.msg);
+            this.$message.warning(data.msg)
           }
           this.loading = false
         }).catch((error) => {
@@ -331,7 +331,8 @@ export default {
         })
       })
     },
-    getProperties(){
+
+    getProperties () {
       let params = {
         site:this.$store.state.user.site,
         partNo: this.orderNo,
@@ -340,39 +341,41 @@ export default {
       }
       getPropertiesListByPartAndCodeNo(params).then(({data})=>{
         if (data && data.code === 0){
-          this.dataList = data.rows;
-          this.dataList2 = JSON.parse(JSON.stringify(data.rows));
+          this.dataList = data.rows
+          this.dataList2 = JSON.parse(JSON.stringify(data.rows))
           for (let i = 0; i <this.dataList2.length ; i++) {
             this.dataList2[i].itemNo=  this.dataList2[i].propertiesItemNo
           }
           this.searchAttributeList({})
-        }else {
+        } else {
           this.$message.warning(data.msg)
         }
       }).catch((error)=>{
         this.$message.error(error)
       })
     },
-    clickSave(){
-      if(this.dataList.length==0){
+
+    clickSave () {
+      if (this.dataList.length === 0) {
         return false
       }
-      if (!this.attributeDialog){
-        this.updateTestPropertiesList();
-      }else {
+      if (!this.attributeDialog) {
+        this.updateTestPropertiesList()
+      } else {
         this.copyAttributeList = JSON.parse(JSON.stringify(this.dataList))
-        this.attributeDialog = false;
+        this.attributeDialog = false
       }
     },
-    updateTestPropertiesList(){
+
+    updateTestPropertiesList () {
       this.loading = true
       updatePropertiesList(this.copyAttributeList).then(({data})=>{
         if (data && data.code === 0){
-          this.$message.success('操作成功');
-          this.getProperties();
-          this.attributeDialog = true;
-        }else {
-          this.$message.warning(data.msg);
+          this.$message.success('操作成功')
+          this.getProperties()
+          this.attributeDialog = true
+        } else {
+          this.$message.warning(data.msg)
         }
         this.loading = false
       }).catch((error)=>{
@@ -380,7 +383,8 @@ export default {
         this.loading = false
       })
     },
-    clickSaveBtn(){
+
+    clickSaveBtn () {
       if (!this.attributeDialog) {
         this.$message.warning('请保存更改！')
         return
@@ -389,7 +393,8 @@ export default {
       this.searchAttributeList({})
       this.attributeSaveDialog = true;
     },
-    saveTestPropertiesItem(params){
+
+    saveTestPropertiesItem (params) {
       let i = 0;
       let arr = params.searchTableList.map(item=>{
         item.partNo = this.orderNo;
diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue
index 50f26c8..1f9f25c 100644
--- a/src/views/modules/proofing/requestForProofing.vue
+++ b/src/views/modules/proofing/requestForProofing.vue
@@ -374,11 +374,13 @@
           <el-button type="primary" @click="saveData()">保存</el-button>
         </template>
         <el-button type="primary" @click="modalFlag = false">关闭</el-button>
-        <template v-if="superAdmin || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name))">
-          <template v-if="isAuth('103001:submit')">
+        <template v-if="isAuth('103001:submit')">
+          <template v-if="superAdmin || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name))">
             <el-button v-if="modalData.proofingStatus === '审批中'" type="primary" @click="agreeSubmit">同意</el-button>
           </template>
-          <template v-if="isAuth('103001:rejected')">
+        </template>
+        <template v-if="isAuth('103001:rejected')">
+          <template v-if="superAdmin || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name))">
             <el-button v-if="modalData.proofingStatus === '审批中' && modalData.isReject === 'Y'" @click="rejectVisible = true" type="primary">驳回</el-button>
           </template>
         </template>
@@ -545,13 +547,15 @@
     <!-- 页签 -->
     <el-tabs v-model="activeTable" style="margin-top: 0px; width: 100%; min-height: 300px;" type="border-card" @tab-click="tabClick" class="customer-tab">
       <el-tab-pane label="基本信息" name="attribute">
-        <proofing-attribute ref="dialogAttribute"
-                            :disabled="proofingCurrentRow.proofingStatus === '已完成'"
-                            :order-no="proofingCurrentRow.proofingNo"
-                            :approval-username="proofingCurrentRow.approvalUsername"
-                            :proofing-status="proofingCurrentRow.proofingStatus"
-                            :code-no="'Proofing'"
-                            :function-type="'order'">
+        <proofing-attribute
+          ref="dialogAttribute"
+          :disabled="proofingCurrentRow.proofingStatus === '已完成'"
+          :order-no="proofingCurrentRow.proofingNo"
+          :approval-username="proofingCurrentRow.approvalUsername"
+          :proofing-status="proofingCurrentRow.proofingStatus"
+          :super-admin="superAdmin"
+          :code-no="'Proofing'"
+          :function-type="'order'">
         </proofing-attribute>
       </el-tab-pane>
       <!-- 项目信息页签 -->
@@ -858,9 +862,11 @@ import BuSelect from "../base/BuSelect.vue";
 import CustomerInfo from "../quotation/sellForQuotation/customerInfo.vue";
 import FilterSearch from "../../common/filterSearch.vue";
 import {testInformationSearchAny} from "../../../api/test/testInformation";
+import PriceCheckProperties from "../quotation/priceCheckProperties.vue";
 
 export default {
   components: {
+    PriceCheckProperties,
     FilterSearch,
     CustomerInfo,
     BuSelect,
diff --git a/src/views/modules/quotation/priceCheckProperties.vue b/src/views/modules/quotation/priceCheckProperties.vue
index fb1ad63..a4dc48b 100644
--- a/src/views/modules/quotation/priceCheckProperties.vue
+++ b/src/views/modules/quotation/priceCheckProperties.vue
@@ -12,37 +12,47 @@ import TransferTable from "../common/transferTable.vue";
 export default {
   name: "priceCheckProperties",
   components: {TransferTable},
-  props:{
-    dataList:{
+  props: {
+    dataList: {
       type: Array,
       default: ()=>[],
     },
-    quotationNo:{
-      type:String,
+    quotationNo: {
+      type: String,
     },
-    columnList:{
+    columnList: {
       type: Array,
       default: ()=>[],
     },
-    height:{
-      type:[Number,String],
-      default:300
+    height: {
+      type: [Number,String],
+      default: 300
     },
-    disabled:{
-      type:Boolean,
-      default:false
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    approvalUsername: {
+      type: String,
+    },
+    quotationStatus: {
+      type: String,
+    },
+    superAdmin: {
+      type: Boolean,
+      default: false
     }
   },
-  model:{
-    prop:"dataList",
-    event:"change"
+  model: {
+    prop: "dataList",
+    event: "change"
   },
-  data(){
-    return{
-      attributeSaveDialog:false,
-      loading:false,
-      attributeDialog:true,
-      copyAttributeList:[],
+  data () {
+    return {
+      attributeSaveDialog: false,
+      loading: false,
+      attributeDialog: true,
+      copyAttributeList: [],
       productColumnList: [
         {
           userId: this.$store.state.user.name,
@@ -184,7 +194,8 @@ export default {
         //   fixed: '',
         // },
       ],
-      searchDataList:[],
+      searchDataList: [],
+      sp: this.$store.state.user.name,
     }
   },
   methods:{
@@ -310,11 +321,15 @@ export default {
 <template>
   <div>
     <div style="margin-top: 5px">
-      <template  v-if="isAuth('102001001:tab1:save')">
-        <el-button type="primary" :loading="loading" v-if="quotationNo && !disabled" @click="saveBtnClick">新增</el-button>
+      <template v-if="isAuth('102001001:tab1:save')">
+        <template v-if="quotationStatus === '草稿' || superAdmin || (approvalUsername && approvalUsername.split(';').includes(sp) && quotationStatus === '审批中')">
+          <el-button type="primary" :loading="loading" v-if="quotationNo && !disabled" @click="saveBtnClick">新增</el-button>
+        </template>
       </template>
       <template v-if="isAuth('102001001:tab1:update')">
-        <el-button type="primary" @click="saveClick" v-if="quotationNo && !disabled">{{ attributeDialog?'编辑':'保存' }}</el-button>
+        <template v-if="quotationStatus === '草稿' || superAdmin || (approvalUsername && approvalUsername.split(';').includes(sp) && quotationStatus === '审批中')">
+          <el-button type="primary" @click="saveClick" v-if="quotationNo && !disabled">{{ attributeDialog?'编辑':'保存' }}</el-button>
+        </template>
       </template>
     </div>
     <div class="rq" v-if="attributeDialog">
diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue
index 96e68e4..c6b39cd 100644
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@@ -378,11 +378,13 @@
           <el-button type="primary" v-if="!detailVisible" @click="saveData">保存</el-button>
         </template>
         <el-button type="primary" @click="modalFlag = false">关闭</el-button>
-        <template v-if="superAdmin || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name))">
-          <template v-if="isAuth('102001001:submit')">
+        <template v-if="isAuth('102001001:submit')">
+          <template v-if="superAdmin || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name))">
             <el-button v-if="modalData.quotationStatus === '审批中'" type="primary" @click="agreeSubmit">同意</el-button>
           </template>
-          <template v-if="isAuth('102001001:rejected')">
+        </template>
+        <template v-if="isAuth('102001001:rejected')">
+          <template v-if="superAdmin || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name))">
             <el-button v-if="modalData.quotationStatus === '审批中' && modalData.isReject === 'Y'" type="primary" @click="rejectVisible = true">驳回</el-button>
           </template>
         </template>
@@ -574,10 +576,19 @@
     <!-- 页签 -->
     <el-tabs v-model="activeTable" type="border-card" style="margin-top: 0px;" @tab-click="tabClick" class="customer-tab">
       <el-tab-pane label="基本信息" name="priceCheck">
-        <price-check-properties :disabled="quotationCurrentRow.quotationStatus === '已完成'" ref="tabProperties" v-model:data-list="priceCheckPropertiesList" :quotation-no="quotationCurrentRow.quotationBatchNo" height="45vh"></price-check-properties>
+        <price-check-properties
+          :disabled="quotationCurrentRow.quotationStatus === '已完成'"
+          ref="tabProperties"
+          v-model:data-list="priceCheckPropertiesList"
+          :quotation-no="quotationCurrentRow.quotationBatchNo"
+          :approval-username="quotationCurrentRow.approvalUsername"
+          :quotation-status="quotationCurrentRow.quotationStatus"
+          :super-admin="superAdmin"
+          height="45vh">
+        </price-check-properties>
       </el-tab-pane>
       <el-tab-pane label="采购详细信息" name="tabMaterialSourcing">
-        <price-check-detail :disabled="quotationCurrentRow.quotationStatus === '已完成'" :quote="quotationCurrentRow"  :data-list="priceCheckDetailList" @refresh="getPriceCheckDetailList" :height="500"></price-check-detail>
+        <price-check-detail :disabled="quotationCurrentRow.quotationStatus === '已完成'" :quote="quotationCurrentRow" :data-list="priceCheckDetailList" @refresh="getPriceCheckDetailList" :height="500"></price-check-detail>
       </el-tab-pane>
       <!-- 项目信息页签 -->
       <el-tab-pane label="项目信息" name="project_information">
diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue
index 68ed0ab..007e167 100644
--- a/src/views/modules/test/requestForTest.vue
+++ b/src/views/modules/test/requestForTest.vue
@@ -394,17 +394,17 @@
         </el-tabs>
       </div>
       <el-footer style="height:30px;text-align:center;margin-top: 8px">
-        <template
-          v-if="modalData.testStatus === '草稿' || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name) && modalData.testStatus === '审批中')">
+        <template v-if="modalData.testStatus === '草稿' || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name) && modalData.testStatus === '审批中')">
           <el-button type="primary" @click="saveData()" v-if="modalData.flag !== '1' && !detailFlag">保存</el-button>
         </template>
-        <!--        <el-button type="primary" @click="modalFlag = false">关闭</el-button>-->
         <el-button type="primary" @click="closeDialog">关闭</el-button>
-        <template v-if="superAdmin || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name))">
-          <template v-if="isAuth('107001:submit')">
+        <template v-if="isAuth('107001:submit')">
+          <template v-if="superAdmin || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name))">
             <el-button v-if="modalData.testStatus === '审批中' && !detailFlag" type="primary" @click="agreeSubmit">同意</el-button>
           </template>
-          <template v-if="isAuth('107001:rejected')">
+        </template>
+        <template v-if="isAuth('107001:rejected')">
+          <template v-if="superAdmin || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name))">
             <el-button v-if="modalData.testStatus === '审批中' && modalData.isReject === 'Y' && !detailFlag" @click="rejectVisible = true" type="primary">驳回</el-button>
           </template>
         </template>
@@ -634,11 +634,18 @@
     </el-dialog>
 
     <!-- 页签 -->
-    <el-tabs v-model="activeTable" style="margin-top: 0px; width: 100%; min-height: 500px;" type="border-card"
-             @tab-click="tabClick" class="customer-tab">
+    <el-tabs v-model="activeTable" style="margin-top: 0px; width: 100%; min-height: 500px;" type="border-card" @tab-click="tabClick" class="customer-tab">
       <el-tab-pane label="基本信息" name="attribute">
-        <test-properties ref="tabProperties" v-model:data-list="testPropertiesList" :test-no="testCurrentRow.testNo"
-                         :disabled="testCurrentRow.testStatus === '已完成'" height="45vh"></test-properties>
+        <test-properties
+          ref="tabProperties"
+          v-model:data-list="testPropertiesList"
+          :test-no="testCurrentRow.testNo"
+          :disabled="testCurrentRow.testStatus === '已完成'"
+          :approval-username="testCurrentRow.approvalUsername"
+          :test-status="testCurrentRow.testStatus"
+          :super-admin="superAdmin"
+          height="45vh">
+        </test-properties>
       </el-tab-pane>
       <el-tab-pane label="物料属性" name="test_attribute" style="padding: 5px">
         <el-table
@@ -966,6 +973,7 @@ import CustomerInfo from "../quotation/sellForQuotation/customerInfo.vue";
 import FilterSearch from "../../common/filterSearch.vue";
 import {quotationInformationSearchByAnyField} from "../../../api/quotation/quotationInformation";
 import {testInformationSearchAny} from "../../../api/test/testInformation";
+import PriceCheckProperties from "../quotation/priceCheckProperties.vue";
 
 export default {
   computed: {
@@ -984,6 +992,7 @@ export default {
   },
   name: "test",
   components: {
+    PriceCheckProperties,
     FilterSearch,
     CustomerInfo,
     BuSelect,
diff --git a/src/views/modules/test/testAttribute/testProperties.vue b/src/views/modules/test/testAttribute/testProperties.vue
index 2e7acee..bb21ca9 100644
--- a/src/views/modules/test/testAttribute/testProperties.vue
+++ b/src/views/modules/test/testAttribute/testProperties.vue
@@ -13,29 +13,39 @@ import TransferTable from "../../common/transferTable.vue";
 export default {
   name: "testProperties",
   components: {TransferTable},
-  props:{
-    dataList:{
+  props: {
+    dataList: {
       type: Array,
       default: ()=>[],
     },
-    testNo:{
-      type:String,
+    testNo: {
+      type: String,
     },
-    testNumber:{
-      type:[String,Number],
+    testNumber: {
+      type: [String, Number],
     },
-    columnList:{
+    columnList: {
       type: Array,
       default: ()=>[],
     },
-    height:{
-      type:[Number,String],
-      default:300
+    height: {
+      type: [Number, String],
+      default: 300
     },
-    disabled:{
-      type:Boolean,
-      default:false
+    disabled: {
+      type: Boolean,
+      default: false
     },
+    approvalUsername: {
+      type: String,
+    },
+    testStatus: {
+      type: String,
+    },
+    superAdmin: {
+      type: Boolean,
+      default: false
+    }
   },
   model:{
     prop:"dataList",
@@ -119,6 +129,7 @@ export default {
         },
       ],
       searchDataList:[],
+      sp: this.$store.state.user.name,
     }
   },
   methods:{
@@ -231,10 +242,14 @@ export default {
 <div>
   <div style="margin-top: 5px">
     <template v-if="isAuth('107001:tab1:save')">
-      <el-button type="primary" @click="clickSaveBtn" v-if="testNo && !disabled">新增</el-button>
+      <template v-if="testStatus === '草稿' || superAdmin || (approvalUsername && approvalUsername.split(';').includes(sp) && testStatus === '审批中')">
+        <el-button type="primary" @click="clickSaveBtn" v-if="testNo && !disabled">新增</el-button>
+      </template>
     </template>
     <template v-if="isAuth('107001:tab1:update')">
-      <el-button type="primary" :loading="loading" v-if="testNo && !disabled" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>
+      <template v-if="testStatus === '草稿' || superAdmin || (approvalUsername && approvalUsername.split(';').includes(sp) && testStatus === '审批中')">
+        <el-button type="primary" :loading="loading" v-if="testNo && !disabled" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>
+      </template>
     </template>
   </div>
   <div class="rq " v-if="attributeDialog">
diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue
index 46ef9d6..48c77f7 100644
--- a/src/views/modules/tooling/searchToolApply.vue
+++ b/src/views/modules/tooling/searchToolApply.vue
@@ -109,7 +109,16 @@
 
     <el-tabs style="font-size: 12px;min-height: 330px" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick">
       <el-tab-pane label="基本信息" name="attribute">
-        <order-attribute ref="dialogAttribute" :order-no="currentRow.applyNo" :code-no="'toolApply'" :function-type="'TL_Receipt'"></order-attribute>
+        <order-attribute
+          ref="dialogAttribute"
+          :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">
         <el-table
@@ -211,11 +220,7 @@
       </el-tab-pane>
     </el-tabs>
 
-    <el-dialog
-      width="800px" v-drag
-      :title="'刀模申请修改'"
-      :close-on-click-modal="false"
-      :visible.sync="visibleU">
+    <el-dialog width="800px" v-drag :title="'刀模申请修改'" :close-on-click-modal="false" :visible.sync="visibleU">
       <el-form :inline="true" label-position="top" label-width="100px">
         <el-form-item :label="'申请编号'">
           <el-input v-model="dataForm.applyNo" style="width: 130px" disabled></el-input>
@@ -300,19 +305,13 @@
                 <template slot-scope="scope">
                   <div v-if="(item.columnProp !== 'applyQty')&& (item.columnProp !== 'standardCost')">
                     <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>
+                    <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
                   </div>
                   <div v-else-if=" (item.columnProp === 'standardCost')">
-                    <el-input v-if="accessField('10601001')" v-model="scope.row.standardCost" type="number"
-                              @change="changeSum(scope.row)" placeholder="请输入成本"
-                              style="width:98%"></el-input>
-
+                    <el-input v-if="accessField('10601001')" v-model="scope.row.standardCost" type="number" @change="changeSum(scope.row)" placeholder="请输入成本" style="width:98%"></el-input>
                   </div>
                   <div v-else>
-                    <el-input v-model="scope.row.applyQty" type="number" @change="changeSum(scope.row)"
-                              placeholder="请输入数量" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')"
-                              style="width:98%"></el-input>
+                    <el-input v-model="scope.row.applyQty" type="number" @change="changeSum(scope.row)" placeholder="请输入数量" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" style="width:98%"></el-input>
                   </div>
                 </template>
               </el-table-column>
@@ -329,8 +328,7 @@
               </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-input type="textarea" v-model="modelData.remark1" :rows="3" style="height: 60px" :disabled="$store.state.user.name!==dataForm.tp"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -346,22 +344,19 @@
               </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"></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"></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-input type="textarea" v-model="modelData.remark2" :rows="3" style="height: 60px" :disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -374,11 +369,7 @@
       </span>
     </el-dialog>
 
-    <el-dialog
-      width="800px" v-drag
-      :title="'刀模申请审批'"
-      :close-on-click-modal="false"
-      :visible.sync="visible">
+    <el-dialog width="800px" v-drag :title="'刀模申请审批'" :close-on-click-modal="false" :visible.sync="visible">
       <el-form :inline="true" label-position="top" label-width="100px">
         <el-form-item :label="'申请编号'">
           <el-input v-model="dataForm.applyNo" style="width: 130px" disabled></el-input>
@@ -387,8 +378,7 @@
           <el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input>
         </el-form-item>
         <el-form-item :label="'总成本'">
-          <el-input v-if="accessField('10601001')" v-model="dataForm.totalCost" style="width: 130px"
-                    disabled></el-input>
+          <el-input v-if="accessField('10601001')" v-model="dataForm.totalCost" style="width: 130px" disabled></el-input>
           <el-input v-if="!accessField('10601001')" v-model="valueNull" style="width: 130px" disabled></el-input>
         </el-form-item>
         <el-form-item :label="'申请人'" required="required">
@@ -405,39 +395,32 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="部门" required="required">
-          <dict-data-select :site="$store.state.user.site" v-model="dataForm.department"
-                            dict-type="tool_application_department" disabled style="width: 130px"></dict-data-select>
+          <dict-data-select :site="$store.state.user.site" v-model="dataForm.department" dict-type="tool_application_department" disabled style="width: 130px"></dict-data-select>
         </el-form-item>
         <el-form-item required="required">
           <span slot="label" style="" @click="getBaseList(2002,1)"><a herf="#">报价员</a></span>
-          <el-input v-model="dataForm.quoterName" ref="quoterName" placeholder="请选择人员" readonly
-                    style="width: 130px"></el-input>
+          <el-input v-model="dataForm.quoterName" ref="quoterName" placeholder="请选择人员" readonly style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item required="required">
           <span slot="label" style="" @click="getBaseList(2042,2)"><a herf="#">TP</a></span>
-          <el-input v-model="dataForm.tpName" ref="tpName" placeholder="请选择人员" readonly
-                    style="width: 130px"></el-input>
+          <el-input v-model="dataForm.tpName" ref="tpName" placeholder="请选择人员" readonly style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item required="required">
           <span slot="label" style="" @click="getBaseList(2000,3)"><a herf="#">采购员</a></span>
-          <el-input v-model="dataForm.purchaserName" ref="purchaserName" placeholder="请选择人员" readonly
-                    style="width: 130px"></el-input>
+          <el-input v-model="dataForm.purchaserName" ref="purchaserName" placeholder="请选择人员" readonly style="width: 130px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" label-width="100px">
         <el-form-item :label="'申请原因'">
-          <el-input type="textarea" style="width: 770px" resize="none" :autosize="{minRows: 3, maxRows: 3}"
-                    v-model="dataForm.applyReason"/>
+          <el-input type="textarea" style="width: 770px" resize="none" :autosize="{minRows: 3, maxRows: 3}" v-model="dataForm.applyReason"/>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 60px">
         <el-form-item :label="'备注'">
-          <el-input type="textarea" style="width: 770px" resize="none" :autosize="{minRows: 3, maxRows: 3}"
-                    v-model="dataForm.remark"/>
+          <el-input type="textarea" style="width: 770px" resize="none" :autosize="{minRows: 3, maxRows: 3}" v-model="dataForm.remark"/>
         </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-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="detail">
           <div class="rq" style="margin-top: 0px">
             <el-table
@@ -460,19 +443,13 @@
                 <template slot-scope="scope">
                   <div v-if="(item.columnProp !== 'applyQty')&& (item.columnProp !== 'standardCost')">
                     <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>
+                    <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
                   </div>
                   <div v-else-if=" (item.columnProp === 'standardCost')">
-                    <el-input v-if="accessField('10601001')" v-model="scope.row.standardCost" type="number"
-                              @change="changeSum(scope.row)" placeholder="请输入成本"
-                              style="width:98%"></el-input>
+                    <el-input v-if="accessField('10601001')" v-model="scope.row.standardCost" type="number" @change="changeSum(scope.row)" placeholder="请输入成本" style="width:98%"></el-input>
                   </div>
                   <div v-else>
-                    <el-input v-model="scope.row.applyQty" type="number" @change="changeSum(scope.row)"
-                              :disabled="changeApplyDetailFlag('applyQty') === 'N'" placeholder="请输入数量"
-                              onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')"
-                              style="width:98%"></el-input>
+                    <el-input v-model="scope.row.applyQty" type="number" @change="changeSum(scope.row)" :disabled="changeApplyDetailFlag('applyQty') === 'N'" placeholder="请输入数量" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" style="width:98%"></el-input>
                   </div>
                 </template>
               </el-table-column>
@@ -489,8 +466,7 @@
               </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-input type="textarea" v-model="modelData.remark1" :rows="3" style="height: 60px" :disabled="$store.state.user.name!==dataForm.tp"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -506,24 +482,20 @@
               </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"></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="valueNull" style="width: 130px"
-                            disabled></el-input>
+                  <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="valueNull" style="width: 130px" disabled></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-input type="textarea" v-model="modelData.remark2" :rows="3" style="height: 60px" :disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -533,17 +505,19 @@
       <span slot="footer" class="dialog-footer" style="height: 40px">
 <!--        <el-button type="primary" @click="saveData()">{{'保存'}}</el-button>-->
         <el-button type="primary" @click="visible = false" class="bigButton">{{ '取消' }}</el-button>
-        <!-- 2025-05-31 保存、同意、驳回的权限没生效 - 与ECN的判断保持一致 -->
         <template v-if="dataForm.status === '草稿' || (dataForm.sp && dataForm.sp.split(';').includes(sp) && dataForm.status === '审批中')">
           <el-button type="primary" @click="saveData" class="bigButton">保存</el-button>
         </template>
-        <template v-if="superAdmin || (dataForm.sp && dataForm.sp.split(';').includes(sp))">
-          <el-button v-if="dataForm.status === '审批中'" type="primary" @click="agreeSubmit" class="bigButton">同意</el-button>
-          <el-button v-if="dataForm.status === '审批中' && dataForm.isReject === 'Y'" type="primary" @click="submitDataModal" class="bigButton">驳回</el-button>
+        <template v-if="isAuth('106002:submit')">
+          <template v-if="superAdmin || (dataForm.sp && dataForm.sp.split(';').includes(sp))">
+            <el-button v-if="dataForm.status === '审批中'" type="primary" @click="agreeSubmit" class="bigButton">同意</el-button>
+          </template>
+        </template>
+        <template v-if="isAuth('106002:rejected')">
+          <template v-if="superAdmin || (dataForm.sp && dataForm.sp.split(';').includes(sp))">
+            <el-button v-if="dataForm.status === '审批中' && dataForm.isReject === 'Y'" type="primary" @click="submitDataModal" class="bigButton">驳回</el-button>
+          </template>
         </template>
-<!--        <el-button type="primary" @click="saveData" class="bigButton">保存</el-button>-->
-<!--        <el-button v-if="dataForm.status === '审批中'" type="primary" @click="agreeSubmit" class="bigButton">同意</el-button>-->
-<!--        <el-button v-if="dataForm.status === '审批中' && dataForm.isReject === 'Y'" type="primary" @click="submitDataModal" class="bigButton">驳回</el-button>-->
       </span>
     </el-dialog>