更新

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -151,6 +151,8 @@
         <el-table-column width='120' class="table_td" prop="amountIngReceivable" label="应收金额（元）"></el-table-column>
         <el-table-column width='120' class="table_td" prop="amountEdReceivable" label="已收金额（元）">
         </el-table-column>
+        <el-table-column width='120' class="table_td" prop="amountNotReceivable" label="未收金额（元）">
+        </el-table-column>
         <el-table-column width='120' class="table_td" prop="alreadyInvoice" label=" 已开发票（元）">
           <template slot-scope="scope">
             <div class="inputChenge">
@@ -287,7 +289,7 @@
 
       <!-- 页数 -->
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
+        :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
     </div>
     <!-- 定金弹窗 -->
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
@@ -313,7 +315,7 @@
           <span>{{ uncollectedAmount1 }}</span>
         </el-form-item>
         <el-form-item label="本次收款金额（元）" :label-width="formLabelWidth">
-          <el-input type='number' v-model="money" autocomplete="off" placeholder="请输入本次收款金额" class="deal"></el-input>
+          <el-input type='number' step="0.01" v-model="money" autocomplete="off" placeholder="请输入本次收款金额" class="deal"></el-input>
         </el-form-item>
         <el-form-item label="收款日期" prop="collectionDate" :label-width="formLabelWidth" class="deal">
           <ws-date-picker v-model="collectionDate" type="date" placeholder="请选择收款日期" value-format="yyyy-MM-dd"
@@ -519,8 +521,8 @@
       var month = now.getMonth(); //得到月份
       var date = now.getDate(); //得到日期
       month = month + 1;
-      month = month.toString().padStart(2, "0");
-      date = date.toString().padStart(2, "0");
+      month = month.toString().padStart(2, '0');
+      date = date.toString().padStart(2, '0');
       this.collectionDate = `${year}-${month}-${date}`;
       this.getList()
       this.showType = this.isShow
@@ -562,15 +564,15 @@
             type: 'warning',
           })
         } else {
-          var num = ''
+          var num = 0
           for (let i = 0; i < this.modification.length; i++) {
-            if (this.modification[i].status != '全部收款' && this.modification[i].status != '部分收款') {
-              this.$message({
-                message: '请选择已付款的条目',
-                type: 'warning',
-              })
-              return
-            }
+            // if (this.modification[i].status != '全部收款' && this.modification[i].status != '部分收款') {
+            //   this.$message({
+            //     message: '请选择已付款的条目',
+            //     type: 'warning',
+            //   })
+            //   return
+            // }
             num = (Number(this.modification[i].amountEdReceivable) - Number(this.modification[i].alreadyInvoice)) +
               Number(num)
           }
@@ -670,8 +672,10 @@
                   })
                 }
               }
+              if(this.tranProcessInfo.length >0){
               this.activeName = this.tranProcessInfo[0].name
               this.tranType = this.tranProcessInfo[0].tranType
+              }
             }