diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
index 8ef92c8..0b7eade 100644
--- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
@@ -85,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="matMatprice"    column="sub_mat_matprice"    />
         <result property="matPrice"    column="sub_mat_price"    />
         <result property="matQuotPrice"    column="sub_mat_quot_price"    />
+        <result property="matQuotTp"    column="sub_mat_quot_tp"  />
         <result property="matQuotAllPrice"    column="sub_mat_quot_allPrice"    />
         <result property="matMatpriceDiff"    column="sub_mat_matprice_diff"    />
         <result property="xh"    column="sub_xh"    />
@@ -175,6 +176,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 b.mat_matprice as sub_mat_matprice,
                 b.mat_price as sub_mat_price,
                 b.mat_quot_price as sub_mat_quot_price,
+
+                b.mat_quot_tp as sub_mat_quot_tp,
                 b.mat_quot_allPrice as sub_mat_quot_allPrice,
                 b.mat_matprice_diff as sub_mat_matprice_diff,
 
diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue
index aaaf820..083440e 100644
--- a/ruoyi-ui/src/views/quot/quot/index.vue
+++ b/ruoyi-ui/src/views/quot/quot/index.vue
@@ -121,6 +121,7 @@
           <dict-tag :options="dict.type.quot_approval_status" :value="scope.row.quotApprovalStatus"/>
         </template>
       </el-table-column>
+      <el-table-column label="金思维报价单号" align="center" prop="quotJswCode" width="280px" v-if="checkRole(['QUOT'])"/>
       <el-table-column label="是否打印" align="center" prop="quotPrint" v-if="$auth.hasPermi('quot:quot:changQuotPrintStatus')">
         <template slot-scope="scope">
           <el-switch
@@ -189,7 +190,7 @@
       <template slot="title">
         报价单信息<span style="color:red;margin-left:25px">(注：此报价单数据，型号规格电压等如需下单或签订合同引用，请再次自行核对，责任自负)</span>
       </template>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-divider content-position="left" class="customer_divider_text">当前协助情况</el-divider>
         <el-row>
           <el-col :span="4">
@@ -305,37 +306,53 @@
         </el-row>
         <div v-if="checkRole(['QUOT'])">
           <el-row :gutter="8" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null">
-            <el-col :span="12">
+            <el-col :span="6">
               <el-form-item label="总数量" prop="quotQuantity">
                 <el-input v-model="form.quotQuantity" :disabled="form.quotApprovalStatus == '2' || form.quotApprovalStatus == '3'"/>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="6">
               <el-form-item label="总价" prop="quotTotalPrice">
                 <el-input v-model="form.quotTotalPrice" :disabled="form.quotApprovalStatus == '2' || form.quotApprovalStatus == '3'"/>
               </el-form-item>
             </el-col>
-          </el-row>
-        </div>
-        <div v-if="checkRole(['QUOT'])">
-          <el-row :gutter="8" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null">
-            <el-col :span="12">
+            <el-col :span="6">
               <el-form-item label="是否打印" prop="quotPrint">
-                <el-switch
-                  v-model="form.quotPrint"
-                  active-value="0"
-                  inactive-value="1"
-                  :disabled="true"
-                ></el-switch>
+                <el-select v-model="form.quotPrint" :disabled="true">
+                  <el-option
+                    v-for="dict in dict.type.quot_print"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="6">
               <el-form-item label="打印人" prop="quotPrintUserName">
                 <el-input v-model="form.quotPrintUserName" :disabled="true"/>
               </el-form-item>
             </el-col>
           </el-row>
         </div>
+        <el-row :gutter="8" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null">
+          <el-col :span="6">
+            <el-form-item label="铜价" prop="quotTongPrice">
+              <el-input v-model="form.quotTongPrice" :disabled="true"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="铝价" prop="quotLvPrice">
+              <el-input v-model="form.quotLvPrice" :disabled="true"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="checkRole(['QUOT_MAT_PRICE_DIFF'])">
+            <el-form-item label="整单料价价差率" prop="quotMatpriceDiff">
+              <el-input v-model="form.quotMatpriceDiff" :disabled="true"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="8" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null">
           <el-col :span="24">
             <el-form-item label="反馈说明" prop="quotFeedbackExplanation">
