大中型在撰写节点添加估价对象以及取号合并号

src/api/modules/majorTarget.js

@@ -26,5 +26,8 @@ export default {
    },
    takeNumber(params){
     return request.post(`majorTarget/takeNumber`, params)
+   },
+   mergeNumber(params){
+    return request.post(`majorTarget/merge`, params)
    }
 }

src/views/major/todoDetail.vue

@@ -442,9 +442,13 @@
                 </div>
               </el-col>
               <el-col :span="2">
-                <el-button v-if="currentNode.nodeCode === 'SPOT_RECONNAISSANCE'" type="danger" round
+                <el-button v-if="couldAddTarget" type="danger" round
                   @click="openLandDialog(major.businessObjectType)">添加估价对象</el-button>
               </el-col>
+              <el-col :span="2">
+                <el-button v-if="couldAddTarget" type="warning" :disabled="!takeNumberItems.length > 0" round
+                @click="openMergeNumberDialog()">合并到已有号</el-button>
+              </el-col>
               <el-col :span="2" v-if="currentNode.nodeCode === 'WRITE_STATEMENT'">
                 <el-tooltip v-if="ifTakeNumber" class="item" effect="dark" content="全选取主号，多次取号(主号-子号)" placement="right">
                   <el-button type="success" :disabled="!takeNumberItems.length > 0" round
@@ -517,7 +521,7 @@
             <el-table-column label="操作" align="center" width="100" fixed="right">
               <template slot-scope="scope">
                 <el-button @click="landTargetEdit(scope.row)" type="text" size="small">
-                  {{ hanlderType() }}
+                  {{ hanlderType()==='新增'?'查看':hanlderType()}}
                 </el-button>
                 <el-button v-if="currentNode.nodeCode === 'SPOT_RECONNAISSANCE'" @click="landTargetRemove(scope.row.id)"
                   type="text" size="small">删除</el-button>
@@ -547,9 +551,13 @@
                 </div>
               </el-col>
               <el-col :span="2">
-                <el-button v-if="currentNode.nodeCode === 'SPOT_RECONNAISSANCE'" type="danger" round
+                <el-button v-if="couldAddTarget" type="danger" round
                   @click="openLandDialog(major.businessObjectType)">添加估价对象</el-button>
               </el-col>
+              <el-col :span="2">
+                <el-button v-if="couldAddTarget" type="warning" :disabled="!takeNumberItems.length > 0" round
+                @click="openMergeNumberDialog()">合并到已有号</el-button>
+              </el-col>
               <el-col :span="2" v-if="currentNode.nodeCode === 'WRITE_STATEMENT'">
                 <el-tooltip v-if="ifTakeNumber" class="item" effect="dark" content="全选取主号，多次取号(主号-子号)" placement="right">
                   <el-button type="success" :disabled="!takeNumberItems.length > 0" round
@@ -623,7 +631,7 @@
             <el-table-column label="操作" width="100" align="center">
               <template slot-scope="scope">
                 <el-button @click="landTargetEdit(scope.row)" type="text" size="small">
-                  {{ hanlderType() }}
+                  {{ hanlderType()==='新增'?'查看':hanlderType() }}
                 </el-button>
                 <el-button v-if="currentNode.nodeCode === 'SPOT_RECONNAISSANCE'" @click="landTargetRemove(scope.row.id)"
                   type="text" size="small">删除</el-button>
@@ -896,7 +904,7 @@
                     </el-col>
                   </el-row>
                   <el-row class="row-style">
-                    <el-col :xs="24" :sm="12" :lg="24" :span="6">
+                    <el-col :xs="24" :sm="12" :lg="18" :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>
@@ -1236,18 +1244,18 @@
                 :rules="{ required: true, message: '土地类型不能为空', trigger: 'blur' }" label-width="140px"
                 class="postInfo-container-item">
                 <el-radio v-model="landTarget.landType" label="国有" size="mini"
