前端 sdy

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -92,18 +92,22 @@
               <ws-form-item label="姓名：" span="1" prop="driver">
                 <span v-show="item.temporaryDriverFlag == 0">{{ item.driver }}</span>
               </ws-form-item>
+               <el-divider direction="vertical" class="line"></el-divider>
               <!--电话-->
               <ws-form-item label="电话：" span="1" prop="driverPhone">
                 <span v-show="item.temporaryDriverFlag == 0">{{ item.driverPhone }}</span>
               </ws-form-item>
+               <el-divider direction="vertical" class="line"></el-divider>
               <!--车牌号-->
               <ws-form-item label="车牌号：" span="1" prop="carNo">
                 <span v-show="item.temporaryDriverFlag == 0">{{ item.carNo }}</span>
               </ws-form-item>
+               <el-divider direction="vertical" class="line"></el-divider>
               <!--装车净重-->
               <ws-form-item label="装车(吨)：" span="1" prop="loadNetWeight">
                 {{item.loadNetWeight}}
               </ws-form-item>
+               <el-divider direction="vertical" class="line"></el-divider>
               <!--卸车净重(吨)-->
               <ws-form-item label="卸车净重(吨)：" span="1" prop="unloadNetWeight">
                 <ws-input
@@ -113,6 +117,7 @@
                   size="small"
                 />
               </ws-form-item>
+               <el-divider direction="vertical" class="line"></el-divider>
               <!--磅单-->
               <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
               <template slot-scope="scope">
@@ -465,7 +470,7 @@ export default {
 //表格文字
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   text-align: left;
-  font-size: 14px;
+  font-size: 13px;
   font-weight: 400;
   color: #8890b1;
   line-height: 16px;
@@ -513,13 +518,14 @@ export default {
   background: #f5f7fa;
   border-radius: 4px;
   color: #8890b1;
-  font-size: 14px;
+  font-size: 12px;
+  font-weight: 400;
 }
 /deep/.driver .ws-info-table .el-form-item .el-form-item__label {
   width: 72px;
 }
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 16.66%;
+  width: 14.66%;
   color: #8890b1;
   font-size: 14px;
 }
