2025/5/30

src/views/modules/sampleManagement/technicalSpecificationList.vue

@@ -388,10 +388,10 @@
 
     <el-dialog width="750px" title="选择物料" :close-on-click-modal="false" :visible.sync="partModelFlag">
       <el-form :inline="true" label-position="top" label-width="100px">
-        <el-form-item label="正式料号">
+        <el-form-item label="IFS物料编码">
           <el-input v-model="copyData.finalPartNo" clearable style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item label="项目料号">
+        <el-form-item label="PLM物料编码">
           <el-input v-model="copyData.testPartNo" clearable style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item label="项目号">

src/views/modules/test/requestForTest.vue

@@ -354,7 +354,7 @@
             <test-routing-table v-if="clickTestRow" :disabled="detailFlag" ref="dialogSoRouting" height="32vh" v-model:data-list="testSoRoutingList" :test-no="modalData.testNo"></test-routing-table>
           </el-tab-pane>
           <el-tab-pane label="附件信息" :disabled="!activeTabList.includes('file')" name="file">
-            <oss-components v-if="clickTestRow" :disabled="detailFlag" label="测试单号" height="32vh" :columns="fileColumnList" :order-ref2="modalData.testNo" :order-ref1="modalData.site"></oss-components>
+            <oss-components ref="ossRef1" v-if="clickTestRow" :disabled="detailFlag" label="测试单号" height="32vh" :columns="fileColumnList" :order-ref2="modalData.testNo" :order-ref1="modalData.site"></oss-components>
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -362,7 +362,8 @@
         <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="modalFlag = false">关闭</el-button>-->
+        <el-button type="primary" @click="closeDialog">关闭</el-button>
         <template v-if="modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name)">
           <template v-if="isAuth('107001:submit')">
             <el-button v-if="modalData.testStatus === '审批中' && !detailFlag" type="primary" @click="agreeSubmit">同意</el-button>
@@ -620,6 +621,7 @@
       </el-tab-pane>
       <el-tab-pane label="附件信息" name="file">
         <oss-components style="margin-top: 5px"
+                        ref="ossRef2"
                         :save-visible="isAuth('107001:tab5:save')"
                         :download-visible="isAuth('107001:tab5:download')"
                         :remove-visible="isAuth('107001:tab5:remove')"
@@ -2395,7 +2397,6 @@
         } else if (this.activeTable === 'customer_information') {
           this.getCustomerInformation()
         }else if (this.activeTable === 'test_attribute') {
-          console.log(this.testCurrentRow)
           this.getPartItem(this.testCurrentRow.site,this.testCurrentRow.testPartNo,2);
         }
       },
@@ -2564,6 +2565,7 @@
         // this.$nextTick(()=>{
         //   this.$refs.dialogSoBom.clearTable();
         // })
+        // this.$refs.ossRef1.handleQuery()
         this.modalDisableFlag = true
         this.modalFlag = true
       },
@@ -3299,6 +3301,11 @@
         this.dialogProperties = [];
         // this.testPropertiesList = this.copyTestPropertiesList;
         this.copyTestPropertiesList = [];