-                  :readonly="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'"
-                  :disabled="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'">国有</el-radio>
+                  :readonly="!couldAddTarget"
+                  :disabled="!couldAddTarget">国有</el-radio>
                 <el-radio v-model="landTarget.landType" label="集体" size="mini"
-                  :readonly="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'"
-                  :disabled="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'">集体</el-radio>
+                  :readonly="!couldAddTarget"
+                  :disabled="!couldAddTarget">集体</el-radio>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
               <el-form-item label="使用权面积：" prop="useAcreage" label-width="140px" class="postInfo-container-item">
                 <el-input v-model="landTarget.useAcreage" class="filter-item"
-                  :readonly="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'"
-                  :disabled="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'">
+                  :readonly="!couldAddTarget"
+                  :disabled="!couldAddTarget">
                   <template slot="append">平方</template>
                 </el-input>
               </el-form-item>
@@ -1259,11 +1267,11 @@
                 :rules="{ required: true, message: '使用权类型不能为空', trigger: 'blur' }" label-width="140px"
                 class="postInfo-container-item">
                 <el-radio v-model="landTarget.rightType" label="出让" size="mini"
-                  :readonly="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'"
-                  :disabled="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'">出让</el-radio>
+                  :readonly="!couldAddTarget"
+                  :disabled="!couldAddTarget">出让</el-radio>
                 <el-radio v-model="landTarget.rightType" label="划拨" size="mini"
-                  @click.native="cleanResidueYears(landTarget)" :readonly="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'"
-                  :disabled="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'">划拨</el-radio>
+                  @click.native="cleanResidueYears(landTarget)" :readonly="!couldAddTarget"
+                  :disabled="!couldAddTarget">划拨</el-radio>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="12" :span="8">
@@ -1271,8 +1279,8 @@
                 :rules="{ required: true, message: '土地使用权人不能为空', trigger: 'blur' }" label-width="120px"
                 class="postInfo-container-item">
                 <el-input v-model.trim="landTarget.rightToUser" class="filter-item"
-                  :readonly="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'"
-                  :disabled="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'" />
+                  :readonly="!couldAddTarget"
+                  :disabled="!couldAddTarget" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -1280,16 +1288,16 @@
             <el-col :xs="24" :sm="12" :lg="12" :span="8">
               <el-form-item label="国土证号：" prop="landCertificateNo" label-width="120px" class="postInfo-container-item">
                 <el-input v-model.trim="landTarget.landCertificateNo" class="filter-item"
-                  :readonly="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'"
-                  :disabled="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'" />
+                  :readonly="!couldAddTarget"
+                  :disabled="!couldAddTarget" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="12" :span="8">
               <el-form-item label="坐落：" prop="located" :rules="{ required: true, message: '坐落不能为空', trigger: 'blur' }"
                 label-width="120px" class="postInfo-container-item">
                 <el-input v-model.trim="landTarget.located" class="filter-item"
-                  :readonly="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'"
-                  :disabled="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'" />
+                  :readonly="!couldAddTarget"
+                  :disabled="!couldAddTarget" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -1297,8 +1305,8 @@
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
               <el-form-item label="剩余年限：" prop="residueYears" label-width="120px" class="postInfo-container-item">
                 <el-input v-model="landTarget.residueYears" class="filter-item"
-                  :readonly="currentNode.nodeCode != 'SPOT_RECONNAISSANCE' || landTarget.rightType === '划拨'"
-                  :disabled="currentNode.nodeCode != 'SPOT_RECONNAISSANCE' || landTarget.rightType === '划拨'">
+                  :readonly="!couldAddTarget || landTarget.rightType === '划拨'"
+                  :disabled="!couldAddTarget || landTarget.rightType === '划拨'">
                   <template slot="append">年</template>
                 </el-input>
               </el-form-item>
@@ -1306,8 +1314,8 @@
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
               <el-form-item label="容积率：" prop="plotRatio" label-width="120px" class="postInfo-container-item">
                 <el-input v-model="landTarget.plotRatio" class="filter-item"
