From 7206ef8037d3eb1d992dcd0a502da8a18b009e20 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Thu, 28 Nov 2024 18:09:23 +0800
Subject: [PATCH] =?UTF-8?q?2024.11.28=20=E5=AE=A1=E6=89=B9=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/auth/authInfo.vue           |  22 +++-
 src/views/modules/auth/authInquiry.vue        |   2 +-
 src/views/modules/auth/authQuote.vue          |   6 +-
 .../modules/inquiry/inquiryApplication.vue    | 102 +++++++++++++++++-
 src/views/modules/inquiry/inquiryDetail.vue   |  99 -----------------
 src/views/modules/oss/ossComponents.vue       |  30 ------
 .../modules/part/partCostInformation.vue      |   4 +-
 .../modules/quote/detail/quoteDetail.vue      |   8 +-
 src/views/modules/quote/index.vue             |   2 +-
 9 files changed, 134 insertions(+), 141 deletions(-)

diff --git a/src/views/modules/auth/authInfo.vue b/src/views/modules/auth/authInfo.vue
index 829b1d8..45e9da3 100644
--- a/src/views/modules/auth/authInfo.vue
+++ b/src/views/modules/auth/authInfo.vue
@@ -77,7 +77,7 @@
           <div v-else-if="item.columnProp === 'status'">
             <span v-if="!item.columnHidden">
               <span v-if="scope.row.status === 'C'">草稿</span>
-              <span v-else-if="scope.row.status === 'B'">已下达</span>
+              <span v-else-if="scope.row.status === 'B'">下达</span>
               <span v-else-if="scope.row.status === 'A'">已报价</span>
               <span v-else>{{ scope.row.status }}</span>
             </span>
