浏览代码

产品质检UI交互方式修改

wucl 10 月之前
父节点
当前提交
53ccf7faad
共有 4 个文件被更改,包括 291 次插入177 次删除
  1. 0 3
      src/components/workflowBoard.vue
  2. 1 1
      src/views/finance/realFundStat.vue
  3. 5 0
      src/views/income/major/market.vue
  4. 285 173
      src/views/major/todoDetail.vue

+ 0 - 3
src/components/workflowBoard.vue

@@ -183,9 +183,6 @@ export default {
         if (val.nextHandlerId){
           commit.nextHandlerId =  val.nextHandlerId;
         }
-        if (val.secondCheckId){
-          commit.secondCheckId =  val.secondCheckId;
-        }
       });
       if (isOk){
           this.$prompt('请填写处理意见,若无可直接点击确认按钮。',handldType,{

+ 1 - 1
src/views/finance/realFundStat.vue

@@ -67,7 +67,7 @@
               <span>{{ row.productionType==='REPORT'?'报告':(row.productionType==='STATEMENT'?'意见书':'复评函')}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="项目名称"  width="150" how-overflow-tooltip  align="center" >
+          <el-table-column label="项目名称"  width="150" show-overflow-tooltip  align="center" >
             <template slot-scope="{row}">
               <span>{{ row.name }}</span>
             </template>

+ 5 - 0
src/views/income/major/market.vue

@@ -276,10 +276,15 @@ export default {
               this.$message.error("设置比例不能为空");
               return;
             }
+          }
+          for (let i in this.declareForm.userShareRates) {
             this.declareForm.userShareRates[i].rate = (this.declareForm.userShareRates[i].rate) / 100;
             total += this.declareForm.userShareRates[i].rate;
           }
           if (total != 1) {
+            for (let i in this.declareForm.userShareRates) {
+              this.declareForm.userShareRates[i].rate = (this.declareForm.userShareRates[i].rate) * 100;
+            }
             this.$message.error("提成比例之和必须为100%");
             return;
           }

+ 285 - 173
src/views/major/todoDetail.vue

@@ -697,24 +697,6 @@
       </el-tab-pane>
       <el-tab-pane name="producution" class="pane-class" :lazy=true>
         <span slot="label"><i class="el-icon-document-checked"></i> 产品信息</span>
-        <!-- <el-alert
-          title="提示:若要提交流程,请选择一个产品后才可提交。"
-          show-icon
-          :closable="false"
-          type="info">
-        </el-alert> -->
-        <div class="createMajor-main-container" style="margin-top:40px">
-          <div class="postInfo-container">
-            <div>
-              <el-divider content-position="left">
-                <h3 class="title">
-                  <div class="avatar-wrapper icon-title">产品</div>
-                  <div class="icon-info">产品信息</div>
-                </h3>
-              </el-divider>
-            </div>
-          </div>
-        </div>
         <el-table :data="productions" stripe ref="pTable" :header-row-style="{ color: '#333333', 'font-size': '16px' }"
           @selection-change="selectioProductionChange" @row-dblclick="expandRow" border
           style="width: 99%; margin-top:20px; font-size: 16px;">
@@ -722,6 +704,18 @@
             <template slot-scope="props">
               <el-form label-position="left" :model="props.row" class="form-container"
                 :ref="'productionFrom' + props.row.id" :rules="rules">
+                <div class="createMajor-main-container" style="margin-top:40px">
+                  <div class="postInfo-container">
+                    <div>
+                      <el-divider content-position="left">
+                        <h3 class="title">
+                          <div class="avatar-wrapper icon-title">产品</div>
+                          <div class="icon-info">产品信息</div>
+                        </h3>
+                      </el-divider>
+                    </div>
+                  </div>
+                </div>
                 <div>
                   <el-row class="row-style">
                     <el-col :xs="24" :sm="12" :lg="12" :span="6">
@@ -823,7 +817,38 @@
                       </el-form-item>
                     </el-col>
                   </el-row>
-
+                  <el-row class="row-style">
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-form-item prop="mainWorker" label-width="120px" class="postInfo-container-item"
+                        label="第一报告人:">
+                        <el-input :value="props.row.mainWorker" style="width:100%" class="filter-item" readonly disabled>
+                          <template slot="append">
+                            <span>注册号:{{ props.row.mainWorkerNo }}</span>
+                          </template>
+                        </el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-form-item prop="minorWorker" label-width="120px" class="postInfo-container-item"
+                        label="第二报告人:">
+                        <el-input :value="props.row.minorWorker" style="width:100%" class="filter-item" readonly disabled>
+                          <template slot="append">
+                            <span>注册号:{{ props.row.minorWorkerNo }}</span>
+                          </template>
+                        </el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-form-item prop="smallWorker" label-width="120px" class="postInfo-container-item"
+                        label="第三报告人:">
+                        <el-input :value="props.row.smallWorker" style="width:100%" class="filter-item" readonly disabled>
+                          <template slot="append">
+                            <span>注册号:{{ props.row.smallWorkerNo }}</span>
+                          </template>
+                        </el-input>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
                   <el-row class="row-style" v-if="props.row.production==='REPORT'">
                     <el-col :xs="24" :sm="12" :lg="6" :span="6">
                       <el-form-item prop="workStartDate" :rules="{ required: true, message: '估价作业开始日期不能为空', trigger: 'blur' }"
@@ -850,6 +875,7 @@
                           <el-option label="司法" value="司法"></el-option>
                           <el-option label="可行性研究" value="可行性研究"></el-option>
                           <el-option label="不良资产价值评估" value="不良资产价值评估"></el-option>
+                          <el-option label="租金" value="租金"></el-option>
                           <el-option label="其他" value="其他"></el-option>
                         </el-select>
                       </el-form-item>
@@ -865,46 +891,23 @@
                       </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="major.businessObjectType === '土地'">
-                      <el-form-item label="是否备案:" prop="isRecord"
+                      <el-form-item label="是否备案:" prop="isRecord" 
                         :rules="{ required: true, message: '是否备案不能为空', trigger: 'blur' }" label-width="120px"
-                        class="postInfo-container-item">
+                        :class="['postInfo-container-item','reason']">
                         <el-radio v-model="props.row.isRecord" :label="true" size="medium">是</el-radio>
                         <el-radio v-model="props.row.isRecord" :label="false" size="medium">否</el-radio>
                       </el-form-item>
                     </el-col>
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                      <el-form-item prop="mainWorker" label-width="120px" class="postInfo-container-item"
-                        label="第一报告人:">
-                        <el-input :value="props.row.mainWorker" style="width:100%" class="filter-item" readonly disabled>
-                          <template slot="append">
-                            <span>注册号:{{ props.row.mainWorkerNo }}</span>
-                          </template>
-                        </el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                      <el-form-item prop="minorWorker" label-width="120px" class="postInfo-container-item"
-                        label="第二报告人:">
-                        <el-input :value="props.row.minorWorker" style="width:100%" class="filter-item" readonly disabled>
-                          <template slot="append">
-                            <span>注册号:{{ props.row.minorWorkerNo }}</span>
-                          </template>
-                        </el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                      <el-form-item prop="smallWorker" label-width="120px" class="postInfo-container-item"
-                        label="第三报告人:">
-                        <el-input :value="props.row.smallWorker" style="width:100%" class="filter-item" readonly disabled>
-                          <template slot="append">
-                            <span>注册号:{{ props.row.smallWorkerNo }}</span>
-                          </template>
-                        </el-input>
+                    <el-col :xs="24" :sm="12" :lg="18" :span="6" v-if="major.businessObjectType === '土地' && !props.row.isRecord">
+                      <el-form-item prop="notRecordReason" label-width="120px" :class="['postInfo-container-item','reason']"
+                        :rules="{ required: !props.row.isRecord, message: '不备案原因不能为空', trigger: 'blur' }" label="不备案原因:">
+                        <el-input v-model.trim="props.row.notRecordReason" class="filter-item" :readonly="props.row.isRecord" :disabled="props.row.isRecord"/>
                       </el-form-item>
                     </el-col>
                   </el-row>
+                 
                   <el-row class="row-style">
-                    <el-col :xs="24" :sm="12" :lg="18" :span="6">
+                    <el-col :xs="24" :sm="12" :lg="24" :span="6">
                       <el-form-item prop="comment" label-width="120px" class="postInfo-container-item" label="特殊情况说明:">
                         <el-input v-model.trim="props.row.comment" class="filter-item" />
                       </el-form-item>
@@ -938,6 +941,108 @@
                 <div>
                 </div>
               </el-form>
+              <el-form ref="performanceForm" :model="performance" class="form-container" 
+              v-if="currentNode.nodeCode ==='CHECK_STATEMENT'
+                ||currentNode.nodeCode ==='CHECK_REPORT'
+                ||currentNode.nodeCode ==='CHECK_LETTER'
+                ||(currentNode.nodeCode ==='RECHECK_STATEMENT' && props.row.workPurpose!='抵押')
+                ||(currentNode.nodeCode ==='RECHECK_REPORT' && props.row.workPurpose!='抵押')
+                ||(currentNode.nodeCode ==='RECHECK_LETTER' && props.row.workPurpose!='抵押')
+                ||(currentNode.nodeCode ==='THIRD_CHECK_STATEMENT' && props.row.workPurpose!='抵押')
+                ||(currentNode.nodeCode ==='THIRD_CHECK_REPORT' && props.row.workPurpose!='抵押')
+                ||(currentNode.nodeCode ==='THIRD_CHECK_LETTER' && props.row.workPurpose!='抵押')
+                ||(currentNode.nodeCode ==='RECHECK_STATEMENT' && props.row.evaluateAmount>5000 && props.row.workPurpose==='抵押')
+                ||(currentNode.nodeCode ==='RECHECK_REPORT' && props.row.evaluateAmount>5000 && props.row.workPurpose==='抵押')
+                ||(currentNode.nodeCode ==='RECHECK_LETTER' && props.row.evaluateAmount>5000 && props.row.workPurpose==='抵押')
+                ||(currentNode.nodeCode ==='THIRD_CHECK_STATEMENT' && props.row.evaluateAmount>15000 && props.row.workPurpose==='抵押')
+                ||(currentNode.nodeCode ==='THIRD_CHECK_REPORT' && props.row.evaluateAmount>15000 && props.row.workPurpose==='抵押')
+                ||(currentNode.nodeCode ==='THIRD_CHECK_LETTER' && props.row.evaluateAmount>15000 && props.row.workPurpose==='抵押')"
+                >
+                <el-card shadow="never" v-for="(p, id) in performance.info" :index="id">
+                  <el-button type="primary" style="float: right; margin-right: 140px;" round @click="saveQuality(p)">保存审核</el-button>
+                  <div class="createMajor-main-container" style="margin-top:40px">
+                  <div class="postInfo-container">
+                    <div>
+                      <el-divider content-position="left">
+                        <h3 class="title">
+                          <div class="avatar-wrapper icon-title">审核</div>
+                          <div class="icon-info">{{p.checkLoop}}</div>
+                        </h3>
+                      </el-divider>
+                    </div>
+                  </div>
+                </div>
+                  <el-row class="row-style">
+                    <el-col :xs="24" :sm="12" :lg="24" :span="6">
+                      <el-form-item label-width="120px" class="postInfo-container-item" label="一般错误类型:">
+                        <el-checkbox-group v-model="p.normalMistakes">
+                          <el-checkbox label="委托书界定事项和报告描述不符" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="方位图有误" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="实景图有误" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="测算参数取值不充分" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="估价结果确定方式不恰当" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="估价方法表述不完整" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="实物、权益、区位描述缺项" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="价值定义表述不完整" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="非重要文字和数据录入错误" class="mistake-option"></el-checkbox>
+                          <span style="margin-left: 30px;" v-for="(name,index) in p.xnormalMistakes">
+                            <el-checkbox  :label="name" class="mistake-option"></el-checkbox>
+                          </span>
+                          <el-button type="text" style="margin-left: 50px" @click="addMistake(p,'normalMistakes')">手动添加</el-button>
+                        </el-checkbox-group>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row class="row-style">
+                    <el-col :xs="24" :sm="12" :lg="24" :span="6">
+                      <el-form-item label-width="120px" class="postInfo-container-item" label="较大错误类型:">
+                        <el-checkbox-group v-model="p.hardMistakes">
+                          <el-checkbox label="估价结果价格有误" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="大小写不一致" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="面积错误" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="委托方函重要数据出错" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="委托人名称出错" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="假设限制条件错漏" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="价值定义表述错误" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="报告章节缺漏" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="报告出具日期错误" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="报告有效期错误" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="重要文字和数据录入错误" class="mistake-option"></el-checkbox>
+                          <span style="margin-left: 30px;" v-for="(name,index) in p.xhardMistakes">
+                            <el-checkbox  :label="name" class="mistake-option"></el-checkbox>
+                          </span>
+                          <el-button type="text" style="margin-left: 50px" @click="addMistake(p,'hardMistakes')">手动添加</el-button>
+                        </el-checkbox-group>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row class="row-style">
+                    <el-col :xs="24" :sm="12" :lg="24" :span="6">
+                      <el-form-item label-width="120px" class="postInfo-container-item" label="重大错误类型:">
+                        <el-checkbox-group v-model="p.fatalMistakes">
+                          <el-checkbox label="估价对象错误" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="估价目的错误" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="价值时点设定出错" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="登记状况错误" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="权利状况错误" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="利用状况错误" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="技术路线错误" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="关键参数取值错误" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="编造虚假案例" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="编造虚假照片" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="估价依据资料严重不全" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="评估结果严重失真超30%以上" class="mistake-option"></el-checkbox>
+                          <el-checkbox label="关键文字和数据错误" class="mistake-option"></el-checkbox>
+                          <span style="margin-left: 30px;" v-for="(name,index) in p.xfatalMistakes">
+                            <el-checkbox  :label="name" class="mistake-option"></el-checkbox>
+                          </span>
+                          <el-button type="text" style="margin-left: 50px" @click="addMistake(p,'fatalMistakes')">手动添加</el-button>
+                        </el-checkbox-group>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-card>
+              </el-form>
             </template>
           </el-table-column>
           <el-table-column
@@ -969,125 +1074,6 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
-      <el-tab-pane name="quality" v-if="checkLoop" class="pane-class" :lazy=true>
-        <span slot="label"><i class="el-icon-pie-chart"></i> 产品质检</span>
-        <el-form ref="performanceForm" :model="performance" class="form-container">
-          <div class="createMajor-main-container">
-            <div class="postInfo-container">
-              <div>
-                <el-divider content-position="left">
-                  <h3 class="title">
-                    <div class="avatar-wrapper icon-title">质检</div>
-                    <div class="icon-info">产品质检</div>
-                  </h3>
-                </el-divider>
-              </div>
-              <div style="margin-top:50px">
-                <el-row class="row-style" style="margin-top:30px;">
-                  <el-col :xs="24" :sm="12" :lg="7" :span="6">
-                    <el-form-item prop="productionNo" label-width="120px" class="postInfo-container-item" label="产品号:">
-                      <el-input style="width:100%;" disabled readonly :value="performance.productionNo"
-                        class="filter-item" />
-                    </el-form-item>
-                  </el-col>
-                  <el-col :xs="24" :sm="12" :lg="4" :span="6">
-                    <el-form-item prop="productionType" label-width="120px" class="postInfo-container-item" label="产品类型:">
-                      <el-input style="width:100%;" disabled readonly :value="performance.productionType"
-                        class="filter-item" />
-                    </el-form-item>
-                  </el-col>
-                  <el-col :xs="24" :sm="12" :lg="5" :span="6">
-                    <el-form-item prop="productionName" label-width="120px" class="postInfo-container-item" label="项目名称:">
-                      <el-input style="width:100%;" disabled readonly :value="performance.productionName"
-                        class="filter-item" />
-                    </el-form-item>
-                  </el-col>
-                  <el-col :xs="24" :sm="12" :lg="4" :span="6">
-                    <el-form-item prop="productionName" label-width="120px" class="postInfo-container-item" label="负责人:">
-                      <el-input style="width:100%;" disabled readonly :value="performance.principal"
-                        class="filter-item" />
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-card shadow="hover" style="width:80%;margin-left:3%" v-for="(p, id) in performance.info" :index="id">
-                  <el-divider content-position="left">
-                    <h3 class="title">
-                      {{ p.checkLoop }}
-                    </h3>
-                  </el-divider>
-                  <el-row class="row-style">
-                    <el-col :xs="24" :sm="12" :lg="8" :span="6">
-                      <el-form-item prop="normalMistake" label-width="120px" class="postInfo-container-item"
-                        label="一般错误个数:">
-                        <el-input-number :min="0" style="width:100%;" type="number" v-model="p.normalMistake"
-                          class="filter-item" />
-                      </el-form-item>
-                    </el-col>
-                    <el-col :xs="24" :sm="12" :lg="8" :span="6">
-                      <el-form-item prop="hardMistake" label-width="120px" class="postInfo-container-item"
-                        label="较大错误个数:">
-                        <el-input-number :min="0" style="width:100%;" type="number" v-model="p.hardMistake"
-                          class="filter-item" />
-                      </el-form-item>
-                    </el-col>
-                    <el-col :xs="24" :sm="12" :lg="8" :span="6">
-                      <el-form-item prop="fatalMistake" label-width="120px" class="postInfo-container-item"
-                        label="重大错误个数:">
-                        <el-input-number :min="0" style="width:100%;" type="number" v-model="p.fatalMistake"
-                          class="filter-item" />
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-                  <el-row class="row-style">
-                    <el-col :xs="24" :sm="12" :lg="24" :span="6">
-                      <el-form-item label-width="120px" class="postInfo-container-item" label="错误类型:">
-                        <el-tag class="error-type" effect="plain" type="info"
-                          @click="addErrorType(p, '委托书界定事项和报告描述不符')">委托书界定事项和报告描述不符</el-tag>
-                        <el-tag class="error-type" effect="plain" type="info"
-                          @click="addErrorType(p, '委托方函重要数据出错')">委托方函重要数据出错</el-tag>
-                        <el-tag class="error-type" effect="plain" type="info"
-                          @click="addErrorType(p, '假设限制条件错漏')">假设限制条件错漏</el-tag>
-                        <el-tag class="error-type" effect="plain" type="info"
-                          @click="addErrorType(p, '地价定义表述有误或不完整')">地价定义表述有误或不完整</el-tag>
-                        <el-tag class="error-type" effect="plain" type="info"
-                          @click="addErrorType(p, '大小写有误')">大小写有误</el-tag>
-                        <el-tag class="error-type" effect="plain" type="info"
-                          @click="addErrorType(p, '面积有误')">面积有误</el-tag>
-                        <el-tag class="error-type" effect="plain" type="info"
-                          @click="addErrorType(p, '报告章节缺漏')">报告章节缺漏</el-tag>
-                        <el-tag class="error-type" effect="plain" type="info"
-                          @click="addErrorType(p, '技术路线错误')">技术路线错误</el-tag>
-                        <el-tag class="error-type" effect="plain" type="info"
-                          @click="addErrorType(p, '测算参数取值错误')">测算参数取值错误</el-tag>
-                        <el-tag class="error-type" effect="plain" type="info"
-                          @click="addErrorType(p, '实景图方位图错误')">实景图方位图错误</el-tag>
-                        <el-tag class="error-type" effect="plain" type="info"
-                          @click="addErrorType(p, '报告出具日期错误')">报告出具日期错误</el-tag>
-                        <el-tag class="error-type" effect="plain" type="info"
-                          @click="addErrorType(p, '报告有效期错误')">报告有效期错误</el-tag>
-                        <el-tag class="error-type" effect="plain" type="info"
-                          @click="addErrorType(p, '估价依据适用不当')">估价依据适用不当</el-tag>
-                        <el-tag class="error-type" effect="plain" type="info"
-                          @click="addErrorType(p, '委托人名称出错')">委托人名称出错</el-tag>
-                        <el-tag class="error-type" effect="plain" type="info"
-                          @click="addErrorType(p, '价值时点出错')">价值时点出错</el-tag>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-                  <el-row class="row-style">
-                    <el-col :xs="24" :sm="12" :lg="24" :span="6">
-                      <el-form-item prop="reason" label-width="120px" class="postInfo-container-item" label="扣分原因:">
-                        <el-input v-model.trim="p.reason" class="filter-item" type="textarea" />
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-                  <el-button type="primary" style="margin-left:50%" @click="saveQuality(p)">保存</el-button>
-                </el-card>
-              </div>
-            </div>
-          </div>
-        </el-form>
-      </el-tab-pane>
       <el-tab-pane name="finance" class="pane-class" :lazy=true>
         <span slot="label"><i class="el-icon-coin"></i> 收款开票</span>
         <div class="createMajor-main-container">
@@ -1701,6 +1687,40 @@
         <el-button type="primary" @click="doMergeNo()" :disabled="!toMergeNo">确定</el-button>
       </span>
     </el-dialog>
+    <el-dialog :visible.sync="notRecordDialog" width="45%" center top="35vh" custom-class="doWarehouseClass">
+      <el-divider content-position="left">
+          <h3 >
+            <div style="color: red;"><i class="el-icon-warning"></i> 不备案提醒</div>
+          </h3>
+      </el-divider>
+      <el-form ref="notRecordFrom" v-model="notRecordRemind">
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="24" :span="6">
+            <el-form-item label="报告号:" prop="reportNo" label-width="140px" :class="['postInfo-container-item','reason']">
+              <el-input :value="notRecordRemind.reportNo" :class="['filter-item','resaon_input']" disabled readonly style=" width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="24" :span="6">
+            <el-form-item label="是否备案:" prop="isRecord" label-width="140px" :class="['postInfo-container-item','reason']">
+              <el-input :value="notRecordRemind.isRecord?'备案':'不备案'" :class="['filter-item','resaon_input']"  readonly style=" width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="24" :span="6">
+            <el-form-item label="不备案原因:" prop="notRecordReason" label-width="140px" :class="['postInfo-container-item']">
+              <el-input  type="textarea":value="notRecordRemind.notRecordReason" :class="['filter-item']"  readonly style=" width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="notRecordDialog=false">不通过</el-button>
+        <el-button type="primary" @click="doPassNotRecord()">通过</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -1848,7 +1868,7 @@ export default {
           return 'evaluate'
         }
         if (check.includes(nodeCode)) {
-          return 'quality'
+          return 'producution'
         }
         if (saveCheck.includes(nodeCode)) {
           return 'finance'
@@ -2070,7 +2090,20 @@ export default {
       showQR:true,
       toMergeNo:null,
       mergeNos:[],
-      mergeNoDialog:false
+      mergeNoDialog:false,
+      normalMistakes:[],
+      xNormalMistakes:[],
+      fatalMistakes:[],
+      xFatalMistakes:[],
+      xHardMistakes:[],
+      hardMistakes:[],
+      notRecordDialog:false,
+      passNotRecord:false,
+      notRecordRemind:{
+        reportNo:null,
+        isRecord:null,
+        notRecordReason:null
+      }
     }
   },
   created() {
@@ -3161,7 +3194,8 @@ export default {
       let commit = val.commit;
       let verify = new Object();
       verify.state = true;
-      verify.secondCheckId = this.secondCheckUserId;
+      verify.nextHandlerId = this.secondCheckUserId;
+      verify.passNotRecord = this.passNotRecord;
       let nodeCode = this.currentNode.nodeCode;
       if (commit.state === 'PASS') {
         this.getProductions(this.majorId, (this.reportNo == null ? this.statementNo : this.reportNo));
@@ -3304,7 +3338,7 @@ export default {
           case "CHECK_STATEMENT":
           case "CHECK_REPORT":
           case "CHECK_LETTER":
-            if (commit.doSecondCheck != '不审' && !verify.secondCheckId ) {
+            if (commit.doSecondCheck != '不审' && !verify.nextHandlerId ) {
               verify.state = false;
               callback(verify);
               this.chooseSecondCheckerDialog = true
@@ -3318,6 +3352,16 @@ export default {
               return;
             }
             break;
+          case "RECHECK_REPORT":
+          case "THIRD_CHECK_REPORT":
+            if (!verify.passNotRecord && this.major.businessObjectType==='土地'){
+              verify.state = false;
+              callback(verify);
+              this.notRecordRemind = this.productions[0];
+              this.notRecordDialog = true;
+              return;
+            }
+            break;
           case "INITIAL_PRICE":
             let notEvaluateValueTargets = this.evaluateLandData.filter(function (e) {
               return e.evaluateValue == null;
@@ -3563,6 +3607,17 @@ 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;
+      mistakes.fatalMistakes = p.fatalMistakes;
+      mistakes.xnormalMistakes = p.xnormalMistakes;
+      mistakes.xhardMistakes = p.xhardMistakes;
+      mistakes.xfatalMistakes = p.xfatalMistakes;
+      p.reason = JSON.stringify(mistakes);
       p.businessType = 'MAJOR_BUSINESS';
       if (p.id) {
         this.$api.businessProductionPerformance.edit(this.taskRecordDTO).then(res => {
@@ -3802,8 +3857,42 @@ export default {
             });
           this.mergeNoDialog = false;
           this.getLandTargetList();
+          this.getProductions(this.majorId, (this.reportNo == null ? this.statementNo : this.reportNo));
           }
         })
+    },
+    addMistake(p,mistakeType){
+        let type ;
+        if (mistakeType ==='normalMistakes'){
+            type = '添加一般错误';
+        }
+        if (mistakeType ==='hardMistakes'){
+            type = '添加较大错误';
+        }
+        if (mistakeType ==='fatalMistakes'){
+            type = '添加重大错误';
+        }
+        this.$prompt(null, type, {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+        }).then(({ value }) => {
+          if (mistakeType ==='normalMistakes'){
+            p.xnormalMistakes.push(value)
+            p.normalMistakes.push(value);
+          }
+          if (mistakeType ==='hardMistakes'){
+            p.xhardMistakes.push(value);
+            p.hardMistakes.push(value);
+          }
+          if (mistakeType ==='fatalMistakes'){
+            p.xfatalMistakes.push(value);
+            p.fatalMistakes.push(value);
+          }
+        })
+    },
+    doPassNotRecord(){
+      this.passNotRecord = true;
+      this.commit('PASS');
     }
   },
 }
@@ -3894,4 +3983,27 @@ a:hover{
   cursor: pointer;
   color: #5a9cf8
 }
+.reason{
+    /deep/ .el-form-item__label {
+    color: red;
+    font-weight: bold;
+    }
+   
+  }
+.resaon_input{
+  /deep/ .el-input__inner{
+    color: red !important;
+    font-weight: bold;
+  }
+}
+.mistake-option{
+  transition: transform 0.5s ease;
+  color: #acacae;
+  
+}
+.mistake-option:hover{
+  transform: scale(1.3); 
+  color: black;
+  z-index: 999;
+}
 </style>