-                  :readonly="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'"
-                  :disabled="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'">
+                  :readonly="!couldAddTarget"
+                  :disabled="!couldAddTarget">
                 </el-input>
               </el-form-item>
             </el-col>
@@ -1317,8 +1325,8 @@
               <el-form-item label="用途(地类)：" prop="landUse" label-width="120px"
                 :rules="{ required: true, message: '用途(地类)不能为空', trigger: 'blur' }" class="postInfo-container-item">
                 <el-input v-model.trim="landTarget.landUse" class="filter-item"
-                  :readonly="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'"
-                  :disabled="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'" />
+                  :readonly="!couldAddTarget"
+                  :disabled="!couldAddTarget" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="12" :span="8">
@@ -1326,8 +1334,8 @@
                 :rules="{ required: true, message: '估价期日不能为空', trigger: 'blur' }" label-width="120px"
                 class="postInfo-container-item">
                 <el-date-picker v-model="landTarget.evaluateDate" type="date" placeholder="选择日期" style="width:100%"
-                  :readonly="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'"
-                  :disabled="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'">
+                  :readonly="!couldAddTarget"
+                  :disabled="!couldAddTarget">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -1346,8 +1354,8 @@
               <el-form-item label="实勘人：" prop="sites" :rules="{ required: true, message: '实勘人不能为空', trigger: 'blur' }"
                 label-width="120px" class="postInfo-container-item">
                 <el-select v-model="landTarget.sites" placeholder="请选择" multiple filterable clearable style="width:100%"
-                  @change="sitesChange()" :readonly="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'"
-                  :disabled="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'">
+                  @change="sitesChange()" :readonly="!couldAddTarget"
+                  :disabled="!couldAddTarget">
                   <el-option v-for="(u, id) in allUsers" :label="u.name" :value="u.id" :key="u.id"></el-option>
                 </el-select>
               </el-form-item>
@@ -1357,18 +1365,18 @@
             <el-col :xs="24" :sm="12" :lg="24" :span="12">
               <el-form-item label="备注：" prop="remark" label-width="120px" class="postInfo-container-item">
                 <el-input v-model.trim="landTarget.remark" class="filter-item" type="textarea" style="width:100%;"
-                  :readonly="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'"
-                  :disabled="currentNode.nodeCode != 'SPOT_RECONNAISSANCE'" />
+                  :readonly="!couldAddTarget"
+                  :disabled="!couldAddTarget" />
               </el-form-item>
             </el-col>
           </el-row>
           <div
-            v-if="currentNode.nodeCode === 'INITIAL_PRICE' || currentNode.nodeCode === 'REVIEW_QUOTATION' || hanlderType() === '查看'">
+            v-if="currentNode.nodeCode === 'INITIAL_PRICE' || currentNode.nodeCode === 'REVIEW_QUOTATION' || couldAddTarget">
             <el-divider content-position="left">【土地】定价信息</el-divider>
             <el-row>
               <el-col :xs="24" :sm="12" :lg="24" :span="6">
                 <el-form-item label="评估方法：" prop="eMethods"
-                  :rules="{ required: true, message: '评估方法不能为空', trigger: 'blur' }" label-width="160px"
+                   label-width="160px"
                   :class="['postInfo-container-item', 'task-class']">
                   <el-checkbox-group v-model="eMethods">
                     <el-checkbox-button label="市场比较法" key="市场比较法">市场比较法</el-checkbox-button>
@@ -1396,8 +1404,8 @@
                 <el-form-item label="初步定价：" prop="evaluateValue" label-width="160px"
                   :class="['postInfo-container-item', 'task-class']">
                   <el-input v-model="landTarget.evaluateValue" 
-                  :disabled="currentNode.nodeCode != 'INITIAL_PRICE'"
-                  :readonly="currentNode.nodeCode != 'INITIAL_PRICE'" class="filter-item">
+                  :disabled="!couldAddTarget"
+                  :readonly="!couldAddTarget" class="filter-item">
                     <template slot="append">万</template>
                   </el-input>
                 </el-form-item>