@@ -357,6 +357,24 @@ export default {
           fixed: '',
           columnWidth: 100
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 190007,
+          serialNumber: '190007Table1AllAuthFlag',
+          tableId: '190007Table1',
+          tableName: '申请单信息表',
+          columnProp: 'allAuthFlag',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '审批状态',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 190007,
@@ -701,7 +719,7 @@ export default {
           this.authInfoDataList = data.rows
           this.authInfoDataList.forEach(item => {
             if (item.authTypeDb === 'G') {
-              item.nameDesc = '审批组'
+              item.nameDesc = '审批组/'+item.authGroupId
             } else {
               item.nameDesc = '个人/'+item.authUserDisplay
             }
diff --git a/src/views/modules/auth/authInquiry.vue b/src/views/modules/auth/authInquiry.vue
index 1bcf595..5fb979d 100644
--- a/src/views/modules/auth/authInquiry.vue
+++ b/src/views/modules/auth/authInquiry.vue
@@ -133,7 +133,7 @@
           <div v-else-if="item.columnProp === 'status'">
             <span v-if="!item.columnHidden">
               <span v-if="scope.row.status === 'C'">草稿</span>
-              <span v-if="scope.row.status === 'B'">已下达</span>
+              <span v-if="scope.row.status === 'B'">下达</span>
               <span v-if="scope.row.status === 'A'">已报价</span>
             </span>
             <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
diff --git a/src/views/modules/auth/authQuote.vue b/src/views/modules/auth/authQuote.vue
index bdb1a63..59f3a0d 100644
--- a/src/views/modules/auth/authQuote.vue
+++ b/src/views/modules/auth/authQuote.vue
@@ -149,7 +149,7 @@
             <el-input type="textarea" :rows="2" v-model="quoteCurrentRow.remark" style="width: 1019px" readonly></el-input>
           </el-form-item>
         </el-form>
-        <tp-cost :quote-detail="quoteCurrentRow" height="36vh" style="margin-top: 10px"></tp-cost>
+          <quote-detail :quote="quoteCurrentRow" :auth-flag="true" :height="'33vh'"></quote-detail>
       </el-tab-pane>
     </el-tabs>
 
@@ -213,6 +213,7 @@ import {
 import quotationUpload from "../quote/quotation_upload.vue";
 import {updateAuthHist} from "../../../api/auth/auth";
 import TpCost from "../quote/detail/tpCost.vue";
+import QuoteDetail from "../quote/detail/quoteDetail.vue";
 
 export default {
   computed: {
@@ -230,6 +231,7 @@ export default {
     //   },
   },
   components: {
+    QuoteDetail,
     TpCost,
     quotationUpload,
     DictDataSelect,
@@ -782,7 +784,6 @@ export default {
      */
     quoteClickRow(row) {
       this.quoteCurrentRow = JSON.parse(JSON.stringify(row))
-      this.quoteCurrentRow.id = row.quoteDetailId
     },
     /**
      * 当前值发生变化的时候修改
@@ -793,7 +794,6 @@ export default {
       // 判断是否是获取焦点的事件
       if (row) {
         this.quoteCurrentRow = JSON.parse(JSON.stringify(row))
-        this.quoteCurrentRow.id = row.quoteDetailId
         //刷新当前页表
         this.refreshCurrentTabTable()
       }
diff --git a/src/views/modules/inquiry/inquiryApplication.vue b/src/views/modules/inquiry/inquiryApplication.vue
index 8f3f64c..63b8573 100644
--- a/src/views/modules/inquiry/inquiryApplication.vue
+++ b/src/views/modules/inquiry/inquiryApplication.vue
@@ -136,7 +136,7 @@
           <div v-else-if="item.columnProp === 'status'">
             <span v-if="!item.columnHidden">
               <span v-if="scope.row.status === 'C'">草稿</span>
-              <span v-if="scope.row.status === 'B'">已下达</span>
+              <span v-if="scope.row.status === 'B'">下达</span>
               <span v-if="scope.row.status === 'A'">已报价</span>
             </span>
             <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
@@ -305,6 +305,12 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
+      <!-- 询价明细 相关文档 -->
+      <el-tab-pane label="相关文档" name="inquiryDocument">
+        <oss-components label="申请单号" style="margin-top: 5px" height="44vh" :columns="ossColumns" :order-ref1="inquiryCurrentRow.site" :order-ref2="inquiryCurrentRow.id"
+                        :rfq-no="inquiryCurrentRow.rfqNo">
+        </oss-components>
+      </el-tab-pane>
     </el-tabs>
 
     <el-dialog :title="inquiryPartModalData.title" v-drag @close="closeInquiryPartSaveDataDialog"
@@ -464,6 +470,7 @@ import {verifyData} from "@/api/part/partInformation";
 import {EventBus} from "../../../main";
 import {partInformationSearch} from "../../../api/part/partInformation";
 import quotationUpload from "../quote/quotation_upload.vue";
+import OssComponents from "../oss/ossComponents.vue";
 
 export default {
   computed: {
@@ -481,6 +488,7 @@ export default {
     //   },
   },
   components: {
+    OssComponents,
     quotationUpload,
     DictDataSelect,
     Chooselist
@@ -645,6 +653,98 @@ export default {
         valueChooseFlag: '',
         availableValueList: [],
       },
+      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: 'createdBy',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '上传人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140
+        }
+      ],
       // ======== 数据列表 ========
       dataList: [],
       inquiryPartDataList: [],
diff --git a/src/views/modules/inquiry/inquiryDetail.vue b/src/views/modules/inquiry/inquiryDetail.vue
index 38401a2..e4c5fc6 100644
--- a/src/views/modules/inquiry/inquiryDetail.vue
+++ b/src/views/modules/inquiry/inquiryDetail.vue
@@ -280,13 +280,6 @@
           </el-form>
         </div>
       </el-tab-pane>
-      <!-- 询价明细 相关文档 -->
-      <el-tab-pane label="相关文档" name="inquiryPartDocument">
-        <oss-components label="申请单号" style="margin-top: 5px" height="44vh" :columns="ossColumns" :order-ref1="inquiryPartCurrentRow.site" :order-ref2="inquiryPartCurrentRow.id"
-                        :order-ref3="inquiryPartCurrentRow.testPartId" :rfq-no="inquiryPartCurrentRow.rfqNo"
-                        :part-no="inquiryPartCurrentRow.partNo" :part-desc="inquiryPartCurrentRow.partDesc">
-        </oss-components>
-      </el-tab-pane>
       <!-- 询价明细 报价记录页签 -->
       <el-tab-pane label="报价记录" name="inquiryPartQuotation">
         <el-table
@@ -1138,98 +1131,6 @@ export default {
           columnWidth: 130
         },
       ],
-      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: 'createdBy',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '上传人',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 140
-        }
-      ],
       // ======== 选中的当前行数据 ========
       inquiryPartCurrentRow: {},
     }
diff --git a/src/views/modules/oss/ossComponents.vue b/src/views/modules/oss/ossComponents.vue
index 298b548..d3e9f4c 100644
--- a/src/views/modules/oss/ossComponents.vue
+++ b/src/views/modules/oss/ossComponents.vue
@@ -12,22 +12,10 @@ export default {
       type:[Number,String],
       default:''
     },
-    orderRef3:{
-      type:String,
-      default:''
-    },
     rfqNo:{
       type:String,
       default:''
     },
-    partNo:{
-      type:String,
-      default:''
-    },
-    partDesc:{
-      type:String,
-      default:''
-    },
     columns:{
       type:Array,
       required:true
@@ -58,10 +46,7 @@ export default {
       ossVisible:false,
       ossForm:{
         orderRef2:'',
-        orderRef3:'',
         rfqNo:'',
-        partNo:'',
-        partDesc:'',
         remark:''
       },
       fileList:[],
@@ -118,7 +103,6 @@ export default {
       }
       formData.append('orderRef1', this.orderRef1);
       formData.append('orderRef2', this.ossForm.orderRef2);
-      formData.append('orderRef3', this.orderRef3);
       formData.append('createdBy', this.$store.state.user.name);
       formData.append('fileRemark', this.ossForm.remark);
       this.uploadLoading = true;
@@ -243,7 +227,6 @@ export default {
         return{
           orderRef1:this.orderRef1,
           orderRef2:this.orderRef2,
-          orderRef3:this.orderRef3,
         }
       }
     }
@@ -252,10 +235,7 @@ export default {
     params:{
       handler(){
         this.ossForm.orderRef2 = this.orderRef2;
-        this.ossForm.orderRef3 = this.orderRef3;
         this.ossForm.rfqNo = this.rfqNo;
-        this.ossForm.partNo = this.partNo;
-        this.ossForm.partDesc = this.partDesc;
         this.dataList = [];
         this.handleQuery();
       }
@@ -313,16 +293,6 @@ export default {
             <el-input v-model="ossForm.rfqNo" readonly></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="产品编码">
-            <el-input v-model="ossForm.partNo" readonly></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="产品描述">
-            <el-input v-model="ossForm.partDesc" readonly></el-input>
-          </el-form-item>
-        </el-col>
         <slot></slot>
         <el-col :span="24">
           <el-form-item label=" " class="auto">
diff --git a/src/views/modules/part/partCostInformation.vue b/src/views/modules/part/partCostInformation.vue
index e5614ed..c9df68d 100644
--- a/src/views/modules/part/partCostInformation.vue
+++ b/src/views/modules/part/partCostInformation.vue
@@ -161,7 +161,7 @@
       </span>
     </el-dialog>
 
-    <el-dialog :title="titleCon" :close-on-click-modal="false" :visible.sync="visible" width="390px" style="height: 520px;" class="customer-dialog">
+    <el-dialog :title="titleCon" @close="closeUploadDialog" :close-on-click-modal="false" :visible.sync="visible" width="390px" style="height: 520px;" class="customer-dialog">
       <el-form :inline="true" label-position="top" label-width="80px">
         <el-button type="primary" @click="downloadFile()">下载文件模板</el-button>
         <el-row>
@@ -1062,7 +1062,7 @@ export default {
         if (data.code === 0) {
           this.$message.success(data.msg)
           // 关闭窗口并刷新页面
-          this.closeDialog()
+          this.closeUploadDialog()
         } else {
           this.$message.warning(data.msg)
         }
diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue
index 49c4bdd..faac0bb 100644
--- a/src/views/modules/quote/detail/quoteDetail.vue
+++ b/src/views/modules/quote/detail/quoteDetail.vue
@@ -29,6 +29,10 @@ export default {
       type:[Number,String],
       default:300
     },
+    authFlag:{
+      type:Boolean,
+      default:false
+    }
   },
   data(){
     return{
@@ -957,7 +961,7 @@ export default {
 
 <template>
 <div>
-  <el-button type="primary" :disabled="quote.status === '下达' || !quote.status" @click="handleSaveQuoteDetail(null)">新增</el-button>
+  <el-button type="primary" v-if="!authFlag" :disabled="quote.status === '下达' || !quote.status" @click="handleSaveQuoteDetail(null)">新增</el-button>
   <el-table v-loading="queryLoading" border :data="dataList" style="width: 100%;margin-top: 5px" :height="height">
     <el-table-column type="index" width="55" align="center" label="序号"></el-table-column>
     <el-table-column
@@ -976,7 +980,7 @@ export default {
                                            style="width: 100px; height: 80px"/></span>
       </template>
     </el-table-column>
-    <el-table-column label="操作" fixed="right" align="center" width="120">
+    <el-table-column label="操作" v-if="!authFlag" fixed="right" align="center" width="120">
       <template slot-scope="{row,$index}">
 <!--        <a type="text" v-if="row.status === '草稿'" @click="handleComputeYield(row)">计算</a>-->
         <a type="text" v-if="row.status === '草稿'" @click="handleSaveQuoteDetail(row)">编辑</a>
diff --git a/src/views/modules/quote/index.vue b/src/views/modules/quote/index.vue
index 8f51893..0255154 100644
--- a/src/views/modules/quote/index.vue
+++ b/src/views/modules/quote/index.vue
@@ -823,7 +823,7 @@ export default {
     </el-pagination>
     <el-tabs v-model="activeName" >
       <el-tab-pane label="报价明细" name="detail">
-        <quote-detail :quote="currentQuote" :height="'33vh'"></quote-detail>
+        <quote-detail :quote="currentQuote" :auth-flag="false" :height="'33vh'"></quote-detail>
       </el-tab-pane>
     </el-tabs>