From f2d39187d42804a51d4790d00fcc6eb0af8e4a2a Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Wed, 28 Feb 2024 11:24:04 +0800
Subject: [PATCH] =?UTF-8?q?2024-02-28=20=E6=8A=A5=E4=BB=B7=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/quotation/sellForQuotation.vue    |  6 ++--
 .../sellForQuotation/quotationDetail.vue      | 30 ++++++++++---------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/views/modules/quotation/sellForQuotation.vue b/src/views/modules/quotation/sellForQuotation.vue
index a4ade41..059603c 100644
--- a/src/views/modules/quotation/sellForQuotation.vue
+++ b/src/views/modules/quotation/sellForQuotation.vue
@@ -226,7 +226,7 @@
     </el-tabs>
 
     <!-- 新增弹框 -->
-    <el-dialog title="新增报价" @close="closeInsertDialog" :close-on-click-modal="false" v-drag :visible.sync="insertDiaLogFlag" width="40%">
+    <el-dialog title="新增报价" v-drag @close="closeInsertDialog" :close-on-click-modal="false" v-drag :visible.sync="insertDiaLogFlag" width="40%">
       <el-form :rules="rules" label-position="top" ref="insertQuotationForm" :model="insertData"
       label-width="120px">
         <el-row>
@@ -321,7 +321,7 @@
     </el-dialog>
 
     <!--询价单号选择弹框-->
-    <el-dialog title="内部询价单号"
+    <el-dialog title="内部询价单号" v-drag
                @close="closeQuotationNoDialog"
                @open="openQuotationNoDialog"
                :visible.sync="quotationNoDialogFlag"
