大中型审核报告错误修改

src/views/major/detail.vue

@@ -1345,7 +1345,7 @@
                         <el-form-item  prop="reason"
                           label-width="120px"
                           class="postInfo-container-item" label="扣分原因:">
-                          <el-input disabled readonly :value="p.reason" class="filter-item" type="textarea" />
+                          <el-input disabled readonly :value="'一般错误：'+p.normalMistakes +';较大错误：'+p.hardMistakes+';重大错误：'+p.fatalMistakes" class="filter-item" type="textarea" />
                         </el-form-item>
                       </el-col>
                     </el-row>

src/views/major/todoDetail.vue

@@ -1012,6 +1012,10 @@
                           </span>
                           <el-button type="text" style="margin-left: 50px" @click="addMistake(p,'normalMistakes')">手动添加</el-button>
                         </el-checkbox-group>
+                          <el-form-item prop="normalMistake" label-width="120px"
+                          label="一般错误个数:">
+                          <el-input-number v-model="p.normalMistake" class="filter-item"  :default="0" :precision="0" :min="0" :value-on-clear="0"  />
+                        </el-form-item>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -1035,6 +1039,10 @@
                           </span>
                           <el-button type="text" style="margin-left: 50px" @click="addMistake(p,'hardMistakes')">手动添加</el-button>
                         </el-checkbox-group>
+                        <el-form-item prop="hardMistake" label-width="120px"
+                          label="较大错误个数:">
+                          <el-input-number v-model="p.hardMistake" class="filter-item"  :default="0" :precision="0" :min="0" :value-on-clear="0"  />
+                        </el-form-item>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -1060,6 +1068,10 @@
                           </span>
                           <el-button type="text" style="margin-left: 50px" @click="addMistake(p,'fatalMistakes')">手动添加</el-button>
                         </el-checkbox-group>
+                        <el-form-item prop="fatalMistake" label-width="120px"
+                          label="重大错误个数:">
+                          <el-input-number v-model="p.fatalMistake" class="filter-item"  :default="0" :precision="0" :min="0" :value-on-clear="0"  />
+                        </el-form-item>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -3665,9 +3677,6 @@ export default {
     saveQuality(p) {
       this.taskRecordDTO.recordId = this.currentNode.tasks[0].recordId;
       this.taskRecordDTO.taskData = p;
-      p.normalMistake = p.normalMistakes.length;
-      p.hardMistake = p.hardMistakes.length;
-      p.fatalMistake = p.fatalMistakes.length;
       let mistakes = new Object();
       mistakes.normalMistakes = p.normalMistakes;
       mistakes.hardMistakes = p.hardMistakes;
@@ -4068,7 +4077,7 @@ a:hover{
   
 }
 .mistake-option:hover{
-  transform: scale(1.3); 
+  // transform: scale(1.3); 
   color: black;
   z-index: 999;
 }

src/views/staff/detail.vue

@@ -132,11 +132,27 @@
                         label-width="120px"
                         class="postInfo-container-item"
                       >
-                        <el-input v-model="postForm.homeAddress" class="filter-item" style="width: 480px"/>
+                        <el-input v-model="postForm.homeAddress" class="filter-item" />
                       </el-form-item>
                     </el-col>
-                    <el-button type="danger" style="margin-left: 300px" @click="initPassword">重置密码</el-button>
+                    <el-button type="danger" style="margin-left: 30px" @click="initPassword">重置密码</el-button>
                     <el-button type="danger" @click="initSettlePassword">重置提成查询密码</el-button>
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-form-item
+                        label="启用状态："
+                        prop="enable"
+                        label-width="120px"
+                        class="postInfo-container-item"
+                      >
+                        <el-switch
+                          v-model="postForm.enable"
+                          active-color="#13ce66"
+                          inactive-color="#ff4949"
+                          active-text="启用"
+                          inactive-text="禁用">
+                        </el-switch>
+                      </el-form-item>
+                    </el-col>
                   </el-row>
                   <div style="margin-top:20px;width:100%;height:1px;background:rgba(242,242,242,1);"/>
                   <div style="margin-bottom: 30px">

src/views/statistical/major/performanceDeductionDepInternal.vue

@@ -115,7 +115,7 @@
                 </el-table-column>
             </el-table>
         </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">
@@ -123,7 +123,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%;" :isBoard=500>
                     <el-table-column label="项目编号" align="center">
                         <template slot-scope="{row}">
                             <span>{{ row.orderId }}</span>
@@ -195,9 +195,11 @@
                             <span>{{ row.checkTime }}</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.reason }}</span>
+                            <div>{{ '一般错误：'+JSON.parse(row.reason).normalMistakes }}</div>
+                            <div>{{ '较大错误：'+JSON.parse(row.reason).hardMistakes  }}</div>
+                            <div>{{ '重大错误：'+JSON.parse(row.reason).fatalMistakes }}</div>
                         </template>
                     </el-table-column>
                 </parentTable>