From b9300ab15c1191517735202e6f5979d6557dbd18 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Sat, 16 Mar 2024 10:48:50 +0800
Subject: [PATCH] plm BM

---
 .../com_projectInfo-add-or-update.vue         | 11 +++++-----
 .../com_project_info_purchase_request.vue     | 22 +++++++++----------
 .../projectInfo/com_project_upload_file.vue   |  2 +-
 .../com_bm_demoSlot.vue                       |  3 ++-
 .../technicalSpecificationList.vue            | 13 ++++++-----
 5 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
index 11e5a68..f6690b8 100644
--- a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
+++ b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
@@ -16,7 +16,8 @@
           <el-col :span="6">
             <el-form-item prop="buDesc" :rules="projectRole.buDesc">
               <span slot="label" style="" @click="getBaseList(106,1)"><a herf="#">BU</a></span>
-              <el-input v-model="dataForm.buDesc" readonly @focus="getBaseList(106,1)"></el-input>
+<!--              <el-input v-model="dataForm.buDesc" readonly @focus="getBaseList(106,1)"></el-input>-->
+              <el-input v-model="dataForm.buDesc" readonly ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -37,7 +38,7 @@
           <el-col :span="12">
             <el-form-item prop="customerName">
               <span slot="label" style="" @click="getBaseList(102,1)"><a herf="#">所属客户</a></span>
-              <el-input v-model="dataForm.customerName" readonly @focus="getBaseList(102,1)"></el-input>
+              <el-input v-model="dataForm.customerName" readonly ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -59,13 +60,13 @@
           <el-col :span="6">
             <el-form-item prop="projectManagerName" :rules="projectRole.projectManagerName">
               <span slot="label" style="" @click="managerChooseModal()"><a herf="#">项目经理</a></span>
-              <el-input v-model="dataForm.projectManagerName" readonly @focus="managerChooseModal()"></el-input>
+              <el-input v-model="dataForm.projectManagerName" readonly ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item prop="projectOwnerName" :rules="projectRole.projectOwnerName">
               <span slot="label" style="" @click="ownerChooseModal()"><a herf="#">项目负责人</a></span>
-              <el-input v-model="dataForm.projectOwnerName" readonly @focus="ownerChooseModal()"></el-input>
+              <el-input v-model="dataForm.projectOwnerName" readonly ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -80,7 +81,7 @@
         </el-form-item>
         <el-form-item prop="userRoleName" :rules="projectRole.userRoleName">
           <span slot="label" style="" @click="userRollModal()"><a herf="#">项目权限</a></span>
-          <el-input v-model="dataForm.userRoleName" @focus="userRollModal()"></el-input>
+          <el-input v-model="dataForm.userRoleName" ></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
diff --git a/src/views/modules/project/projectInfo/com_project_info_purchase_request.vue b/src/views/modules/project/projectInfo/com_project_info_purchase_request.vue
index 3685af1..2ee74f2 100644
--- a/src/views/modules/project/projectInfo/com_project_info_purchase_request.vue
+++ b/src/views/modules/project/projectInfo/com_project_info_purchase_request.vue
@@ -41,17 +41,17 @@
                                              style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
-      <el-table-column
-        header-align="center"
-        align="center"
-        width="150"
-        fixed="right"
-        label="操作">
-        <template slot-scope="scope">
-<!--          <a type="text" size="small" @click="updateModel(scope.row)">修改</a>-->
-<!--          <a type="text" size="small" @click="deleteData(scope.row)">删除</a>-->
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        width="150"-->
+<!--        fixed="right"-->
+<!--        label="操作">-->
+<!--        <template slot-scope="scope">-->
+<!--&lt;!&ndash;          <a type="text" size="small" @click="updateModel(scope.row)">修改</a>&ndash;&gt;-->
+<!--&lt;!&ndash;          <a type="text" size="small" @click="deleteData(scope.row)">删除</a>&ndash;&gt;-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
     <el-dialog
       width="600px"
diff --git a/src/views/modules/project/projectInfo/com_project_upload_file.vue b/src/views/modules/project/projectInfo/com_project_upload_file.vue
index 78901b4..2de1887 100644
--- a/src/views/modules/project/projectInfo/com_project_upload_file.vue
+++ b/src/views/modules/project/projectInfo/com_project_upload_file.vue
@@ -152,7 +152,7 @@ export default {
       formData.append("remark", remark);
       uploadProjectFile(formData).then(({data}) => {
         if (data.code === 0) {
-          this.$message.success(data.msg);
+          this.$message.success('操作成功');
           //清空文件上传记录
           this.$refs.uploadFile.clearFiles();
           this.pageData.fileRemark = '';
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
index 7ff7a05..0ee90db 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
@@ -122,7 +122,8 @@
         }
         //this.searchData.type= JSON.parse(JSON.stringify(this.type));
         //刷新表格
-        this.searchTable();
+        this.$nextTick(()=>{this.searchTable();} )
+
 
       },
       searchTable(){
diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue
index f4fa889..984bdc7 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationList.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue
@@ -2,14 +2,14 @@
   <div class="mod-config">
     <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
       <el-form-item :label="'参数卡编码'">
-        <el-input v-model="searchData.cdoeNo" style="width: 130px"></el-input>
+        <el-input v-model="searchData.oriCodeNo" style="width: 130px"></el-input>
       </el-form-item>
       <el-form-item >
         <span slot="label" style="" @click="getBaseList(105,1)"><a herf="#">测试料号</a></span>
         <el-input v-model="searchData.testPartNo" style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'状态'">
-        <el-input v-model="searchData.projectOwnerName" style="width: 130px"></el-input>
+        <el-input v-model="searchData.statusDesc" style="width: 130px"></el-input>
       </el-form-item>
       <el-form-item label=" ">
         <el-button @click="search()" type="primary" style="margin-left: 2px;margin-top:0px">查询</el-button>
@@ -214,14 +214,14 @@
           <el-row :gutter="20">
             <el-col :span="24"><div class="grid-content bg-purple">
               <el-form-item :label="'客户图纸'" style="margin-top: 15px">
-                <el-input v-model="customerData.finalCustomer" readonly  ></el-input>
+                <el-input v-model="customerData.pictureAddess" readonly  ></el-input>
               </el-form-item>
             </div></el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="24"><div class="grid-content bg-purple">
               <el-form-item :label="'客户图纸变更说明'">
-                <el-input v-model="customerData.finalCustomer" readonly  ></el-input>
+                <el-input v-model="customerData.customerPictureChangeRemark" readonly  ></el-input>
               </el-form-item>
             </div></el-col>
           </el-row>
@@ -231,7 +231,7 @@
               <el-form-item :label="'转量产附档说明'" style="height: 70px">
                 <el-input
                   type="textarea"
-                  v-model="customerData.finalCustomer "
+                  v-model="customerData.productionFileComments "
                   :rows="3"
                   resize='none'
                   maxlength="120"
@@ -336,7 +336,8 @@
           site: this.$store.state.user.site,
           username: this.$store.state.user.name,
           testPartNo: '',
-          cdoeNo: '',
+          oriCodeNo: '',
+          statusDesc: '',
         },
         pageIndex: 1,
         pageSize: 100,