From 69d77f6dc7eb6a6dd853a895f2c28adb8840770f Mon Sep 17 00:00:00 2001
From: DouDou <877258667@qq.com>
Date: Sun, 26 Jan 2025 16:10:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/com_tool_property_show.vue       | 10 ++++++----
 .../tooling/components/orderProperties.vue      | 17 +++++++----------
 src/views/modules/tooling/manuf_tool.vue        |  2 +-
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/tooling/components/com_tool_property_show.vue b/src/views/modules/tooling/components/com_tool_property_show.vue
index a8f4004..4dca897 100644
--- a/src/views/modules/tooling/components/com_tool_property_show.vue
+++ b/src/views/modules/tooling/components/com_tool_property_show.vue
@@ -25,7 +25,7 @@
           <!--工具属性的使用记录-->
           <fieldset class="customer-fieldset" style="width: 650px;">
             <legend>属性维护</legend>
-            <propertyTable  ref="propertyTable"  v-if="visible" :order-no="dataNo" :code-no="propertyNo" :function-type="propertyType"></propertyTable>
+            <propertyTable  ref="propertyTable"  v-if="visible" :site="site" :order-no="dataNo" :code-no="propertyNo" :function-type="propertyType"></propertyTable>
           </fieldset>
           </el-form>
       </el-container>
@@ -48,6 +48,7 @@ export default {
       propertyType: 'TL',
       propertyNo: 'TL01',
       dataNo: '1001',//数据编码
+      site: '',
       visible: false,
       showFlag: false,
       pageData: {
@@ -63,14 +64,15 @@ export default {
 
     //初始化组件的参数
     init(toolInfo, dataType) {
-      //区分工具和工具实例
+      //设置site
+      this.site = toolInfo.site;
       if(dataType === 'TL'){
         this.showFlag = false;
         this.dataNo = toolInfo.toolId;
         this.propertyNo = toolInfo.propertyNo;
         this.propertyType = 'TL';
         this.titleCon = '工具属性维护';
-        this.pageData.site = '*';
+        this.pageData.site = toolInfo.site;
         this.pageData.toolId = toolInfo.toolId;
         this.pageData.toolInstance = '';
       }else  if(dataType === 'TLI'){
@@ -79,7 +81,7 @@ export default {
         this.propertyNo = toolInfo.propertyNo;
         this.propertyType = 'TLI';
         this.titleCon = '工具实例属性维护';
-        this.pageData.site = '*';
+        this.pageData.site = toolInfo.site;
         this.pageData.toolId = toolInfo.toolId;
         this.pageData.toolInstance = toolInfo.toolInstance;
       }
diff --git a/src/views/modules/tooling/components/orderProperties.vue b/src/views/modules/tooling/components/orderProperties.vue
index 401273a..17cc210 100644
--- a/src/views/modules/tooling/components/orderProperties.vue
+++ b/src/views/modules/tooling/components/orderProperties.vue
@@ -74,10 +74,7 @@
     <el-dialog title="属性项目" v-drag :visible.sync="attributeSaveDialog" append-to-body>
       <transfer-table v-if="attributeSaveDialog"
                       v-model="dataList2"
-                      :data-list="searchDataList"
-                      @add="saveTestPropertiesItem"
-                      @delete="removeTestPropertiesItem"
-                      @search="searchAttributeList"></transfer-table>
+                      :data-list="searchDataList"> </transfer-table>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
         <el-button type="primary" @click="attributeSaveDialog = false">关闭</el-button>
       </el-footer>
@@ -90,7 +87,6 @@
 <script>
 import {propertiesList,refreshPropertiesModal,updatePropertiesList,getPropertiesListByPartAndCodeNo
 ,searchPropertiesItemList,saveSubPropertiesValueForAlone,deleteSubPropertiesValueForAlone
-
 } from "@/api/base/properties.js";
 import {
   removeTestPropertiesItem,
@@ -99,11 +95,13 @@ import {
 } from "@/api/test/testProperties.js";
 import TransferTable from "../../common/transferTable.vue";
 
-
 export default {
   name: "orderAttribute",
   components: {TransferTable},
   props:{
+    site:{
+      type:String,
+    },
     orderNo:{
       type:String,
     },
@@ -279,7 +277,6 @@ export default {
     },
   },
   methods:{
-
     refreshPropertiesModal(){
       this.$confirm(`是否刷新至最新模板界面，已填数据会更新到新模板中，若旧属性在新模板中被删除，该条数据会消失。`, '提示', {
         confirmButtonText: '确定',
@@ -309,7 +306,7 @@ export default {
     },
     getProperties(){
       let params = {
-        site: '*',
+        site: this.site,
         partNo: this.orderNo,
         codeNo: this.codeNo,
         recordType: this.functionType,
@@ -369,7 +366,7 @@ export default {
       let i = 0;
       let arr = params.searchTableList.map(item=>{
         item.partNo = this.orderNo;
-        item.site = this.$store.state.user.site;
+        item.site = this.site;
         item.codeNo = this.codeNo;
         item.recordType = this.functionType;
         return item
@@ -414,7 +411,7 @@ export default {
         this.searchDataList = [];
       }
       let inData={
-        site: '*',
+        site: this.site,
         functionType: this.functionType,
         list :this.dataList,
       }
diff --git a/src/views/modules/tooling/manuf_tool.vue b/src/views/modules/tooling/manuf_tool.vue
index e240214..aa6d13e 100644
--- a/src/views/modules/tooling/manuf_tool.vue
+++ b/src/views/modules/tooling/manuf_tool.vue
@@ -81,7 +81,7 @@
     </el-pagination>
     <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" style="margin-left: -10px;">
-        <el-form label-position="top" style="margin-top: -15px; margin-left: 2px;">
+        <el-form label-position="top" style="margin-top: 5px; margin-left: 5px;">
           <el-button type="primary" @click="addToolInstanceModal()">新增</el-button>
         </el-form>
         <el-table