@@ -1417,8 +1425,8 @@
               </el-col>
             </el-row>
           </div>
-          <el-row v-if="hanlderType() != '查看'">
-            <el-button v-if="currentNode.nodeCode === 'SPOT_RECONNAISSANCE'" type="success"
+          <el-row>
+            <el-button v-if="couldAddTarget" type="success"
               @click="saveLandTarget(major.businessObjectType)" style="width:100%;">保存</el-button>
             <el-button v-else type="success" @click="doTask(currentNode.nodeCode)" style="width:100%;">保存</el-button>
           </el-row>
@@ -1443,7 +1451,8 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
               <el-form-item label="土地使用权人：" prop="rightToUser" label-width="140px" class="postInfo-container-item">
-                <el-input v-model.trim="landTarget.rightToUser" class="filter-item" />
+                <el-input v-model.trim="landTarget.rightToUser" :readonly="!couldAddTarget"
+                :disabled="!couldAddTarget" class="filter-item" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -1451,25 +1460,29 @@
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
               <el-form-item label="权利人：" prop="owner" :rules="{ required: true, message: '权利人不能为空', trigger: 'blur' }"
                 label-width="120px" class="postInfo-container-item">
-                <el-input v-model.trim="landTarget.owner" class="filter-item" />
+                <el-input v-model.trim="landTarget.owner" class="filter-item" :readonly="!couldAddTarget"
+                :disabled="!couldAddTarget"/>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
               <el-form-item label="权证号：" prop="ownerNo" label-width="120px" class="postInfo-container-item">
-                <el-input v-model.trim="landTarget.ownerNo" class="filter-item" />
+                <el-input v-model.trim="landTarget.ownerNo" class="filter-item" :readonly="!couldAddTarget"
+                :disabled="!couldAddTarget"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
               <el-form-item label="土地证号：" prop="landCertificateNo" label-width="120px" class="postInfo-container-item">
-                <el-input v-model.trim="landTarget.landCertificateNo" class="filter-item" />
+                <el-input v-model.trim="landTarget.landCertificateNo" class="filter-item" :readonly="!couldAddTarget"
+                :disabled="!couldAddTarget"/>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
               <el-form-item label="坐落：" prop="located" label-width="120px"
                 :rules="{ required: true, message: '坐落不能为空', trigger: 'blur' }" class="postInfo-container-item">
-                <el-input v-model.trim="landTarget.located" class="filter-item" />
+                <el-input v-model.trim="landTarget.located" class="filter-item" :readonly="!couldAddTarget"
+                :disabled="!couldAddTarget"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -1477,24 +1490,28 @@
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
               <el-form-item label="使用权类型：" :rules="{ required: true, message: '使用权类型不能为空', trigger: 'blur' }"
                 prop="useRightType" label-width="140px" class="postInfo-container-item">
-                <el-input v-model.trim="landTarget.useRightType" class="filter-item" />
+                <el-input v-model.trim="landTarget.useRightType" class="filter-item" :readonly="!couldAddTarget"
+                :disabled="!couldAddTarget"/>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="12" :span="8">
               <el-form-item label="项目名称：" prop="targetName" label-width="120px" class="postInfo-container-item">
-                <el-input v-model.trim="landTarget.targetName" />
+                <el-input v-model.trim="landTarget.targetName" :readonly="!couldAddTarget"
+                :disabled="!couldAddTarget"/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :xs="24" :sm="12" :lg="12" :span="8">
               <el-form-item label="竣工年代：" prop="buildDoneYear" label-width="120px" class="postInfo-container-item">
-                <el-input v-model.trim="landTarget.buildDoneYear" class="filter-item" />
+                <el-input v-model.trim="landTarget.buildDoneYear" class="filter-item" :readonly="!couldAddTarget"
+                :disabled="!couldAddTarget"/>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="12" :span="8">
               <el-form-item label="建筑面积：" prop="buildAcreage" label-width="120px" class="postInfo-container-item">
