|
|
@@ -641,10 +641,10 @@
|
|
|
ref="multipleTable"
|
|
|
:data="evaluateLandData"
|
|
|
stripe
|
|
|
- :header-row-style="{ color: '#333333' }"
|
|
|
+ :header-row-style="{ color: '#333333','font-size': '14px'}"
|
|
|
border
|
|
|
takeNumberItems
|
|
|
- style="width: 100%; margin-top:20px"
|
|
|
+ style="width: 100%; margin-top:20px;font-size: 14px;"
|
|
|
@selection-change="handleSelectionChange">
|
|
|
<el-table-column
|
|
|
v-if="ifTakeNumber"
|
|
|
@@ -656,7 +656,7 @@
|
|
|
<el-table-column
|
|
|
type="index"
|
|
|
label="序号"
|
|
|
- width="80"
|
|
|
+ width="50"
|
|
|
align="center">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -668,13 +668,13 @@
|
|
|
<el-table-column
|
|
|
prop="landType"
|
|
|
label="土地类型"
|
|
|
- width="120"
|
|
|
+ width="80"
|
|
|
align="center">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="landUse"
|
|
|
label="用途"
|
|
|
- width="120"
|
|
|
+ width="80"
|
|
|
align="center">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -692,21 +692,25 @@
|
|
|
<el-table-column
|
|
|
prop="plotRatio"
|
|
|
label="容积率"
|
|
|
+ width="80"
|
|
|
align="center">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="useAcreage"
|
|
|
label="使用权面积(㎡)"
|
|
|
+ width="80"
|
|
|
align="center">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="evaluateValue"
|
|
|
label="初步定价(万)"
|
|
|
+ width="80"
|
|
|
align="center">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="checked"
|
|
|
label="审核定价(万)"
|
|
|
+ width="80"
|
|
|
align="center">
|
|
|
<template slot-scope="scope">
|
|
|
{{scope.row.checkValue==null?'待审核':scope.row.checkValue}}
|
|
|
@@ -716,7 +720,7 @@
|
|
|
prop="statementNo"
|
|
|
label="价值意见书号"
|
|
|
align="center"
|
|
|
- width="200">
|
|
|
+ width="250">
|
|
|
<template slot-scope="scope">
|
|
|
<el-tag type='success'>
|
|
|
{{scope.row.statementNo==null?'未取号':scope.row.statementNo}}</el-tag>
|
|
|
@@ -736,7 +740,7 @@
|
|
|
prop="letterNo"
|
|
|
label="复评函号"
|
|
|
align="center"
|
|
|
- width="200">
|
|
|
+ width="250">
|
|
|
<template slot-scope="scope">
|
|
|
<el-tag type='primary'>
|
|
|
{{scope.row.letterNo==null?'未取号':scope.row.letterNo}}</el-tag>
|
|
|
@@ -812,10 +816,10 @@
|
|
|
ref="multipleTable"
|
|
|
:data="evaluateLandData"
|
|
|
stripe
|
|
|
- :header-row-style="{ color: '#333333' }"
|
|
|
+ :header-row-style="{ color: '#333333','font-size': '14px' }"
|
|
|
border
|
|
|
takeNumberItems
|
|
|
- style="width: 100%; margin-top:20px"
|
|
|
+ style="width: 100%; margin-top:20px;font-size: 14px;"
|
|
|
@selection-change="handleSelectionChange">
|
|
|
<el-table-column
|
|
|
v-if="ifTakeNumber"
|
|
|
@@ -827,12 +831,13 @@
|
|
|
<el-table-column
|
|
|
type="index"
|
|
|
label="序号"
|
|
|
- width="80"
|
|
|
+ width="50"
|
|
|
align="center">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="housePurpose"
|
|
|
label="用途"
|
|
|
+ width="80"
|
|
|
align="center"
|
|
|
show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
@@ -845,6 +850,7 @@
|
|
|
prop="owner"
|
|
|
label="权利人"
|
|
|
width="120"
|
|
|
+ show-overflow-tooltip
|
|
|
align="center">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -856,22 +862,26 @@
|
|
|
<el-table-column
|
|
|
prop="buildAcreage"
|
|
|
label="建筑面积(㎡)"
|
|
|
+ width="80"
|
|
|
align="center"
|
|
|
show-overflow-tooltip>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="landAcreage"
|
|
|
label="土地面积(㎡)"
|
|
|
+ width="80"
|
|
|
align="center">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="evaluateValue"
|
|
|
label="初步定价(万)"
|
|
|
+ width="80"
|
|
|
align="center">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="checked"
|
|
|
label="审核定价(万)"
|
|
|
+ width="80"
|
|
|
align="center">
|
|
|
<template slot-scope="scope">
|
|
|
{{scope.row.checkValue==null?'待审核':scope.row.checkValue}}
|
|
|
@@ -881,7 +891,7 @@
|
|
|
prop="statementNo"
|
|
|
label="价值意见书号"
|
|
|
align="center"
|
|
|
- width="200">
|
|
|
+ width="250">
|
|
|
<template slot-scope="scope">
|
|
|
<el-tag type='success'>
|
|
|
{{scope.row.statementNo==null?'未取号':scope.row.statementNo}}</el-tag>
|
|
|
@@ -910,6 +920,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
label="操作"
|
|
|
+ width="100"
|
|
|
align="center">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button @click="landTargetEdit(scope.row)" type="text" size="small">
|
|
|
@@ -941,7 +952,9 @@
|
|
|
class="postInfo-container-item"
|
|
|
>
|
|
|
<el-checkbox-group v-model="feedback.production" style="width:300px">
|
|
|
- <el-checkbox-button label="STATEMENT" name="production">价值意见书</el-checkbox-button>
|
|
|
+ <el-tooltip class="item" effect="dark" content="意见书已送达，无法取消此类型产品！" placement="top-start">
|
|
|
+ <el-checkbox-button label="STATEMENT" name="production">价值意见书</el-checkbox-button>
|
|
|
+ </el-tooltip>
|
|
|
<el-checkbox-button label="REPORT" name="production">报告</el-checkbox-button>
|
|
|
<el-checkbox-button label="LETTER" name="production">复评函</el-checkbox-button>
|
|
|
<el-tooltip class="item" effect="dark" content="只出具价值意见书，不再出具其他产品。" placement="top-start">
|
|
|
@@ -1008,16 +1021,19 @@
|
|
|
:data="productions"
|
|
|
stripe
|
|
|
ref = "pTable"
|
|
|
- :header-row-style="{ color: '#333333' }"
|
|
|
+ :header-row-style="{ color: '#333333' ,'font-size': '16px' }"
|
|
|
@selection-change="selectioProductionChange"
|
|
|
@row-dblclick="expandRow"
|
|
|
border
|
|
|
- style="width: 99%; margin-top:20px;">
|
|
|
- <el-table-column type="expand">
|
|
|
- <template slot-scope="props">
|
|
|
- <el-form label-position="left" :model="props.row" class="form-container" ref="productionFrom" :rules="rules">
|
|
|
+ style="width: 99%; margin-top:20px; font-size: 16px;">
|
|
|
+ <el-table-column type="expand" style="background-color: red">
|
|
|
+ <template slot-scope="props" >
|
|
|
+ <el-form label-position="left" :model="props.row" class="form-container" ref="productionFrom" :rules="rules">
|
|
|
<div>
|
|
|
- <el-tag effect="plain" size="medium" disable-transitions><span style="font-size:16px">基本信息</span></el-tag>
|
|
|
+ <!-- <el-tag effect="plain" size="medium" disable-transitions><span style="font-size:16px ; margin-top:10px">基本信息</span></el-tag> -->
|
|
|
+ <div style="margin-left:10px;margin-bottom:10px;margin-top:10px">
|
|
|
+ <el-button round type="danger" @click="saveProduction(props.row)">更新产品信息</el-button>
|
|
|
+ </div>
|
|
|
<el-row class="row-style">
|
|
|
<el-col :xs="24" :sm="12" :lg="6" :span="6">
|
|
|
<el-form-item
|
|
|
@@ -1053,7 +1069,7 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row class="row-style">
|
|
|
- <el-col :xs="24" :sm="12" :lg="8" :span="6">
|
|
|
+ <el-col :xs="24" :sm="12" :lg="6" :span="6">
|
|
|
<el-form-item prop="evaluateAmount"
|
|
|
label-width="120px"
|
|
|
class="postInfo-container-item" label="评估总价：">
|
|
|
@@ -1061,12 +1077,12 @@
|
|
|
style="width:100%"
|
|
|
class="filter-item">
|
|
|
<template slot="append">
|
|
|
- <span>{{(props.row.evaluateAmount/10000).toFixed(4)}}万</span>
|
|
|
+ <span>元</span>
|
|
|
</template>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :xs="24" :sm="12" :lg="8" :span="6">
|
|
|
+ <el-col :xs="24" :sm="12" :lg="6" :span="6">
|
|
|
<el-form-item prop="evaluateAcreage"
|
|
|
label-width="120px"
|
|
|
class="postInfo-container-item" label="评估面积：">
|
|
|
@@ -1079,7 +1095,7 @@
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :xs="24" :sm="12" :lg="8" :span="6">
|
|
|
+ <el-col :xs="24" :sm="12" :lg="6" :span="6">
|
|
|
<el-form-item prop="evaluatePrice"
|
|
|
label-width="120px"
|
|
|
class="postInfo-container-item" label="评估单价：">
|
|
|
@@ -1088,7 +1104,7 @@
|
|
|
readonly disabled
|
|
|
class="filter-item" >
|
|
|
<template slot="append">
|
|
|
- <span>{{(props.row.evaluatePrice/10000).toFixed(4)}}万</span>
|
|
|
+ <span>元</span>
|
|
|
</template>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
@@ -1114,7 +1130,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6" :span="6" v-if="props.row.production==='REPORT'">
|
|
|
- <el-form-item prop="signatory"
|
|
|
+ <el-form-item prop="signatoryId" :rules="{required: true, message: '签字人不能为空', trigger: 'blur'}"
|
|
|
label-width="120px"
|
|
|
class="postInfo-container-item" label="签字人：" >
|
|
|
<el-select v-model="props.row.signatoryId"
|
|
|
@@ -1127,7 +1143,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="24" :sm="12" :lg="6" :span="6" v-else>
|
|
|
- <el-form-item prop="signatory"
|
|
|
+ <el-form-item prop="signatoryId"
|
|
|
label-width="120px"
|
|
|
class="postInfo-container-item">
|
|
|
</el-form-item>
|
|
|
@@ -1151,20 +1167,31 @@
|
|
|
|
|
|
</el-row>
|
|
|
<el-row class="row-style" v-if="doUpload">
|
|
|
- <el-col :xs="24" :sm="12" :lg="18" :span="6">
|
|
|
- <el-form-item label="电子文档：" label-width="120px" class="postInfo-container-item" >
|
|
|
+ <el-col :xs="24" :sm="12" :lg="8" :span="6">
|
|
|
+ <el-form-item label="产品初稿：" label-width="120px" class="postInfo-container-item" >
|
|
|
<el-upload
|
|
|
action="/api/upload"
|
|
|
:limit="3" :on-success="changeres" :on-exceed="handleExceed" :on-preview="handleAttachmentPreview"
|
|
|
:file-list="props.row.filePathList" :before-remove="beforeRemove" >
|
|
|
- <el-button plain type="info" round style="width: 100%" >上传电子文档<i class="el-icon-upload el-icon--right"></i></el-button>
|
|
|
+ <el-button plain type="info" round style="width: 100%" >上传<i class="el-icon-upload el-icon--right"></i></el-button>
|
|
|
+ </el-upload>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ <el-col :xs="24" :sm="12" :lg="8" :span="6">
|
|
|
+ <el-form-item label="产品审核稿：" label-width="140px" class="postInfo-container-item" >
|
|
|
+ <el-upload
|
|
|
+ action="/api/upload"
|
|
|
+ :limit="3" :on-success="changeres1" :on-exceed="handleExceed" :on-preview="handleAttachmentPreview"
|
|
|
+ :file-list="props.row.filePathList1" :before-remove="beforeRemove1" >
|
|
|
+ <el-button plain type="info" round style="width: 100%" >上传<i class="el-icon-upload el-icon--right"></i></el-button>
|
|
|
</el-upload>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</div>
|
|
|
<div>
|
|
|
- <el-tag effect="plain" size="medium" disable-transitions><span style="font-size:16px">库存状态</span></el-tag>
|
|
|
+ <!-- <el-tag effect="plain" size="medium" disable-transitions><span style="font-size:16px">库存状态</span></el-tag> -->
|
|
|
<el-row class="row-style" v-if="doWare">
|
|
|
<el-col :xs="24" :sm="12" :lg="4" :span="6">
|
|
|
<el-form-item label="出入库操作：" label-width="120px" class="postInfo-container-item" >
|
|
|
@@ -1174,18 +1201,13 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <el-steps :active="props.row.repertoryState==null?0:(props.row.repertoryState?2:1)"
|
|
|
+ <!-- <el-steps :active="props.row.repertoryState==null?0:(props.row.repertoryState?2:1)"
|
|
|
process-status="success" finish-status="success" simple style="margin: 10px 1% 20px 40px">
|
|
|
<el-step title="未入库" ></el-step>
|
|
|
<el-step title="已入库" ></el-step>
|
|
|
<el-step title="已出库" ></el-step>
|
|
|
- </el-steps>
|
|
|
+ </el-steps> -->
|
|
|
</div>
|
|
|
- <el-row class="row-style">
|
|
|
- <el-col :xs="24" :sm="12" :lg="6" :span="6">
|
|
|
- <el-button plain round style="width:50%;letter-spacing:4px" type="success" @click="saveProduction(props.row)">更新产品信息</el-button>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
</el-form>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -1200,7 +1222,7 @@
|
|
|
prop="reportNo"
|
|
|
align="center">
|
|
|
<template slot-scope="props">
|
|
|
- <el-tag type="danger"><span style="font-size:16px">{{props.row.reportNo}}</span></el-tag>
|
|
|
+ <el-tag type="danger">{{props.row.reportNo}}</el-tag>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -1208,7 +1230,7 @@
|
|
|
prop="name"
|
|
|
align="center">
|
|
|
<template slot-scope="props">
|
|
|
- <span style="font-size:16px">{{props.row.name}}</span>
|
|
|
+ {{props.row.name}}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -1216,7 +1238,7 @@
|
|
|
prop="production"
|
|
|
align="center">
|
|
|
<template slot-scope="props">
|
|
|
- <span style="font-size:16px">{{aliasProductionType(props.row.production)}}</span>
|
|
|
+ {{aliasProductionType(props.row.production)}}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -1224,8 +1246,8 @@
|
|
|
prop="name"
|
|
|
align="center">
|
|
|
<template slot-scope="props">
|
|
|
- <i v-if="props.row.name" style="font-size:20px; color:green" class="el-icon-success"></i>
|
|
|
- <i v-else style="font-size:20px; color:red" class="el-icon-error"></i>
|
|
|
+ <i v-if="props.row.name" style="color:green" class="el-icon-success"></i>
|
|
|
+ <i v-else style="color:red" class="el-icon-error"></i>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -2047,10 +2069,6 @@
|
|
|
}
|
|
|
else if(this.currentNode.nodeCode === 'STATEMENT_FEEDBACK' && !ps.includes("STATEMENT")){
|
|
|
this.feedback.production.push("STATEMENT");
|
|
|
- this.$message({
|
|
|
- message: '警告，意见书已送达，无法取消此类型产品！',
|
|
|
- type: 'error'
|
|
|
- });
|
|
|
this.validFeed = true;
|
|
|
}
|
|
|
else if (ps.includes("REPORT") && ps.includes("LETTER")){
|
|
|
@@ -2121,9 +2139,9 @@
|
|
|
if (evaluate.includes(nodeCode)){
|
|
|
return 'evaluate'
|
|
|
}
|
|
|
- if (check.includes(nodeCode)){
|
|
|
- return 'quality'
|
|
|
- }
|
|
|
+ // if (check.includes(nodeCode)){
|
|
|
+ // return 'quality'
|
|
|
+ // }
|
|
|
return 'producution'
|
|
|
},
|
|
|
set(){}
|
|
|
@@ -3016,9 +3034,13 @@
|
|
|
//回显上传的文档
|
|
|
for (let p in this.productions){
|
|
|
let d = JSON.parse(this.productions[p].filePath);
|
|
|
+ let c = JSON.parse(this.productions[p].checkedFilePath);
|
|
|
for (let q in d){
|
|
|
this.productions[p].filePathList.push({name: d[q].name, url:d[q].url,index:p});
|
|
|
}
|
|
|
+ for (let cc in c){
|
|
|
+ this.productions[p].filePathList1.push({name: c[cc].name, url:c[cc].url,index:p});
|
|
|
+ }
|
|
|
}
|
|
|
//显示出入库操作按钮
|
|
|
let wareHoseNodes = ['STATEMENT_IN','STATEMENT_OUT','REPORT_IN','REPORT_OUT','LETTER_IN','LETTER_OUT']
|
|
|
@@ -3026,7 +3048,8 @@
|
|
|
this.doWare = true;
|
|
|
}
|
|
|
//显示上传附件按钮
|
|
|
- let writeNodes = ['WRITE_STATEMENT','WRITE_REPORT','WRITE_LETTER']
|
|
|
+ let writeNodes = ['WRITE_STATEMENT','WRITE_REPORT','WRITE_LETTER','CHECK_STATEMENT','CHECK_REPORT','CHECK_LETTER'
|
|
|
+ ,'RECHECK_STATEMENT','THIRD_CHECK_STATEMENT','RECHECK_REPORT','THIRD_CHECK_REPORT','RECHECK_LETTER','THIRD_CHECK_LETTER']
|
|
|
if (writeNodes.includes(currentNodeCode)){
|
|
|
this.doUpload = true;
|
|
|
}
|
|
|
@@ -3044,22 +3067,16 @@
|
|
|
case 'WRITE_STATEMENT':
|
|
|
case 'WRITE_REPORT':
|
|
|
case 'WRITE_LETTER':
|
|
|
- this.caseEditProduction(production);
|
|
|
- break;
|
|
|
case 'CHECK_STATEMENT':
|
|
|
case 'CHECK_REPORT':
|
|
|
case 'CHECK_LETTER':
|
|
|
- this.caseFirstCheck(production);
|
|
|
- break;
|
|
|
case 'RECHECK_STATEMENT':
|
|
|
case 'RECHECK_REPORT':
|
|
|
case 'RECHECK_LETTER':
|
|
|
- this.caseSecondCheck(production);
|
|
|
- break;
|
|
|
case 'THIRD_CHECK_STATEMENT':
|
|
|
case 'THIRD_CHECK_REPORT':
|
|
|
case 'THIRD_CHECK_LETTER':
|
|
|
- this.caseThirdCheck(production);
|
|
|
+ this.caseEditProduction(production);
|
|
|
break;
|
|
|
case 'CHECK_ARCHIVING':
|
|
|
this.caseCheckArchiving(production);
|
|
|
@@ -3086,12 +3103,45 @@
|
|
|
index = (this.productions.length)-1;
|
|
|
}
|
|
|
if (res.code===200){
|
|
|
- this.productions[index].filePathList.push({name:file.name,url:res.data.url});
|
|
|
+ this.productions[index].filePathList = [];
|
|
|
+ for(let i in fileList){
|
|
|
+ if (fileList[i].response){
|
|
|
+ this.productions[index].filePathList.push({name:fileList[i].name,url:fileList[i].response.data.url});
|
|
|
+ }else{
|
|
|
+ this.productions[index].filePathList.push({name:fileList[i].name,url:fileList[i].url});
|
|
|
+ }
|
|
|
+ }
|
|
|
this.productions[index].filePath = JSON.stringify(this.productions[index].filePathList);
|
|
|
}else {
|
|
|
this.$notify({
|
|
|
title: '错误',
|
|
|
- message: '电子文档上传失败',
|
|
|
+ message: '产品上传失败',
|
|
|
+ type: 'error',
|
|
|
+ duration: 2000
|
|
|
+ });
|
|
|
+ fileList.pop();
|
|
|
+ }
|
|
|
+
|
|
|
+ },
|
|
|
+ changeres1(res, file,fileList) {
|
|
|
+ let index = fileList[0].index;
|
|
|
+ if (typeof(index) === 'undefined'){
|
|
|
+ index = (this.productions.length)-1;
|
|
|
+ }
|
|
|
+ if (res.code===200){
|
|
|
+ this.productions[index].filePathList1= [];
|
|
|
+ for(let i in fileList){
|
|
|
+ if (fileList[i].response){
|
|
|
+ this.productions[index].filePathList1.push({name:fileList[i].name,url:fileList[i].response.data.url});
|
|
|
+ }else{
|
|
|
+ this.productions[index].filePathList1.push({name:fileList[i].name,url:fileList[i].url});
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.productions[index].checkedFilePath = JSON.stringify(this.productions[index].filePathList1);
|
|
|
+ }else {
|
|
|
+ this.$notify({
|
|
|
+ title: '错误',
|
|
|
+ message: '产品上传失败',
|
|
|
type: 'error',
|
|
|
duration: 2000
|
|
|
});
|
|
|
@@ -3114,6 +3164,16 @@
|
|
|
let xPaths = paths.filter(item=>item.url !== file.url);
|
|
|
this.productions[index].filePath = JSON.stringify(xPaths);
|
|
|
},
|
|
|
+ beforeRemove1(file, fileList) {
|
|
|
+ let index = fileList[0].index;
|
|
|
+ if (typeof(index) === 'undefined'){
|
|
|
+ index = (this.productions.length)-1;
|
|
|
+ }
|
|
|
+ let paths = JSON.parse(this.productions[index].checkedFilePath);
|
|
|
+ let xPaths = paths.filter(item=>item.url !== file.url);
|
|
|
+ this.productions[index].checkedFilePath = JSON.stringify(xPaths);
|
|
|
+ },
|
|
|
+
|
|
|
caseEditProduction(production){
|
|
|
let po = this.productions.filter(function(i){
|
|
|
return i.id!=production.id;
|
|
|
@@ -3325,7 +3385,8 @@
|
|
|
let selected = this.productions.filter(function(e){
|
|
|
return e.reportNo === commit.businessSubId
|
|
|
})
|
|
|
- if (!selected[0].name){
|
|
|
+ if (!selected[0].name || !selected[0].clientName || !selected[0].clientTel || !selected[0].clientAddress || !selected[0].evaluateAmount || !selected[0].evaluateAcreage
|
|
|
+ || !selected[0].owner || !selected[0].valueTiming ){
|
|
|
this.$notify({
|
|
|
title: '提示',
|
|
|
message: '请完成所选产品的基本信息后，再进行流程提交。',
|
|
|
@@ -3366,7 +3427,8 @@
|
|
|
let selected1 = this.productions.filter(function(e){
|
|
|
return e.reportNo === commit.businessMinId
|
|
|
})
|
|
|
- if (!selected1[0].name){
|
|
|
+ if (!selected1[0].name || !selected1[0].clientName || !selected1[0].clientTel || !selected1[0].clientAddress || !selected1[0].evaluateAmount || !selected1[0].evaluateAcreage
|
|
|
+ || !selected1[0].owner || !selected1[0].valueTiming || !selected1[0].signatory ){
|
|
|
this.$notify({
|
|
|
title: '提示',
|
|
|
message: '请完成所选产品的基本信息后，再进行流程提交。',
|
|
|
@@ -3377,6 +3439,7 @@
|
|
|
callback(verify);
|
|
|
return ;
|
|
|
}
|
|
|
+
|
|
|
break;
|
|
|
case 'WRITE_LETTER':
|
|
|
let notTakeLetterNumberTargets = this.evaluateLandData.filter(function(e){
|
|
|
@@ -3407,7 +3470,8 @@
|
|
|
let selected2 = this.productions.filter(function(e){
|
|
|
return e.reportNo === commit.businessMinId
|
|
|
})
|
|
|
- if (!selected2[0].name){
|
|
|
+ if (!selected2[0].name || !selected2[0].clientName || !selected2[0].clientTel || !selected2[0].clientAddress || !selected2[0].evaluateAmount || !selected2[0].evaluateAcreage
|
|
|
+ || !selected2[0].owner || !selected2[0].valueTiming){
|
|
|
this.$notify({
|
|
|
title: '提示',
|
|
|
message: '请完成所选产品的基本信息后，再进行流程提交。',
|
|
|
@@ -3422,7 +3486,7 @@
|
|
|
case "CHECK_STATEMENT":
|
|
|
case "CHECK_REPORT":
|
|
|
case "CHECK_LETTER":
|
|
|
- if (!verify.nextHandlerId){
|
|
|
+ if (commit.doSecondCheck!='不审' && !verify.nextHandlerId){
|
|
|
verify.state = false;
|
|
|
callback(verify);
|
|
|
this.chooseSecondCheckerDialog = true
|
|
|
@@ -3435,6 +3499,21 @@
|
|
|
})
|
|
|
return ;
|
|
|
}
|
|
|
+ case "REVIEW_QUOTATION":
|
|
|
+ let notCheckValueTargets = this.evaluateLandData.filter(function(e){
|
|
|
+ return e.checkValue ==null;
|
|
|
+ })
|
|
|
+ if (notCheckValueTargets.length>0){
|
|
|
+ this.$notify({
|
|
|
+ title: '提示',
|
|
|
+ message: '还有有估价对象价格未审核。',
|
|
|
+ type: 'error',
|
|
|
+ duration: 2000
|
|
|
+ });
|
|
|
+ verify.state = false;
|
|
|
+ callback(verify);
|
|
|
+ return ;
|
|
|
+ }
|
|
|
}
|
|
|
callback(verify);
|
|
|
}
|
