前端sdy

src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -40,13 +40,19 @@
           <span style="margin-left: 14px"
             >出货库：{{ shipment1.sendWarehouse }}</span
           >
-          <span class="status" v-show="shipment1.taskStatus == '待审核'">{{ shipment1.taskStatus }}</span>
-           <span class="status2" v-show="shipment1.taskStatus == '执行中'">{{ shipment1.taskStatus }}</span>
-          <span class="status1" v-show="shipment1.taskStatus == '已完成'">{{ shipment1.taskStatus }}</span>
+          <span class="status" v-show="shipment1.taskStatus == '待审核'">{{
+            shipment1.taskStatus
+          }}</span>
+          <span class="status2" v-show="shipment1.taskStatus == '执行中'">{{
+            shipment1.taskStatus
+          }}</span>
+          <span class="status1" v-show="shipment1.taskStatus == '已完成'">{{
+            shipment1.taskStatus
+          }}</span>
         </div>
         <!--出库经办人-->
         <ws-form-item label="出库经办人：" span="1" prop="agent">
-          {{shipment1.agent}}
+          {{ shipment1.agent }}
         </ws-form-item>
         <el-divider direction="vertical" class="line"></el-divider>
         <!--出库重量（吨）-->
@@ -71,9 +77,15 @@
           <span style="margin-left: 14px">
             入货库：{{ enter.warehouseName }}</span
           >
-          <span class="status" v-show="enter.taskStatus == '待审核'">{{ enter.taskStatus }}</span>
-            <span class="status2" v-show="enter.taskStatus == '执行中'">{{ enter.taskStatus }}</span>
-          <span class="status1" v-show="enter.taskStatus  == '已完成'">{{ enter.taskStatus  }}</span>
+          <span class="status" v-show="enter.taskStatus == '待审核'">{{
+            enter.taskStatus
+          }}</span>
+          <span class="status2" v-show="enter.taskStatus == '执行中'">{{
+            enter.taskStatus
+          }}</span>
+          <span class="status1" v-show="enter.taskStatus == '已完成'">{{
+            enter.taskStatus
+          }}</span>
         </div>
         <!--入库经办人-->
         <ws-form-item label="入库经办人：" span="1" prop="agent">
@@ -156,28 +168,32 @@
       />
       <div class="small-title" style="font-size: 16px">实际流转数量</div>
       <ws-info-table class="flow">
-        <el-table :data="weights"  border style="width: 100%">
+        <el-table :data="weights" border style="width: 100%">
           <el-table-column prop="weightOut" label="累计出库量（吨）">
           </el-table-column>
           <el-table-column prop="weightIn" label="累计入库量（吨）">
           </el-table-column>
-          <el-table-column prop="transportLoss" label="累计运输损耗（吨）"> 
+          <el-table-column prop="transportLoss" label="累计运输损耗（吨）">
             <template scope="scope">
-              {{scope.row.weightOut - scope.row.weightIn}}
+              {{ scope.row.weightOut - scope.row.weightIn }}
             </template>
           </el-table-column>
         </el-table>
       </ws-info-table>
       <ws-info-table class="flow1">
-        <el-table :data="enter.inOutWarehouseTaskList"  border style="width: 100%">
+        <el-table
+          :data="enter.inOutWarehouseTaskList"
+          border
+          style="width: 100%"
+        >
           <el-table-column prop="weight" label="累计退库量（吨）">
-             <template >
-             {{this.enter.stockReturnCount}}
-            </template> 
-             <template scope="scope">
-              {{scope.row.weight}}<span style="margin: 0 30px;color: #8890B1;">退至</span>{{scope.row.warehouseName}}
-              <div></div>
-            </template> 
+            <el-table-column :label="count">
+              <template scope="scope">
+                {{ scope.row.weight
+                }}<span style="margin: 0 30px; color: #8890b1">退至</span
+                >{{ scope.row.warehouseName }}
+              </template>
+            </el-table-column>
           </el-table-column>
         </el-table>
       </ws-info-table>
