diff --git a/src/api/project/project.js b/src/api/project/project.js
index b582995..b679112 100644
--- a/src/api/project/project.js
+++ b/src/api/project/project.js
@@ -29,6 +29,7 @@ export const getContactChooseData= data => createAPI(`/project/getContactChooseD
 export const saveProjectContactList= data => createAPI(`/project/saveProjectContactList`,'post',data)
 export const deleteProjectInfo= data => createAPI(`/project/deleteProjectInfo`,'post',data)
 export const getProjectInfoPartList= data => createAPI(`/project/getProjectInfoPartList`,'post',data)
+export const getProjectPartList= data => createAPI(`/project/getProjectPartList`,'get',data)
 export const saveProjectPart= data => createAPI(`/project/saveProjectPart`,'post',data)
 export const deleteProjectPartWithId= data => createAPI(`/project/deleteProjectPartWithId`,'post',data)
 export const getPlmToolPurchaseRequestDataByProject= data => createAPI(`/project/getPlmToolPurchaseRequestDataByProject`,'post',data)
diff --git a/src/components/quotation/sellForQuotation/quotationCustomerContact.vue b/src/components/quotation/sellForQuotation/quotationCustomerContact.vue
index c4baade..ec24196 100644
--- a/src/components/quotation/sellForQuotation/quotationCustomerContact.vue
+++ b/src/components/quotation/sellForQuotation/quotationCustomerContact.vue
@@ -1,29 +1,33 @@
 <template>
   <div class="mode-config">
-    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
-      <el-form :inline="true" label-position="top" style="margin-top: 0px">
-        <download-excel
-          :fields="fields2()"
-          :data="exportData2"
-          type="xls"
-          :name="exportName2"
-          :header="exportHeader2"
-          :footer="exportFooter2"
-          :fetch="createExportData2"
-          :before-generate="startDownload2"
-          :before-finish="finishDownload2"
-          worksheet="导出信息"
-          class="el-button el-button--primary el-button--medium">
-          {{ '导出' }}
-        </download-excel>
-      </el-form>
-    </el-form>
+    <el-row>
+      <el-col>
+        <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
+          <el-form :inline="true" label-position="top" style="margin-top: 0px">
+            <download-excel
+              :fields="fields2()"
+              :data="exportData2"
+              type="xls"
+              :name="exportName2"
+              :header="exportHeader2"
+              :footer="exportFooter2"
+              :fetch="createExportData2"
+              :before-generate="startDownload2"
+              :before-finish="finishDownload2"
+              worksheet="导出信息"
+              class="el-button el-button--primary el-button--medium">
+              {{ '导出' }}
+            </download-excel>
+          </el-form>
+        </el-form>
+      </el-col>
+    </el-row>
     <el-table
       :data="contactList"
-      height="370"
+      height="360"
       border
       v-loading="dataListLoading"
-      style="width: 100%; ">
+      style="width: 100%;margin-top: 10px ">
       <el-table-column
         v-for="(item,index) in columnList2" :key="index"
         :sortable="item.columnSortable"
diff --git a/src/components/quotation/sellForQuotation/quotationDetail.vue b/src/components/quotation/sellForQuotation/quotationDetail.vue
index 505bf0b..c3adde6 100644
--- a/src/components/quotation/sellForQuotation/quotationDetail.vue
+++ b/src/components/quotation/sellForQuotation/quotationDetail.vue
@@ -4,7 +4,7 @@
       <el-col :span="24">
         <el-button type="primary" @click="quotationLeadIntoDetailFlag = true">新增
         </el-button>
-        <el-button type="primary">从历史询价导入</el-button>
+        <el-button type="primary" @click="clickOtherQuotationDetailsBtn(-1)">从历史询价导入</el-button>
 
         <el-button type="primary" @click="clickHistoryQuotationDetailBtn">从历史报价导入</el-button>
       </el-col>
@@ -139,6 +139,11 @@
             label="报价次数" prop="quotationDetailCount"
             width="80" align="center">
           </el-table-column>
+
+          <div slot="empty">
+            <svg height="180" node-id="1" sillyvg="true" template-height="1024" template-width="1024" version="1.1" viewBox="0 0 1024 1024" width="1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs node-id="115"><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_28" node-id="5" spreadMethod="pad" x1="26305.36" x2="26384.72" y1="-42886.72" y2="-42888.098"><stop offset="0" stop-color="#98d6fa"/><stop offset="1" stop-color="#47b0f1"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_28-2" node-id="8" spreadMethod="pad" x1="26305.36" x2="26384.72" y1="-42886.72" y2="-42888.098"><stop offset="0" stop-color="#98d6fa"/><stop offset="1" stop-color="#47b0f1"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_3" node-id="9" spreadMethod="pad" x1="198806.11" x2="199736.11" y1="-228966.97" y2="-228966.97"><stop offset="0" stop-color="#fff5de"/><stop offset="1" stop-color="#fbd2ac"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_28-3" node-id="12" spreadMethod="pad" x1="15798.319" x2="15845.487" y1="-23888.906" y2="-23889.418"><stop offset="0" stop-color="#98d6fa"/><stop offset="1" stop-color="#47b0f1"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_28-4" node-id="13" spreadMethod="pad" x1="10883.409" x2="10916.618" y1="-16576.174" y2="-16576.527"><stop offset="0" stop-color="#98d6fa"/><stop offset="1" stop-color="#47b0f1"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_28-5" node-id="14" spreadMethod="pad" x1="10883.409" x2="10916.618" y1="-16576.174" y2="-16576.527"><stop offset="0" stop-color="#98d6fa"/><stop offset="1" stop-color="#47b0f1"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_28-6" node-id="15" spreadMethod="pad" x1="7478.883" x2="7501.544" y1="-11524.333" y2="-11524.578"><stop offset="0" stop-color="#98d6fa"/><stop offset="1" stop-color="#47b0f1"/></linearGradient><linearGradient gradientTransform="matrix(269.22 47.47 27.01 -153.15 -82548.68 133303.42)" gradientUnits="userSpaceOnUse" id="未命名的渐变_28-7" node-id="16" spreadMethod="pad" x1="213.04" x2="213.68" y1="931.65" y2="931.72"><stop offset="0" stop-color="#98d6fa"/><stop offset="1" stop-color="#47b0f1"/></linearGradient><linearGradient gradientTransform="matrix(50.26 -50.26 -135.69 -135.69 115943.22 138005.55)" gradientUnits="userSpaceOnUse" id="未命名的渐变_13" node-id="17" spreadMethod="pad" x1="213.03" x2="213.21" y1="932.64" y2="932.57"><stop offset="0.03" stop-color="#afdef9"/><stop offset="1" stop-color="#7cc9f9"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_28-8" node-id="20" spreadMethod="pad" x1="43370.684" x2="43480.617" y1="-201779.2" y2="-201831.23"><stop offset="0" stop-color="#98d6fa"/><stop offset="1" stop-color="#47b0f1"/></linearGradient><linearGradient gradientTransform="matrix(64.64 -31.53 -95 -194.77 74960.15 188980.58)" gradientUnits="userSpaceOnUse" id="未命名的渐变_13-2" node-id="21" spreadMethod="pad" x1="212.15" x2="212.28" y1="932.39" y2="932.32"><stop offset="0.03" stop-color="#afdef9"/><stop offset="1" stop-color="#7cc9f9"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_28-9" node-id="22" spreadMethod="pad" x1="23507.504" x2="23531.85" y1="-226021.66" y2="-226160.14"><stop offset="0" stop-color="#98d6fa"/><stop offset="1" stop-color="#47b0f1"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_13-3" node-id="23" spreadMethod="pad" x1="15016.36" x2="15028.444" y1="-178656.97" y2="-178643.53"><stop offset="0.03" stop-color="#afdef9"/><stop offset="1" stop-color="#7cc9f9"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_28-10" node-id="24" spreadMethod="pad" x1="8457.1875" x2="8441.035" y1="-33805.3" y2="-33833.215"><stop offset="0" stop-color="#98d6fa"/><stop offset="1" stop-color="#47b0f1"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_28-11" node-id="25" spreadMethod="pad" x1="8490.103" x2="8512.86" y1="-46595" y2="-46620.5"><stop offset="0" stop-color="#98d6fa"/><stop offset="1" stop-color="#47b0f1"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_28-12" node-id="26" spreadMethod="pad" x1="9834.147" x2="9874.055" y1="-34236.848" y2="-34247.86"><stop offset="0" stop-color="#98d6fa"/><stop offset="1" stop-color="#47b0f1"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_28-13" node-id="27" spreadMethod="pad" x1="12840.5" x2="12892.351" y1="-41019.44" y2="-41030.883"><stop offset="0" stop-color="#98d6fa"/><stop offset="1" stop-color="#47b0f1"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_28-14" node-id="28" spreadMethod="pad" x1="7918.4404" x2="7950.7397" y1="-25205.85" y2="-25212.6"><stop offset="0" stop-color="#98d6fa"/><stop offset="1" stop-color="#47b0f1"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_19" node-id="29" spreadMethod="pad" x1="31230.15" x2="31340.4" y1="-179798.8" y2="-179582.64"><stop offset="0" stop-color="#47b0f1"/><stop offset="1" stop-color="#98d6fa"/></linearGradient><linearGradient gradientTransform="matrix(-47.94015888 29.95633601 -28.48845965 -45.59106565 37296.44 36527.24)" gradientUnits="userSpaceOnUse" id="未命名的渐变_28-15" node-id="32" spreadMethod="pad" x1="217.6" x2="216.6" y1="935.69" y2="934.47"><stop offset="0" stop-color="#98d6fa"/><stop offset="1" stop-color="#47b0f1"/></linearGradient><linearGradient gradientTransform="matrix(-474.84 33.2 -9.98 -142.65 111928.37 126624.6)" gradientUnits="userSpaceOnUse" id="未命名的渐变_21" node-id="33" spreadMethod="pad" x1="214.44" x2="215.44" y1="932.12" y2="932.12"><stop offset="0" stop-color="#f5dda7"/><stop offset="1" stop-color="#fa9a41"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_28-16" node-id="36" spreadMethod="pad" x1="80122.016" x2="80466.94" y1="-53643.043" y2="-53643.62"><stop offset="0" stop-color="#98d6fa"/><stop offset="1" stop-color="#47b0f1"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_28-17" node-id="37" spreadMethod="pad" x1="32668.813" x2="32745.557" y1="-181383.7" y2="-181307.72"><stop offset="0" stop-color="#98d6fa"/><stop offset="1" stop-color="#47b0f1"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_35" node-id="38" spreadMethod="pad" x1="29469.025" x2="29603.594" y1="-221184.02" y2="-221107.98"><stop offset="0" stop-color="#98d6fa"/><stop offset="0.91" stop-color="#47b0f1"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_28-18" node-id="41" spreadMethod="pad" x1="80072.234" x2="80289.66" y1="-56389.87" y2="-56386.848"><stop offset="0" stop-color="#98d6fa"/><stop offset="1" stop-color="#47b0f1"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_34" node-id="42" spreadMethod="pad" x1="27554.043" x2="27680.025" y1="-270635.3" y2="-270548.1"><stop offset="0.13" stop-color="#98d6fa"/><stop offset="0.22" stop-color="#8acff8"/><stop offset="0.5" stop-color="#66bef4"/><stop offset="0.72" stop-color="#4fb4f2"/><stop offset="0.86" stop-color="#47b0f1"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_28-19" node-id="48" spreadMethod="pad" x1="57545.945" x2="57816.023" y1="-93468.28" y2="-93461.26"><stop offset="0" stop-color="#98d6fa"/><stop offset="1" stop-color="#47b0f1"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_28-20" node-id="49" spreadMethod="pad" x1="61533.684" x2="61798.797" y1="-42980.875" y2="-42981.332"><stop offset="0" stop-color="#98d6fa"/><stop offset="1" stop-color="#47b0f1"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_30" node-id="50" spreadMethod="pad" x1="31954.738" x2="31825.982" y1="-106629.42" y2="-106629.42"><stop offset="0" stop-color="#923629"/><stop offset="0.3" stop-color="#57352c"/><stop offset="0.5" stop-color="#42352c"/><stop offset="0.7" stop-color="#2c2422"/><stop offset="1" stop-color="#1d181c"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_30-2" node-id="56" spreadMethod="pad" x1="29657.88" x2="29538.314" y1="-39212.887" y2="-39212.887"><stop offset="0" stop-color="#923629"/><stop offset="0.3" stop-color="#57352c"/><stop offset="0.5" stop-color="#42352c"/><stop offset="0.7" stop-color="#2c2422"/><stop offset="1" stop-color="#1d181c"/></linearGradient><linearGradient gradientUnits="userSpaceOnUse" id="未命名的渐变_31" node-id="57" spreadMethod="pad" x1="20253.799" x2="20159.55" y1="-133201.05" y2="-133201.05"><stop offset="0" stop-color="#f97b61"/><stop offset="1" stop-color="#ffb859"/></linearGradient><linearGradient gradientTransform="matrix(-80.83481119 -46.67 38.075 -65.9478345 -17289.32 72227.94)" gradientUnits="userSpaceOnUse" id="未命名的渐变_32" node-id="60" spreadMethod="pad" x1="216.28" x2="217.72" y1="931.17" y2="930.69"><stop offset="0" stop-color="#ffb859"/><stop offset="1" stop-color="#f97b61"/></linearGradient></defs><g node-id="326"><g node-id="327"><path d="M 0.00 0.00 L 1024.00 0.00 L 1024.00 1024.00 L 0.00 1024.00 Z" fill="#ffffff" fill-opacity="0" fill-rule="nonzero" group-id="1,2" id="矩形" node-id="66" stroke="none" target-height="1024" target-width="1024" target-x="0" target-y="0"/><g node-id="328"><g node-id="333"><path d="M 76.80 581.77 C 69.12 548.67 19.18 333.15 160.40 303.51 C 301.62 273.87 385.05 308.39 447.10 248.05 C 509.15 187.71 524.62 197.61 575.59 201.60 C 626.56 205.59 685.63 162.00 705.47 149.00 C 725.31 136.00 904.53 51.69 950.35 303.51 C 957.59 412.38 963.61 530.51 912.91 575.24 C 862.21 619.97 913.84 660.15 950.35 664.62 C 986.86 669.09 933.28 745.53 849.00 778.90 C 792.88 804.06 430.19 876.18 213.00 802.00 C 108.11 757.12 84.47 614.86 76.80 581.77 Z" fill="#47b0f1" fill-opacity="0.05" fill-rule="nonzero" group-id="1,2,3,8" id="路径-58" node-id="68" stroke="none" target-height="824.49" target-width="967.68" target-x="19.18" target-y="51.69"/></g><g node-id="334"><path d="M 158.00 329.00 L 158.00 329.15 C 161.49 329.87 164.00 332.94 164.00 336.50 L 164.00 337.50 C 164.00 341.64 160.64 345.00 156.50 345.00 L 77.50 345.00 C 73.36 345.00 70.00 341.64 70.00 337.50 L 70.00 336.50 C 70.00 332.36 73.36 329.00 77.50 329.00 L 109.00 329.00 C 112.77 329.00 115.87 326.01 116.00 322.24 L 116.00 322.00 C 116.00 318.23 113.01 315.13 109.24 315.00 L 106.00 315.00 L 106.00 314.85 C 102.51 314.14 100.00 311.06 100.00 307.50 L 100.00 306.50 C 100.00 302.36 103.36 299.00 107.50 299.00 L 186.50 299.00 C 190.64 299.00 194.00 302.36 194.00 306.50 L 194.00 307.50 C 194.00 311.64 190.64 315.00 186.50 315.00 L 155.00 315.00 C 151.23 315.00 148.13 317.99 148.00 321.76 L 148.00 322.00 C 148.00 325.77 150.99 328.87 154.76 329.00 L 158.00 329.00 Z" fill="url(#未命名的渐变_28)" fill-opacity="0.1" fill-rule="nonzero" group-id="1,2,3,9" id="形状结合" node-id="69" stroke="none" target-height="46" target-width="124" target-x="70" target-y="299"/></g><g node-id="335"><path d="M 858.00 159.00 L 858.00 159.15 C 861.49 159.87 864.00 162.94 864.00 166.50 L 864.00 167.50 C 864.00 171.64 860.64 175.00 856.50 175.00 L 777.50 175.00 C 773.36 175.00 770.00 171.64 770.00 167.50 L 770.00 166.50 C 770.00 162.36 773.36 159.00 777.50 159.00 L 809.00 159.00 C 812.77 159.00 815.87 156.01 816.00 152.24 L 816.00 152.00 C 816.00 148.23 813.01 145.13 809.24 145.00 L 806.00 145.00 L 806.00 144.85 C 802.51 144.14 800.00 141.06 800.00 137.50 L 800.00 136.50 C 800.00 132.36 803.36 129.00 807.50 129.00 L 886.50 129.00 C 890.64 129.00 894.00 132.36 894.00 136.50 L 894.00 137.50 C 894.00 141.64 890.64 145.00 886.50 145.00 L 855.00 145.00 C 851.23 145.00 848.13 147.99 848.00 151.76 L 848.00 152.00 C 848.00 155.77 850.99 158.87 854.76 159.00 L 858.00 159.00 Z" fill="url(#未命名的渐变_28-2)" fill-opacity="0.1" fill-rule="nonzero" group-id="1,2,3,10" id="形状结合-2" node-id="70" stroke="none" target-height="46" target-width="124" target-x="770" target-y="129"/></g><path d="M 514.52 712.00 C 645.62 712.00 763.78 722.79 846.30 740.00 C 927.06 740.65 992.00 765.00 992.00 795.00 C 992.00 819.23 949.55 839.80 890.61 847.13 C 877.61 850.88 863.20 854.43 847.45 857.75 C 847.82 859.81 848.00 861.90 848.00 864.00 C 848.00 915.91 735.18 958.00 596.00 958.00 C 471.35 958.00 367.83 924.24 347.59 879.89 C 180.20 867.13 62.00 835.72 62.00 799.00 C 62.00 751.00 264.37 712.00 514.52 712.00 Z" fill="url(#未命名的渐变_3)" fill-rule="nonzero" group-id="1,2,3" id="形状结合-3" node-id="71" stroke="none" target-height="246" target-width="930" target-x="62" target-y="712"/><path d="M 686.61 226.65 L 686.61 226.55 C 681.28 211.55 663.91 204.44 649.17 206.62 C 660.10 199.83 678.17 198.02 686.61 208.44 L 686.61 208.53 C 695.07 198.20 713.20 199.92 724.04 206.71 C 709.32 204.63 691.95 211.71 686.61 226.64 Z" fill="url(#未命名的渐变_28-3)" fill-rule="nonzero" group-id="1,2,3,11" id="路径" node-id="73" stroke="none" target-height="28.62999" target-width="74.869995" target-x="649.17" target-y="198.02"/><path d="M 770.00 214.11 L 770.00 214.00 C 766.30 203.58 754.27 198.69 744.06 200.19 C 751.63 195.48 764.13 194.19 770.00 201.45 L 770.00 201.51 C 775.87 194.35 788.44 195.51 796.00 200.25 C 785.79 198.81 773.76 203.71 770.00 214.07 Z" fill="url(#未命名的渐变_28-4)" fill-rule="nonzero" group-id="1,2,3,11" id="路径-2" node-id="74" stroke="none" target-height="19.919998" target-width="51.940002" target-x="744.06" target-y="194.19"/><path d="M 735.24 179.63 L 735.24 179.57 C 731.54 169.14 719.51 164.25 709.24 165.75 C 716.82 161.04 729.32 159.75 735.24 167.01 L 735.24 167.07 C 741.11 159.92 753.67 161.07 761.24 165.82 C 751.02 164.37 739.00 169.27 735.24 179.63 Z" fill="url(#未命名的渐变_28-5)" fill-rule="nonzero" group-id="1,2,3,11" id="路径-3" node-id="75" stroke="none" target-height="19.880005" target-width="52" target-x="709.24" target-y="159.75"/><path d="M 840.72 220.07 L 840.72 220.07 C 838.16 212.84 829.82 209.44 822.72 210.49 C 827.97 207.23 836.63 206.35 840.72 211.36 L 840.72 211.36 C 844.80 206.36 853.50 207.23 858.72 210.49 C 851.63 209.49 843.29 212.89 840.72 220.07 Z" fill="url(#未命名的渐变_28-6)" fill-rule="nonzero" group-id="1,2,3,11" id="路径-4" node-id="76" stroke="none" target-height="13.720001" target-width="36" target-x="822.72" target-y="206.35"/><path d="M 54.17 676.40 C 21.50 661.73 6.84 668.95 10.17 698.04 C 12.06 707.07 15.46 712.73 20.37 715.00 C 33.21 730.65 40.00 743.19 40.74 752.62 C 41.85 766.76 52.85 782.78 80.40 773.62 C 98.77 767.51 111.38 777.73 118.24 804.30 C 138.95 831.74 175.32 842.70 227.37 837.19 C 279.42 831.68 276.11 807.68 217.44 765.19 C 201.49 758.89 189.31 755.00 180.90 753.52 C 172.49 752.04 168.37 742.87 168.54 726.00 C 168.54 715.45 160.90 707.74 145.62 702.89 C 130.34 698.04 123.94 690.32 126.42 679.75 C 116.27 664.80 104.15 662.66 90.08 673.34 C 76.01 684.02 64.04 685.04 54.17 676.40 Z" fill="url(#未命名的渐变_28-7)" fill-rule="nonzero" group-id="1,2,3,12" id="路径-61" node-id="78" stroke="none" target-height="180.96997" target-width="272.58" target-x="6.8366666" target-y="661.73334"/><path d="M 52.64 691.51 L 100.91 723.73 C 98.45 710.81 95.51 700.34 92.09 692.33 C 87.02 680.46 102.68 712.12 102.89 725.05 L 143.13 751.91 L 143.02 751.75 C 144.13 734.46 143.68 722.40 141.68 715.55 C 144.37 719.14 147.24 744.92 145.68 753.55 L 182.68 778.25 C 182.47 778.01 182.34 777.84 182.34 777.84 C 182.34 777.84 184.25 763.56 182.56 756.37 C 184.23 758.37 185.35 773.37 184.86 779.71 L 215.41 800.10 L 211.52 804.00 L 180.00 781.68 C 171.48 786.68 159.79 787.47 154.14 786.94 C 164.59 785.99 172.22 783.59 177.04 779.75 C 177.81 780.38 178.65 780.91 179.54 781.35 L 90.70 718.45 C 90.90 718.68 91.08 718.90 91.26 719.14 C 78.10 721.00 66.29 720.21 55.82 716.76 C 56.66 715.09 70.57 721.59 88.93 717.21 Z M 94.00 768.36 C 104.54 768.67 118.26 762.58 135.17 750.09 C 135.86 750.88 136.60 751.62 137.39 752.31 C 121.39 764.93 104.24 769.90 94.00 768.36 Z" fill="url(#未命名的渐变_13)" fill-rule="nonzero" group-id="1,2,3,12" id="形状结合-4" node-id="79" stroke="none" target-height="123.53998" target-width="162.77" target-x="52.64" target-y="680.46"/><path d="M 89.57 607.28 C 57.40 585.39 42.48 590.89 44.79 623.79 C 51.00 647.36 55.00 663.12 53.00 677.56 C 51.00 692.00 57.31 719.31 89.56 730.56 C 111.06 738.03 117.10 748.63 107.68 762.35 C 102.95 783.43 129.03 798.56 185.90 807.73 C 271.23 821.49 250.90 789.86 228.96 755.57 C 213.09 739.69 210.96 729.99 210.96 717.85 C 210.96 705.71 222.57 685.85 189.20 677.61 C 174.53 674.28 166.85 659.61 166.14 633.61 C 163.84 620.55 149.84 617.28 124.14 623.81 C 112.75 626.00 101.23 620.49 89.57 607.28 Z" fill="url(#未命名的渐变_28-8)" fill-rule="nonzero" group-id="1,2,3,12" id="路径-65" node-id="80" stroke="none" target-height="236.10333" target-width="228.75334" target-x="42.476665" target-y="585.38666"/><path d="M 74.94 624.74 L 110.38 669.80 L 110.45 669.63 C 114.28 660.71 115.11 650.78 112.80 641.35 L 112.72 641.04 L 112.72 641.04 C 115.06 648.31 119.53 656.98 112.11 671.97 L 142.11 710.15 L 142.30 709.88 C 148.30 701.40 151.30 690.25 151.30 676.42 C 152.68 680.72 152.71 700.42 144.14 712.69 L 170.75 746.51 C 172.43 743.90 176.63 736.56 176.63 728.36 C 177.52 734.01 177.63 741.58 172.74 749.04 L 212.00 799.00 L 205.77 799.00 L 167.77 748.45 C 149.39 756.29 139.07 753.01 133.96 750.70 C 143.96 753.14 154.53 751.47 165.68 745.70 L 136.81 707.26 C 136.97 707.55 137.13 707.86 137.31 708.17 C 118.10 714.90 98.16 715.70 88.95 710.91 C 98.81 714.63 114.48 712.78 135.95 705.35 L 135.52 705.50 L 103.35 662.66 C 103.42 662.84 103.48 663.01 103.53 663.18 C 89.40 664.05 78.12 659.55 69.69 649.69 C 71.03 648.39 80.04 661.50 101.83 660.69 Z" fill="url(#未命名的渐变_13-2)" fill-rule="nonzero" group-id="1,2,3,12" id="形状结合-5" node-id="81" stroke="none" target-height="174.26001" target-width="142.31" target-x="69.69" target-y="624.74"/><path d="M 199.20 608.75 C 211.62 591.49 222.74 593.24 232.55 614.01 C 237.31 631.95 229.80 643.35 254.37 651.51 C 270.76 656.95 273.24 668.33 261.81 685.66 C 257.04 696.56 260.57 703.53 272.39 706.57 C 284.21 709.61 282.79 721.68 268.12 742.79 C 263.04 754.36 263.04 762.10 268.12 765.99 C 275.75 771.82 290.40 789.34 272.39 823.38 C 254.38 857.42 211.93 830.98 205.56 814.98 C 199.19 798.98 211.93 776.92 205.56 765.98 C 199.19 755.04 162.10 751.28 172.00 718.47 C 180.25 705.04 191.74 701.16 180.21 678.31 C 168.68 655.46 165.75 664.63 180.21 642.12 C 186.53 635.65 192.86 624.53 199.20 608.75 Z" fill="url(#未命名的渐变_28-9)" fill-rule="nonzero" group-id="1,2,3,12" id="路径-96" node-id="82" stroke="none" target-height="265.93" target-width="128.29999" target-x="162.1" target-y="591.49"/><path d="M 216.11 638.51 L 227.46 695.42 C 234.85 684.56 240.18 675.08 243.46 666.99 C 248.27 654.99 236.96 688.47 227.96 697.76 L 237.42 745.21 C 237.41 745.15 237.41 745.08 237.42 745.02 C 250.43 733.58 258.65 724.73 262.07 718.47 C 261.43 722.91 245.22 743.17 237.97 748.17 L 246.68 791.81 L 246.68 791.28 C 246.68 791.28 258.12 782.53 262.02 776.28 C 261.77 778.90 252.02 790.28 247.14 794.42 L 254.32 830.42 L 248.90 830.42 L 242.39 792.33 C 232.80 789.87 224.00 782.14 220.39 777.77 C 228.45 784.48 235.54 788.19 241.67 788.88 C 241.77 789.86 241.98 790.83 242.30 791.77 L 224.00 684.47 C 223.99 684.77 223.96 685.06 223.91 685.35 C 213.29 677.35 205.50 668.44 200.54 658.61 C 202.31 658.03 207.54 672.46 223.64 682.34 Z M 191.00 722.08 C 198.23 729.75 212.23 735.14 233.00 738.27 C 232.93 739.32 232.93 740.36 233.00 741.41 C 212.80 739.00 197.16 730.42 191.00 722.08 Z" fill="url(#未命名的渐变_13-3)" fill-rule="nonzero" group-id="1,2,3,12" id="形状结合-6" node-id="83" stroke="none" target-height="191.90997" target-width="71.07001" target-x="191" target-y="638.51"/><path d="M 938.40 787.52 C 941.30 765.31 933.83 753.34 916.00 751.63 C 940.14 749.33 956.12 764.02 956.38 787.52 C 951.38 787.69 945.39 787.69 938.40 787.52 Z" fill="url(#未命名的渐变_28-10)" fill-rule="nonzero" group-id="1,2,3,13" id="路径-38" node-id="85" stroke="none" target-height="38.363342" target-width="40.380005" target-x="916" target-y="749.33"/><path d="M 950.12 787.65 C 954.83 765.22 949.04 748.67 932.73 738.00 C 953.55 744.57 968.51 754.44 973.37 787.65 C 965.63 788.12 957.86 788.12 950.12 787.65 Z" fill="url(#未命名的渐变_28-11)" fill-rule="nonzero" group-id="1,2,3,13" id="路径-39" node-id="86" stroke="none" target-height="50.1239" target-width="40.640015" target-x="932.73" target-y="738"/><path d="M 977.07 788.00 C 974.98 766.70 982.62 754.50 1000.00 751.39 C 983.89 750.99 965.91 749.91 953.00 788.00 C 963.93 787.65 971.96 787.65 977.07 788.00 Z" fill="url(#未命名的渐变_28-12)" fill-rule="nonzero" group-id="1,2,3,13" id="路径-40" node-id="87" stroke="none" target-height="38.090027" target-width="47" target-x="953" target-y="749.91"/><path d="M 927.41 802.00 C 944.26 802.00 957.00 802.41 957.00 786.61 C 957.00 770.81 943.34 758.00 926.50 758.00 C 909.66 758.00 896.00 770.81 896.00 786.61 C 896.00 802.41 910.57 802.00 927.41 802.00 Z" fill="url(#未命名的渐变_28-13)" fill-rule="nonzero" group-id="1,2,3,13" id="椭圆形" node-id="88" stroke="none" target-height="44.409973" target-width="61" target-x="896" target-y="758"/><path d="M 960.57 802.00 C 971.06 802.00 979.00 802.25 979.00 792.56 C 979.00 782.87 970.49 775.00 960.00 775.00 C 949.51 775.00 941.00 782.86 941.00 792.56 C 941.00 802.26 950.07 802.00 960.57 802.00 Z" fill="url(#未命名的渐变_28-14)" fill-rule="nonzero" group-id="1,2,3,13" id="椭圆形备份-6" node-id="89" stroke="none" target-height="27.26001" target-width="38" target-x="941" target-y="775"/></g><g node-id="329"><path d="M 304.19 419.00 C 390.06 434.22 410.22 455.46 364.67 482.71 C 296.34 523.59 231.97 554.06 330.57 591.82 C 353.11 599.75 385.25 606.47 427.00 612.00" fill="none" group-id="1,2,4" id="路径-33" node-id="91" stroke="url(#未命名的渐变_19)" stroke-dasharray="2 2" stroke-linecap="butt" stroke-width="1" target-height="193" target-width="195.03" target-x="231.97" target-y="419"/><path d="M 272.67 412.44 L 262.37 424.38 L 226.78 391.16 L 292.59 389.80 L 283.70 400.86 L 235.83 393.87 L 279.45 406.11 L 287.93 416.34 L 272.67 412.44 Z" fill="url(#未命名的渐变_28-15)" fill-rule="nonzero" group-id="1,2,4" id="路径-5" node-id="92" stroke="none" target-height="34.580017" target-width="65.81" target-x="226.78" target-y="389.8"/></g><g node-id="330"><path d="M 367.00 784.78 C 407.79 794.88 390.34 799.86 375.66 804.78 C 348.71 813.87 359.09 822.68 371.08 830.84 C 388.84 842.93 529.25 874.59 688.77 854.84 C 837.51 836.42 820.90 796.05 785.87 777.03 C 757.64 761.74 630.54 725.46 479.20 728.71 C 388.13 730.65 347.84 740.32 339.20 748.34 C 324.88 761.64 321.58 773.53 367.00 784.78 Z" fill="url(#未命名的渐变_21)" fill-opacity="0.4" fill-rule="nonzero" group-id="1,2,5" id="路径-6" node-id="93" stroke="none" target-height="149.13" target-width="515.93005" target-x="321.58" target-y="725.46"/></g><g node-id="331"><path d="M 444.09 783.72 L 581.64 755.93 L 819.00 769.42 L 689.47 813.49 L 444.09 783.72 Z" fill="url(#未命名的渐变_28-16)" fill-rule="nonzero" group-id="1,2,6" id="路径-68" node-id="95" stroke="none" target-height="57.559998" target-width="374.91" target-x="444.09" target-y="755.93"/><path d="M 582.82 582.50 L 582.82 755.58 L 736.31 764.79 L 736.03 569.97 L 582.82 582.50 Z" fill="url(#未命名的渐变_28-17)" fill-rule="nonzero" group-id="1,2,6" id="路径-69" node-id="96" stroke="none" target-height="194.82" target-width="153.48999" target-x="582.82" target-y="569.97"/><path d="M 444.09 546.36 L 444.09 783.97 L 582.82 755.29 L 582.82 583.21 L 444.09 546.36 Z" fill="url(#未命名的渐变_35)" fill-rule="nonzero" group-id="1,2,6" id="路径-70" node-id="97" stroke="none" target-height="237.60999" target-width="138.73001" target-x="444.09" target-y="546.36"/><path d="M 444.09 546.69 L 688.11 522.75 L 818.96 564.46 L 582.64 583.25 L 444.09 546.69 Z" fill="url(#未命名的渐变_28-18)" fill-rule="nonzero" group-id="1,2,6" id="路径-71" node-id="98" stroke="none" target-height="60.5" target-width="374.87003" target-x="444.09" target-y="522.75"/><path d="M 692.24 524.22 L 689.08 814.97 L 818.96 769.48 L 818.96 562.36 L 692.24 524.22 Z" fill="url(#未命名的渐变_34)" fill-rule="nonzero" group-id="1,2,6" id="路径-72" node-id="99" stroke="none" target-height="290.75" target-width="129.88" target-x="689.08" target-y="524.22"/><path d="M 445.57 546.36 L 460.98 487.02 L 715.65 446.00 L 692.88 524.67 L 445.57 546.36 Z" fill="url(#未命名的渐变_28-19)" fill-rule="nonzero" group-id="1,2,6" id="路径-73" node-id="100" stroke="none" target-height="100.359985" target-width="270.08002" target-x="445.57" target-y="446"/><path d="M 444.86 783.97 L 402.40 797.75 L 622.80 830.07 L 690.56 812.52 L 444.86 783.97 Z" fill="url(#未命名的渐变_28-20)" fill-rule="nonzero" group-id="1,2,6" id="路径-74" node-id="101" stroke="none" target-height="46.100037" target-width="288.16" target-x="402.4" target-y="783.97"/></g><g node-id="332"><g node-id="339"><path d="M 680.92 666.24 C 678.36 661.24 677.78 653.93 679.61 650.35 C 681.44 646.77 687.69 627.76 673.12 620.91 C 658.55 614.06 645.64 625.85 646.89 640.91 C 648.14 655.97 648.95 664.37 652.89 665.25 C 656.83 666.13 657.89 671.40 658.50 674.61 C 659.11 677.82 676.62 670.16 676.62 670.16 L 680.68 669.16 Z" fill="#ebb0b0" fill-rule="nonzero" group-id="1,2,7,14" id="路径-7" node-id="104" stroke="none" target-height="63.76001" target-width="42.049988" target-x="645.64" target-y="614.06"/><path d="M 655.51 605.76 C 640.51 606.42 641.88 619.40 645.25 626.49 C 648.62 633.58 649.02 631.35 654.19 635.24 C 654.19 635.24 655.19 633.95 655.84 643.53 L 658.41 644.60 C 659.41 644.94 658.18 642.60 659.69 641.49 C 661.20 640.38 665.62 643.83 663.43 647.88 C 661.24 651.93 661.36 650.74 661.36 650.74 C 661.36 650.74 664.74 655.32 666.99 654.74 C 669.24 654.16 681.55 654.36 682.43 650.62 C 683.31 646.88 687.62 642.80 687.73 632.62 C 687.84 622.44 677.19 611.62 670.68 609.09 C 664.17 606.56 659.24 605.60 655.51 605.76 Z" fill="#131322" fill-rule="nonzero" group-id="1,2,7,14" id="路径-8" node-id="105" stroke="none" target-height="49.72003" target-width="47.330017" target-x="640.51" target-y="605.6"/></g><path d="M 483.41 789.92 C 484.63 794.33 486.28 796.21 485.50 798.77 C 484.72 801.33 479.40 805.08 476.08 804.53 C 471.87 803.83 464.68 802.15 462.65 801.73 C 460.62 801.31 446.72 798.00 445.09 793.73 C 443.46 789.46 449.90 786.09 458.87 786.65 C 467.84 787.21 480.68 789.09 480.68 789.09 Z" fill="#333333" fill-rule="nonzero" group-id="1,2,7" id="路径-9" node-id="106" stroke="none" target-height="18.98999" target-width="42.820007" target-x="443.46" target-y="786.09"/><path d="M 519.64 792.54 C 520.64 796.02 521.90 797.54 521.29 799.54 C 520.68 801.54 516.48 804.54 513.85 804.09 C 510.53 803.53 504.85 802.21 503.25 801.87 C 501.65 801.53 490.67 798.93 489.39 795.56 C 488.11 792.19 493.18 789.56 500.27 789.97 C 507.36 790.38 517.49 791.90 517.49 791.90 Z" fill="#333333" fill-rule="nonzero" group-id="1,2,7" id="路径备份" node-id="107" stroke="none" target-height="14.97998" target-width="33.79004" target-x="488.11" target-y="789.56"/><path d="M 573.38 783.30 C 563.90 775.59 557.11 763.43 548.26 730.41 C 545.46 737.19 523.76 754.69 482.13 798.97 L 470.56 793.22 C 494.85 723.41 524.20 695.49 544.35 685.66 C 567.79 676.38 591.82 723.41 594.77 730.41 C 596.77 735.08 605.27 751.15 620.28 778.62 C 599.00 788.40 581.39 789.84 573.38 783.30 Z" fill="url(#未命名的渐变_30)" fill-rule="nonzero" group-id="1,2,7" id="_Path_" node-id="108" stroke="none" target-height="122.589966" target-width="149.72003" target-x="470.56" target-y="676.38"/><path d="M 650.87 805.23 C 614.65 814.62 589.05 819.69 574.06 820.42 C 551.57 821.52 516.12 816.07 511.84 803.31 C 515.17 797.07 518.17 793.71 520.84 793.22 C 524.84 792.48 542.96 796.68 564.63 787.10 C 579.13 780.71 597.68 777.89 620.29 778.62" fill="url(#未命名的渐变_30-2)" fill-rule="nonzero" group-id="1,2,7" id="_Path_2" node-id="109" stroke="none" target-height="43.63336" target-width="139.03" target-x="511.84" target-y="777.88666"/><path d="M 601.26 778.51 C 590.79 760.96 594.33 752.45 595.80 746.41 C 597.96 733.84 603.59 720.84 612.68 707.41 C 625.68 689.41 630.52 684.47 647.84 674.41 C 657.57 668.75 687.65 650.60 688.84 695.41 C 690.22 743.41 690.22 778.52 647.84 809.03 C 635.17 807.00 611.80 796.00 601.26 778.51 Z" fill="url(#未命名的渐变_31)" fill-rule="nonzero" group-id="1,2,7" id="_Path_3" node-id="110" stroke="none" target-height="158.43005" target-width="99.42999" target-x="590.79" target-y="650.6"/><path d="M 559.61 661.87 L 583.39 687.37 L 580.84 689.75 L 557.06 664.24 L 559.61 661.87 Z" fill="#000000" fill-rule="evenodd" group-id="1,2,7" id="矩形-2" node-id="111" stroke="none" target-height="27.880005" target-width="26.330017" target-x="557.06" target-y="661.87"/><path d="M 585.35 692.00 C 584.02 689.77 582.61 687.46 581.10 685.06 C 580.83 683.81 580.36 682.61 579.70 681.52 C 577.87 679.43 576.70 678.87 576.21 679.82 C 575.71 680.80 575.73 681.96 576.28 682.91 L 572.98 679.73 L 570.51 675.73 C 567.84 671.55 565.55 671.05 563.62 674.23 C 562.18 678.23 563.51 684.48 571.12 688.87 C 573.25 689.39 575.59 691.03 578.12 693.78 Z" fill="#efba9e" fill-rule="nonzero" group-id="1,2,7" id="路径-50备份" node-id="112" stroke="none" target-height="22.730042" target-width="23.169983" target-x="562.18" target-y="671.05"/><path d="M 582.27 685.00 L 613.33 723.00 L 647.88 687.45 C 655.21 682.01 662.50 682.15 669.75 687.87 C 673.88 693.69 676.03 700.75 669.75 712.59 C 666.00 718.13 647.00 731.50 627.53 741.71 C 619.64 744.85 611.27 743.71 603.43 736.06 C 599.62 731.69 589.83 716.90 574.04 691.67 Z" fill="url(#未命名的渐变_32)" fill-rule="nonzero" group-id="1,2,7" id="路径-3-2" node-id="113" stroke="none" target-height="62.839966" target-width="101.99005" target-x="574.04" target-y="682.01"/></g></g></g></svg>
+            <p><span>暂无数据</span></p>
+          </div>
         </el-table>
       </el-col>
       <el-col :span="24">
@@ -155,13 +160,14 @@
     </el-row>
 
     <!--新增报价明细-->
-    <el-dialog @open="openInsertQuotationDetail" @close="closeInsertQuotationDetail"
-               :visible.sync="quotationLeadIntoDetailFlag" title="新增报价明细" width="40%" :close-on-click-modal="false">
+    <el-dialog 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">
         <el-row>
           <el-col :span="8">
             <el-form-item label="产品编码" prop="productNo">
+              <span slot="label" style="" @click="projectPartDialogFlag = true"><a>产品编码</a></span>
               <el-input v-model="insertQuotationDetail.productNo" clearable/>
             </el-form-item>
           </el-col>
@@ -224,7 +230,7 @@
               <el-input clearable disabled v-model="quotationDetailData.productDesc"/>
             </el-form-item>
             <el-form-item label="报价数量" prop="quotationDetailQuantity">
-              <el-input clearable disabled oninput="value=value.replace(/[^0-9.]/g,'')" v-model="quotationDetailData.quotationDetailQuantity" @change="finalPrice"/>
+              <el-input clearable disabled oninput="value=value.replace(/[^0-9.]/g,'')" v-model="quotationDetailData.quotationDetailQuantity"/>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -251,7 +257,7 @@
           <el-form :model="quotationPartFormTable" :rules="quotationPartRules" ref="quotationPartTableForm">
             <el-table style="margin-top: 5px" v-loading="partTableFlag"
                       element-loading-text="拼命加载中"
-                      element-loading-spinner="el-icon-loading"
+                      element-loading-spinner="el-icon-loading" stripe
                       :data="quotationPartFormTable.quotationPartList" height="400"
                       @selection-change="handleSelectionChangeQuotationPartTable">
               <el-table-column
@@ -290,9 +296,10 @@
               <el-table-column
                 type="selection"
                 width="55"
+                fixed
                 align="center">
               </el-table-column>
-              <el-table-column label="操作" width="80" align="center">
+              <el-table-column label="操作" width="80" align="center" fixed>
                 <template slot-scope="{row,$index}">
                   <el-link style="cursor: pointer" @click="editQuotationRoutingBtn(row)">编辑</el-link>
                   <el-link style="cursor: pointer" @click="deleteQuotationRoutingBtn(row,$index)">删除</el-link>
@@ -309,7 +316,7 @@
               <el-table-column label="产出单位" align="center" width="120" prop="outputUnit" show-overflow-tooltip/>
               <el-table-column label="效率%" align="center" width="120" prop="routingEfficiency" show-overflow-tooltip/>
               <el-table-column label="操作工人数" align="center" width="120" prop="operatorsNumber" show-overflow-tooltip/>
-              <el-table-column label="单位机械成本" align="center" width="120" prop="unitMachineryCost" show-overflow-tooltip/>
+              <el-table-column label="单位机器成本" align="center" width="120" prop="unitMachineryCost" show-overflow-tooltip/>
               <el-table-column label="单位人工成本" align="center" width="120" prop="unitLaborCost" show-overflow-tooltip/>
               <el-table-column label="单位制造费用" align="center" width="120" prop="unitManufacturingCost" show-overflow-tooltip/>
               <el-table-column label="单位报价成本" align="center" width="120" prop="unitQuotedCost" show-overflow-tooltip/>
@@ -353,7 +360,7 @@
 
         </el-tab-pane>
         <el-tab-pane label="成本&价格">
-          <el-button type="primary"> 计 算 </el-button>
+          <el-button type="primary" @click="computeCost"> 计 算 </el-button>
           <!--系统自动计算结果-->
           <fieldset style="height:80px;margin-top: 2px;border-color: rgb(255,255,255);">
             <legend>系统自动计算结果(料工费/工具)</legend>
@@ -395,27 +402,32 @@
               <el-row>
                 <el-col :span="4">
                   <el-form-item label="材料成本:" prop="adjustPartCost">
-                    <el-input v-model="quotationDetailData.adjustPartCost" @input="inputOuterCost" clearable/>
+                    <span slot="label" @dblclick="quotationDetailData.adjustPartCost = quotationDetailData.computePartCost" style="cursor: pointer"><a>材料成本:</a></span>
+                    <el-input v-model="quotationDetailData.adjustPartCost"   clearable/>
                   </el-form-item>
                 </el-col>
                 <el-col :span="4" :offset="1">
                   <el-form-item label="机器成本:" prop="adjustMachineCost">
-                    <el-input v-model="quotationDetailData.adjustMachineCost" @input="inputOuterCost" clearable/>
+                    <span slot="label" @dblclick="quotationDetailData.adjustMachineCost = quotationDetailData.computeMachineCost" style="cursor: pointer"><a>机器成本:</a></span>
+                    <el-input v-model="quotationDetailData.adjustMachineCost"   clearable/>
                   </el-form-item>
                 </el-col>
                 <el-col :span="4" :offset="1">
                   <el-form-item label="制造费用成本:" prop="adjustFabricateCost">
-                    <el-input v-model="quotationDetailData.adjustFabricateCost" @input="inputOuterCost" clearable/>
+                    <span slot="label" @dblclick="quotationDetailData.adjustFabricateCost = quotationDetailData.computeFabricateCost" style="cursor: pointer"><a>制造费用成本:</a></span>
+                    <el-input v-model="quotationDetailData.adjustFabricateCost"   clearable/>
                   </el-form-item>
                 </el-col>
                 <el-col :span="4" :offset="1">
                   <el-form-item label="人工成本:" prop="adjustLabourCost">
-                    <el-input v-model="quotationDetailData.adjustLabourCost" @input="inputOuterCost" clearable/>
+                    <span slot="label" @dblclick="quotationDetailData.adjustLabourCost = quotationDetailData.computeLabourCost" style="cursor: pointer"><a>人工成本:</a></span>
+                    <el-input v-model="quotationDetailData.adjustLabourCost"   clearable/>
                   </el-form-item>
                 </el-col>
                 <el-col :span="4" :offset="1">
                   <el-form-item label="工具成本:" prop="adjustToolCost">
-                    <el-input v-model="quotationDetailData.adjustToolCost" @input="inputOuterCost" clearable/>
+                    <span slot="label" @dblclick="quotationDetailData.adjustToolCost = quotationDetailData.computeToolCost" style="cursor: pointer"><a>工具成本:</a></span>
+                    <el-input v-model="quotationDetailData.adjustToolCost"   clearable/>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -429,12 +441,12 @@
               <el-row>
                 <el-col :span="4">
                   <el-form-item label="管理成本:" prop="detailManageCost">
-                    <el-input v-model="quotationDetailData.detailManageCost" @input="inputOuterCost" clearable/>
+                    <el-input v-model="quotationDetailData.detailManageCost"   clearable/>
                   </el-form-item>
                 </el-col>
                 <el-col :span="4" :offset="1">
                   <el-form-item label="其他成本:" prop="detailOtherCost">
-                    <el-input v-model="quotationDetailData.detailOtherCost" @input="inputOuterCost" clearable/>
+                    <el-input v-model="quotationDetailData.detailOtherCost"   clearable/>
                   </el-form-item>
                 </el-col>
                 <el-col :span="4" :offset="1">
@@ -453,7 +465,7 @@
               <el-row>
                 <el-col :span="4">
                   <el-form-item label="利润率%:" prop="detailProfitRate">
-                    <el-input v-model="quotationDetailData.detailProfitRate" @input="inputProfitRate" clearable/>
+                    <el-input v-model="quotationDetailData.detailProfitRate" clearable/>
                   </el-form-item>
                 </el-col>
                 <el-col :span="4" :offset="1">
@@ -476,23 +488,23 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="4" :offset="1">
-                  <el-form-item label="含税总价:" prop="systemComputePrice">
-                    <el-input v-model="quotationDetailData.systemComputePrice" disabled/>
+                  <el-form-item label="未税单价:" prop="finalUntaxedPrice">
+                    <el-input v-model="quotationDetailData.finalUntaxedPrice" disabled clearable/>
                   </el-form-item>
                 </el-col>
                 <el-col :span="4" :offset="1">
-                  <el-form-item label="未税单价:" prop="finalUntaxedPrice">
-                    <el-input v-model="quotationDetailData.finalUntaxedPrice" disabled clearable/>
+                  <el-form-item label="税率%:" prop="taxRate">
+                    <el-input v-model="quotationDetailData.taxRate" clearable/>
                   </el-form-item>
                 </el-col>
                 <el-col :span="4" :offset="1">
-                  <el-form-item label="含税单价:" prop="finalTaxedPrice">
-                    <el-input v-model="quotationDetailData.finalTaxedPrice" disabled/>
+                  <el-form-item label="含税总价:" prop="systemComputePrice">
+                    <el-input v-model="quotationDetailData.systemComputePrice" disabled/>
                   </el-form-item>
                 </el-col>
                 <el-col :span="4" :offset="1">
-                  <el-form-item label="税率%:" prop="taxRate">
-                    <el-input v-model="quotationDetailData.taxRate" @input="finalPrice" clearable/>
+                  <el-form-item label="含税单价:" prop="finalTaxedPrice">
+                    <el-input v-model="quotationDetailData.finalTaxedPrice" disabled/>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -507,7 +519,7 @@
     </el-dialog>
 
     <!--quotationTool新增-->
-    <el-dialog @close="closeQuotationToolDialog" title="报价工具" :visible.sync="saveQuotationToolFlag" width="40%"
+    <el-dialog title="报价工具" @close="closeQuotationToolDialog"  :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">
@@ -543,9 +555,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="quotationTool.remark" type="textarea" :rows="3"
-                    style="max-height: 60px;min-height: 30px;width: 93%"/>
+        <el-form-item label="备注" prop="remark" style="height: 90px">
+          <el-input v-model="quotationTool.remark" type="textarea" :autosize="{minRows: 3, maxRows: 3}" style="width: 93%"/>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer" style="margin-top: 5px">
@@ -555,10 +566,11 @@
     </el-dialog>
 
     <!--tool列表-->
-    <el-dialog @open="openToolHeaderDialog"
+    <el-dialog title="工具信息"
+                @open="openToolHeaderDialog"
                @close="closeToolHeaderDialog"
                :close-on-click-modal="false"
-               title="工具信息" width="40%" top="15vh"
+                width="40%" top="15vh"
                :visible.sync="toolHeaderDialogFlag">
       <!--搜索条件-->
       <el-form :model="toolHeader" ref="toolHeaderForm" label-position="top">
@@ -590,7 +602,7 @@
     </el-dialog>
 
     <!--quotationRouting新增-->
-    <el-dialog @close="closeQuotationRoutingDialog" title="报价工艺" :visible.sync="quotationRoutingDialogFlag" width="40%" top="15vh" :close-on-click-modal="false">
+    <el-dialog title="报价工艺" @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>
           <el-col :span="8">
@@ -672,18 +684,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="8" >
-            <el-form-item label="单位机械成本" prop="unitMachineryCost">
-              <el-input @change="changeRoutingCost" :disabled="quotationRouting.machiningCenterNo != '*'" v-model="quotationRouting.unitMachineryCost" oninput="value=value.replace(/[^0-9.]/g,'')" clearable/>
+            <el-form-item label="单位机器成本" prop="unitMachineryCost">
+              <el-input @input="changeRoutingCost" :disabled="quotationRouting.machiningCenterNo != '*'" v-model="quotationRouting.unitMachineryCost" oninput="value=value.replace(/[^0-9.]/g,'')" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="12" :offset="2">
             <el-form-item label="单位人工成本" prop="unitLaborCost">
-              <el-input @change="changeRoutingCost" :disabled="quotationRouting.machiningCenterNo != '*'" v-model="quotationRouting.unitLaborCost" oninput="value=value.replace(/[^0-9.]/g,'')" clearable/>
+              <el-input @input="changeRoutingCost" :disabled="quotationRouting.machiningCenterNo != '*'" v-model="quotationRouting.unitLaborCost" oninput="value=value.replace(/[^0-9.]/g,'')" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="8" >
             <el-form-item label="单位制造费用" prop="unitManufacturingCost">
-              <el-input @change="changeRoutingCost" :disabled="quotationRouting.machiningCenterNo != '*'" v-model="quotationRouting.unitManufacturingCost" oninput="value=value.replace(/[^0-9.]/g,'')" clearable/>
+              <el-input @input="changeRoutingCost" :disabled="quotationRouting.machiningCenterNo != '*'" v-model="quotationRouting.unitManufacturingCost" oninput="value=value.replace(/[^0-9.]/g,'')" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="12" :offset="2">
@@ -717,7 +729,7 @@
           <el-col :span="8">
             <el-form-item label="材料编号" prop="quotationPartNo">
               <span slot="label" @click="partDialogFlag = true" style="cursor: pointer"><a>材料编码</a></span>
-              <el-input v-model="quotationPart.quotationPartNo" :disabled="quotationPart.quotationPartDesc" clearable/>
+              <el-input v-model="quotationPart.quotationPartNo" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="12" :offset="2">
@@ -811,6 +823,37 @@
             {{getUmName(row.umId)}}
           </template>
         </el-table-column>
+        <el-table-column label="材料成本" prop="standardCost"/>
+      </el-table>
+    </el-dialog>
+
+    <el-dialog title="产品列表" @close="closeProjectPartDialog" @open="openProjectPartDialog"
+               :visible.sync="projectPartDialogFlag">
+      <!--搜索条件-->
+      <el-form :model="projectPartData" ref="projectPartDataForm" label-position="top">
+        <el-row>
+          <el-col :span="4">
+            <el-form-item label="项目编号" prop="toolNo">
+              <el-input v-model="projectPartData.projectId" clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" :offset="1">
+            <el-form-item label="项目名称" prop="toolDescription">
+              <el-input v-model="projectPartData.projectName" clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" :offset="1">
+            <el-form-item label=" ">
+              <el-button @click="getProjectPartList" type="primary"> 查 询 </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table height="300px" stripe border width="30%" @row-dblclick="dblClickProjectPartTable"
+                :data="projectPartTable" ref="projectPartDataTable" :style="{marginTop:'10px'}">
+        <el-table-column label="项目编号" show-overflow-tooltip prop="testPartNo"/>
+        <el-table-column label="项目名称" show-overflow-tooltip prop="partName"/>
+        <el-table-column label="项目类别" show-overflow-tooltip prop="partTypeDesc"/>
       </el-table>
     </el-dialog>
 
@@ -822,18 +865,23 @@
                 width="50%">
       <!--搜索条件-->
       <el-form :model="otherDetail" ref="otherDetailForm" label-position="top">
-        <el-row>
+        <el-row :gutter="20">
+          <el-col :span="4" v-if="options === -1">
+            <el-form-item label="报价单号">
+              <el-input v-model="otherDetail.internalInquiryNo" @change="initOtherQuotationDetail" clearable/>
+            </el-form-item>
+          </el-col>
           <el-col :span="4">
             <el-form-item label="报价单号">
               <el-input v-model="otherDetail.quotationNo" @change="initOtherQuotationDetail" clearable/>
             </el-form-item>
           </el-col>
-          <el-col :span="4" :offset="1">
+          <el-col :span="4">
             <el-form-item label="产品编码">
               <el-input v-model="otherDetail.productNo" @change="initOtherQuotationDetail" clearable/>
             </el-form-item>
           </el-col>
-          <el-col :span="4" :offset="1">
+          <el-col :span="4">
             <el-form-item label="产品名称">
               <el-input v-model="otherDetail.productDesc" @change="initOtherQuotationDetail" clearable/>
             </el-form-item>
@@ -841,13 +889,14 @@
         </el-row>
       </el-form>
       <!--筛选的数据-->
-      <el-table v-if="options===0" :data="otherQuotationDetailList" ref="otherQuotationDetailTable" :style="{marginTop:'10px'}"
+      <el-table v-if="options===0 || options=== -1" :data="otherQuotationDetailList" ref="otherQuotationDetailTable" :style="{marginTop:'10px'}"
                 height="300px" stripe border width="30%" @selection-change="handleSelectionChangeOtherDetail"
                 @row-click="(row)=>toggleRowSelectionTable(row,'otherQuotationDetailTable')">
         <el-table-column
           type="selection"
           width="55" align="center">
         </el-table-column>
+        <el-table-column v-if="options=== -1" label="询价单号" prop="internalInquiryNo" show-overflow-tooltip/>
         <el-table-column label="报价单号" prop="quotationNo" show-overflow-tooltip/>
         <el-table-column label="产品编码" prop="productNo" show-overflow-tooltip/>
         <el-table-column label="产品名称" prop="productDesc" show-overflow-tooltip/>
@@ -864,15 +913,15 @@
         <el-table-column label="产品名称" prop="productDesc" show-overflow-tooltip/>
         <el-table-column label="材料编号" prop="quotationPartNo" show-overflow-tooltip/>
         <el-table-column label="材料描述" prop="quotationPartDesc" show-overflow-tooltip/>
-        <el-table-column label="计量单位" align="center" show-overflow-tooltip prop="umId">
+        <el-table-column label="计量单位" show-overflow-tooltip prop="umId">
           <template slot-scope="{row,$index}">
             {{getUmName(row.umId)}}
           </template>
         </el-table-column>
-        <el-table-column label="单位用量" align="center" show-overflow-tooltip prop="unitDosage"/>
-        <el-table-column label="损耗率%" align="center" show-overflow-tooltip prop="attritionRate"/>
-        <el-table-column label="调机用量" align="center" show-overflow-tooltip prop="transferAmount"/>
-        <el-table-column label="单位成本" align="center" show-overflow-tooltip prop="unitCost"/>
+        <el-table-column label="单位用量" show-overflow-tooltip prop="unitDosage"/>
+        <el-table-column label="损耗率%"  show-overflow-tooltip prop="attritionRate"/>
+        <el-table-column label="调机用量" show-overflow-tooltip prop="transferAmount"/>
+        <el-table-column label="单位成本" show-overflow-tooltip prop="unitCost"/>
       </el-table>
 
       <el-table v-if="options===2" :data="otherQuotationRoutingList" ref="otherQuotationRoutingTable" :style="{marginTop:'10px'}"
@@ -882,23 +931,23 @@
           type="selection"
           width="55" align="center">
         </el-table-column>
-        <el-table-column label="报价单号" prop="quotationNo" show-overflow-tooltip/>
-        <el-table-column label="产品编码" prop="productNo" show-overflow-tooltip/>
-        <el-table-column label="产品名称" prop="productDesc" show-overflow-tooltip/>
-        <el-table-column label="工序编码" prop="quotationRoutingNo" show-overflow-tooltip/>
-        <el-table-column label="工序名称" prop="quotationRoutingDesc" show-overflow-tooltip/>
-        <el-table-column label="加工中心编码" prop="machiningCenterNo" show-overflow-tooltip/>
-        <el-table-column label="加工中心名称" prop="machiningCenterDesc" show-overflow-tooltip/>
-        <el-table-column label="加工中心类别" prop="machiningCenterType" show-overflow-tooltip/>
-        <el-table-column label="调机时间" prop="machiningSetupTime" show-overflow-tooltip/>
-        <el-table-column label="单位产出量" prop="unitOutputQuantity" show-overflow-tooltip/>
-        <el-table-column label="产出单位" prop="outputUnit" show-overflow-tooltip/>
-        <el-table-column label="效率%" prop="routingEfficiency" show-overflow-tooltip/>
-        <el-table-column label="操作工人数" prop="operatorsNumber" show-overflow-tooltip/>
-        <el-table-column label="单位机械成本" prop="unitMachineryCost" show-overflow-tooltip/>
-        <el-table-column label="单位人工成本" prop="unitLaborCost" show-overflow-tooltip/>
-        <el-table-column label="单位制造费用" prop="unitManufacturingCost" show-overflow-tooltip/>
-        <el-table-column label="单位报价成本" prop="unitQuotedCost" show-overflow-tooltip/>
+        <el-table-column label="报价单号" width="120" prop="quotationNo" show-overflow-tooltip/>
+        <el-table-column label="产品编码" width="120" prop="productNo" show-overflow-tooltip/>
+        <el-table-column label="产品名称" width="120" prop="productDesc" show-overflow-tooltip/>
+        <el-table-column label="工序编码" width="120" prop="quotationRoutingNo" show-overflow-tooltip/>
+        <el-table-column label="工序名称" width="120" prop="quotationRoutingDesc" show-overflow-tooltip/>
+        <el-table-column label="加工中心编码" width="120" prop="machiningCenterNo" show-overflow-tooltip/>
+        <el-table-column label="加工中心名称" width="120" prop="machiningCenterDesc" show-overflow-tooltip/>
+        <el-table-column label="加工中心类别" width="120" prop="machiningCenterType" show-overflow-tooltip/>
+        <el-table-column label="调机时间"     width="120" prop="machiningSetupTime" show-overflow-tooltip/>
+        <el-table-column label="单位产出量"    width="120" prop="unitOutputQuantity" show-overflow-tooltip/>
+        <el-table-column label="产出单位"    width="120" prop="outputUnit" show-overflow-tooltip/>
+        <el-table-column label="效率%"      width="120" prop="routingEfficiency" show-overflow-tooltip/>
+        <el-table-column label="操作工人数"  width="120" prop="operatorsNumber" show-overflow-tooltip/>
+        <el-table-column label="单位机器成本" width="120" prop="unitMachineryCost" show-overflow-tooltip/>
+        <el-table-column label="单位人工成本" width="120" prop="unitLaborCost" show-overflow-tooltip/>
+        <el-table-column label="单位制造费用" width="120" prop="unitManufacturingCost" show-overflow-tooltip/>
+        <el-table-column label="单位报价成本" width="120" prop="unitQuotedCost" show-overflow-tooltip/>
       </el-table>
 
       <el-table v-if="options===3" :data="otherQuotationToolList" ref="otherQuotationToolTable" :style="{marginTop:'10px'}"
@@ -926,40 +975,34 @@
 </template>
 <script>
 import {
-  saveQuotationTool,
-  batchInsertQuotationTool,
-  searchQuotationTool,
-  deleteQuotationTool,
+  batchDeleteQuotationPart,
+  batchDeleteQuotationRouting,
   batchDeleteQuotationTool,
-  searchQuotationDetailPageByHeaderId,
-  insertQuotationDetail,
   batchInsertQuotationDetail,
-  updateQuotationDetail,
-  deleteQuotationDetail,
-  searchQuotationRoutingByDetailId,
-  insertQuotationRouting,
+  batchInsertQuotationPart,
   batchInsertQuotationRouting,
+  batchInsertQuotationTool,
+  deleteQuotationDetail,
+  deleteQuotationPart,
   deleteQuotationRouting,
-  batchDeleteQuotationRouting,
-  searchQuotationPart,
+  deleteQuotationTool,
+  insertQuotationDetail,
   insertQuotationPart,
-  batchInsertQuotationPart,
-  deleteQuotationPart,
-  batchDeleteQuotationPart,
+  insertQuotationRouting,
+  saveQuotationTool,
   searchQuotationDetail,
+  searchQuotationDetailPageByHeaderId,
+  searchQuotationPart,
+  searchQuotationRoutingByDetailId,
+  searchQuotationTool,
+  updateQuotationDetail,
 } from '@/api/quotation/quotationHeader.js';
-import {
-  searchUmInformationList, // 单位信息列表查询
-} from '@/api/part/umInformation.js';
-import {
-  searchToolHeader, // 工具头表查询
-} from '@/api/part/toolHeader.js';
-import {
-  searchWorkCenter, // 加工中心查询
-} from '@/api/part/workCenter.js';
-import {
-  searchPartList, // 材料查询
-} from '@/api/part/partInformation.js';
+import {searchUmInformationList,} from '@/api/part/umInformation.js';
+import {searchToolHeader,} from '@/api/part/toolHeader.js';
+import {searchWorkCenter,} from '@/api/part/workCenter.js';
+import {searchPartList,} from '@/api/part/partInformation.js';
+import {getProjectPartList} from '@/api/project/project.js';
+
 export default {
   props: ['quotationHeader'],
   name: "quotationDetail",
@@ -991,6 +1034,8 @@ export default {
       otherQuotationRoutingList:[],//其他工艺集合
       otherQuotationToolList:[],//其他报价工具集合
       selectionOtherDetailList:[],//选中的其他报价集合
+      selectionProjectPartList:[],//选择的项目集合
+      projectPartTable:[],//查询的姓名集合
       // ===================================================分页参数======================================
       no: 1,//当前页
       size: 20,//每页条数
@@ -1004,6 +1049,7 @@ export default {
       quotationPartDialogFlag:false,// 报价材料新增弹框
       partDialogFlag:false,// 材料信息弹框
       otherQuotationDetailDialogFlag:false,// 其他报价明细
+      projectPartDialogFlag:false,// 项目物料
       options:0,// 从其他报价明细 复制选项
       // =============================================新增报价明细的开关==========================================
       //新增 报价详情数据
@@ -1093,7 +1139,7 @@ export default {
         outputUnit:'单位/小时',//单位编码
         routingEfficiency:100,//效率
         operatorsNumber:1,//操作工人数
-        unitMachineryCost:undefined,//单位机械成本
+        unitMachineryCost:undefined,//单位机器成本
         unitLaborCost:undefined,//单位人工成本
         unitManufacturingCost:undefined,//单位制造费用
         unitQuotedCost:undefined,//单位报价成本
@@ -1120,8 +1166,15 @@ export default {
         partNo:undefined,// 编号
         partDesc:undefined,
       },
+      // 项目物料筛选列表
+      projectPartData:{
+        site:this.$store.state.user.site,
+        projectId:undefined,// 项目编号
+        projectName:undefined,// 项目名称
+      },
       // 其他报价明细搜索条件
       otherDetail:{
+        internalInquiryNo:undefined,//外部报价
         quotationNo:undefined,// 报价单号
         productNo:undefined,// 产品编码
         productDesc:undefined,// 产品名称
@@ -1241,6 +1294,14 @@ export default {
           {required: true, message: ' ', trigger: 'change'},
           {required: true, message: ' ', trigger: 'blur'},
         ],
+        machiningCenterType: [
+          {required: true, message: ' ', trigger: 'change'},
+          {required: true, message: ' ', trigger: 'blur'},
+        ],
+        machiningCenterDesc: [
+          {required: true, message: ' ', trigger: 'change'},
+          {required: true, message: ' ', trigger: 'blur'},
+        ],
         routingEfficiency: [
           {required: true, pattern: /^[0-9]+(.[0-9]{1,2})?$/, message: ' ', trigger: 'change'},
           {required: true, pattern: /^[0-9]+(.[0-9]{1,2})?$/, message: ' ', trigger: 'blur'},
@@ -1336,7 +1397,7 @@ export default {
         {label: "outputUnit", value: "产出单位"},
         {label: "routingEfficiency", value: "效率"},
         {label: "operatorsNumber", value: "操作工人数"},
-        {label: "unitMachineryCost", value: "单位机械成本"},
+        {label: "unitMachineryCost", value: "单位机器成本"},
         {label: "unitLaborCost", value: "单位人工成本"},
         {label: "unitManufacturingCost", value: "单位制造费用"},
         {label: "unitQuotedCost", value: "单位报价成本"},
@@ -1405,6 +1466,9 @@ export default {
     // 父组件值发生改变，修改子组件的值
     quotationHeader: function (val) {
       this.quotation = val;
+      if (!val){
+        this.quotation = undefined;
+      }
       this.initData();
     },
     // 监听其他报价集合
@@ -1453,6 +1517,7 @@ export default {
     options:function (val){
       let dataList = [];
       switch (val){
+        case -1:
         case 0:
           dataList = this.otherQuotationDetailList;
           break;
@@ -1871,6 +1936,7 @@ export default {
       let otherSelectionRouting = [];// 选中的 工艺
       let otherSelectionTool = [];// 选中的 工具
       switch (this.options){
+        case -1:
         case 0:
           this.selectionOtherDetailList = this.selectionOtherDetailList.map(value => {
             value.quotationHeaderId = this.quotation.quotationHeaderId;
@@ -1946,12 +2012,23 @@ export default {
       let params = {
         no: this.no,
         size: this.size,
-        quotationHeaderId: this.quotation.quotationHeaderId
+        quotationHeaderId: this.quotation?this.quotation.quotationHeaderId:null,
       }
       searchQuotationDetailPageByHeaderId(params).then(({data}) => {
         if (data.code == 200) {
           this.tableData = data.data.records;
           this.total = data.data.total;
+        }else {
+          this.tableData = [];
+          this.total = 0;
+        }
+      })
+    },
+    // 查询项目材料信息
+    getProjectPartList(){
+      getProjectPartList(this.projectPartData).then(({data})=>{
+        if (data.code === 0){
+          this.projectPartTable = data.rows;
         }
       })
     },
@@ -2000,23 +2077,23 @@ export default {
         quotationDetailId: this.quotationDetailData.quotationDetailId,
         site:this.$store.state.user.site,
       };
-      let total = 0;
       searchQuotationRoutingByDetailId(params).then(({data})=>{
         if (data.code == 200) {
           this.quotationRoutingFormTable.quotationRoutingList = data.data;
-          let unitMachineryCostTotal = this.quotationRoutingFormTable.quotationRoutingList.reduce((total, currentValue) => {
-            return total + currentValue.unitMachineryCost;
-          }, 0);
-          this.quotationDetailData.computeMachineCost = unitMachineryCostTotal;
-          this.quotationDetailData.adjustMachineCost = unitMachineryCostTotal;
+          // 计算价格
+          let list = this.quotationRoutingFormTable.quotationRoutingList;
+          for (let i = 0; i < list.length; i++) {
+            let item = list[i];
+            // 获取总价格
+            this.quotationDetailData.computeLabourCost = 0;
+            this.quotationDetailData.computeFabricateCost = 0;
+            this.quotationDetailData.computeMachineCost = 0;
+            this.quotationDetailData.computeLabourCost += +item.unitLaborCost;
+            this.quotationDetailData.computeFabricateCost += +item.unitMachineryCost;
+            this.quotationDetailData.computeMachineCost += +item.unitMachineryCost;
+          }
         }
       });
-      this.quotationDetailData.computeFabricateCost = total;
-      this.quotationDetailData.adjustFabricateCost = total;
-      this.quotationDetailData.computeLabourCost = total;
-      this.quotationDetailData.adjustLabourCost = total;
-      this.inputProfitRate();
-      this.inputOuterCost();
     },
     // 报价材料 查询
     initQuotationPart() {
@@ -2027,13 +2104,9 @@ export default {
       searchQuotationPart(params).then(({data})=>{
         if (data.code == 200){
           this.quotationPartFormTable.quotationPartList = data.data;
+          this.computeQuotationPartCost();// 计算材料
         }
       })
-      let total = 0;
-      this.quotationDetailData.computePartCost = total;
-      this.quotationDetailData.adjustPartCost = total;
-      this.inputProfitRate();
-      this.inputOuterCost();
     },
     // 报价工具查询
     initQuotationToolData() {
@@ -2043,7 +2116,7 @@ export default {
       searchQuotationTool(params).then(({data}) => {
         if (data.code == 200) {
           this.quotationToolFormTable.quotationToolList = data.data;
-          this.computeQuotationToolCost();
+          this.computeQuotationToolCost();// 计算工具价格
         }
       })
     },
@@ -2079,6 +2152,7 @@ export default {
         quotationNo:this.otherDetail.quotationNo,
         productNo:this.otherDetail.productNo,
         productDesc:this.otherDetail.productDesc,
+        internalInquiryNo:this.otherDetail.internalInquiryNo,
         quotationHeaderId:this.quotation.quotationHeaderId,
       };
       searchQuotationDetail(params).then(({data})=>{
@@ -2120,12 +2194,12 @@ export default {
         this.quotationDetailData.systemComputePrice=0
         this.quotationDetailData.finalUntaxedPrice=0
         this.quotationDetailData.finalTaxedPrice=0
+        this.quotationDetailData.detailProfitRate=0
+        this.quotationDetailData.detailManageCost=0
+        this.quotationDetailData.detailOtherCost=0
+        this.quotationDetailData.taxRate=13
       }
-      this.quotationDetailData.detailProfitRate=0
-      this.quotationDetailData.detailManageCost=0
-      this.quotationDetailData.detailOtherCost=0
-      this.quotationDetailData.taxRate=13
-      // 计算结果
+      // 查询结果
       this.initQuotationToolData();
       this.initQuotationRoutingData();
       this.initQuotationPart();
@@ -2148,6 +2222,9 @@ export default {
         this.$refs.quotationPartForm.resetFields();
       }
     },
+    openProjectPartDialog(){
+      this.getProjectPartList();
+    },
     // 点击其他报价明细 按钮
     clickOtherQuotationDetailsBtn(i){
       this.initOtherQuotationDetail();
@@ -2176,6 +2253,38 @@ export default {
         this.$refs['priceForm' + i].resetFields();
       }
       this.$refs['quotationDetailForm'].resetFields();
+      this.quotationDetailData= {
+        quotationDetailId: undefined,//主键
+        quotationHeaderId: undefined,//父编号
+        site: this.$store.state.user.site,// 工厂编号
+        productNo: undefined,//产品编码
+        productDesc: undefined,//产品名称
+        quotationDetailQuantity: undefined,//报价数量
+        internalInquiryNo: undefined,//内部询价单号
+        quotationDetailStatus: "草稿",//报价状态
+        itemNo: undefined,//序号
+        computePartCost: undefined,//计算的材料成本
+        computeLabourCost: undefined,//计算的人工成本
+        computeMachineCost: undefined,//计算的机器成本
+        computeFabricateCost: undefined,//计算的制造成本
+        computeToolCost: undefined,//计算的工具成本
+        adjustPartCost: undefined,//调整后的材料成本
+        adjustLabourCost: undefined,//调整后的人工成本
+        adjustFabricateCost: undefined,//调整后的制造费用成本
+        adjustToolCost: undefined,//调整后的工具成本
+        adjustMachineCost: undefined,//调整后的机器成本
+        detailProfitRate: undefined,//利润率
+        detailProfitAmount: undefined,//利润额
+        detailManageCost: undefined,//管理成本
+        detailOtherCost: undefined,//其他成本
+        detailTotalCost: undefined,//总成本
+        systemComputeAmount: undefined,//系统计算成本
+        systemComputePrice: undefined,//系统计算价格
+        finalUntaxedPrice: undefined,//最终去税价格
+        finalTaxedPrice: undefined,//最终含税价格
+        taxRate: 13,//税率
+        remark: undefined,//备注
+      }
     },
     // 关闭新增报价明细
     closeInsertQuotationDetail() {
@@ -2200,7 +2309,7 @@ export default {
           outputUnit:'单位/小时',//单位编码
           routingEfficiency:100,//效率
           operatorsNumber:1,//操作工人数
-          unitMachineryCost:undefined,//单位机械成本
+          unitMachineryCost:undefined,//单位机器成本
           unitLaborCost:undefined,//单位人工成本
           unitManufacturingCost:undefined,//单位制造费用
           unitQuotedCost:undefined,//单位报价成本
@@ -2256,6 +2365,16 @@ export default {
         this.$refs.partDataTable.clearSelection();
       }
     },
+    // 关闭项目物料
+    closeProjectPartDialog(){
+      this.$refs['projectPartDataForm'].resetFields();
+      this.projectPartData = {
+        site:this.$store.state.user.site,
+        projectId:undefined,// 项目编号
+        projectName:undefined,// 项目名称
+      }
+      this.projectPartTable = [];
+    },
     // 关闭其他报价明细弹框
     closeOtherQuotationDetail(){
       this.options = 0;
@@ -2304,8 +2423,16 @@ export default {
       this.quotationPart.quotationPartNo = row.partNo;
       this.quotationPart.quotationPartDesc = row.partDesc;
       this.quotationPart.umId = row.umId;
+      this.quotationPart.unitCost = row.standardCost;
       this.partDialogFlag = false;
     },
+    // 项目材料双击事件
+    dblClickProjectPartTable(row){
+      row = JSON.parse(JSON.stringify(row));
+      this.insertQuotationDetail.productNo = row.testPartNo;
+      this.insertQuotationDetail.productDesc = row.partName;
+      this.projectPartDialogFlag = false;
+    },
     // 工具表格双击事件
     dblclickToolHeader(row){
       row = JSON.parse(JSON.stringify(row));
@@ -2315,87 +2442,70 @@ export default {
       this.toolHeaderDialogFlag= false;
     },
     // =============================================输入框输入事件=======================================================
-    // 利润率 输入框 修改   计算利润额
-    inputProfitRate() {
-      this.quotationDetailData.detailProfitAmount = 0;
-      if (this.quotationDetailData.detailProfitRate) {
-        let num = (this.quotationDetailData.detailTotalCost * (this.quotationDetailData.detailProfitRate / 100));
-        Math.round(num * 100) / 100.
-        num = num.toFixed(2);
-        this.quotationDetailData.detailProfitAmount = num;
-      }
-      this.finalPrice();
-    },
-    // 计算最终价格
-    finalPrice(){
-      // 未税总价
-      this.quotationDetailData.systemComputeAmount = (+this.quotationDetailData.detailTotalCost + +this.quotationDetailData.detailProfitAmount);
-      // 含税总价
-      let num = this.quotationDetailData.systemComputeAmount + (this.quotationDetailData.systemComputeAmount*this.quotationDetailData.taxRate/100);
-      Math.round(num * 100) / 100.
-      num = num.toFixed(4);
-      this.quotationDetailData.finalUntaxedPrice = num;
-      this.quotationDetailData.systemComputePrice = num;
-      // 未税单价
-      num = (this.quotationDetailData.systemComputeAmount / this.quotationDetailData.quotationDetailQuantity);
-      Math.round(num * 100) / 100.
-      num = num.toFixed(4);
-      this.quotationDetailData.finalUntaxedPrice = num;
-      // 含税单价
-      num = this.quotationDetailData.systemComputePrice / this.quotationDetailData.quotationDetailQuantity;
-      Math.round(num * 100) / 100.
-      num = num.toFixed(4);
-      this.quotationDetailData.finalTaxedPrice = num;
-    },
-    // 其他成本输入框 修改   计算总成本
-    inputOuterCost() {
-      this.quotationDetailData.detailTotalCost = 0;
-      // 调整的价格
-      if (this.quotationDetailData.adjustPartCost) {
-        this.quotationDetailData.detailTotalCost += +this.quotationDetailData.adjustPartCost;
-      }
-      if (this.quotationDetailData.adjustLabourCost) {
-        this.quotationDetailData.detailTotalCost += +this.quotationDetailData.adjustLabourCost;
-      }
-      if (this.quotationDetailData.adjustFabricateCost) {
-        this.quotationDetailData.detailTotalCost += +this.quotationDetailData.adjustFabricateCost;
-      }
-      if (this.quotationDetailData.adjustToolCost) {
-        this.quotationDetailData.detailTotalCost += +this.quotationDetailData.adjustToolCost;
-      }
-      if (this.quotationDetailData.adjustMachineCost) {
-        this.quotationDetailData.detailTotalCost += +this.quotationDetailData.adjustMachineCost;
-      }
-      // 管理成本
-      if (this.quotationDetailData.detailManageCost) {
-        this.quotationDetailData.detailTotalCost += +this.quotationDetailData.detailManageCost;
-      }
-      // 其他成本
-      if (this.quotationDetailData.detailOtherCost) {
-        this.quotationDetailData.detailTotalCost += +this.quotationDetailData.detailOtherCost;
-      }
-      // 计算 最终价格
-      this.finalPrice();
+    // 计算材料总成本
+    computeQuotationPartCost(){
+      let amount = this.quotationPartFormTable.quotationPartList.reduce((total,currentValue)=>{
+        // 用量  调机用量+单位用量+损耗率
+        let count = +currentValue.unitDosage + +currentValue.transferAmount ;
+        count = count + count * currentValue.attritionRate/100;
+        return total + count * currentValue.unitCost;
+      },0);
+      this.quotationDetailData.computePartCost = amount * this.quotationDetailData.quotationDetailQuantity;
     },
     // 计算 报价工具总成本
     computeQuotationToolCost(){
-      let total = this.quotationToolFormTable.quotationToolList.reduce((total, currentValue) => {
+      this.quotationDetailData.computeToolCost = this.quotationToolFormTable.quotationToolList.reduce((total, currentValue) => {
         return total + currentValue.toolQuantity * currentValue.unitCost;
       }, 0);
-      this.quotationDetailData.computeToolCost = total;
-      if (this.quotationDetailData.adjustToolCost == 0){
-        this.quotationDetailData.adjustToolCost = total;
-      }
-      this.inputProfitRate();
-      this.inputOuterCost();
+    },
+    // 计算按钮
+    computeCost(){
+      // 计算总金额
+      this.computeAmount();
+      // 利润额
+      this.computeProfitAmount();
+      // 计算最终价格
+      this.computeEndAmount();
+    },
+    // 最终价格
+    computeEndAmount(){
+      // 未税总价/单价
+      this.quotationDetailData.systemComputeAmount = +this.quotationDetailData.detailProfitAmount + +this.quotationDetailData.detailTotalCost;
+      this.quotationDetailData.finalUntaxedPrice = +this.quotationDetailData.systemComputeAmount / +this.quotationDetailData.quotationDetailQuantity;
+      this.quotationDetailData.finalUntaxedPrice = String(this.quotationDetailData.finalUntaxedPrice).replace(/^(.*\..{4}).*$/,"$1");
+      // 含税总价/单价
+      this.quotationDetailData.systemComputePrice = (1 + +this.quotationDetailData.taxRate / 100) * +this.quotationDetailData.systemComputeAmount;
+      this.quotationDetailData.systemComputePrice = String(this.quotationDetailData.systemComputePrice).replace(/^(.*\..{4}).*$/,"$1");
+      this.quotationDetailData.finalTaxedPrice = +this.quotationDetailData.systemComputePrice / +this.quotationDetailData.quotationDetailQuantity;
+      this.quotationDetailData.finalTaxedPrice = String(this.quotationDetailData.finalTaxedPrice).replace(/^(.*\..{4}).*$/,"$1");
+    },
+    // 利润额
+    computeProfitAmount(){
+      this.quotationDetailData.detailProfitAmount = 0;
+      this.quotationDetailData.detailProfitAmount = +this.quotationDetailData.detailTotalCost * +this.quotationDetailData.detailProfitRate / 100;
+      this.quotationDetailData.detailProfitAmount = String(this.quotationDetailData.detailProfitAmount).replace(/^(.*\..{4}).*$/,"$1");
+    },
+    // 总金额
+    computeAmount(){
+      this.quotationDetailData.detailTotalCost = 0;
+      this.quotationDetailData.detailTotalCost += +this.quotationDetailData.adjustPartCost;
+      this.quotationDetailData.detailTotalCost += +this.quotationDetailData.adjustLabourCost;
+      this.quotationDetailData.detailTotalCost += +this.quotationDetailData.adjustFabricateCost;
+      this.quotationDetailData.detailTotalCost += +this.quotationDetailData.adjustMachineCost;
+      this.quotationDetailData.detailTotalCost += +this.quotationDetailData.adjustToolCost;
+      this.quotationDetailData.detailTotalCost += +this.quotationDetailData.detailOtherCost;
+      this.quotationDetailData.detailTotalCost += +this.quotationDetailData.detailManageCost;
     },
     // ====================================================输入框 事件=============================================
     changeWorkCenterSelect(val,obj){
-      let value = this.workCenterList.find((item)=>{
-        return item.workCenterNo == val;
-      });
+      let value = this.workCenterList.find((item)=>item.workCenterNo == val);
       obj.machiningCenterDesc = value?value.workCenterDesc:"";
       obj.machiningCenterType = value?value.workCenterType:"";
+      obj.unitLaborCost = value?value.laborCost:0; // 人工成本
+      obj.unitMachineryCost = value?value.unitCost:0; // 机器成本
+      obj.unitManufacturingCost = value?value.overheadCost:0;// 制造费用
+
+      this.changeRoutingCost();// 工艺 计算单位成本
     },
     machiningCenterNoSelect(e,row){
       let value = e.target.value; // 输入框值
diff --git a/src/views/modules/quotation/sellForQuotation.vue b/src/views/modules/quotation/sellForQuotation.vue
index 01d4c8a..256f203 100644
--- a/src/views/modules/quotation/sellForQuotation.vue
+++ b/src/views/modules/quotation/sellForQuotation.vue
@@ -4,25 +4,25 @@
       <el-row>
         <el-col :span="24">
           <el-form-item label="客户编码">
-            <el-input v-model="searchData.customerNo" placeholder="请输入内容" clearable style="width: 120px"/>
+            <el-input v-model="searchData.customerNo" clearable style="width: 120px"/>
           </el-form-item>
           <el-form-item label="客户名称">
-            <el-input v-model="searchData.customerName" placeholder="请输入内容" clearable style="width: 120px"/>
+            <el-input v-model="searchData.customerName" clearable style="width: 120px"/>
           </el-form-item>
           <el-form-item label="跟单员">
-            <el-input v-model="searchData.trackerName" placeholder="请输入内容" clearable style="width: 120px"/>
+            <el-input v-model="searchData.trackerName" clearable style="width: 120px"/>
           </el-form-item>
           <el-form-item label="报价单号">
-            <el-input v-model="searchData.quotationNo" placeholder="请输入内容" clearable style="width: 120px"/>
+            <el-input v-model="searchData.quotationNo" clearable style="width: 120px"/>
           </el-form-item>
           <el-form-item label="客户询价单号">
-            <el-input v-model="searchData.customerInquiryNo" placeholder="请输入内容" clearable style="width: 120px"/>
+            <el-input v-model="searchData.customerInquiryNo" clearable style="width: 120px"/>
           </el-form-item>
           <el-form-item label="内部询价单号">
-            <el-input v-model="searchData.internalInquiryNo" placeholder="请输入内容" clearable style="width: 120px"/>
+            <el-input v-model="searchData.internalInquiryNo" clearable style="width: 120px"/>
           </el-form-item>
           <el-form-item label="状态">
-            <el-select v-model="searchData.quotationStatus" placeholder="请选择" style="width: 120px">
+            <el-select v-model="searchData.quotationStatus" style="width: 120px">
               <el-option label="全部" value=""></el-option>
               <el-option label="草稿" value="草稿"></el-option>
               <el-option label="下达" value="下达"></el-option>
@@ -33,13 +33,13 @@
       <el-row>
         <el-col :span="24">
           <el-form-item label="项目编码">
-            <el-input v-model="searchData.projectId" placeholder="请输入内容" clearable style="width: 120px"/>
+            <el-input v-model="searchData.projectId" clearable style="width: 120px"/>
           </el-form-item>
           <el-form-item label="项目名称">
-            <el-input v-model="searchData.projectName" placeholder="请输入内容" clearable style="width: 120px"/>
+            <el-input v-model="searchData.projectName" clearable style="width: 120px"/>
           </el-form-item>
           <el-form-item label="销售员">
-            <el-input v-model="searchData.quoterName" placeholder="请输入内容" size="large" clearable style="width: 120px;height: 28px"/>
+            <el-input v-model="searchData.quoterName" size="large" clearable style="width: 120px;height: 28px"/>
           </el-form-item>
           <el-form-item label="报价日期">
             <el-date-picker
@@ -52,7 +52,6 @@
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
-
               @change="changeDateRange"
               placeholder="选择日期">
             </el-date-picker>
@@ -295,7 +294,7 @@
         </el-row>
       </el-form>
       <el-footer style="height:30px;margin-top: 20px;text-align:center">
-        <el-button type="primary" @click="insertDiaLogFlag = false">关闭</el-button>
+        <el-button @click="insertDiaLogFlag = false">关闭</el-button>
         <el-button type="primary" :loading="insertQuotationHeaderBtn" @click="insertQuotationHeader">保存</el-button>
       </el-footer>
     </el-dialog>
@@ -523,7 +522,11 @@ export default {
       getQuotationHeaderByPage(params).then(({data})=>{
         this.tableData = data.data.records;
         this.total = data.data.total;
-        this.quotationHeader = this.tableData[0];
+        if (this.tableData.length > 0){
+          this.quotationHeader = this.tableData[0];
+        }else {
+          this.quotationHeader = null;
+        }
       })
     },
     // size 发送改变