1.优化资产业务各个页面的内容展现

src/components/BaseTable/parentTable.vue

@@ -60,7 +60,7 @@ export default {
         let plus = this.noPage ? 100 : 0;
         let sub = this.hasStatic ? 130 : 0;
         let clientHeight = document.documentElement.clientHeight;
-        return clientHeight - 250 + plus - sub;
+        return clientHeight - 284 + plus - sub;
       }
     },
   },

src/views/assets/allList.vue

@@ -67,17 +67,17 @@
             <span>{{ row.customerSubName }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="委托人" align="center" width="100" v-if="!hiddenLabels.includes('bailor')" prop="bailor">
+        <el-table-column label="委托人" align="center" width="150" v-if="!hiddenLabels.includes('bailor')" prop="bailor">
           <template slot-scope="{row}">
             <span>{{ row.bailor == null ? '-' : row.bailor }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="委托人电话" align="center" width="110" v-if="!hiddenLabels.includes('bailorContactTel')" prop="bailorContactTel">
+        <el-table-column label="委托人电话" align="center" width="120" v-if="!hiddenLabels.includes('bailorContactTel')" prop="bailorContactTel">
           <template slot-scope="{row}">
             <span>{{ row.bailorContactTel == null ? '-' : row.bailorContactTel }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="当前节点" align="center" width="100" v-if="!hiddenLabels.includes('currentNodeName')" prop="currentNodeName">
+        <el-table-column label="当前节点" align="center" width="120" v-if="!hiddenLabels.includes('currentNodeName')" prop="currentNodeName">
           <template slot-scope="{row}">
             <span>{{ row.currentNodeName }}</span>
           </template>

src/views/assets/archivedList.vue

@@ -56,7 +56,7 @@
                         <span>{{ row.reportNo == null ? '-' : row.reportNo }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="项目名称" align="center" width="150">
+                <el-table-column label="项目名称" align="center" width="300" show-overflow-tooltip>
                     <template slot-scope="{row}">
                         <span>{{ row.reportName || row.statementName || row.name }}</span>
                     </template>

src/views/assets/myOrderList.vue

@@ -59,17 +59,17 @@
             <span>{{ row.allotType }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="意见书号" align="center" width="220">
+        <el-table-column label="意见书号" align="center" width="250">
           <template slot-scope="{row}">
             <span>{{ row.statementNo == null ? '-' : row.statementNo }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="报告号" align="center" width="220">
+        <el-table-column label="报告号" align="center" width="250">
           <template slot-scope="{row}">
             <span>{{ row.reportNo == null ? '-' : row.reportNo }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="项目名称" align="center" width="250" show-overflow-tooltip>
+        <el-table-column label="项目名称" align="center" width="300" show-overflow-tooltip>
           <template slot-scope="{row}">
             <span>{{ row.name }}</span>
           </template>
@@ -99,12 +99,12 @@
             <span>{{ row.customerSubName }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="委托人" align="center" width="100" show-overflow-tooltip>
+        <el-table-column label="委托人" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="{row}">
             <span>{{ row.bailor == null ? '-' : row.bailor }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="委托人电话" align="center" width="100">
+        <el-table-column label="委托人电话" align="center" width="120">
           <template slot-scope="{row}">
             <span>{{ row.bailorContactTel == null ? '-' : row.bailorContactTel }}</span>
           </template>
@@ -169,7 +169,7 @@
           <template slot-scope="{row}">
             <div class="optionDiv" style="white-space: nowrap; display: inline-block">
               <div>
-                <el-button type="text" size="mini" :disabled="!((!row.reportDelivery || row.reportDelivery == null) && row.reportRepertoryState)" @click="markDelivery(row)">标记送达</el-button>
+                <el-button type="text" size="mini" :disabled="!((!row.reportDelivery || row.reportDelivery == null) && row.reportRepertoryState)" @click="markDelivery(row)">送达</el-button>
                 <el-button type="text" size="mini" @click="orderDetail(row)">查看</el-button>
                 <el-button type="text" size="mini" @click="editOrder(row)">编辑</el-button>
               </div>
@@ -179,15 +179,13 @@
                                 </el-button>
               </div>-->
               <div>
-                <el-button :disabled="!(row.reportNo !== null)" type="text" size="mini" @click="openProShouldAmountDialog(row)">产品应收款</el-button>
-                <el-button :disabled="!(row.currentNodeCode === 'REPORT_OUT_APPLY')" type="text" size="mini" @click="openRepertoryOutWarehouse(row)">提前出库</el-button>
-              </div>
-              <div>
+                <el-button :disabled="!(row.reportNo !== null)" type="text" size="mini" @click="openProShouldAmountDialog(row)">应收款</el-button>
+                <el-button :disabled="!(row.currentNodeCode === 'REPORT_OUT_APPLY')" type="text" size="mini" @click="openRepertoryOutWarehouse(row)">出库</el-button>
                 <el-button :disabled="!(row.realAmount > 0)" type="text" size="mini" @click="openAllotProductionDialog(row)">实收款分配</el-button>
-                <el-button type="text" size="mini" @click="openFinanceInvoiceDialog(row.orderFundId, row.productionFundId, row.realAmount, row.customerName, row.customerSubName)">申请开票</el-button>
               </div>
               <div>
-                <el-button type="text" size="mini" @click="openProductionReturnDialog(row)">申请产品退回</el-button>
+                <el-button type="text" size="mini" @click="openFinanceInvoiceDialog(row.orderFundId, row.productionFundId, row.realAmount, row.customerName, row.customerSubName)">开票</el-button>
+                <el-button type="text" size="mini" @click="openProductionReturnDialog(row)">产品退回</el-button>
                 <el-button type="text" size="mini" @click="openComplaintDialog(row)">项目投诉</el-button>
               </div>
               <!-- <el-button v-if="row.currentNodeCode === 'REPORT_OUT_APPLY'" type="text"