+        this.$refs.ossRef2.handleQuery()
+      },
+      closeDialog(){
+        this.modalFlag = false
+        this.$refs.ossRef2.handleQuery()
       },
       checkSelectable(row,index){
         if (this.modalData.flag === '1' && this.activeTabList.length === 1){

src/views/modules/tooling/components/com_tool_info_add_update.vue

@@ -441,7 +441,9 @@ export default {
           if(data.code === 200){
             this.searchFlag = true;
             this.$message.success('操作成功!');
+            console.log(this.pageData);
             this.closeDialog();
+            this.$emit('changeCurrentToolRow', this.pageData)
           }else{
             this.$message.error(data.msg);
           }

src/views/modules/tooling/manuf_tool.vue

@@ -53,7 +53,8 @@
         label="操作">
         <template slot-scope="scope">
           <a type="text" size="small" @click="editToolInfoModal(scope.row)">编辑 </a>
-          <a type="text" size="small" v-if = "scope.row.propertyNo && scope.row.propertyNo !== ''" @click="editToolInfoPropertyModal(scope.row)">属性 </a>
+          <a type="text" size="small" v-if="scope.row.propertyNo && scope.row.propertyNo !== ''"
+             @click="editToolInfoPropertyModal(scope.row)">属性 </a>
           <a type="text" size="small" @click="deleteToolInfoConfirm(scope.row)">删除 </a>
         </template>
       </el-table-column>
@@ -84,7 +85,8 @@
       :total="totalPage"
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
-    <el-tabs style="font-size: 12px;min-height: 330px" class="customer-tab" v-model="activeName"  type="border-card"  @tab-click="tabClick">
+    <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="detail">
         <div style="padding: 5px 0 0 5px">
           <el-button type="primary" @click="addToolInstanceModal()">新增</el-button>
@@ -122,7 +124,8 @@
             label="操作">
             <template slot-scope="scope">
               <a type="text" size="small" @click="editToolInstanceModal(scope.row)">编辑 </a>
-              <a type="text" size="small" v-if = "scope.row.propertyNo && scope.row.propertyNo !== ''" @click="editToolInstancePropertyModal(scope.row)">属性 </a>
+              <a type="text" size="small" v-if="scope.row.propertyNo && scope.row.propertyNo !== ''"
+                 @click="editToolInstancePropertyModal(scope.row)">属性 </a>
               <a type="text" size="small" @click="editToolInstanceDateModal(scope.row)">生命周期 </a>
               <a type="text" size="small" @click="deleteToolInstanceConfirm(scope.row)">删除 </a>
             </template>
@@ -134,15 +137,19 @@
     <!-- 选择组件   -->
     <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
     <!--  工具信息  -->
-    <toolInfoAddUpdate ref="toolInfoAddUpdate" :close-on-click-modal="false"  @refreshTooInfoData="refreshTooInfoData" @changeCurrentToolInfo="changeCurrentToolInfo">
+    <toolInfoAddUpdate ref="toolInfoAddUpdate" :close-on-click-modal="false" @refreshTooInfoData="refreshTooInfoData"
+                       @changeCurrentToolInfo="changeCurrentToolInfo" @changeCurrentToolRow="changeCurrentToolRow">
     </toolInfoAddUpdate>
 
     <!--  工具实例信息  -->
-    <toolInstanceAddUpdate ref="toolInstanceAddUpdate" :close-on-click-modal="false"  @refreshTooInstanceData="refreshTooInstanceData" @changeCurrentToolInstance="changeCurrentToolInstance">
+    <toolInstanceAddUpdate ref="toolInstanceAddUpdate" :close-on-click-modal="false"
+                           @refreshTooInstanceData="refreshTooInstanceData"
+                           @changeCurrentToolInstance="changeCurrentToolInstance">
     </toolInstanceAddUpdate>
 
     <!--  工具实例生命周期信息  -->
-    <toolInstanceDateShow ref="toolInstanceDateShow" :close-on-click-modal="false"  @refreshTooInstanceData="refreshTooInstanceData">
+    <toolInstanceDateShow ref="toolInstanceDateShow" :close-on-click-modal="false"
+                          @refreshTooInstanceData="refreshTooInstanceData">
     </toolInstanceDateShow>
 
     <!--  工具属性信息  -->
@@ -1038,6 +1045,7 @@ export default {
           this.refreshCurrentTabTable()
         }
         this.dataListLoading = false
+
       })
     },
 
@@ -1121,6 +1129,11 @@ export default {
       }
     },
 
+    changeCurrentToolRow(tempData) {
+      this.currentRow = JSON.parse(JSON.stringify(tempData));
+      this.refreshCurrentTabTable();
+    },
+
     /*调整等待派工单的等待时间*/
     changeCurrentToolInstance(tempData) {
       //重置选择行
@@ -1152,6 +1165,7 @@ export default {
 /deep/ .customer-tab .el-tabs__content {
   padding: 0px !important;
 }
+
 .el-transfer-panel {
   border: 2px solid #17b3a3;
   border-radius: 4px;