前端孟祥旭

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -155,12 +155,12 @@
                     alt=""
                   />
                 </el-upload>
-                <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
+                <!-- <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未上传'" class="signStatus">
                   {{ item.signStatus }}
                 </div>
-                <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'" class="signStatus1">
+                <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已上传'" class="signStatus1">
                   {{ item.signStatus }}
-                </div>
+                </div> -->
               </template>
             </ws-form-item>
             </ws-info-table>
@@ -241,6 +241,7 @@ export default {
     }
   },
   activated() {
+    this.deptBudgetList.id = this.$route.query.id
     this.getList()
   },
   computed: {
@@ -623,4 +624,8 @@ export default {
   height: 20px;
   line-height: 18px;
 }
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
 </style>

src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -137,9 +137,9 @@
                   @click="fujian(scope.row)"
                   alt=""
                 />
-                <div v-show="item.temporaryDriverFlag == 0">
+                <!-- <div v-show="item.temporaryDriverFlag == 0">
                   {{ item.signStatus }}
-                </div>
+                </div> -->
               </template>
             </ws-form-item>
            
@@ -257,11 +257,14 @@ export default {
       arr: [],
     }
   },
-  mounted() {
-    this.deptBudgetList.id = this.$route.query.id
-    this.getList()
-  },
-
+  // mounted() {
+   
+  //   this.getList()
+  // },
+activated(){
+   this.deptBudgetList.id = this.$route.query.id
+  this.getList()
+},
   computed: {
     totalStorage: function () {
       var maxStorage = 0

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -62,47 +62,54 @@
             :key="index"
           >
             <div class="zhong">
-                <ws-form-item label="姓名" span="1" prop="driver" class="ys">
+                <ws-form-item label="姓名" span="1" prop="driver" >
                   <el-select
                     v-model="item.driver"
                     placeholder="请选择姓名"
                     filterable
                     :filter-method="dataFilter"
                     @change="selectstaff"
-                    class="ys"
+                    class="small"
                   >
                     <el-option
                       v-for="item in options"
                       :key="item.value"
                       :label="item.staffName"
                       :value="item.staffName"
+                       
                     />
                   </el-select>
                 </ws-form-item>
-                <ws-form-item label="电话" span="1" prop="driverPhone" class="zz">
+                <ws-form-item label="电话" span="1" prop="driverPhone" class="biao">
                   <ws-input
                     :readonly="true"
                     v-model="item.driverPhone"
                     placeholder="请输入电话"
                     maxlength="20"
                     size="small"
+                    class="ys"
                   />
                 </ws-form-item>
-                <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="">
+                <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="biao2">
                   <ws-date-picker
                     v-model="item.sendDateStart"
                     type="date"
                     placeholder="请选择发货日期"
                     value-format="yyyy-MM-dd"
+                    class="small"
                   />
                 </ws-form-item>
-                <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="">
+                <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="biao3">
                   <ws-date-picker
                     v-model="item.receiveDateEnd"
                     type="date"
                     placeholder="请选择发货日期"
                     value-format="yyyy-MM-dd"
+                    class="small"
                   />
+                </ws-form-item>
+                 <ws-form-item label="航次" span="1" prop="shipNo" class="biao4">
+                  <ws-input v-model="item.shipNo" placeholder="请选择航次" maxlength="100" size="small" class="ys"></ws-input>
                 </ws-form-item>
                 <ws-form-item label="船名" span="1" prop="shipName" class="">
                   <ws-input
@@ -110,18 +117,17 @@
                     placeholder="请输入船名"
                     maxlength="100"
                     size="small"
+                    class="ys"
                   ></ws-input>
                 </ws-form-item>
-                <ws-form-item label="航次" span="1" prop="shipNo" class="">
-                  <ws-input v-model="item.shipNo" placeholder="请选择航次" maxlength="100" size="small"></ws-input>
-                </ws-form-item>
-                <ws-form-item label="类型" span="1" prop="shipType" class="">
-                  <ws-select v-model="item.shipType" placeholder="请输入" class="typeselect">
+                <ws-form-item label="类型" span="1" prop="shipType" class="biao5">
+                  <ws-select v-model="item.shipType" placeholder="请输入" class="ys">
                     <ws-option
                       v-for="items in shipType"
                       :key="items.constKey"
                       :label="items.constValue"
                       :value="items.constValue"
+                       
                     />
                   </ws-select>
                 </ws-form-item>
@@ -129,10 +135,10 @@
                   label="数量"
                   span="1"
                   prop="boxNumber"
-                  class="siji"
+                  class="biao6"
                   v-show="item.shipType=='集装箱'"
                 >
-                  <ws-input v-model="item.boxNumber" placeholder="请输入数量" size="small"></ws-input>
+                  <ws-input v-model="item.boxNumber" placeholder="请输入数量" class="ys"></ws-input>
                 </ws-form-item>
               </ws-info-table>
             </div>
@@ -340,18 +346,18 @@ 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]
+              })
+            }
+          }
         })
     },
     //返回按钮
@@ -775,10 +781,20 @@ export default {
   border: none;
   width: 1000px;
 }
-.el-input--small .el-input__inner {
-  border-block-color: #f6f7fc;
-  background: #f6f7fc;
-}
+/deep/.el-select .el-input__inner {
+    border: 1px solid #ccc !important;
+    padding: 0 15px !important;
+    font-size: 12px !important;
+    width: 150px;
+}
+// .el-input--small .el-input__inner {
+//   height: 32px;
+//     line-height: 32px;
+//     width: 150px;
+//   border-block-color: #f6f7fc;
+//   background: #f6f7fc;
+  
+// }
 .zhong {
   background: #f6f7fc;
   border: 1px solid #d8dce6;
@@ -786,9 +802,40 @@ export default {
 .bg-left {
   padding-left: 30px;
 }
+/deep/.el-icon-arrow-up:before {
+    margin-left: 116px;
+}
+/deep/.el-input--prefix .el-input__inner {
+    padding-left: 30px;
+    width: 150px;
+}
 .ys{
   // margin-left: 300px;
-  width: 230px;
-  background: #5878e8;
+  width: 100px;
+
+}
+.biao{
+  margin-left: 200px;
+  margin-top: -57px;
+}
+.biao2{
+  margin-left: 350px;
+  margin-top: -57px;
+}
+.biao3{
+   margin-left: 580px;
+  margin-top: -57px;
+}
+.biao4{
+  margin-left: 850px;
+  margin-top: -57px;
+}
+.biao5{
+  margin-left: 200px;
+  margin-top: -57px;
+}
+.biao6{
+  margin-left: 400px;
+  margin-top: -57px;
 }
 </style>