@@ -241,20 +257,20 @@ export default {
       name: '',
       moveLookData: [],
       shipment: {},
-      shipment1:{},
-      enter: {},
+      shipment1: {},
+      enter: {
+        inOutWarehouseTaskList:[],
+      },
       moveTaskNo: '',
-      weights:[
+      weights: [
         {},
-        // {weightIn: 0},
-        // { transportLoss: 0}
       ],
       weightOut: 0,
       weightIn: 0,
       transportLoss: 0,
 
       weightIn: 0,
-     
+
       retreat: 0,
       goodsName: '',
       grade: '',
@@ -263,6 +279,7 @@ export default {
       weight: 0,
       unitPrice: 0,
       businessDescribe: '',
+      count: '0',
     }
   },
 
@@ -279,7 +296,6 @@ export default {
       this.deptBudgetList.warehousePositioning =
         item.lnglat.lat + ',' + item.lnglat.lng
     },
-
     confirmPositioncity() {
       this.listDate.level = 'city'
       this.listDate.country = this.name
@@ -310,16 +326,24 @@ export default {
             if (this.moveLookData[i].inOutType == '移库出库') {
               this.shipment = this.moveLookData[i]
               this.shipment1 = this.moveLookData[i]
-               this.weightOut = this.moveLookData[i].weight
-               this.$set(this.weights[0],'weightOut',this.moveLookData[i].weight)
-            } else  {
+              this.weightOut = this.moveLookData[i].weight
+              this.$set(
+                this.weights[0],
+                'weightOut',
+                this.moveLookData[i].weight
+              )
+            } else {
               // if (this.moveLookData[i].inOutType == '移库入库')
-               this.enter = this.shipment = this.moveLookData[i]
-                this.weightIn = this.moveLookData[i].weight
-                this.$set(this.weights[0],'weightIn',this.moveLookData[i].weight)
+              this.enter = this.shipment = this.moveLookData[i]
+              this.weightIn = this.moveLookData[i].weight
+              this.$set(
+                this.weights[0],
+                'weightIn',
+                this.moveLookData[i].weight
+              )
               this.businessDescribe = this.moveLookData[i].businessDescribe
             }
-           this.transportLoss = this.weightOut - this.weightIn
+            this.transportLoss = this.weightOut - this.weightIn
             this.goodsName = this.moveLookData[0].goodsName
             this.grade = this.moveLookData[0].grade
             this.bulkDensity = this.moveLookData[0].bulkDensity
@@ -327,7 +351,11 @@ export default {
             this.weight = this.moveLookData[0].weight
             this.unitPrice = this.moveLookData[0].unitPrice
           }
-          console.log(this.shipment1,"出库对象")
+          var num = 0
+          for (var i = 0; i < this.enter.inOutWarehouseTaskList.length; i++) {  
+            num += this.enter.inOutWarehouseTaskList[i].weight
+          }
+          this.count = ""+num
         })
     },
     selectChapterTwo(e) {
@@ -654,7 +682,7 @@ export default {
   // border-bottom: 0px;
   border-top: 0px;
 }
-.flow{
+.flow {
   height: 95px;
 }
 /deep/.flow .el-form-item {
@@ -689,28 +717,28 @@ export default {
   color: #000 !important;
   font-weight: 400;
 }
-/deep/.el-table td{
+/deep/.el-table td {
   text-align: center;
 }
-.status{
+.status {
   margin-left: 10px;
-  background: #E6EAF8;
+  background: #e6eaf8;
   padding: 2px 5px;
   border-radius: 3px;
-  color: #5473E8;
+  color: #5473e8;
 }
-.status1{
-   margin-left: 10px;
-background: #E5F1F7;
+.status1 {
+  margin-left: 10px;
+  background: #e5f1f7;
   padding: 2px 5px;
   border-radius: 3px;
-  color: #50CAD4;
+  color: #50cad4;
 }
-.status2{
-   margin-left: 10px;
-background: #E1E7FD;
+.status2 {
+  margin-left: 10px;
+  background: #e1e7fd;
   padding: 2px 5px;
   border-radius: 3px;
-  color: #5473E8;
+  color: #5473e8;
 }
 </style>

src/views/taskManagement/tranManagementTransport.vue

@@ -272,7 +272,6 @@ export default {
         type: 'warning'
       })
         .then(() => {
-          console.log(row)
           deltran({
             id: row.id
           })
@@ -298,7 +297,6 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          console.log(response)
           this.gainList = response
           this.currentPage = response.current
           this.pageSize = response.size
@@ -477,11 +475,6 @@ export default {
     handleCloe() {
       this.dialogViewSpareMoney = false
     },
-
-    find() {
-      this.currentPage = 1
-      this.getList()
-    },
   }
 }
 </script>
@@ -490,10 +483,6 @@ export default {
   width: 62px;
   text-align: right;
 }
-// .el-button--primary {
-//   background-color: #5878e8;
-//   border-color: #5878e8;
-// }
 .el-pagination{
   padding-top: 20px;
   text-align: center;

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -425,13 +425,6 @@ export default {
     this.showType = this.isShow
   },
   computed: {
-    // weight:function(){
-    //     var maxStorage = 0
-    //     for(var i =0 ; i<this.deptBudgetList.tranProcessInfoList.length;i++){
-    //       maxStorage += Number(this.deptBudgetList.tranProcessInfoList[i].weight)
-    //     }
-    //     return maxStorage
-    //   },
     warehouse: function() {
       if (
         this.deptBudgetList.taskType == '销售出库' ||
@@ -454,13 +447,8 @@ export default {
           tmp[2]=TextToCode[this.warehouseList[i].warehousePrivate][this.warehouseList[i].warehouseCity][this.warehouseList[i].warehouseArea].code
           this.selectedOptions=tmp
           this.deptBudgetList.tranProcessInfoList[0].selectedOptions=tmp
-<<<<<<< HEAD
-          this.deptBudgetList.startDetailedAddress =  this.warehouseList[i].detailedAddress
-          this.deptBudgetList.tranProcessInfoList[0].sendDetailedAddress = this.deptBudgetList.startDetailedAddress
-=======
           this.$set(this.deptBudgetList,'startDetailedAddress',this.warehouseList[i].detailedAddress)
-          this.$set(this.deptBudgetList.tranProcessInfoList[0],'sendDetailedAddress',this.warehouseList[i].detailedAddress)
->>>>>>> e6daec5cb47b44b717d48840c4539dc5d238525f
+          this.$set(this.deptBudgetList.tranProcessInfoList[0],'sendDetailedAddress',this.deptBudgetList.startDetailedAddress)
         }
       }
     },

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -458,10 +458,12 @@ export default {
             ][this.warehouseList[i].warehouseArea].code
           this.selectedOptions = tmp
           this.deptBudgetList.tranProcessInfoList[0].selectedOptions = tmp
-          this.deptBudgetList.startDetailedAddress =
-            this.warehouseList[i].detailedAddress
-          this.deptBudgetList.tranProcessInfoList[0].sendDetailedAddress =
-            this.warehouseList[i].detailedAddress
+          // this.deptBudgetList.startDetailedAddress =
+          //   this.warehouseList[i].detailedAddress
+          // this.deptBudgetList.tranProcessInfoList[0].sendDetailedAddress =
+          //   this.warehouseList[i].detailedAddress
+           this.$set(this.deptBudgetList,'startDetailedAddress',this.warehouseList[i].detailedAddress)
+          this.$set(this.deptBudgetList.tranProcessInfoList[0],'sendDetailedAddress',this.deptBudgetList.startDetailedAddress)
         }
       }
     },