Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/outboundManagement/qualityInspection.vue

@@ -44,9 +44,9 @@
             <ws-form-item label="货名" span="1" prop="goodsName">
               <ws-input v-model="inspect.goodsName" placeholder="自动获取，不可编辑" disabled size="small" />
             </ws-form-item>
-            <ws-form-item label="经办人" span="1" prop="secretaryWeigher">
+            <!-- <ws-form-item label="经办人" span="1" prop="secretaryWeigher">
               <ws-input v-model="inspect.weighingManagement.secretaryWeigher" placeholder="自动获取，不可编辑" disabled size="small" />
-            </ws-form-item>
+            </ws-form-item> -->
             <ws-form-item label="出库类型" span="1" prop="inOutType">
               <ws-input v-model="inspect.weighingManagement.inOutType" placeholder="自动获取，不可编辑" disabled size="small" />
             </ws-form-item>
@@ -64,16 +64,16 @@
             </ws-form-item>
 
             <ws-form-item label="箱号-1" span="1" prop="boxNo">
-              <ws-input v-model="inspect.boxNo" placeholder="暂无" disabled size="small" />
+              <ws-input v-model="inspect.weighingManagement.boxNo" placeholder="暂无" disabled size="small" />
             </ws-form-item>
             <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
-              <ws-input v-model="inspect.boxNoOther" placeholder="暂无" disabled size="small" />
+              <ws-input v-model="inspect.weighingManagement.boxNoOther" placeholder="暂无" disabled size="small" />
             </ws-form-item>
             <ws-form-item label="封号-1" span="1" prop="titleNo">
-              <ws-input v-model="inspect.titleNo" placeholder="暂无" disabled size="small" />
+              <ws-input v-model="inspect.weighingManagement.titleNo" placeholder="暂无" disabled size="small" />
             </ws-form-item>
             <ws-form-item label="封号-2" span="1" prop="titleNoOther">
-              <ws-input v-model="inspect.titleNoOther" placeholder="暂无" disabled size="small" />
+              <ws-input v-model="inspect.weighingManagement.titleNoOther" placeholder="暂无" disabled size="small" />
             </ws-form-item>
           </ws-info-table>
 

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -400,10 +400,10 @@
     <el-dialog width="25%" title="定金" :visible.sync="dialogFormVisible2" :append-to-body="true">
       <el-form :model="form">
         <el-form-item label="已收定金(元)" :label-width="formLabelWidth">
-          <el-input v-model="orderList.deposit" autocomplete="off" placeholder="输入定金金额" class="deal"></el-input>
+          <el-input v-model="deposit" autocomplete="off" placeholder="输入定金金额" class="deal"></el-input>
         </el-form-item>
         <el-form-item label="上传定金截图" :label-width="formLabelWidth">
-          <el-upload action="https://www.zthymaoyi.com/upload/admin" :limit='1' list-type="picture-card"
+          <el-upload ref="upload" action="https://www.zthymaoyi.com/upload/admin" :limit='1' list-type="picture-card"
             :on-success="handlePictureCardPreview1" :on-remove="handleRemove" class="photo2">
             <i class="el-icon-plus"></i>
           </el-upload>
@@ -469,6 +469,7 @@
         dialogFormVisible2: false,
         amountEdReceivable: 0,
         amountNotReceivable: 0,
+        deposit:'',
         deptBudgetList: {},
         //分页
         currentPage: 1,
@@ -495,7 +496,9 @@
         value2: [],
         startDate: '',
         endDate: '',
-        orderList: {},
+        orderList: {
+          deposit:''
+        },
         options: [],
         contractNoList: [],
         contractNo: '',
@@ -855,6 +858,7 @@
                 this.collectForm1 = false
                 this.$message.success('添加备注信息成功')
                 this.remarkInformationList = {}
+                
                 this.getList()
 
               })
@@ -893,7 +897,7 @@
               index === 7 ||
               index === 8 ||
               index === 9 ||
-              // index === 10 ||
+              index === 10 ||
               index === 8 ||
               index === 11 ||
               index === 13 ||
@@ -909,25 +913,27 @@
                     return prev
                   }
                 }, 0)
-                if (index == 11) {
-                  this.money = sums[index]
-                }
+                // if (index == 11) {
+                //   this.money = sums[index]
+                // }
                 if (index == 8) {
                   this.weight = sums[index]
                 }
               } else {
                 sums[index] = '元'
               }
-            } else if (index === 10) {
-              const values = data.map((item) => Number(item[column.property]))
-              if (!values.every((value) => isNaN(value))) {
-                if (this.money == 0 || this.weight == 0) {
-                  sums[index] = 0
-                } else {
-                  sums[index] = Number(this.money / this.weight).toFixed(2)
-                }
-              }
-            } else {
+            } 
+            // else if (index === 10) {
+            //   const values = data.map((item) => Number(item[column.property]))
+            //   if (!values.every((value) => isNaN(value))) {
+            //     if (this.money == 0 || this.weight == 0) {
+            //       sums[index] = 0
+            //     } else {
+            //       sums[index] = Number(this.money / this.weight).toFixed(2)
+            //     }
+            //   }
+            // } 
+            else {
               sums[index] = '--'
             }
           } else {
@@ -936,7 +942,7 @@
                 sums[index] = '合计'
               } else if (
                 index === 11 ||
-                // index === 9 ||
+                index === 9 ||
                 index === 10 ||
                 index === 8
               ) {
@@ -950,26 +956,28 @@
                       return prev
                     }
                   }, 0)
