2024-09-14 附件信息

src/views/modules/cdc/collect.vue

@@ -548,7 +548,7 @@ export default {
       });
     },
     handleDelete(row) {
-      this.$confirm('此操作将永久删除该数据标识, 是否继续?', '提示', {
+      this.$confirm('此操作将该数据标识, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/modules/cdc/collect/collectError.vue

@@ -142,7 +142,7 @@ export default {
       this.open = true;
     },
     handleDelete(row) {
-      this.$confirm('此操作将永久删除, 是否继续?', '提示', {
+      this.$confirm('此操作将是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/modules/cdc/device.vue

@@ -287,7 +287,7 @@ export default {
       });
     },
     handleDelete(row) {
-      this.$confirm('此操作将永久删除该设备信息, 是否继续?', '提示', {
+      this.$confirm('此操作将设备信息, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/modules/oss/ossComponents.vue

@@ -42,6 +42,7 @@ export default {
       ossVisible:false,
       ossForm:{
         orderRef2:'',
+        orderRef3:'',
         remark:''
       },
       fileList:[],
@@ -209,6 +210,7 @@ export default {
     params:{
       handler(){
         this.ossForm.orderRef2 = this.orderRef2;
+        this.ossForm.orderRef3 = this.orderRef3;
         this.dataList = [];
         this.handleQuery();
       }
@@ -266,6 +268,7 @@ export default {
             <el-input v-model="ossForm.orderRef2" readonly></el-input>
           </el-form-item>
         </el-col>
+        <slot></slot>
         <el-col :span="24">
           <el-form-item label=" " class="auto">
             <el-upload drag :file-list="fileList"

src/views/modules/proofing/requestForProofing.vue

@@ -923,7 +923,8 @@
         </el-form>
       </el-tab-pane>
       <el-tab-pane label="附件信息" name="proofing_file">
-      <profing-file ref="profingFile" :test-no="proofingCurrentRow.proofingNo"  ></profing-file>
+<!--        <profing-file ref="profingFile" :test-no="proofingCurrentRow.proofingNo"  ></profing-file>-->
+        <oss-components label="打样单号" style="margin-top: 5px" height="28vh" :columns="ossColumns" :order-ref2="proofingCurrentRow.proofingNo" :order-ref1="proofingCurrentRow.site"></oss-components>
       </el-tab-pane>
       <!-- 审批信息 -->
       <el-tab-pane label="审批信息" name="approvalInformation">
@@ -1076,9 +1077,11 @@ import proofingAttribute from "../demoComponents/orderProperties"
 import ApprovalInformation from "../changeManagement/approvalInformation.vue";
 import {queryCustomer} from "../../../api/customer/customerInformation";
 import {queryProjectByCustomer} from "../../../api/project/project";
+import OssComponents from "../oss/ossComponents.vue";
 
 export default {
   components: {
+    OssComponents,
     ApprovalInformation,
     ProjectInfo
     ,DictDataSelect
@@ -2181,6 +2184,98 @@ export default {
 
       columnFieldList1: [],
       columnFieldList2: [],
+      ossColumns:[
+        {
+          userId: this.$store.state.user.name,
+          functionId: 103001,
+          serialNumber: '103001Table2FileName',
+          tableId: '103001Table2',
+          tableName: '文件信息表',
+          columnProp: 'fileName',
+          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: 103001,
+          serialNumber: '103001Table2FileRemark',
+          tableId: '103001Table2',
+          tableName: '文件信息表',
+          columnProp: 'fileRemark',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '备注',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 240
+        },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 103001,
+        //   serialNumber: '103001Table2OrderRef3',
+        //   tableId: '103001Table2',
+        //   tableName: '文件信息表',
+        //   columnProp: 'orderRef3',
+        //   headerAlign: 'center',
+        //   align: 'center',
+        //   columnLabel: '文件描述',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 120
+        // },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 103001,
+          serialNumber: '103001Table2CreateDate',
+          tableId: '103001Table2',
+          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: 103001,
+          serialNumber: '103001Table2CreatedBy',
+          tableId: '103001Table2',
+          tableName: '文件信息表',
+          columnProp: 'createBy',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '上传人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140
+        }
+      ],
     }
   },
   mounted() {

src/views/modules/quotation/sellForQuotation.vue

@@ -170,9 +170,12 @@
         <approval-information ref="approvalTable" v-model:data-list="approvalList" :height="300"></approval-information>
       </el-tab-pane>
 
-      <el-tab-pane label="附件信息" name="oss">
+      <el-tab-pane label="报价-附件信息" name="quote_oss">
         <oss-components label="报价单号" :columns="ossColumns" :order-ref1="quotationHeader.site" :order-ref2="`${quotationHeader.quotationNo}-${quotationHeader.versionCode}`"></oss-components>
       </el-tab-pane>
+      <el-tab-pane label="询价-附件信息" name="oss">
+        <oss-components label="询价单号" :columns="ossColumns" :order-ref1="quotationHeader.site" :order-ref2="quotationHeader.internalInquiryNo"></oss-components>
+      </el-tab-pane>
     </el-tabs>
 
     <!-- 新增弹框 -->

src/views/modules/test/requestForTest.vue

@@ -771,7 +771,8 @@
         <test-routing-table ref="tabSoBom" :test-no="testCurrentRow.testNo" v-model:data-list="testSoRoutingList" :height="500" ></test-routing-table>
       </el-tab-pane>
       <el-tab-pane label="附件信息" name="file">
-        <test-file ref="tabFile" :column-list="fileColumnList" v-model:data-list="testFileList" :test-no="testCurrentRow.testNo" :height="500"></test-file>
+<!--        <test-file ref="tabFile" :column-list="fileColumnList" v-model:data-list="testFileList" :test-no="testCurrentRow.testNo" :height="500"></test-file>-->
+        <oss-components label="测试单号" height="45vh" :columns="fileColumnList" :order-ref2="testCurrentRow.testNo" :order-ref1="testCurrentRow.site"></oss-components>
       </el-tab-pane>
 
       <!-- 项目信息页签 -->
@@ -1160,6 +1161,7 @@
   import ApprovalInformation from "../changeManagement/approvalInformation.vue";
   import {queryCustomer} from "../../../api/customer/customerInformation";
   import {queryProjectByCustomer, queryProjectPart} from "../../../api/project/project";
+  import OssComponents from "../oss/ossComponents.vue";
   export default {
     computed: {
       testInformationFlag () {
@@ -1177,6 +1179,7 @@
     },
     name:"test",
     components: {
+      OssComponents,
       TestFile,
       TestProperties,
       TestAttribute,
@@ -2751,11 +2754,11 @@
           return
         }
         if (this.modalData.tracker === '' || this.modalData.tracker == null) {
-          this.$message.warning('请选择Artwork编码！')
+          this.$message.warning('请选择Artwork！')
           return
         }
         if (this.modalData.trackerName === '' || this.modalData.trackerName == null) {
-          this.$message.warning('请选择Artwork名称！')
+          this.$message.warning('请选择Artwork！')
           return
         }
         if (this.modalData.projectId === '' || this.modalData.projectId == null) {
@@ -2767,11 +2770,11 @@
           return
         }
         if (this.modalData.engineer === '' || this.modalData.engineer == null) {
-          this.$message.warning('请选择TP工程师编码！')
+          this.$message.warning('请选择TP工程师！')
           return
         }
         if (this.modalData.engineerName === '' || this.modalData.engineerName == null) {
-          this.$message.warning('请选择TP工程师名称！')
+          this.$message.warning('请选择TP工程师！')
           return
         }
         if (this.modalData.testPartNo === '' || this.modalData.testPartNo == null) {

src/views/modules/test/testSoBom/testTable.vue

@@ -416,7 +416,7 @@ export default {
         this.$message.warning("请勾选需要删除的信息")
         return
       }
-      this.$confirm('此操作将永久删除材料信息, 是否继续?', '提示', {
+      this.$confirm('此操作将删除材料信息, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'