1.优化资产业务页面

2.修复页面BUG

src/views/assets/allList.vue

@@ -48,12 +48,12 @@
                 </el-table-column>
                 <el-table-column label="意见书号" align="center" width="250">
                     <template slot-scope="{row}">
-                        <span>{{ row.statementNo }}</span>
+                        <span>{{ row.statementNo == null ? '-' : row.statementNo }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="报告号" align="center" width="250">
                     <template slot-scope="{row}">
-                        <span>{{ row.reportNo }}</span>
+                        <span>{{ row.reportNo == null ? '-' : row.reportNo }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="项目名称" align="center" width="250">

src/views/assets/archivedList.vue

@@ -48,12 +48,12 @@
                 </el-table-column>
                 <el-table-column label="意见书号" align="center" width="250">
                     <template slot-scope="{row}">
-                        <span>{{ row.statementNo }}</span>
+                        <span>{{ row.statementNo == null ? '-' : row.statementNo }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="报告号" align="center" width="250">
                     <template slot-scope="{row}">
-                        <span>{{ row.reportNo }}</span>
+                        <span>{{ row.reportNo == null ? '-' : row.reportNo }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="项目名称" align="center" width="150">

src/views/assets/departmentDoneList.vue

@@ -31,17 +31,17 @@
                 </el-table-column>
                 <el-table-column label="项目名称" align="center" width="300">
                     <template slot-scope="{row}">
-                        <span>{{ row.reportName || row.statementName || row.name }}</span>
+                        <span>{{ row.reportName || row.statementName || row.assetsName }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="意见书号" align="center" width="250">
                     <template slot-scope="{row}">
-                        <span>{{ row.statementNo }}</span>
+                        <span>{{ row.statementNo == null ? '-' : row.statementNo }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="报告号" align="center" width="250">
                     <template slot-scope="{row}">
-                        <span>{{ row.reportNo }}</span>
+                        <span>{{ row.reportNo == null ? '-' : row.reportNo }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="处理人" align="center" width="150">

src/views/assets/departmentTodoList.vue

@@ -48,12 +48,12 @@
                 </el-table-column>
                 <el-table-column label="意见书号" align="center" width="250">
                     <template slot-scope="{row}">
-                        <span>{{ row.statementNo }}</span>
+                        <span>{{ row.statementNo == null ? '-' : row.statementNo }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="报告号" align="center" width="250">
                     <template slot-scope="{row}">
-                        <span>{{ row.reportNo }}</span>
+                        <span>{{ row.reportNo == null ? '-' : row.reportNo }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="项目名称" align="center" width="250">

src/views/assets/doneList.vue

@@ -27,17 +27,17 @@
                 </el-table-column>
                 <el-table-column label="项目名称" align="center" width="300">
                     <template slot-scope="{row}">
-                        <span>{{ row.reportName || row.statementName || row.name }}</span>
+                        <span>{{ row.reportName || row.statementName || row.assetsName }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="意见书号" align="center" width="250">
                     <template slot-scope="{row}">
-                        <span>{{ row.statementNo }}</span>
+                        <span>{{ row.statementNo == null ? '-' : row.statementNo }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="报告号" align="center" width="250">
                     <template slot-scope="{row}">
-                        <span>{{ row.reportNo }}</span>
+                        <span>{{ row.reportNo == null ? '-' : row.reportNo }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="处理人" align="center" width="150">

src/views/assets/myOrderList.vue

@@ -42,12 +42,12 @@
                 </el-table-column>
                 <el-table-column label="意见书号" align="center" width="250">
                     <template slot-scope="{row}">
-                        <span>{{ row.statementNo }}</span>
+                        <span>{{ row.statementNo == null ? '-' : row.statementNo }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="报告号" align="center" width="250">
                     <template slot-scope="{row}">
-                        <span>{{ row.reportNo }}</span>
+                        <span>{{ row.reportNo == null ? '-' : row.reportNo }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="项目名称" align="center" width="250">
@@ -149,33 +149,33 @@
                 <el-table-column label="操作" align="center" :min-width="dynamicWidth" fixed="right">
                     <template slot-scope="{row}">
                         <div class="optionDiv" style="white-space: nowrap; display: inline-block">
-                            <el-button type="danger" size="mini"
+                            <el-button type="text" size="mini"
                                 v-if="(!row.reportDelivery || row.reportDelivery == null) && row.reportRepertoryState"
                                 @click="markDelivery(row)">
                                 标记送达
                             </el-button>
-                            <el-button type="success" size="mini" @click="orderDetail(row)">
+                            <el-button type="text" size="mini" @click="orderDetail(row)">
                                 查看
                             </el-button>
-                            <el-button type="danger" size="mini" @click="editOrder(row)">
+                            <el-button type="text" size="mini" @click="editOrder(row)">
                                 编辑
                             </el-button>
-                            <el-button type="primary" size="mini" @click="openShouldAmountDialog(row)">
+                            <el-button type="text" size="mini" @click="openShouldAmountDialog(row)">
                                 订单应收款
                             </el-button>
-                            <el-button v-if="row.reportNo !== null" type="success" size="mini"
+                            <el-button v-if="row.reportNo !== null" type="text" size="mini"
                                 @click="openProShouldAmountDialog(row)">
                                 产品应收款
                             </el-button>
-                            <el-button v-if="row.currentNodeCode === 'REPORT_OUT_APPLY'" type="danger" size="mini"
+                            <el-button v-if="row.currentNodeCode === 'REPORT_OUT_APPLY'" type="text" size="mini"
                                 @click="openRepertoryOutWarehouse(row)">
                                 申请提前出库
                             </el-button>
-                            <el-button v-if="row.realAmount > 0" type="danger" size="mini"
+                            <el-button v-if="row.realAmount > 0" type="text" size="mini"
                                 @click="openAllotProductionDialog(row)">
                                 实收款分配
                             </el-button>
-                            <el-button type="primary" size="mini"
+                            <el-button type="text" size="mini"
                                 @click="openFinanceInvoiceDialog(row.orderFundId)">申请开票</el-button>
                             <!-- <el-button v-if="row.currentNodeCode === 'REPORT_OUT_APPLY'" type="text"
                             @click="canceladdRepertoryOutWarehouse(row)">
@@ -243,6 +243,9 @@
             <el-form ref="outWarehouse" :model="outWarehouse" style="margin-left:40px; margin-right: 200px;">
                 <el-row>
                     <el-col>
+                        <el-form-item label="报告号：" prop="remark" label-width="160px" class="postInfo-container-item">
+                            <el-input type="input" placeholder="请输入申请提前出库原因" v-model="outWarehouse.reportNo" disabled></el-input>
+                        </el-form-item>
                         <el-form-item label="出库原因：" prop="remark" label-width="160px" class="postInfo-container-item">
                             <el-input type="textarea" placeholder="请输入申请提前出库原因" v-model="outWarehouse.remark"></el-input>
                         </el-form-item>
@@ -630,6 +633,9 @@ export default {
         this.getAllotDepartment();
         // 获取我的资产业务订单
         this.selectMyOrderPage();
+        if(this.$route.query.repertoryOutWarehouseVisible === 'true'){
+            this.openRepertoryOutWarehouse(JSON.parse(this.$route.query.row));
+        }
     },
     updated() {
         this.dynamicWidth = getOperatorWidth();

src/views/assets/orderDetail.vue

@@ -47,7 +47,7 @@
           <el-form ref="assetsForm" :model="assetsForm" :rules="assetsFormRules" :disabled="disabledStatus">
             <div class="createMajor-main-container">
               <div class="postInfo-container">
-                <el-row class="row-style" style="margin-top: 20px; float: right; position: relative; z-index: 2;">
+                <el-row v-if="canUpdateOrderBaseInfoNode.includes(currentNode.nodeCode)" class="row-style" style="margin-top: 20px; float: right; position: relative; z-index: 2;">
                   <el-col :xs="24" :sm="12" :lg="23" :span="12">
                     <el-button type="danger" @click="updateOrderBaseInfo()" round>更新基本信息</el-button>
                   </el-col>
@@ -417,15 +417,21 @@
               </el-table-column> -->
               <el-table-column width="220" prop="statementNo" label="意见书号" align="center" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <el-tag type='danger'>
-                    {{ scope.row.statementNo == null ? '未取号' : scope.row.statementNo }}
+                  <el-tag type='success' v-if="scope.row.statementNo">
+                    {{ scope.row.statementNo }}
+                  </el-tag>
+                  <el-tag type='danger' v-else>
+                    未取号
                   </el-tag>
                 </template>
               </el-table-column>
               <el-table-column width="220" prop="reportNo" label="报告号" align="center" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <el-tag type='danger'>
-                    {{ scope.row.reportNo == null ? '未取号' : scope.row.reportNo }}
+                  <el-tag type='success' v-if="scope.row.reportNo">
+                    {{ scope.row.reportNo }}
+                  </el-tag>
+                  <el-tag type='danger' v-else>
+                    未取号
                   </el-tag>
                 </template>
               </el-table-column>
@@ -625,61 +631,61 @@
               <el-table-column type="expand">
                 <template slot-scope="props">
                   <el-form label-position="left">
-                    <el-tag style="margin-left: 20px;" effect="plain" size="medium" disable-transitions><span
-                        style="font-size:16px">基本信息</span></el-tag>
+                    <!-- <el-tag style="margin-left: 20px;" effect="plain" size="medium" disable-transitions><span
+                        style="font-size:16px">基本信息</span></el-tag> -->
                     <el-row class="row-style">
-                      <el-col :xs="24" :sm="6" :lg="3" :span="3" class="postInfo-container-item">
+                      <el-col :xs="24" :sm="12" :lg="6" :span="6" class="postInfo-container-item">
                         <el-form-item label-width="150px" label="委托方名称：">
                           <span>{{ props.row.clientName }}</span>
                         </el-form-item>
                       </el-col>
-                      <el-col :xs="24" :sm="6" :lg="3" :span="3" class="postInfo-container-item">
+                      <el-col :xs="24" :sm="12" :lg="6" :span="6" class="postInfo-container-item">
                         <el-form-item label-width="150px" label="委托方电话：">
                           <span>{{ props.row.clientTel }}</span>
                         </el-form-item>
                       </el-col>
                     </el-row>
                     <el-row class="row-style">
-                      <el-col :xs="24" :sm="6" :lg="3" :span="3" class="postInfo-container-item">
+                      <el-col :xs="24" :sm="12" :lg="6" :span="6" class="postInfo-container-item">
                         <el-form-item label-width="150px" label="评估基准日：">
                           <span>{{ props.row.valuationBasisDate }}</span>
                         </el-form-item>
                       </el-col>
-                      <el-col :xs="24" :sm="6" :lg="3" :span="3" class="postInfo-container-item">
+                      <el-col :xs="24" :sm="12" :lg="6" :span="6" class="postInfo-container-item">
                         <el-form-item label-width="150px" label="评估面积：">
                           <span>{{ props.row.evaluateAcreage }} m²</span>
                         </el-form-item>
                       </el-col>
-                      <el-col :xs="24" :sm="6" :lg="3" :span="3" class="postInfo-container-item">
+                      <el-col :xs="24" :sm="12" :lg="6" :span="6" class="postInfo-container-item">
                         <el-form-item label-width="150px" label="评估单价：">
                           <span>{{ props.row.evaluatePrice }}（元）</span>
                         </el-form-item>
                       </el-col>
-                      <el-col :xs="24" :sm="6" :lg="3" :span="3" class="postInfo-container-item">
+                      <el-col :xs="24" :sm="12" :lg="6" :span="6" class="postInfo-container-item">
                         <el-form-item label-width="150px" label="评估总价：">
                           <span>{{ props.row.evaluateAmount }}（万）</span>
                         </el-form-item>
                       </el-col>
-                      <el-col :xs="24" :sm="6" :lg="3" :span="3" class="postInfo-container-item">
+                      <el-col :xs="24" :sm="12" :lg="6" :span="6" class="postInfo-container-item">
                         <el-form-item label-width="150px" label="产权人：">
                           <span>{{ props.row.owner }}</span>
                         </el-form-item>
                       </el-col>
                     </el-row>
                     <el-row class="row-style">
-                      <el-col :xs="24" :sm="6" :lg="3" :span="3" class="postInfo-container-item">
+                      <el-col :xs="24" :sm="12" :lg="6" :span="6" class="postInfo-container-item">
                         <el-form-item label-width="150px" label="产品打印数量：">
                           <span>{{ props.row.printCount }}（份）</span>
                         </el-form-item>
                       </el-col>
-                      <el-col :xs="24" :sm="6" :lg="3" :span="3" class="postInfo-container-item">
+                      <el-col :xs="24" :sm="12" :lg="6" :span="6" class="postInfo-container-item">
                         <el-form-item label-width="150px" label="产品出具日期：">
                           <span>{{ props.row.createProductionDate }}</span>
                         </el-form-item>
                       </el-col>
                     </el-row>
                     <el-row class="row-style">
-                      <el-col :xs="24" :sm="6" :lg="3" :span="3" class="postInfo-container-item">
+                      <el-col :xs="24" :sm="12" :lg="6" :span="6" class="postInfo-container-item">
                         <el-form-item label-width="150px" label="资料附件：">
                           <el-link type="primary" v-for="file in props.row.filePath" :key="file.name" :href="file.url">
                             {{ file.name }}
@@ -688,7 +694,7 @@
                       </el-col>
                     </el-row>
                     <el-row class="row-style">
-                      <el-col :xs="24" :sm="6" :lg="3" :span="3" class="postInfo-container-item">
+                      <el-col :xs="24" :sm="12" :lg="6" :span="6" class="postInfo-container-item">
                         <el-form-item prop="qrCode" label-width="150px" label="产品二维码：">
                           <img style="width:130px;height:120px; display:inline-block ;" :src="props.row.qrCode"
                             alt="NULL" />
@@ -702,14 +708,14 @@
                         </el-form-item>
                       </el-col>
                     </el-row>
-                    <el-tag style="margin-left: 20px;" effect="plain" size="medium" disable-transitions><span
+                    <!-- <el-tag style="margin-left: 20px;" effect="plain" size="medium" disable-transitions><span
                         style="font-size:16px">库存状态</span></el-tag>
                     <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> -->
                   </el-form>
                 </template>
               </el-table-column>
@@ -895,7 +901,7 @@
           </el-row>
           <el-row class="row-style">
             <el-col :xs="24" :sm="12" :lg="12" :span="6"">
-                <el-form-item label=" 产权持有人：" prop="theHolder" label-width="200px" class="postInfo-container-item">
+                    <el-form-item label=" 产权持有人：" prop="theHolder" label-width="200px" class="postInfo-container-item">
               <el-input v-model="targetForm.theHolder" class="filter-item" style="width: 100%" />
               </el-form-item>
             </el-col>
@@ -1027,11 +1033,9 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row class="row-style">
-            <el-button type="success" v-if="saveButtonStatus" @click="assetsTargetSave"
-              style="width:20%;float:right">保存</el-button>
-            <el-button type="success" v-if="updateButtonStatus" @click="assetsTargetUpdate"
-              style="width:20%;float:right">更新</el-button>
+          <el-row class="row-style" style="text-align:center">
+            <el-button type="success" v-if="saveButtonStatus" @click="assetsTargetSave">保存</el-button>
+            <el-button type="success" v-if="updateButtonStatus" @click="assetsTargetUpdate">更新</el-button>
           </el-row>
         </el-form>
       </div>
@@ -1069,18 +1073,17 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row class="row-style">
-              <el-button v-if="productionChoiceStatus == 0" @click="assetsProductionSave"
-                style="width:100%;">提交</el-button>
-              <el-button v-if="productionChoiceStatus == 1" @click="assetsProductionUpdateChoice"
-                style="width:100%;">提交</el-button>
+            <el-row class="row-style" style="text-align:center">
+              <el-button type="primary" v-if="productionChoiceStatus == 0" @click="assetsProductionSave">提交</el-button>
+              <el-button type="primary" v-if="productionChoiceStatus == 1"
+                @click="assetsProductionUpdateChoice">提交</el-button>
             </el-row>
           </div>
         </div>
       </el-form>
     </el-dialog>
 
-    <el-dialog :visible.sync="productionWriteDialogVisible" @close="resetProductionForm">
+    <el-dialog :visible.sync="productionWriteDialogVisible" @open="clearassetsProductionFormValidate()" @close="resetProductionForm()">
       <el-form ref="assetsProductionForm" :model="assetsProductionForm" :rules="assetsProductionFormRules"
         :disabled="productionDisabledStatus">
         <div class="createMajor-main-container">
@@ -1095,7 +1098,7 @@
             </div>
             <el-row class="row-style">
               <el-col v-if="currentNode.nodeCode === 'GENERATE_STATEMENT'">
-                <el-form-item label="产品号：" prop="productionNo" label-width="120px" class="postInfo-container-item">
+                <el-form-item label="产品号：" prop="productionNo" label-width="140px" class="postInfo-container-item">
                   <el-select v-model="assetsProductionForm.productionNo" @change="getAssetsProductionDetailByNo()"
                     placeholder="请选择" style="width: 300px;">
                     <el-option v-for="statementNo in writeProductionStatementNos" :label="statementNo"
@@ -1104,7 +1107,7 @@
                 </el-form-item>
               </el-col>
               <el-col v-if="currentNode.nodeCode === 'WRITE_REPORT'">
-                <el-form-item label="产品号：" prop="productionNo" label-width="120px" class="postInfo-container-item">
+                <el-form-item label="产品号：" prop="productionNo" label-width="140px" class="postInfo-container-item">
                   <el-select v-model="assetsProductionForm.productionNo" @change="getAssetsProductionDetailByNo()"
                     placeholder="请选择" style="width: 300px;">
                     <el-option v-for="reportNo in writeProductionReportNos" :label="reportNo" :value="reportNo"
@@ -1115,14 +1118,15 @@
             </el-row>
             <el-row class="row-style">
               <el-col>
-                <el-form-item label="项目名称：" prop="assetsName" label-width="120px" class="postInfo-container-item">
+                <el-form-item label="项目名称：" prop="assetsName" label-width="140px" class="postInfo-container-item">
                   <el-input v-model.number="assetsProductionForm.assetsName" class="filter-item" />
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row class="row-style" v-if="assetsProductionForm.productionType !== 'STATEMENT'">
+            <el-row class="row-style"
+              v-if="(assetsProductionForm.productionType && assetsProductionForm.productionType !== 'STATEMENT') || (currentNode.nodeCode === 'WRITE_REPORT' && writeType === 'add')">
               <el-col>
-                <el-form-item label="签字人：" prop="signatory" label-width="120px" class="postInfo-container-item">
+                <el-form-item label="签字人：" prop="signatory" label-width="140px" class="postInfo-container-item">
                   <el-select v-model="assetsProductionForm.signatory" placeholder="请选择" multiple>
                     <el-option v-for="(u, id) in allUsers" :label="u.name" :value="u.id" :key="u.id"></el-option>
                   </el-select>
@@ -1131,21 +1135,21 @@
             </el-row>
             <el-row class="row-style">
               <el-col>
-                <el-form-item label="委托方名称：" prop="clientName" label-width="120px" class="postInfo-container-item">
+                <el-form-item label="委托方名称：" prop="clientName" label-width="140px" class="postInfo-container-item">
                   <el-input v-model.number="assetsProductionForm.clientName" class="filter-item" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row class="row-style">
               <el-col>
-                <el-form-item label="委托方电话：" prop="clientTel" label-width="120px" class="postInfo-container-item">
+                <el-form-item label="委托方电话：" prop="clientTel" label-width="140px" class="postInfo-container-item">
                   <el-input v-model.number="assetsProductionForm.clientTel" class="filter-item" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row class="row-style">
               <el-col>
-                <el-form-item label="估价基准日：" prop="valuationBasisDate" label-width="120px"
+                <el-form-item label="估价基准日：" prop="valuationBasisDate" label-width="140px"
                   class="postInfo-container-item">
                   <el-date-picker v-model="assetsProductionForm.valuationBasisDate" type="date" placeholder="选择日期"
                     style="width:100%">
@@ -1182,21 +1186,21 @@
             </el-row>
             <el-row class="row-style">
               <el-col>
-                <el-form-item label="资产持有人：" prop="owner" label-width="120px" class="postInfo-container-item">
+                <el-form-item label="资产持有人：" prop="owner" label-width="140px" class="postInfo-container-item">
                   <el-input v-model.number="assetsProductionForm.owner" class="filter-item" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row class="row-style">
               <el-col>
-                <el-form-item label="产品打印份数：" prop="printCount" label-width="150px" class="postInfo-container-item">
+                <el-form-item label="产品打印份数：" prop="printCount" label-width="140px" class="postInfo-container-item">
                   <el-input v-model.number="assetsProductionForm.printCount" class="filter-item" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row class="row-style">
               <el-col>
-                <el-form-item label="出具产品日期：" prop="createProductionDate" label-width="150px"
+                <el-form-item label="出具产品日期：" prop="createProductionDate" label-width="140px"
                   class="postInfo-container-item">
                   <el-date-picker v-model="assetsProductionForm.createProductionDate" type="date" placeholder="选择日期"
                     style="width:100%">
@@ -1206,7 +1210,7 @@
             </el-row>
             <el-row class="row-style">
               <el-col>
-                <el-form-item prop="filePath" label="资料附件：" label-width="120px" class="postInfo-container-item">
+                <el-form-item prop="filePath" label="资料附件：" label-width="140px" class="postInfo-container-item">
                   <el-upload action="/api/upload" :limit="3" :on-success="changeresProduction" :on-exceed="handleExceed"
                     :on-preview="handleAttachmentPreview" :before-remove="beforeRemovePro" :file-list="fileList">
                     <el-button plain type="info" round style="width: 100%">上传附件<i
@@ -1217,18 +1221,18 @@
             </el-row>
             <el-row class="row-style">
               <el-col>
-                <el-form-item label="特殊情况说明：" prop="comment" label-width="150px" class="postInfo-container-item">
+                <el-form-item label="特殊情况说明：" prop="comment" label-width="140px" class="postInfo-container-item">
                   <el-input v-model="assetsProductionForm.comment" :autosize="{ minRows: 4, maxRows: 4 }"
                     class="filter-item" type="textarea" />
                 </el-form-item>
               </el-col>
             </el-row>
 
-            <el-row class="row-style">
-              <el-button v-if="writeType === 'add'" @click="writeAssetsProduction()" style="width:100%;">提交</el-button>
+            <el-row class="row-style" style="text-align:center">
+              <el-button type="primary" v-if="writeType === 'add'" @click="writeAssetsProduction()">提交</el-button>
             </el-row>
-            <el-row class="row-style">
-              <el-button v-if="writeType === 'edit'" @click="productionUpdate()" style="width:100%;">提交</el-button>
+            <el-row class="row-style" style="text-align:center">
+              <el-button type="primary" v-if="writeType === 'edit'" @click="productionUpdate()">提交</el-button>
             </el-row>
           </div>
         </div>
@@ -1281,9 +1285,9 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row>
+            <el-row style="text-align:center">
               <el-col>
-                <el-button @click="checkValue()" style="width:100%;">审核定价</el-button>
+                <el-button type="primary" @click="checkValue()">审核定价</el-button>
               </el-col>
             </el-row>
           </div>
@@ -1355,9 +1359,9 @@
                 </el-col>
               </el-row>
             </div>
-            <el-row>
+            <el-row style="text-align:center">
               <el-col>
-                <el-button style="width:100%;" @click="saveQuality()">提交</el-button>
+                <el-button type="primary" @click="saveQuality()">提交</el-button>
               </el-col>
             </el-row>
           </div>
@@ -1943,7 +1947,12 @@ export default {
           // }
         ]
       },
-      showDistributionButton: null
+      showDistributionButton: null,
+      canUpdateOrderBaseInfoNode:[
+        'DEPARTMENT_ALLOCATION','SPOT_RECONNAISSANCE_DETERMINE_PRICE','QUOTATION_FEEDBACK',
+        'PRODUCT_CHOICE','GENERATE_STATEMENT','REVIEW_STATEMENT','REEXAMINE_STATEMENT',
+        'WRITE_REPORT','CHECK_REPORT','RECHECK_REPORT','FOURTH_CHECK_REPORT'
+      ]
     }
   },
   watch: {
@@ -2362,14 +2371,14 @@ export default {
           this.assetsEvaluationTarget = res.data;
           this.writeProductionStatementNos = this.assetsEvaluationTarget
             // 过滤
-            .filter(obj => obj.statementCreateProductionDate == null || obj.statementCreateProductionDate == '')
+            .filter(obj => (!obj.statementCreateProductionDate && obj.statementNo))
             // 获取
             .map(obj => obj.statementNo)
             // 去重
             .filter((value, index, self) => self.indexOf(value) === index);
           this.writeProductionReportNos = this.assetsEvaluationTarget
             // 过滤
-            .filter(obj => obj.reportCreateProductionDate == null || obj.reportCreateProductionDate == '')
+            .filter(obj => (!obj.reportCreateProductionDate && obj.reportNo))
             // 获取
             .map(obj => obj.reportNo)
             // 去重
@@ -2548,12 +2557,6 @@ export default {
               this.targetDialogVisible = false;
               //获取评估对象列表
               this.getAETargetListByAssetsId();
-              // setTimeout(() => {
-              //   this.targetDialogVisible = false;
-              //   //获取评估对象列表
-              //   this.getAETargetListByAssetsId();
-              // }, 1000);
-
             }
           })
         }
@@ -2601,17 +2604,28 @@ export default {
     },
     // 删除资产评估对象
     assetsTargetDelete(id) {
-      this.$api.assets.assetsTargetDelete(id).then(res => {
-        if (res.code === 200) {
-          this.$notify({
-            title: '成功',
-            message: '删除资产业务评估对象成功！',
-            type: 'success',
-            duration: 2000
-          });
-          this.getAETargetListByAssetsId();
-        }
-      })
+      this.$confirm('确认删除该评估对象?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$api.assets.assetsTargetDelete(id).then(res => {
+          if (res.code === 200) {
+            this.$notify({
+              title: '成功',
+              message: '删除资产业务评估对象成功！',
+              type: 'success',
+              duration: 2000
+            });
+            this.getAETargetListByAssetsId();
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
     },
     // 根据不同情况打开的评估对象表单可编辑状态不同
     changeStatus(val) {
@@ -2932,11 +2946,33 @@ export default {
           })
         }
       })
-
     },
     resetProductionForm() {
+      this.assetsProductionForm = {
+        businessId: null,
+        productionNo: null,
+        productionType: null,
+        signatory: [],
+        clientName: null,
+        clientTel: null,
+        valuationBasisDate: null,
+        evaluateAcreage: null,
+        evaluatePrice: null,
+        evaluateAmount: null,
+        owner: null,
+        printCount: null,
+        createProductionDate: null,
+        comment: null,
+        filePath: [],
+        assetsName: null
+      }
       this.fileList = [];
     },
+    clearassetsProductionFormValidate() {
+      if (this.$refs.assetsProductionForm !== undefined) {
+        this.$refs.assetsProductionForm.clearValidate();
+      }
+    },
     // 根据业务id与产品号查询产品信息
     getProductionList() {
       let aProListSelectDTO = new Object();
@@ -3611,4 +3647,5 @@ export default {
   z-index: 999;
   position: relative;
   top: 10px;
-}</style>
+}
+</style>

src/views/assets/repertoryList.vue

@@ -41,7 +41,7 @@
                 </el-table-column>
                 <el-table-column label="报告号" align="center" width="250">
                     <template slot-scope="{row}">
-                        <span>{{ row.reportNo }}</span>
+                        <span>{{ row.reportNo == null ? '-' : row.reportNo }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="评估目的" align="center" width="150">

src/views/assets/terminateList.vue

@@ -48,12 +48,12 @@
                 </el-table-column>
                 <el-table-column label="意见书号" align="center" width="250">
                     <template slot-scope="{row}">
-                        <span>{{ row.statementNo }}</span>
+                        <span>{{ row.statementNo == null ? '-' : row.statementNo }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="报告号" align="center" width="250">
                     <template slot-scope="{row}">
-                        <span>{{ row.reportNo }}</span>
+                        <span>{{ row.reportNo == null ? '-' : row.reportNo }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="业务类型" align="center" width="150">

src/views/assets/todoList.vue

@@ -44,12 +44,12 @@
                 </el-table-column>
                 <el-table-column label="意见书号" align="center" width="250">
                     <template slot-scope="{row}">
-                        <span>{{ row.statementNo }}</span>
+                        <span>{{ row.statementNo == null ? '-' : row.statementNo }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="报告号" align="center" width="250">
                     <template slot-scope="{row}">
-                        <span>{{ row.reportNo }}</span>
+                        <span>{{ row.reportNo == null ? '-' : row.reportNo }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="项目名称" align="center" width="250">
@@ -218,7 +218,21 @@ export default {
         },
         orderDetail(row) {
             if (row.currentNodeCode === 'REPORT_OUT_APPLY') {
-                this.$router.push(`/assets/myOrderList`)
+                const newRow = {
+                    reportNo: row.reportNo,
+                    statementNo: row.statementNo,
+                    businessType: 'ASSET_BUSINESS',
+                    assetsId: row.assetsId,
+                    recordId: row.recordId,
+                    currentNodeId: row.currentNodeId
+                }
+                this.$router.push({
+                    path: `/assets/myOrderList`,
+                    query: {
+                        repertoryOutWarehouseVisible: true,
+                        row: JSON.stringify(newRow)
+                    }
+                })
                 return;
             } else if (row.currentNodeCode === 'REPORT_OUT_DEPARTMENT_CHECK') {
                 this.$router.push(`/out/warehouse/check?todoBusinessId=${row.assetsId}&sNo=${row.statementNo}&rNo=${row.reportNo}&tId=${row.recordId}&cId=${row.currentNodeId}&nCode=${row.currentNodeCode}&businessType=ASSET_BUSINESS`)

src/views/income/assets/market.vue

@@ -124,7 +124,7 @@
       <el-divider content-position="left">
         <span style="color:red;font-weight: bold;">
           【市场人员】
-        </span>大中型业务提成申报</el-divider>
+        </span>资产业务提成申报</el-divider>
       <el-form :model="declareForm" ref="declareForm" :rules="rules">
         <el-form-item label="订单号：" prop="orderId" label-width="140px" class="postInfo-container-item">
           <el-input v-model="declareForm.orderId" :step="1" :max="100" style="width: 100%;" readonly disabled></el-input>