-                  if (index == 8) {
-                    this.weight = sums[index]
-                  }
-                  if (index == 10) {
-                    this.money = sums[index]
-                  }
+                  // if (index == 8) {
+                  //   this.weight = sums[index]
+                  // }
+                  // if (index == 10) {
+                  //   this.money = sums[index]
+                  // }
                 } else {
                   sums[index] = '元'
                 }
-              } else if (index === 9) {
-                const values = data.map((item) => Number(item[column.property]))
-                if (!values.every((value) => isNaN(value))) {
-                  if (this.money == 0 || this.weight == 0) {
-                    sums[index] = 0
-                  } else {
-                    sums[index] = Number(this.money / this.weight).toFixed(2)
-                  }
-                }
-
-              } else {
+              }
+              //  else if (index === 9) {
+              //   const values = data.map((item) => Number(item[column.property]))
+              //   if (!values.every((value) => isNaN(value))) {
+              //     if (this.money == 0 || this.weight == 0) {
+              //       sums[index] = 0
+              //     } else {
+              //       sums[index] = Number(this.money / this.weight).toFixed(2)
+              //     }
+              //   }
+
+              // } 
+              else {
                 sums[index] = '--'
               }
             } else if (this.tranType == '汽运') {
@@ -979,7 +987,7 @@
                 index === 11 ||
                 index === 7 ||
                 index === 8 ||
-                // index === 10 ||
+                index === 10 ||
                 index === 13 ||
                 index === 12
               ) {
@@ -993,25 +1001,27 @@
                       return prev
                     }
                   }, 0)
-                  if (index == 8) {
-                    this.weight = sums[index]
-                  }
-                  if (index == 11) {
-                    this.money = sums[index]
-                  }
+                  // if (index == 8) {
+                  //   this.weight = sums[index]
+                  // }
+                  // if (index == 11) {
+                  //   this.money = sums[index]
+                  // }
                 } else {
                   sums[index] = '元'
                 }
-              } else if (index === 10) {
-                const values = data.map((item) => Number(item[column.property]))
-                if (!values.every((value) => isNaN(value))) {
-                  if (this.money == 0 || this.weight == 0) {
-                    sums[index] = 0
-                  } else {
-                    sums[index] = Number(this.money / this.weight).toFixed(2)
-                  }
-                }
-              } else {
+              } 
+              // else if (index === 10) {
+              //   const values = data.map((item) => Number(item[column.property]))
+              //   if (!values.every((value) => isNaN(value))) {
+              //     if (this.money == 0 || this.weight == 0) {
+              //       sums[index] = 0
+              //     } else {
+              //       sums[index] = Number(this.money / this.weight).toFixed(2)
+              //     }
+              //   }
+              // }
+               else {
                 sums[index] = '--'
               }
             } else if (this.tranType == '箱船') {
@@ -1020,7 +1030,7 @@
               } else if (
                 index === 11 ||
                 index === 12 ||
-                // index === 10 ||
+                index === 10 ||
                 index === 9
               ) {
                 const values = data.map((item) => Number(item[column.property]))
@@ -1033,26 +1043,28 @@
                       return prev
                     }
                   }, 0)
-                  if (index == 9) {
-                    this.weight = sums[index]
-                  }
-                  if (index = 11) {
-                    this.money = sums[index]
-                  }
+                  // if (index == 9) {
+                  //   this.weight = sums[index]
+                  // }
+                  // if (index = 11) {
+                  //   this.money = sums[index]
+                  // }
                 } else {
                   sums[index] = '元'
                 }
-              } else if (index == 10) {
-                const values = data.map((item) => Number(item[column.property]))
-                if (!values.every((value) => isNaN(value))) {
-                  if (this.money == 0 || this.weight == 0) {
-                    sums[index] = 0
-                  } else {
-                    sums[index] = Number(this.money / this.weight).toFixed(2)
-                  }
-
-                }
-              } else {
+              } 
+              // else if (index == 10) {
+              //   const values = data.map((item) => Number(item[column.property]))
+              //   if (!values.every((value) => isNaN(value))) {
+              //     if (this.money == 0 || this.weight == 0) {
+              //       sums[index] = 0
+              //     } else {
+              //       sums[index] = Number(this.money / this.weight).toFixed(2)
+              //     }
+
+              //   }
+              // } 
+              else {
                 sums[index] = '--'
               }
             }
@@ -1076,7 +1088,7 @@
         this.dialogFormVisible2 = true
       },
       depositSubmit() {
-        this.remarkInformation.deposit = this.orderList.deposit
+        this.remarkInformation.deposit = this.deposit
         this.remarkInformation.depositUrl = this.depositUrl
         this.$confirm(`确定提交定金信息？`, {
           cancelButtonText: '取消',
@@ -1098,6 +1110,7 @@
                 message: '定金成功',
               })
               this.remarkInformationList = {}
+              this.$refs.upload.clearFiles();
               this.dialogFormVisible2 = false
               this.getList()
             })
@@ -1150,8 +1163,10 @@
       handlecollect() {
         if (this.modification.length > 0) {
           this.uncollectedAmount1 = 0
+          this.money=0
           for (let i = 0; i < this.modification.length; i++) {
             this.uncollectedAmount1 += Number(this.modification[i].amountNotReceivable)
+            this.money+=Number(this.modification[i].amountIngReceivable)
           }
           this.uncollectedAmount1 = this.uncollectedAmount1.toFixed(2)
           this.amountEdReceivable = this.saleList.records[0].amountEdReceivable