Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-web

src/views/major/myOrder.vue

@@ -1426,6 +1426,7 @@ export default {
       this.invoice.modified = null;
       this.invoice.ticketNo = null;
       this.invoice.realMakeDate = null;
+      this.invoice.realAmount = null;
       this.newInvoiceDialog = true;
     },
     // 大中型我的订单导出

src/views/statistical/major/ledgerList.vue

@@ -148,7 +148,7 @@
                     </el-table-column>
                     <el-table-column label="评估总价(万元)" width="120" align="center" v-if="!hiddenLabels.includes('evaluateAmount')" prop="evaluateAmount">
                         <template slot-scope="{row}">
-                            <span>{{ row.evaluateAmount }}</span>
+                            <span>{{ row.evaluateAmount/10000 }}</span>
                         </template>
                     </el-table-column>
                     <el-table-column label="评估收入(万元)" width="120" align="center" v-if="!hiddenLabels.includes('productionRealAmount')" prop="productionRealAmount">

src/views/statistical/major/performanceDeduction.vue

@@ -195,7 +195,7 @@
                 </el-tab-pane>
             </el-tabs>
         </div>
-        <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="70%"
+        <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="90%"
             @open="getMajorPerformanceDeductionDetailVO()">
             <y-page-list-layout :get-page-list="getMajorPerformanceDeductionDetailVO" :page-list="pageData"
                 :page-para="listQueryDetail">
@@ -203,7 +203,7 @@
                     <el-button class="filter-item" round type="info" @click="exportPerformanceDeductionDetail()">导出
                     </el-button>
                 </template>
-                <parentTable ref="table" :data="pageData.records" slot="table" style="width: 100%;" :isBoard=800>
+                <parentTable ref="table" :data="pageData.records" slot="table" style="width: 100%;">
                     <el-table-column label="项目编号" align="center">
                         <template slot-scope="{row}">
                             <span>{{ row.orderId }}</span>
@@ -215,7 +215,7 @@
                             <span v-else>非金融</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="项目名称" align="center">
+                    <el-table-column label="项目名称" align="center" show-overflow-tooltip>
                         <template slot-scope="{row}">
                             <span>{{ row.projectName }}</span>
                         </template>
@@ -225,11 +225,11 @@
                             <span>{{ row.customerName }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="产品类型" align="center">
+                    <!-- <el-table-column label="产品类型" align="center">
                         <template slot-scope="{row}">
                             <span>{{ row.productionType }}</span>
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
                     <el-table-column label="产品号" align="center">
                         <template slot-scope="{row}">
                             <span>{{ row.productionNo }}</span>
@@ -240,14 +240,14 @@
                             <span>{{ row.principalName }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="参与人" align="center">
+                    <!-- <el-table-column label="参与人" align="center">
                         <template slot-scope="{row}">
                             <span>{{ row.members }}</span>
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
                     <el-table-column label="评估金额(万元)" align="center">
                         <template slot-scope="{row}">
-                            <span>{{ row.evaluateAmount }}</span>
+                            <span>{{ row.evaluateAmount/10000 }}</span>
                         </template>
                     </el-table-column>
                     <el-table-column label="评估目的" align="center">
@@ -260,14 +260,14 @@
                             <span>{{ row.checkerName }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="错误个数" align="center">
+                    <el-table-column label="错误个数" align="center" width="50">
                         <template slot-scope="{row}">
-                            <span>{{ row.mistakeCount }}</span>
+                            <span style="color: red;"> {{ row.mistakeCount }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="加减分" align="center">
+                    <el-table-column label="加减分" align="center" width="50">
                         <template slot-scope="{row}">
-                            <span>{{ row.mistakeScore }}</span>
+                            <span style="color: red;">{{ row.mistakeScore }}</span>
                         </template>
                     </el-table-column>
                     <el-table-column label="扣分时间" align="center">
@@ -275,9 +275,9 @@
                             <span>{{ row.checkTime }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="扣分原因" align="center">
+                    <el-table-column label="扣分原因" align="center" width="300">
                         <template slot-scope="{row}">
-                            <span>{{ row.reason }}</span>
+                            <span style="color: red;">{{ errorType(row.reason) }}</span>
                         </template>
                     </el-table-column>
                 </parentTable>
@@ -551,6 +551,19 @@ export default {
                 "major/statisticalStatement/evaluator/getMajorPerformanceDeductionVO/export", this.listQueryByEvaluator,
                 "导出"
             );
+        },
+        errorType(jsonStr){
+            let errorJson = JSON.parse(jsonStr);
+            if (this.listQueryDetail.mistakeType==='normal'){
+                return errorJson.normalMistakes
+            }
+            if (this.listQueryDetail.mistakeType==='hard'){
+                return errorJson.hardMistakes
+            }
+            if (this.listQueryDetail.mistakeType==='fatal'){
+                return errorJson.fatalMistakes
+            }
+            
         }
     }
 }

src/views/statistical/major/performanceDeductionErrorType.vue

@@ -338,7 +338,7 @@
               <span v-else>非金融</span>
             </template>
           </el-table-column>
-          <el-table-column label="项目名称" align="center">
+          <el-table-column label="项目名称" align="center" show-overflow-tooltip>
             <template slot-scope="{row}">
               <span>{{ row.projectName }}</span>
             </template>