@@ -588,7 +588,7 @@ export default {
         type: 'warning'
       }).then(() => {
         deleteByQuotationHeaderId(row).then(({data})=>{
-          if (data.code == 200){
+          if (data.code === 200){
             this.$message.success(data.msg);
             this.initData();
           }else {
diff --git a/src/views/modules/quotation/sellForQuotation/quotationDetail.vue b/src/views/modules/quotation/sellForQuotation/quotationDetail.vue
index 143192e..a7206a8 100644
--- a/src/views/modules/quotation/sellForQuotation/quotationDetail.vue
+++ b/src/views/modules/quotation/sellForQuotation/quotationDetail.vue
@@ -161,7 +161,7 @@
     </el-row>
 
     <!--新增报价明细-->
-    <el-dialog title="新增报价明细" @open="openInsertQuotationDetail" @close="closeInsertQuotationDetail"
+    <el-dialog v-drag title="新增报价明细" @open="openInsertQuotationDetail" @close="closeInsertQuotationDetail"
                :visible.sync="quotationLeadIntoDetailFlag"  width="40%" :close-on-click-modal="false">
       <el-form :model="insertQuotationDetail" ref="insertQuotationDetailForm" :rules="quotationDetailRules"
                label-position="top">
@@ -213,7 +213,7 @@
     </el-dialog>
 
     <!--新增-->
-    <el-dialog @open="openQuotationDetailData" @close="closeInsertDialog" :visible.sync="quotationDetailFlag"
+    <el-dialog v-drag @open="openQuotationDetailData" @close="closeInsertDialog" :visible.sync="quotationDetailFlag"
                width="60%" top="10vh" :close-on-click-modal="false">
       <el-form :rules="quotationDetailRules" style="margin-top: 5px" ref="quotationDetailForm"
                :model="quotationDetailData" label-width="80px" label-position="top">
@@ -590,7 +590,7 @@
     </el-dialog>
 
     <!--quotationTool新增-->
-    <el-dialog title="报价工具" @close="closeQuotationToolDialog" @open="openQuotationToolDialog"  :visible.sync="saveQuotationToolFlag" width="40%"
+    <el-dialog title="报价工具" v-drag @close="closeQuotationToolDialog" @open="openQuotationToolDialog"  :visible.sync="saveQuotationToolFlag" width="40%"
                top="15vh" :close-on-click-modal="false">
       <el-form :rules="quotationToolRules" ref="quotationToolForm" :model="quotationTool" label-position="top"
                style="height: 260px">
@@ -650,7 +650,7 @@
     </el-dialog>
 
     <!--tool列表-->
-    <el-dialog title="工具信息"
+    <el-dialog v-drag title="工具信息"
                 @open="openToolHeaderDialog"
                @close="closeToolHeaderDialog"
                :close-on-click-modal="false"
@@ -686,7 +686,7 @@
     </el-dialog>
 
     <!--quotationRouting新增-->
-    <el-dialog title="报价工艺" @open="openQuotationRoutingDialog" @close="closeQuotationRoutingDialog"  :visible.sync="quotationRoutingDialogFlag" width="40%" top="15vh" :close-on-click-modal="false">
+    <el-dialog v-drag title="报价工艺" @open="openQuotationRoutingDialog" @close="closeQuotationRoutingDialog"  :visible.sync="quotationRoutingDialogFlag" width="40%" top="15vh" :close-on-click-modal="false">
       <el-form :rules="quotationRoutingRules" ref="quotationRoutingForm" :model="quotationRouting" label-position="top">
         <el-row :gutter="20">
           <el-col :span="8">
@@ -886,7 +886,7 @@
     </el-dialog>
 
     <!--报价材料新增-->
-    <el-dialog
+    <el-dialog v-drag
       title="报价材料"
       :visible.sync="quotationPartDialogFlag"
       @close="closeQuotationPartDialog"
@@ -971,7 +971,7 @@
     </el-dialog>
 
     <!--材料弹框-->
-    <el-dialog title="材料列表" @open="openPartDialog"
+    <el-dialog v-drag title="材料列表" @open="openPartDialog"
                :visible.sync="partDialogFlag">
       <!--搜索条件-->
       <el-form :model="partData" ref="partDataForm" label-position="top">
@@ -1009,7 +1009,7 @@
       </el-table>
     </el-dialog>
 
-    <el-dialog title="产品列表" @close="closeProjectPartDialog" @open="openProjectPartDialog"
+    <el-dialog v-drag title="产品列表" @close="closeProjectPartDialog" @open="openProjectPartDialog"
                :visible.sync="projectPartDialogFlag">
       <!--搜索条件-->
       <el-form :model="projectPartData" ref="projectPartDataForm" label-position="top">
@@ -1040,7 +1040,7 @@
     </el-dialog>
 
     <!-- 其他报价单弹框 -->
-    <el-dialog title="报价明细列表"
+    <el-dialog title="报价明细列表"  v-drag
                @close="closeOtherQuotationDetail"
                :close-on-click-modal="false"
                :visible.sync="otherQuotationDetailDialogFlag"
@@ -1164,7 +1164,7 @@
     </el-dialog>
 
     <!-- 子明细工序模态框 -->
-    <el-dialog title="工序清单" :visible.sync="componentPartModelFlag" width="520px">
+    <el-dialog title="工序清单" v-drag :visible.sync="componentPartModelFlag" width="520px">
       <el-form :inline="true" label-position="top" :model="operationData">
         <el-form-item :label="'工序号'">
           <el-input v-model="operationData.operationId" clearable style="width: 120px"></el-input>
@@ -1200,7 +1200,7 @@
       </el-table>
     </el-dialog>
 
-    <el-dialog title="成品属性"  :visible.sync="saveQuotationProductFlag" width="40%"
+    <el-dialog title="成品属性" v-drag :visible.sync="saveQuotationProductFlag" width="40%"
                top="15vh" :close-on-click-modal="false" @close="closeQuotationProductDialog">
       <el-form label-position="top" ref="quotationProductForm" :model="modalData" :rules="quotationProductRule" style="height: 260px">
         <el-row>
@@ -1272,7 +1272,7 @@
       </span>
     </el-dialog>
 
-    <el-dialog title="可选值" @close="closeChooseModalData" :close-on-click-modal="false" v-drag :visible.sync="chooseModalFlag" width="35%">
+    <el-dialog title="可选值" v-drag @close="closeChooseModalData" :close-on-click-modal="false" v-drag :visible.sync="chooseModalFlag" width="35%">
       <el-form :inline="true" label-position="top" :model="chooseModalData">
         <el-form-item label="属性名称:">
           <el-input v-model="chooseModalData.itemDesc" disabled style="width: 120px"></el-input>
@@ -1323,7 +1323,7 @@
       </el-table>
     </el-dialog>
 
-    <el-dialog title="可选值维护" @close="closeItemData" :close-on-click-modal="false" v-drag :visible.sync="itemModalFlag" width="30%" >
+    <el-dialog title="可选值维护" v-drag @close="closeItemData" :close-on-click-modal="false" v-drag :visible.sync="itemModalFlag" width="30%" >
       <el-form ref="itemDataForm" :model="itemData" label-position="top" :rules="itemDataRule" style="height: 80px;width: 80%">
         <el-form-item label="可选值" prop="availableValue">
           <el-input v-model="itemData.availableValue" v-if="chooseModalData.valueTypeDb === 'T'"></el-input>
@@ -1337,7 +1337,7 @@
     </el-dialog>
 
     <!--成品选择-->
-    <el-dialog title="成品属性列表" @close="closePropertiesItemDialog" @open="openPropertiesItemDialog" :visible.sync="propertiesItemDialogFlag" width="40%">
+    <el-dialog title="成品属性列表" v-drag @close="closePropertiesItemDialog" @open="openPropertiesItemDialog" :visible.sync="propertiesItemDialogFlag" width="40%">
       <el-form :inline="true" label-position="top" ref="searchPropertiesDataForm" :model="searchPropertiesData" @keyup.enter.native="getDataList()">
         <el-form-item label="属性编码">
           <el-input v-model="searchPropertiesData.itemNo" style="width: 120px"></el-input>
@@ -2222,6 +2222,7 @@ export default {
         if (!validate){
           this.$message.warning("可选值不能为空!")
         }else {
+          this.itemData.quotationDetailId = this.quotationDetailData.quotationDetailId
           saveQuotationPropertiesItemAvailable(this.itemData).then(({data})=>{
             if (data.code === 200){
               this.searchQuotationPropertiesItemAvailable();
@@ -3049,6 +3050,7 @@ export default {
       this.chooseModalData.itemDesc=row.itemDesc;
       this.chooseModalData.valueTypeDb=row.valueTypeDb;
       this.chooseModalData.itemType=row.itemType;
+      this.chooseModalData.quotationDetailId = row.quotationDetailId
       this.searchQuotationPropertiesItemAvailable();
     },
     // 修改可选值