-                <el-input v-model="landTarget.buildAcreage" style="width:100%" class="filter-item">
+                <el-input v-model="landTarget.buildAcreage" style="width:100%" class="filter-item" :readonly="!couldAddTarget"
+                :disabled="!couldAddTarget">
                   <template slot="append">平方</template>
                 </el-input>
               </el-form-item>
@@ -1503,7 +1520,8 @@
           <el-row>
             <el-col :xs="24" :sm="12" :lg="12" :span="8">
               <el-form-item label="土地面积：" prop="landAcreage" label-width="120px" class="postInfo-container-item">
-                <el-input v-model="landTarget.landAcreage" style="width:100%" class="filter-item">
+                <el-input v-model="landTarget.landAcreage" style="width:100%" class="filter-item" :readonly="!couldAddTarget"
+                :disabled="!couldAddTarget">
                   <template slot="append">平方</template>
                 </el-input>
               </el-form-item>
@@ -1511,7 +1529,8 @@
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
               <el-form-item label="规划用途：" :rules="{ required: true, message: '规划用途不能为空', trigger: 'blur' }"
                 prop="planPurpose" label-width="120px" class="postInfo-container-item">
-                <el-input v-model.trim="landTarget.planPurpose" class="filter-item" />
+                <el-input v-model.trim="landTarget.planPurpose" class="filter-item" :readonly="!couldAddTarget"
+                :disabled="!couldAddTarget"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -1519,13 +1538,15 @@
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
               <el-form-item label="实勘地址：" :rules="{ required: true, message: '实勘地址不能为空', trigger: 'blur' }"
                 prop="siteLocated" label-width="120px" class="postInfo-container-item">
-                <el-input v-model.trim="landTarget.siteLocated" class="filter-item" />
+                <el-input v-model.trim="landTarget.siteLocated" class="filter-item" :readonly="!couldAddTarget"
+                :disabled="!couldAddTarget"/>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
               <el-form-item label="实际用途：" :rules="{ required: true, message: '实际用途不能为空', trigger: 'blur' }"
                 prop="realPurpose" label-width="120px" class="postInfo-container-item">
-                <el-input v-model.trim="landTarget.realPurpose" class="filter-item" />
+                <el-input v-model.trim="landTarget.realPurpose" class="filter-item" :readonly="!couldAddTarget"
+                :disabled="!couldAddTarget"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -1543,7 +1564,8 @@
               <el-form-item label="实勘人：" prop="sites" :rules="{ required: true, message: '实勘人不能为空', trigger: 'blur' }"
                 label-width="120px" class="postInfo-container-item">
                 <el-select v-model="landTarget.sites" placeholder="请选择" multiple filterable clearable style="width:100%"
-                  @change="sitesChange()">
+                  @change="sitesChange()" :readonly="!couldAddTarget"
+                  :disabled="!couldAddTarget">
                   <el-option v-for="(u, id) in allUsers" :label="u.name" :value="u.id" :key="u.id"></el-option>
                 </el-select>
               </el-form-item>
@@ -1552,17 +1574,18 @@
           <el-row>
             <el-col :xs="24" :sm="12" :lg="24" :span="12">
               <el-form-item label="备注：" prop="remark" label-width="120px" class="postInfo-container-item">
-                <el-input v-model.trim="landTarget.remark" class="filter-item" type="textarea" />
+                <el-input v-model.trim="landTarget.remark" class="filter-item" type="textarea" :readonly="!couldAddTarget"
+                :disabled="!couldAddTarget"/>
               </el-form-item>
             </el-col>
           </el-row>
           <div
