From 7bf5215b904d5f354bc74073160146fb84d7a4a6 Mon Sep 17 00:00:00 2001
From: xd <xudong163mail@163.com>
Date: Tue, 11 Jun 2024 19:56:49 +0800
Subject: [PATCH] 123

---
 .../priceVerification/hjInfo.vue              | 105 +++++++-----------
 ruoyi-ui/src/views/quot/quot/index.vue        |  20 ++--
 2 files changed, 50 insertions(+), 75 deletions(-)

diff --git a/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue b/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue
index b31c339..f812fc2 100644
--- a/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue
+++ b/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue
@@ -15,20 +15,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="8">
-          <el-col :span="8">
-            <el-form-item label="核价日期" prop="quotHjPricingDate">
-              <div class="el-p" style="width:100%">
-                <el-date-picker
-                  style="width:100%"
-                  v-model="form.quotHjPricingDate"
-                  type="datetime"
-                  placeholder="系统自动生成"
-                  :disabled="true">
-                </el-date-picker>
-              </div>
-            </el-form-item>
-          </el-col>
+<!--        <el-row :gutter="8">
           <el-col :span="8">
             <el-form-item label="核价类型" prop="quotHjPricingType">
               <el-select v-model="form.quotHjPricingType" style="width: 100%;" :disabled="true">
@@ -41,23 +28,38 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="业务员" prop="quotSalesmanName">
-              <el-input v-model="form.quotSalesmanName" :disabled="true"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        </el-row>-->
         <el-row :gutter="8">
-          <el-col :span="16">
+          <el-col :span="12">
             <el-form-item label="客户" prop="quotCustomerName">
               <el-input v-model="form.quotCustomerName" :disabled="true"/>
             </el-form-item>
           </el-col>
-          <el-col :span="16">
+          <el-col :span="12">
+            <el-form-item label="核价日期" prop="quotHjPricingDate">
+              <div class="el-p" style="width:100%">
+                <el-date-picker
+                  style="width:100%"
+                  v-model="form.quotHjPricingDate"
+                  type="datetime"
+                  placeholder="系统自动生成"
+                  :disabled="true">
+                </el-date-picker>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="8">
+          <el-col :span="12">
             <el-form-item label="项目名称" prop="quotProject">
               <el-input type="textarea" autosize v-model="form.quotProject" :disabled="true"/>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="业务员" prop="quotSalesmanName">
+              <el-input v-model="form.quotSalesmanName" :disabled="true"/>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="8">
           <el-col :span="24">
@@ -66,68 +68,38 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-divider content-position="left" class="customer_divider_text">产品信息</el-divider>
+        <el-divider content-position="center">产品信息</el-divider>
         <el-table :data="quotMaterialList" height="300px" show-summary :summary-method="getSummaries" :row-class-name="rowQuotMaterialIndex" 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" width="130">
+          <el-table-column label="型号" prop="matXingh" width="180">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.matXingh" placeholder="请输入型号" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
+              <el-input v-model="scope.row.matXingh" placeholder="型号" :disabled="true"/>
             </template>
           </el-table-column>
-          <el-table-column label="规格" prop="matGuig" width="130">
+          <el-table-column label="规格" prop="matGuig" width="150">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.matGuig" placeholder="请输入规格" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
+              <el-input v-model="scope.row.matGuig" placeholder="规格" :disabled="true"/>
             </template>
           </el-table-column>
           <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"/>
+              <el-input v-model="scope.row.matDiany" placeholder="电压" :disabled="true"/>
             </template>
           </el-table-column>
-          <el-table-column label="单位" prop="matDanw">
+          <el-table-column label="单位" prop="matDanw" width="100">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.matDanw" placeholder="请输入单位" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
+              <el-input v-model="scope.row.matDanw" placeholder="单位" :disabled="true"/>
             </template>
           </el-table-column>
           <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"/>
+              <el-input v-model="scope.row.matSl" placeholder="数量" :disabled="true"/>
             </template>
           </el-table-column>
-          <el-table-column label="备注" prop="matRemark" width="250">
+          <el-table-column label="备注" prop="matRemark" width="180">
             <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"/>
+              <el-input v-model="scope.row.matRemark" placeholder="备注" :disabled="true"/>
             </template>
           </el-table-column>
         </el-table>
@@ -135,7 +107,7 @@
         <el-row :gutter="8">
           <el-col :span="24">
             <el-divider content-position="center">询价附件</el-divider>
-            <el-table class="down" :data="quotXjFileList" border stripe style="width: 100%;" height="150px">
+            <el-table class="down" :data="quotXjFileList" border stripe style="width: 100%;" height="200px">
               <el-table-column prop="fileName" label="文件名称" width="450px"></el-table-column>
               <el-table-column prop="fileSize" label="文件大小" width="100px">
                 <template slot-scope="scope">
@@ -175,7 +147,7 @@
         </el-row>
         <el-row :gutter="8">
           <el-col :span="24">
-            <el-table class="down" :data="quotHjFileList" border stripe style="width: 100%;" height="150px">
+            <el-table class="down" :data="quotHjFileList" border stripe style="width: 100%;" height="200px">
               <el-table-column prop="fileName" label="文件名称"></el-table-column>
               <el-table-column prop="fileSize" label="文件大小" width="150px">
                 <template slot-scope="scope">
@@ -380,6 +352,7 @@
   }
 </style>
 <script>
+import { NumberAdd }  from '@/utils/number';// 数值计算
 import { getPriceVerification, commitHj, rejectHj } from "@/api/priceVerification/priceVerification";
 import { getToken } from "@/utils/auth";
 import {getQuot, quotFileList, quotFileDelete} from "@/api/quot/quot";
@@ -400,6 +373,8 @@ export default {
       open: false,
       // 是否是自身页面调用
       isSelfProp: true,
+      // 产品数据
+      quotMaterialList: [],
       // 报价单-询价附件数据
       quotXjFileList: [],
       // 报价单-核价单附件数据
diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue
index 2f34f30..85a64d2 100644
--- a/ruoyi-ui/src/views/quot/quot/index.vue
+++ b/ruoyi-ui/src/views/quot/quot/index.vue
@@ -425,34 +425,34 @@
         <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" width="130">
+          <el-table-column label="型号" prop="matXingh" width="180">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.matXingh" placeholder="请输入型号" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
+              <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" width="130">
+          <el-table-column label="规格" prop="matGuig" width="150">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.matGuig" placeholder="请输入规格" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
+              <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" width="130">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.matDiany" placeholder="请输入电压" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
+              <el-input v-model="scope.row.matDiany" placeholder="电压" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
             </template>
           </el-table-column>
-          <el-table-column label="单位" prop="matDanw">
+          <el-table-column label="单位" prop="matDanw" width="100">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.matDanw" placeholder="请输入单位" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
+              <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" width="100">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.matSl" placeholder="请输入数量" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
+              <el-input v-model="scope.row.matSl" placeholder="数量" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
             </template>
           </el-table-column>
-          <el-table-column label="备注" prop="matRemark" width="250">
+          <el-table-column label="备注" prop="matRemark" width="180">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.matRemark" placeholder="请输入备注" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
+              <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">