@@ -528,7 +534,7 @@ export default {
   height: 50px;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width: 40%;
+  width:55%;
   border: 0px solid #d8dce6;
   background: #f5f7fa;
   text-align: center;
@@ -604,4 +610,22 @@ export default {
   overflow: scroll;
   height: 93vh;
 }
+.line{
+  height: 26px;
+  margin-top: 6px;
+  left: 2px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+    // background-color: #eee;
+    // padding-right: 8px;
+    // padding-left: 8px;
+    // width: 100px;
+    font-size: 12px;
+    font-weight: bold;
+    // color: #333;
+    // overflow: hidden;
+    // text-overflow: ellipsis;
+    white-space: nowrap;
+    // line-height: 40px;
+}
 </style>

src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -733,7 +733,7 @@ activated(){
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   background-color: #fff;
-  font-size: 12px;
+  font-size: 13px;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #8890b1;
@@ -755,7 +755,7 @@ activated(){
   height: 50px;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width: 48%;
+  width: 53%;
   background: #F6F7FC;
 }
 /deep/.liaison .flex {

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -144,20 +144,20 @@
               </ws-info-table>
             </div>
             <div
-              style="width: 530px"
+              style=" width: 536px;"
               class="xia"
               v-for="(items, index) in freightspace"
               v-show="item.shipType=='散船'"
               :key="index"
             >
               <ws-info-table>
-                <ws-form-item :label="'仓位号-'+ (index +1 )" span="1" prop="impurity" class="bot">
+                <ws-form-item :label="'仓位号-'+ (index +1 )" span="1" prop="impurity"  class="bot" >
                   <el-input v-model="items.impurity"></el-input>
                 </ws-form-item>
-                <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot">
+                 <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot" >
                   <el-input v-model="items.positionWeight"></el-input>
-                </ws-form-item>
-                <span
+                </ws-form-item> 
+                 <span
                   width="22"
                   height="22"
                   class="del"
@@ -290,6 +290,7 @@ export default {
   },
   activated() {
     this.loaddata()
+     this.getList()
     
   },
   computed: {
@@ -348,17 +349,44 @@ export default {
         .toPromise()
         .then(response => {
           this.deptBudgetList = response
-          for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-            var num = this.deptBudgetList.tranCarInfoList[
-              i
-            ].positionWeight.split(',')
-            for (var j = 0; j < num.length; j++) {
-              var num2 = num[j].split('/')
-              this.freightspace.push({
-                impurity: num2[i],
-                positionWeight: num2[num2.length - 1]
-              })
+          // for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+          //   var num = this.deptBudgetList.tranCarInfoList[
+          //     i
+          //   ].positionWeight.split(',')
+          //   for (var j = 0; j < num.length; j++) {
+          //     var num2 = num[j].split('/')
+          //     this.freightspace.push({
+          //       impurity: num2[i],
+          //       positionWeight: num2[num2.length - 1]
+          //     })
+          //   }
+          // }
+          if(response.tranCarInfoList.length>0) {
+            if(response.tranCarInfoList[i].positionWeight) {
+              this.list = response.tranCarInfoList[0].positionWeight.splice(',')
+              for(var i = 0;i<this.list.length;i++) {
+                var num = this.list[i]
+                this.freightspace.push({
+                  trandriver:num,
+                })
+              }
             }
+          }else{
+            this.deptBudgetList.tranCarInfoList = [
+              {
+                driver:'',
+                driverPhone:'',
+                sendDateStart:'',
+                receiveDateEnd: '',
+                shipNo:'',
+                shipName:'',
+                shipType:'',
+                boxNumber:'',
+                positionWeight:'',
+
+
+              }
+            ]
           }
         })
     },
@@ -583,6 +611,7 @@ export default {
   position: relative;
   padding: 10px;
   font-weight: 600;
+  margin-left: 27px;
 }
 
 .position .zaizhong {
@@ -591,6 +620,7 @@ export default {
 
 .bot {
   width: 30%;
+ 
 }
 //去边框
 /deep/.el-form-item {
@@ -716,6 +746,7 @@ export default {
   margin-top: 10px;
   background: #f6f7fc;
   border-radius: 4px;
+  margin-left: 24px;
 }
 .basicInformation .ws-info-table {
   border: none;
@@ -732,6 +763,9 @@ export default {
     background: #F6F7FC;
     border-radius: 4px;
     border: 1px solid #D8DCE6;
+    width: 99%;
+    margin: 0 2%;
+    // margin-left: -76px;
 }
 .bg-left {
   padding-left: 30px;
@@ -747,7 +781,8 @@ export default {
 .basicInformation .ws-info-table {
     border: none;
     width: 141%;
-     margin-left: -16px;
+    margin: 0 auto;
+    // margin-left: -89px;
 }
 .ys{
   // margin-left: 300px;
@@ -813,7 +848,7 @@ export default {
   height: 10px;
   line-height: 0px;
   margin-top: 10px;
-  margin-left: 24px;
+  margin-left: 17px;
 }
 
 .amap-page-container {
@@ -933,6 +968,7 @@ export default {
 .center {
   width: 86%;
   margin: 0 auto;
+  // margin: 0 -29%;
 }
 .el-form-item {
   width: 50%;
@@ -1032,6 +1068,7 @@ export default {
 /deep/.ws-info-table .el-form-item {
   border: none;
   height: 50px;
+  // margin: 0 auto;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   background: #f5f7fa;
@@ -1060,21 +1097,6 @@ export default {
 /deep/.flex .ws-info-table .el-form-item .el-form-item__content {
   border: 0px;
 }
-
-// /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-//   width: 30%;
-//   border: 0px solid #d8dce6;
-//   background: #f5f7fa;
-// }
-// /deep/.liaison {
-//   display: contents;
-//   background: #f5f7fa;
-//   border-radius: 4px;
-//   border: 0px solid #d8dce6;
-// }
-// /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
-//   border: none;
-// }
 .add {
   width: 100px;
   height: 34px;
@@ -1083,6 +1105,8 @@ export default {
   color: #5473e8;
   font-size: 14px;
   border: none;
+  margin-left: 17px;
+  // margin-left: -79px;
 }
 .add img {
   display: inline-block;
@@ -1127,5 +1151,6 @@ export default {
     font-weight: 400;
     color: #8890B1;
     line-height: 16px;
+    margin-left: 22px;
 }
 </style>

src/views/tranManagement/tranManagementShippingLook.vue

@@ -160,35 +160,9 @@
               </ws-form-item>
                
             </ws-info-table>
+            
           </div>
-          <div class="xia">
-            <div
-              style="width: 100%"
-              class="flex position"
-              v-for="(items, index) in freightspace"
-              :key="index"
-            >
-              <ws-info-table>
-                <ws-form-item
-                  :label="'仓位号-' + (index + 1)"
-                  span="1"
-                  prop="impurity"
-                  class="bot"
-                >
-                  {{ items.impurity }}
-                </ws-form-item>
-                <!-- 重量（吨） -->
-                <ws-form-item
-                  label="重量(吨)"
-                  span="1"
-                  prop="positionWeight"
-                  class="bot"
-                >
-                  {{ items.positionWeight }}
-                </ws-form-item>
-              </ws-info-table>
-            </div>
-          </div>
+          
           <div style="text-align: right; padding: 10px">
             <el-button
               class="bg-bottom-up"
@@ -295,7 +269,7 @@ export default {
     this.deptBudgetList.positionId = this.$route.query.positionId
     this.deptBudgetList.warehouseName = this.$route.query.warehouseName
     this.deptBudgetList.binNumber = this.$route.query.binNumber
-    this.getList()
+    // this.getList()
   },
   activated() {
     this.loaddata()
@@ -319,19 +293,19 @@ export default {
           }
         })
     },
-    getList() {
-      shippingList({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        contractType: this.contractType,
-        tranTypeKey: this.tranTypeKey,
-      })
-        .toPromise()
-        .then((response) => {
-          this.warehouseList = response
-        })
-    },
+    // getList() {
+    //   shippingList({
+    //     compId: sessionStorage.getItem('ws-pf_compId'),
+    //     currentPage: this.currentPage,
+    //     pageSize: this.pageSize,
+    //     contractType: this.contractType,
+    //     tranTypeKey: this.tranTypeKey,
+    //   })
+    //     .toPromise()
+    //     .then((response) => {
+    //       this.warehouseList = response
+    //     })
+    // },
     //返回按钮
     revert() {
       this.freightspace = []
@@ -388,12 +362,12 @@ export default {
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
       this.pageSize = val
-      this.getList()
+      // this.getList()
     },
     handleCurrentChange(val) {
       this.currentPage = val
       console.log(`当前页: ${val}`)
-      this.getList()
+      // this.getList()
     },
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -155,6 +155,7 @@
                 >{{ item.driverPhone }}
               </span>
             </ws-form-item>
+             <el-divider direction="vertical" class="line"></el-divider>
             <!--车牌号-->
             <ws-form-item label="车牌号：" span="1" prop="carNo">
               <ws-input
@@ -168,6 +169,7 @@
                 >{{ item.carNo }}
               </span>
             </ws-form-item>
+             <el-divider direction="vertical" class="line"></el-divider>
             <!--装车净重-->
             <ws-form-item label="装车净重：" span="1" prop="loadNetWeight">
               <ws-input
@@ -177,6 +179,7 @@
                 size="small"
               />
             </ws-form-item>
+             <el-divider direction="vertical" class="line"></el-divider>
             <!--磅单-->
             <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
               <template slot-scope="scope">
@@ -939,7 +942,7 @@ export default {
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   background-color: #fff;
-  font-size: 14px;
+  font-size: 13px;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #8890b1;
@@ -956,10 +959,10 @@ export default {
 }
 //联络员及车次
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 20%;
+  width: 18%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width: 30%;
+  width: 41%;
   background: #f6f7fc;
 }
 /deep/.liaison .flex {
@@ -1010,6 +1013,7 @@ export default {
   color: #ffffff;
   background: #c4cada;
   line-height: 24px;
+  margin-left: 18px;
 }
 .signStatus1 {
   height: 25px;
@@ -1021,4 +1025,9 @@ export default {
   color: #5473E8;
   line-height: 24px;
 }
+.line{
+  height: 26px;
+  margin-top: 6px;
+  left: 2px;
+}
 </style>