-            v-if="currentNode.nodeCode === 'INITIAL_PRICE' || currentNode.nodeCode === 'REVIEW_QUOTATION' || hanlderType() === '查看'">
+            v-if="currentNode.nodeCode === 'INITIAL_PRICE' || currentNode.nodeCode === 'REVIEW_QUOTATION' || couldAddTarget">
             <el-divider content-position="left">【房地产】定价信息</el-divider>
             <el-row>
               <el-col :xs="24" :sm="12" :lg="24" :span="6">
                 <el-form-item label="评估方法：" prop="eMethods"
-                  :rules="{ required: true, message: '评估方法不能为空', trigger: 'blur' }" label-width="160px"
+                   label-width="160px"
                   :class="['postInfo-container-item', 'task-class']">
                   <el-checkbox-group v-model="eMethods">
                     <el-checkbox-button label="比较法" key="比较法">比较法</el-checkbox-button>
@@ -1579,8 +1602,9 @@
                 <el-form-item label="初步定价：" prop="evaluateValue" label-width="160px"
                   :class="['postInfo-container-item', 'task-class']">
                   <el-input v-model="landTarget.evaluateValue" style="width:100%"
-                    :disabled="currentNode.nodeCode != 'INITIAL_PRICE'"
-                    :readonly="currentNode.nodeCode != 'INITIAL_PRICE'" class="filter-item">
+                  :disabled="!couldAddTarget"
+                  :readonly="!couldAddTarget" 
+                     class="filter-item">
                     <template slot="append">万</template>
                   </el-input>
                 </el-form-item>
@@ -1602,8 +1626,8 @@
               </el-col>
             </el-row>
           </div>
-          <el-row v-if="hanlderType() != '查看'">
-            <el-button v-if="currentNode.nodeCode === 'SPOT_RECONNAISSANCE'" type="success"
+          <el-row>
+            <el-button v-if="couldAddTarget" type="success"
               @click="saveLandTarget(major.businessObjectType)" style="width:100%;">保存</el-button>
             <el-button v-else type="success" @click="doTask(currentNode.nodeCode)" style="width:100%;">保存</el-button>
           </el-row>
@@ -1664,6 +1688,19 @@
         <el-button type="primary" @click="commit('PASS')" :disabled="!secondCheckUserId">确定</el-button>
       </span>
     </el-dialog>
+    <el-dialog :visible.sync="mergeNoDialog" width="25%" center top="35vh" custom-class="doWarehouseClass">
+      <div>
+        <i class="el-icon-warning" style="color:RGB(230,162,60);font-size:22px;margin-right:10px;"></i>
+        <span style="position:absolute;top:58px">请选择已取的号码：</span>
+      </div>
+        <el-radio-group v-model="toMergeNo" size="medium" style="margin-top: 10px;margin-left: 90px" >
+          <el-radio border v-for="(no, index) in mergeNos" :label="no" style="margin-bottom: 5px">{{ no }}</el-radio>
+        </el-radio-group>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="mergeNoDialog = false">取消</el-button>
+        <el-button type="primary" @click="doMergeNo()" :disabled="!toMergeNo">确定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -1820,6 +1857,11 @@ export default {
       },
       set() { }
 
+    },
+    couldAddTarget(){
+      const curNode = this.currentNode.nodeCode;
+      let couldNodes = ['SPOT_RECONNAISSANCE','WRITE_STATEMENT','WRITE_REPORT','WRITE_LETTER']
+      return couldNodes.includes(curNode);
     }
 
   },
