Merge branch 'main' of http://jialcheerful.club:3000/xd/JNBusiness

ruoyi-ui/src/views/quotePage/quote/index.vue

@@ -269,6 +269,41 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="当前调价日期" title="当前调价日期">
+                <el-input :disabled="true" v-model="totalForm.currAdjDate" placeholder="当前调价日期">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" >
+              <el-form-item label="当前铜价" title="当前铜价">
+                <el-input :disabled="true" v-model="totalForm.currCopperPrice" placeholder="当前铜价">
+                  <template slot="append">￥</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" >
+              <el-form-item label="当前铝价" title="当前铝价">
+                <el-input :disabled="true" v-model="totalForm.totalActualAmount" placeholder="当前铝价">
+                  <template slot="append">￥</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" >
+              <el-form-item title="">
+                            <span slot="label">
+                                 合计差异
+									<el-tooltip :content="'总差异 = (厂价金额合计 - 成本金额合计) / 厂价金额合计'" placement="top">
+										<i class="el-icon-question"></i>
+									</el-tooltip>
+								</span>
+                <el-input :disabled="true" v-model="totalForm.totalDifferenceValue" placeholder="总差异">
+                  <template slot="append">%</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </div>
       <!-- 添加物料和计算数据的按钮div -->