From 7a9e32179ed1af6d73a82064ce6f8a32d6492804 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Fri, 28 Mar 2025 17:59:42 +0800
Subject: [PATCH] 2025-03-28

---
 src/views/modules/oss/ossComponents.vue       |   5 +-
 .../com_projectInfo-add-or-update.vue         |  64 ++++---
 .../com_bm_customerInformation.vue            | 168 ++++++++++++++----
 .../com_tsd_basicInformation.vue              |   2 +-
 .../technicalSpecificationDetail.vue          |   2 +-
 .../technicalSpecificationList.vue            |   4 +-
 6 files changed, 169 insertions(+), 76 deletions(-)

diff --git a/src/views/modules/oss/ossComponents.vue b/src/views/modules/oss/ossComponents.vue
index f8fe354..fc8c974 100644
--- a/src/views/modules/oss/ossComponents.vue
+++ b/src/views/modules/oss/ossComponents.vue
@@ -120,7 +120,6 @@ export default {
       formData.append('orderRef1', this.orderRef1);
       formData.append('orderRef2', this.ossForm.orderRef2);
       formData.append('orderRef3', this.orderRef3);
-      formData.append('createBy', this.$store.state.user.name);
       formData.append('fileRemark', this.ossForm.remark);
       this.uploadLoading = true;
       ossUpload(formData).then(({data})=>{
@@ -298,7 +297,7 @@ export default {
       header-align="center"
       align="center"
       width="120"
-      label="操作">
+      label="操作" v-if="removeVisible || previewVisible">
       <template slot-scope="{row,$index}">
         <template v-if="removeVisible">
           <el-link style="cursor:pointer;" v-if="!disabled" @click="handleRemove(row)">删除</el-link>
@@ -350,6 +349,6 @@ export default {
 <style scoped>
 .auto /deep/ .el-form-item__content{
   height: auto;
-  line-height: 1.5;
+  line-height: 1;
 }
 </style>
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 ea1baa2..ca605e4 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
@@ -578,38 +578,38 @@
           username:this.userRoleForm.username,
           userDisplay:this.userRoleForm.userDisplay,
         }
+        this.userRoleList = []
         searchUserRoll(inData3).then(({data}) => {
           this.userRoleList=data.rows;
-
-          for (let j = 0; j <this.userRoleList.length?this.userRoleList.length:-1 ; j++) {
-            let checkData=this.dataForm.userRoleList.filter(item => item.username === this.userRoleList[j].username)
-            if(checkData.length>0){
-              this.userRoleList[j].deleteCheck=checkData[0].deleteCheck
-              this.userRoleList[j].deleteFlag=checkData[0].deleteFlag
-              this.userRoleList[j].downCheck=checkData[0].downCheck
-              this.userRoleList[j].downFlag=checkData[0].downFlag
-              this.userRoleList[j].searchCheck=checkData[0].searchCheck
-              this.userRoleList[j].searchFlag=checkData[0].searchFlag
-              this.userRoleList[j].updateCheck=checkData[0].updateCheck
-              this.userRoleList[j].checkAll=checkData[0].checkAll
-            }else {
-              this.userRoleList[j].deleteCheck=false
-              this.userRoleList[j].deleteFlag='N'
-              this.userRoleList[j].downCheck=false
-              this.userRoleList[j].downFlag='N'
-              this.userRoleList[j].searchCheck=false
-              this.userRoleList[j].searchFlag='N'
-              this.userRoleList[j].updateCheck=false
-              this.userRoleList[j].checkAll=false
-            }
-
-          }
-          for (let i = 0; i <this.userRoleList.length ; i++) {
-            if(this.userRoleList[i].username===this.$store.state.user.name){
-              this.userRoleList[i].checkAll=true;
-              // this.changeAll(this.userRoleList[i])
-            }
-          }
+          // for (let j = 0; j <this.userRoleList.length?this.userRoleList.length:-1 ; j++) {
+          //   let checkData=this.dataForm.userRoleList.filter(item => item.username === this.userRoleList[j].username)
+          //   if(checkData.length>0){
+          //     this.userRoleList[j].deleteCheck=checkData[0].deleteCheck
+          //     this.userRoleList[j].deleteFlag=checkData[0].deleteFlag
+          //     this.userRoleList[j].downCheck=checkData[0].downCheck
+          //     this.userRoleList[j].downFlag=checkData[0].downFlag
+          //     this.userRoleList[j].searchCheck=checkData[0].searchCheck
+          //     this.userRoleList[j].searchFlag=checkData[0].searchFlag
+          //     this.userRoleList[j].updateCheck=checkData[0].updateCheck
+          //     this.userRoleList[j].checkAll=checkData[0].checkAll
+          //   }else {
+          //     this.userRoleList[j].deleteCheck=false
+          //     this.userRoleList[j].deleteFlag='N'
+          //     this.userRoleList[j].downCheck=false
+          //     this.userRoleList[j].downFlag='N'
+          //     this.userRoleList[j].searchCheck=false
+          //     this.userRoleList[j].searchFlag='N'
+          //     this.userRoleList[j].updateCheck=false
+          //     this.userRoleList[j].checkAll=false
+          //   }
+          //
+          // }
+          // for (let i = 0; i <this.userRoleList.length ; i++) {
+          //   if(this.userRoleList[i].username===this.$store.state.user.name){
+          //     this.userRoleList[i].checkAll=true;
+          //     // this.changeAll(this.userRoleList[i])
+          //   }
+          // }
           // this.userRollModal();
         })
       },
@@ -722,9 +722,7 @@
       userRollModal(){
         // this.userRoleList=JSON.parse(JSON.stringify(this.dataForm.userRoleList));
         this.searchUserRoll()
-
-
-          this.userRoleFlag=true
+        this.userRoleFlag=true
 
       },
       saveUserList(){
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
index 62c0af1..b03ece4 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
@@ -137,43 +137,59 @@
         </div></el-col>
       </el-row>
       <el-row :gutter="20">
-        <el-col :span="24"><div class="grid-content bg-purple">
-          <el-form-item :label="'客户图纸变更说明/Attach Customer Drawing'">
-            <span slot="label" style="" @click="openNewPage(dataForm.customerPictureChangeRemark)">
-              <a herf="#">客户图纸变更说明/Attach Customer Drawing</a>
-            </span>
-            <el-input
-              type="textarea"
-              v-model="dataForm.customerPictureChangeRemark "
-              :rows="3"
-              resize='none'
-              maxlength="120"
-              show-word-limit
-              style="height: 60px" :disabled="ifDisableFlag">
-            </el-input>
-          </el-form-item>
-        </div></el-col>
-      </el-row>
-      <el-row :gutter="20" style="margin-top: 60px">
-        <el-col :span="24"><div class="grid-content bg-purple">
-          <el-form-item :label="'转量产附档说明/MP Comments'">
-            <span slot="label" style="" @click="openNewPage(dataForm.productionFileComments)">
-              <a herf="#">转量产附档说明/MP Comments</a>
-            </span>
-            <el-input
-              type="textarea"
-              v-model="dataForm.productionFileComments "
-              :rows="3"
-              resize='none'
-              maxlength="120"
-              show-word-limit
-              style="height: 60px" :disabled="ifDisableFlag">
-            </el-input>
-          </el-form-item>
-        </div></el-col>
+        <el-col :span="24">
+          <div class="grid-content bg-purple">
+            <el-form-item :label="'客户图纸变更说明/Attach Customer Drawing'" class="auto">
+<!--              <el-input-->
+<!--                type="textarea"-->
+<!--                v-model="dataForm.customerPictureChangeRemark "-->
+<!--                :rows="3"-->
+<!--                resize='none'-->
+<!--                maxlength="120"-->
+<!--                show-word-limit-->
+<!--                style="height: 60px" :disabled="ifDisableFlag">-->
+<!--              </el-input>-->
+              <oss-components
+                label="参数卡编码"
+                height="150px"
+                style="margin-top: 5px"
+                :columns="ossColumns"
+                :order-ref1="dataForm.site?dataForm.site:''"
+                :order-ref2="dataForm.codeNo?dataForm.codeNo:''"
+                order-ref3="customerPictureChangeRemark">
+              </oss-components>
+            </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="'转量产附档说明/MP Comments'" class="auto">
+<!--              <el-input-->
+<!--                type="textarea"-->
+<!--                v-model="dataForm.productionFileComments "-->
+<!--                :rows="3"-->
+<!--                resize='none'-->
+<!--                maxlength="120"-->
+<!--                show-word-limit-->
+<!--                style="height: 60px" :disabled="ifDisableFlag">-->
+<!--              </el-input>-->
 
-      <el-row :gutter="20" style="margin-top: 60px">
+              <oss-components
+                label="参数卡编码"
+                height="150px"
+                style="margin-top: 5px"
+                :columns="ossColumns"
+                :order-ref1="dataForm.site?dataForm.site:''"
+                :order-ref2="dataForm.codeNo?dataForm.codeNo:''"
+                order-ref3="productionFileComments">
+              </oss-components>
+            </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="'备注/Comments'">
             <el-input
@@ -223,8 +239,10 @@
   } from '@/api/changeManagement/changeManagement.js'
   import Chooselist from '@/views/modules/common/Chooselist'
   import DictDataSelect from "../../sys/dict-data-select.vue";
+  import OssComponents from "../../oss/ossComponents.vue";
   export default {
     components: {
+      OssComponents,
       DictDataSelect,
       Chooselist
     },
@@ -286,6 +304,81 @@
         },
         rejectOpinion: '',
         submitModalFlag: false,
+
+        ossColumns:[
+          {
+            userId: this.$store.state.user.name,
+            functionId: 5011,
+            serialNumber: '5011Table2FileName',
+            tableId: '5011Table2',
+            tableName: '文件信息表',
+            columnProp: 'fileName',
+            headerAlign: 'center',
+            align: 'left',
+            columnLabel: '文件名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 140
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 5011,
+            serialNumber: '5011Table2FileRemark',
+            tableId: '5011Table2',
+            tableName: '文件信息表',
+            columnProp: 'fileRemark',
+            headerAlign: 'center',
+            align: 'left',
+            columnLabel: '备注',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 240
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 5011,
+            serialNumber: '5011Table2CreateDate',
+            tableId: '5011Table2',
+            tableName: '文件信息表',
+            columnProp: 'createDate',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '上传时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 140
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 5011,
+            serialNumber: '5011Table2CreatedBy',
+            tableId: '5011Table2',
+            tableName: '文件信息表',
+            columnProp: 'createBy',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '上传人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 140
+          }
+        ],
       }
     },
     methods: {
@@ -523,5 +616,8 @@
 </script>
 
 <style scoped>
-
+.auto-form /deep/ .el-form-item__content {
+  height: auto;
+  line-height: 1.5;
+}
 </style>
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
index f4ea5da..9afcfd0 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
@@ -22,7 +22,7 @@
           </div>
         </el-col>
         <el-col :span="3">
-          <el-form-item label="BU">
+          <el-form-item label="工艺">
             <el-input v-model="dataForm.buNo" disabled></el-input>
           </el-form-item>
         </el-col>
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
index 65911cc..5dfcbfe 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="mod-config">
-      <el-tabs class="tabs" tab-position="left" style="height: 200px;"   type="border-card" v-model="activeName" @tab-click="refreshCurrentTabTable">
+      <el-tabs class="tabs" tab-position="left" style="height: 100vh;"   type="border-card" v-model="activeName" @tab-click="refreshCurrentTabTable">
         <el-tab-pane label="基本信息"  name="baseInfo" >
           <basicInformation ref="basicInformation" ></basicInformation>
         </el-tab-pane>
diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue
index 78a8791..20c729e 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationList.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
-      <el-form-item label="BU">
+      <el-form-item label="工艺">
         <bu-select v-model="searchData.buNo" style="width: 120px"></bu-select>
       </el-form-item>
       <el-form-item :label="'参数卡编码'">
@@ -513,7 +513,7 @@
             columnProp: "buNo",
             headerAlign: "center",
             align: "center",
-            columnLabel: "BU",
+            columnLabel: "工艺",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,