@@ -2024,7 +2066,10 @@ export default {
       secondCheckUserId: null,
       secondCheckUsers: [],
       productionFinance: [],
-      showQR:true
+      showQR:true,
+      toMergeNo:null,
+      mergeNos:[],
+      mergeNoDialog:false
     }
   },
   created() {
@@ -2274,10 +2319,12 @@ export default {
       this.landTarget.principalId = this.major.principalId;
       this.landTarget.sites = this.major.membersId;
       this.landTarget.owner = this.major.owner;
-
+      this.eMethods = [];
     },
     saveLandTarget(targetType) {
       let isOk = true;
+      this.landTarget.eMethods = this.eMethods;
+    
       if (targetType === '土地') {
         this.$refs.landFrom.validate(valid => {
           if (!valid) {
@@ -2510,6 +2557,9 @@ export default {
         if (this.currentNode.nodeCode === 'REVIEW_QUOTATION') {
           return "审核定价";
         }
+        if (this.couldAddTarget){
+          return "新增";
+        }
         return "查看";
 
       }
@@ -2655,7 +2705,9 @@ export default {
         takeType: this.major.businessObjectType === '土地' ? 'LAND_NUMBER' : 'REALTY_NUMBER',
         targets: this.takeNumberItems,
         year: this.year,
-        productionType: "REPORT"
+        productionType: "REPORT",
+        statementNo:this.statementNo
+
       }
       this.$api.majorTarget.takeNumber(takeNumberDTO).then(res => {
         if (res.code === 200 && res.data != null) {
@@ -2800,9 +2852,9 @@ export default {
               this.doUpload = true;
             }
             //默认展开第一行
-            // setTimeout(() => {
-            //   this.defaultExpandOpen();
-            // }, 500);
+            setTimeout(() => {
+              this.defaultExpandOpen();
+            }, 500);
           }
         })
       }
@@ -3470,7 +3522,8 @@ export default {
           takeType: this.major.businessObjectType === '土地' ? 'LAND_NUMBER' : 'REALTY_NUMBER',
           targets: this.takeNumberItems,
           orderId: this.major.orderId,
-          productionType: productionType
+          productionType: productionType,
+          statementNo:this.statementNo
         }
         this.$api.majorTarget.takeNumber(takeNumberDTO).then(res => {
           if (res.code === 200 && res.data != null) {
@@ -3687,6 +3740,60 @@ export default {
       if (row.signatoryId.length > 3){
         this.$message.error("签字人个数建议为2人。")
       }
+    },
+    openMergeNumberDialog(){
+      let numbers = [];
+      if (this.currentNode.nodeCode === 'WRITE_STATEMENT'){
+        numbers = this.evaluateLandData.reduce((setArray,item)=>{
+        if (item.statementNo && !setArray.includes(item.statementNo)){
+            setArray.push(item.statementNo)
+        }
+        return setArray;
+      },[]);
+      }
+      if (this.currentNode.nodeCode === 'WRITE_REPORT'){
+        numbers = this.evaluateLandData.reduce((setArray,item)=>{
+        if (item.reportNo && !setArray.includes(item.reportNo)){
+            setArray.push(item.reportNo)
+        }
+        return setArray;
+      },[]);
+      }
+      if (this.currentNode.nodeCode === 'WRITE_LETTER'){
+        numbers = this.evaluateLandData.reduce((setArray,item)=>{
+        if (item.letterNo && !setArray.includes(item.letterNo)){
+            setArray.push(item.letterNo)
+        }
+        return setArray;
+      },[]);
+      }
+      if (numbers.length>0){
+        this.mergeNoDialog = true;
+        this.mergeNos = numbers;
+      }
+      else{
+        this.$message("还未取任何产品号码。")
+      }
+    },
+    doMergeNo(){
+        let param = new Object();
+        param.mergeType = this.currentNode.nodeCode === 'WRITE_STATEMENT'?'STATEMENT':
+          (this.currentNode.nodeCode === 'WRITE_REPORT'?'REPORT':'LETTER');
+        param.toMergeNumber = this.toMergeNo;
+        param.targetIds = this.takeNumberItems.map(i=>i.id);
+        this.$api.majorTarget.mergeNumber(param).then(res=>{
+          if (res.code === 200 && res.data){
+            this.$notify({
+              title: '成功',
+              message: '合并号码成功',
+              type: 'success',
+              duration: 1000,
+              offset: 100
+            });
+          this.mergeNoDialog = false;
+          this.getLandTargetList();
+          }
+        })
     }
   },
 }