@@ -399,17 +416,17 @@
         <el-table :data="quotMaterialList" height="300px" show-summary :summary-method="getSummaries" :row-class-name="rowQuotMaterialIndex" @selection-change="handleQuotMaterialSelectionChange" ref="quotMaterial">
           <el-table-column type="selection" width="80" align="center" />
           <el-table-column label="序号" align="center" prop="index" width="50"/>
-          <el-table-column label="型号" prop="matXingh">
+          <el-table-column label="型号" prop="matXingh" width="130">
             <template slot-scope="scope">
               <el-input v-model="scope.row.matXingh" placeholder="请输入型号" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
             </template>
           </el-table-column>
-          <el-table-column label="规格" prop="matGuig">
+          <el-table-column label="规格" prop="matGuig" width="130">
             <template slot-scope="scope">
               <el-input v-model="scope.row.matGuig" placeholder="请输入规格" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
             </template>
           </el-table-column>
-          <el-table-column label="电压" prop="matDiany">
+          <el-table-column label="电压" prop="matDiany" width="130">
             <template slot-scope="scope">
               <el-input v-model="scope.row.matDiany" placeholder="请输入电压" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
             </template>
@@ -419,26 +436,46 @@
               <el-input v-model="scope.row.matDanw" placeholder="请输入单位" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
             </template>
           </el-table-column>
-          <el-table-column label="数量" prop="matSl">
+          <el-table-column label="数量" prop="matSl" width="100">
             <template slot-scope="scope">
               <el-input v-model="scope.row.matSl" placeholder="请输入数量" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
             </template>
           </el-table-column>
-          <el-table-column label="报价" prop="matQuotPrice" v-if="checkRole(['QUOT'])">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.matQuotPrice"/>
-            </template>
-          </el-table-column>
-          <el-table-column label="报价金额" prop="matQuotAllPrice" v-if="checkRole(['QUOT'])">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.matQuotAllPrice"/>
-            </template>
-          </el-table-column>
-          <el-table-column label="备注" prop="matRemark">
+          <el-table-column label="备注" prop="matRemark" width="250">
             <template slot-scope="scope">
               <el-input v-model="scope.row.matRemark" placeholder="请输入备注" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
             </template>
           </el-table-column>
+          <el-table-column label="料价" prop="matMatprice" v-if="checkRole(['QUOT_MAT_PRICE_DIFF'])" width="130">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.matMatprice" :disabled="true"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="红本价" prop="matPrice" v-if="checkRole(['QUOT','QUOT_MAT_PRICE_DIFF'])" width="130">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.matPrice" :disabled="true"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="特批下点" prop="matQuotTp" v-if="checkRole(['QUOT','QUOT_MAT_PRICE_DIFF'])" width="100">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.matQuotTp" :disabled="true"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="报价" prop="matQuotPrice" v-if="checkRole(['QUOT','QUOT_MAT_PRICE_DIFF'])" width="130">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.matQuotPrice" :disabled="true"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="报价金额" prop="matQuotAllPrice" v-if="checkRole(['QUOT','QUOT_MAT_PRICE_DIFF'])" width="130">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.matQuotAllPrice" :disabled="true"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="料价价差率" prop="matMatpriceDiff" v-if="checkRole(['QUOT_MAT_PRICE_DIFF'])" width="130">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.matMatpriceDiff" :disabled="true"/>
+            </template>
+          </el-table-column>
         </el-table>
 
         <el-divider content-position="left" class="customer_divider_text">清单附件(先保存再上传且必须是EXCEL文件)</el-divider>
@@ -1122,6 +1159,11 @@ export default {
         quotOAApprovalStatusRemark: null,
         quotApprovalStatus: null,
 
+        quotPrintUserName: null,
+        quotTongPrice: null,
+        quotLvPrice: null,
+        quotMatpriceDiff: null,
+
         quotJsxzApprovalStatus: null,
         quotJsxzChapter: null,
         quotJsxzConfirmCode: null,