前端

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -83,58 +83,24 @@
         <el-table-column class="table_td" prop="tare" label="皮重（吨）" v-if="this.tranType=='退库'"></el-table-column>
         <el-table-column class="table_td" prop="netWeight" label="净重（吨）" v-if="tranType=='退库'">
           <template slot-scope="scope">
-            <span >{{-scope.row.netWeight }}</span>
+            <span >-{{scope.row.netWeight }}</span>
           </template>
         </el-table-column>
-
-        <!-- <el-table-column class="table_td" prop="deliveryDate" label="出库日期">
-          <template slot-scope="scope">
-            <span style="color: #ce4545;" v-if="scope.row.returnFlag == 1">{{scope.row.returnDate}}</span>
-            <span v-if="scope.row.returnFlag == null">{{scope.row.deliveryDate }}</span>
-          </template>
-        </el-table-column> -->
         <el-table-column class="table_td" prop="unloadingWeight" label="卸车净重（吨）" v-if="this.tranType=='汽运'||this.tranType=='火运'"></el-table-column>
         <el-table-column v-else-if="this.tranType=='散船'||this.tranType=='箱船'" class="table_td" prop="unloadingWeight" label="卸船净重（吨）"></el-table-column>
         <el-table-column class="table_td" prop="settlementWeight" label="结算重量（吨）"></el-table-column>
         <el-table-column class="table_td" prop="amountIngReceivable" label="应收金额（元）"></el-table-column>
         <el-table-column class="table_td" prop="amountEdReceivable" label="已收金额（元）">
-          <!-- <template slot-scope="scope">
-            <span style="color: #ce4545;" @click='fujian2(scope.row)'
-              v-if="scope.row.returnFlag == 1">{{scope.row.netWeight}}(退)</span>
-            <span @click='fujian2(scope.row)' v-if="scope.row.returnFlag == null">{{scope.row.netWeight }}</span>
-          </template> -->
         </el-table-column>
         <el-table-column class="table_td" prop="amountNotReceivable" label="未收金额（元）">
-          <!-- <template slot-scope="scope">
-            <div class="inputChenge">
-              <el-input v-model="scope.row.settlementWeight" v-if="scope.row.identification == 'true'">
-              </el-input>
-              <div v-if="scope.row.identification == 'false'" class="inputs">
-                <span style="color: #ce4545;" v-if="scope.row.returnFlag == 1">{{scope.row.settlementWeight}}</span>
-                <span v-if="scope.row.returnFlag == null">{{scope.row.settlementWeight }}</span>
-              </div>
-            </div>
-            <img v-hasPermission="`report.goodsSaleOutReport.edit`" width="17" height="18"
-              style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
-              @click="whether(scope.row)" v-if="scope.row.identification == 'false'" alt="" />
-            <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
-              v-if="scope.row.identification == 'true'" @click="weightClick(scope.row)"></i>
-          </template> -->
         </el-table-column>
         <el-table-column class="table_td" prop="collectionDate" label="收款日期">
-          <!-- <template slot-scope="scope">
-            <span v-if="scope.row.returnFlag == null">{{scope.row.amountIngReceivable.toFixed(2) }}</span>
-          </template> -->
         </el-table-column>
         <el-table-column class="table_td" prop="status" label="状态">
-          <!-- <template slot-scope="scope">
-            <span v-if="scope.row.returnFlag == null">{{scope.row.amountIngReceivable.toFixed(2) }}</span>
-          </template> -->
         </el-table-column>
       </el-table>
-
       <!-- 他运 -->
-      <el-table v-else class="wenzi" :data="saleList.records" :row-class-name="tableRowClassName" style="width: 100%; margin-top: 20px" ref="saleList1"
+      <el-table v-if='orderList.deliverType!=1' class="wenzi" :data="saleList.records" :row-class-name="tableRowClassName" style="width: 100%; margin-top: 20px" ref="saleList1"
         border :summary-method="getSummaries" show-summary @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column type="index" label="序号" width="50"></el-table-column>
@@ -165,9 +131,12 @@
                 <span v-if="scope.row.returnFlag == null">{{scope.row.settlementWeight }}</span>
               </div>
             </div>
-            <img v-hasPermission="`report.goodsSaleOutReport.edit`" width="17" height="18"
+            <div style='display:inline-block;' v-if="scope.row.identification == 'false'">
+              <img v-hasPermission="`report.goodsSaleOutReport.edit`" width="17" height="18"
               style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
-              @click="whether(scope.row)" v-if="scope.row.identification == 'false'" alt="" />
+              @click="whether(scope.row)" alt="" />
+            </div>
+            
             <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
               v-if="scope.row.identification == 'true'" @click="weightClick(scope.row)"></i>
           </template>
@@ -177,25 +146,19 @@
             <span v-if="scope.row.returnFlag == null">{{scope.row.amountIngReceivable.toFixed(2) }}</span>
           </template>
         </el-table-column>
-        <el-table-column class="table_td" prop="amountIngReceivable" label="已收金额(元)">
+        <el-table-column class="table_td" prop="amountEdReceivable" label="已收金额(元)">
           <template slot-scope="scope">
-            <span v-if="scope.row.returnFlag == null">{{scope.row.amountIngReceivable.toFixed(2) }}</span>
+            <span v-if="scope.row.returnFlag == null">{{scope.row.amountEdReceivable.toFixed(2) }}</span>
           </template>
         </el-table-column>
-        <el-table-column class="table_td" prop="amountIngReceivable" label="未收金额(元)">
+        <el-table-column class="table_td" prop="amountNotReceivable" label="未收金额(元)">
           <template slot-scope="scope">
-            <span v-if="scope.row.returnFlag == null">{{scope.row.amountIngReceivable.toFixed(2) }}</span>
+            <span v-if="scope.row.returnFlag == null">{{scope.row.amountNotReceivable.toFixed(2) }}</span>
           </template>
         </el-table-column>
-        <el-table-column class="table_td" prop="amountIngReceivable" label="收款日期">
-          <template slot-scope="scope">
-            <span v-if="scope.row.returnFlag == null">{{scope.row.amountIngReceivable.toFixed(2) }}</span>
-          </template>
+        <el-table-column class="table_td" prop="collectionDate" label="收款日期">
         </el-table-column>
-        <el-table-column class="table_td" prop="amountIngReceivable" label="状态">
-          <template slot-scope="scope">
-            <span v-if="scope.row.returnFlag == null">{{scope.row.amountIngReceivable.toFixed(2) }}</span>
-          </template>
+        <el-table-column class="table_td" prop="status" label="状态">
         </el-table-column>
       </el-table>
 

src/views/tradeServicesManagement/warehouseReceiptAdd.vue

@@ -141,6 +141,7 @@
 		</div>
       <!-- </ws-info-table> -->
 		 </el-form>
+		 
 	</div>
 </template>
 <script>
@@ -184,5 +185,8 @@
 	}
 </script>
 <style lang="scss" scoped>
-
+.el-form{
+	overflow: scroll;
+	height:94vh;
+}
 </style>

src/views/tradeServicesManagement/warehouseReceiptRegulation.vue

@@ -161,7 +161,9 @@ export default {
     startHacking1() {
       this.isActive = false
     },
-    add() {}
+    add() {
+      this.$router.push({name:'warehouseReceiptAdd'})
+    }
   }
 }
 </script>