Selaa lähdekoodia

前端孟祥旭

mxx 3 vuotta sitten
vanhempi
commit
922a0e34e8

+ 1 - 1
src/views/taskManagement/tranManagementTransport.vue

@@ -607,6 +607,6 @@ export default {
     padding: 2px 5px;
     color: #303133;
     font-weight: 700;
-    margin-left: 353px;
+text-align: center;
 }
 </style>

+ 2 - 0
src/views/tranManagement/tranManagementDriverEdit.vue

@@ -350,6 +350,7 @@
             :on-success="uploadSuccessHandlequalification"
             class="avatar-uploader"
             accept=".jpg, .jpeg, .png, .gif"
+           
           >
             <el-button class="upload button-green" size="small" type="primary">从业资格证</el-button>
           </el-upload>
@@ -521,6 +522,7 @@ export default {
         .toPromise()
         .then(response => {
           // this.selectedOptions.push()
+          
           for (var i = 0; i < response.driverPayeeInfoList.length; i++) {
             if (response.driverPayeeInfoList[i].cardAddressUrl != null) {
               response.driverPayeeInfoList[

+ 379 - 93
src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -69,7 +69,7 @@
                     filterable
                     :filter-method="dataFilter"
                     @change="selectstaff"
-                    class="small"
+                    class="ys"
                   >
                     <el-option
                       v-for="item in options"
@@ -163,7 +163,7 @@
                   @click="del(index)"
                   src="../../../public/img/del.png"
                   alt
-                >X</span>
+                >x</span>
               </ws-info-table>
             </div>
             <div>
@@ -289,6 +289,7 @@ export default {
   },
   activated() {
     this.loaddata()
+    
   },
   computed: {
     totalStorage: function() {
@@ -488,16 +489,16 @@ export default {
               }
 
               this.deptBudgetList.totalStorage = this.totalStorage
-              this.tranCarInfoList.driver = this.deptBudgetList.driver
-              this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
-              this.tranCarInfoList.sendDateStart = this.deptBudgetList.sendDateStart
-              this.tranCarInfoList.receiveDateEnd = this.deptBudgetList.receiveDateEnd
-              this.tranCarInfoList.shipName = this.deptBudgetList.shipName
-              this.tranCarInfoList.shipNo = this.deptBudgetList.shipNo
+              this.tranCarInfoList.driver = this.deptBudgetList.tranCarInfoList[0].trandriver
+              this.tranCarInfoList.driverPhone = this.deptBudgetList.tranCarInfoList[0].driverPhone
+              this.tranCarInfoList.sendDateStart = this.deptBudgetList.tranCarInfoList[0].sendDateStart
+              this.tranCarInfoList.receiveDateEnd = this.deptBudgetList.tranCarInfoList[0].receiveDateEnd
+              this.tranCarInfoList.shipName = this.deptBudgetList.tranCarInfoList[0].shipName
+              this.tranCarInfoList.shipNo = this.deptBudgetList.tranCarInfoList[0].shipNo
               this.tranCarInfoList.id = this.deptBudgetList.tranCarInfoList[0].id
-              this.tranCarInfoList.tranType = this.deptBudgetList.tranType
-              this.tranCarInfoList.boxNumber = this.deptBudgetList.boxNumber
-              this.tranCarInfoList.shipType = this.deptBudgetList.shipType
+              this.tranCarInfoList.tranType = this.deptBudgetList.tranCarInfoList[0].tranType
+              this.tranCarInfoList.boxNumber = this.deptBudgetList.tranCarInfoList[0].boxNumber
+              this.tranCarInfoList.shipType = this.deptBudgetList.tranCarInfoList[0].shipType
               this.tranCarInfoList.positionWeight = this.arr.toString()
               var tranCarInfo = {}
               var tranList = [this.tranCarInfoList]
@@ -549,38 +550,8 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-/deep/.basicInformation {
-  .ws-info-table {
-    border: none;
-  }
-  .el-form-item {
-    border: 1px solid #d8dce6;
-    width: 33.3333%;
-    border: none;
-    .el-form-item__label {
-      background: transparent;
-      border: none;
-    }
-    .el-form-item__content {
-      border: none;
-    }
-  }
-}
-.title {
+.position {
   position: relative;
-  // padding-left: 10px;
-}
-.title::before {
-  content: '';
-  display: inline-block;
-  width: 5px;
-  height: 30px;
-  background: #5473e8;
-  position: absolute;
-  left: 0;
-}
-.el-form {
-  padding: 0 10%;
 }
 .el-button--primary {
   background-color: #5878e8;
@@ -594,7 +565,7 @@ export default {
   padding: 16px 20px;
 }
 .center {
-  width: 80%;
+  width: 90%;
   margin: 0 auto;
 }
 
@@ -612,35 +583,11 @@ export default {
   padding: 10px;
   font-weight: 600;
 }
-.small-title::before {
-  position: absolute;
-  content: '';
-  display: block;
-  background: #5473e8;
-  width: 4px;
-  height: 14px;
-  left: 0px;
-  top: 13px;
-  padding: 4px 2px;
-  font-size: 16px;
-  font-family: PingFangSC-Semibold, PingFang SC;
-  font-weight: 600;
-  color: #323233;
-  line-height: 22px;
-}
-/deep/.position .ws-info-table .el-form-item .el-form-item__label {
-  width: 40%;
-  text-align: center;
-}
+
 .position .zaizhong {
   width: 16%;
 }
-//减号
-.del {
-  right: -70px;
-  width: 13px;
-  height: 13px;
-}
+
 .bot {
   width: 30%;
 }
@@ -693,7 +640,7 @@ export default {
   background: white;
   border-radius: 4px;
   /* border: 1px solid #d8dce6; */
-  width: 1010px;
+  width: 1219px;
   
 }
 /deep/.zi {
@@ -738,14 +685,6 @@ export default {
     }
   }
 }
-//下方表格
-// .biao{
-//   background: #F6F7FC;
-//   border-radius: 4px;
-//   border: 1px solid #D8DCE6;
-//   margin-top: 10px;
-
-// }
 //添加仓位样式
 .add {
   width: 100px;
@@ -769,7 +708,7 @@ export default {
   line-height: 18px;
 }
 /deep/.xia {
-  width: 500px;
+  width: 715px;
   height: 54px;
   border-radius: 4px;
   border: 1px solid #d8dce6;
@@ -787,14 +726,6 @@ export default {
     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;
@@ -803,31 +734,37 @@ export default {
   padding-left: 30px;
 }
 /deep/.el-icon-arrow-up:before {
-    margin-left: 116px;
+    margin-left: 171px;
+    display: none;
 }
 /deep/.el-input--prefix .el-input__inner {
     padding-left: 30px;
     width: 150px;
 }
+.basicInformation .ws-info-table {
+    border: none;
+    width: 140%;
+     margin-left: -16px;
+}
 .ys{
   // margin-left: 300px;
   width: 100px;
 
 }
 .biao{
-  margin-left: 200px;
+  margin-left: 240px;
   margin-top: -57px;
 }
 .biao2{
-  margin-left: 350px;
+  margin-left: 441px;
   margin-top: -57px;
 }
 .biao3{
-   margin-left: 580px;
+   margin-left: 722px;
   margin-top: -57px;
 }
 .biao4{
-  margin-left: 850px;
+  margin-left: 1033px;
   margin-top: -57px;
 }
 .biao5{
@@ -835,7 +772,356 @@ export default {
   margin-top: -57px;
 }
 .biao6{
-  margin-left: 400px;
+  margin-left: 450px;
   margin-top: -57px;
 }
+/deep/.totalStorage .el-input__inner {
+  color: #afb5cb;
+  background: #f5f7fa;
+}
+.small-title {
+  position: relative;
+  padding: 10px;
+  font-weight: 600;
+}
+.small-title::before {
+  position: absolute;
+  content: '';
+  display: block;
+  background: #5473e8;
+  width: 4px;
+  height: 14px;
+  left: 0px;
+  top: 13px;
+}
+.position {
+  position: relative;
+}
+
+.del {
+  // position: absolute;
+  // right: -38px;
+  top: 9px;
+  cursor: pointer;
+  right: 0;
+  display: inline-block;
+  font-size: 20px;
+  width: 16px;
+  height: 10px;
+  line-height: 0px;
+  margin-top: 10px;
+}
+
+.amap-page-container {
+  width: 300px;
+  height: 300px;
+}
+.el-form {
+  padding: 0 15%;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 1px solid transparent;
+  border-bottom: 1px solid transparent;
+}
+.readonly {
+  position: relative;
+}
+.readonly:after {
+  content: '*';
+  color: #ff2727;
+  position: absolute;
+  right: 8px;
+  z-index: 10;
+  top: 21%;
+  font-size: 20px;
+}
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-col {
+  background: #f6f7fc;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+  border-left: 1px solid transparent;
+  background: #fff;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 100px;
+  text-align: center;
+  background: #fff;
+  // border: 1px solid #cdd2dc;
+}
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.box-app {
+  display: inline-block;
+  float: left;
+  margin-left: 30px;
+  line-height: 50px;
+}
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
+      }
+    }
+  }
+}
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+.bg-left {
+  padding-left: 30px;
+}
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
+.center {
+  width: 86%;
+  margin: 0 auto;
+}
+.el-form-item {
+  width: 50%;
+}
+.el-form-item__label {
+  text-align: center;
+}
+.hide-sel {
+  .el-input__inner {
+    border: 0px;
+  }
+  .el-icon-arrow-up {
+    display: none;
+  }
+  .el-textarea__inner {
+    background-color: #fff !important;
+    border: 0;
+  }
+  .el-date-editor {
+    i {
+      display: none;
+    }
+  }
+  .is-disabled {
+    .el-input__inner:hover {
+      background-color: #fff !important;
+      border: 0;
+    }
+    color: #606266;
+    .el-input__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+    .el-textarea__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+  }
+}
+
+// 控制select为只读的时候显示样式
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
+  /deep/.el-input__inner {
+    padding: 0px 2px;
+  }
+}
+/deep/.is-disabled {
+  .el-input__prefix,
+  .el-input__suffix {
+    display: none;
+  }
+  .el-input__inner {
+    background-color: #fff;
+    border-color: #fff !important;
+    color: #000 !important;
+    font-size: 14px;
+    cursor: text;
+    padding: 0 !important;
+  }
+}
+.winseaview-view {
+  padding: 0 0 20px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+.ws-info-table .el-form-item {
+  width: 33.3333%;
+}
+.readonly:after {
+  display: none;
+}
+.el-textarea__inner {
+  display: none;
+}
+.el-form {
+  margin-top: 50px;
+}
+.readonly {
+  width: 16%;
+}
+
+//去边框
+/deep/.el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+}
+/deep/.ws-info-table {
+  border-left: 0px;
+  border-top: 0px;
+}
+/deep/.ws-info-table .el-form-item {
+  border: none;
+  height: 50px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  font-family: PingFangSC-Regular, PingFang SC;
+  margin-bottom: 5px;
+  background-color: #fff;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  background-color: #fff;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+}
+/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;
+  background: #f6f7fb;
+  border-radius: 17px;
+  color: #5473e8;
+  font-size: 14px;
+  border: none;
+}
+.add img {
+  display: inline-block;
+  margin-top: 3px;
+  margin-left: -12px;
+}
+.add .spans {
+  display: table-caption;
+  width: 56px;
+  height: 20px;
+  line-height: 18px;
+}
+/deep/.carnum {
+  display: contents;
+}
+/deep/.carnum .ws-info-table .el-form-item {
+  width: 20%;
+}
+// /deep/.liaison .carnum .ws-info-table .el-form-item {
+//   border-radius: 10px;
+//   right: 20px;
+// }
+ /deep/.ws-info-table .el-form-item .el-form-item__label {
+    /* background-color: #fff; */
+    font-size: 14px;
+    font-weight: 400;
+    color: #8890b1;
+    line-height: 16px;
+    background: border-box;
+}
+ /deep/.ws-info-table .el-form-item .el-form-item__content {
+    background: #f5f7fa;
+    border-radius: 4px;
+    /* border: 1px solid #d8dce6; */
+    border: none;
+}
+ /deep/.basicInformation .el-form-item .el-form-item__label {
+    background: transparent;
+    border: none;
+    font-size: 14px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #8890B1;
+    line-height: 16px;
+}
 </style>

+ 11 - 7
src/views/tranManagement/tranManagementShippingLook.vue

@@ -94,15 +94,15 @@
           </ws-info-table>
           <div class="small-title">联络员及航次</div>
           <div
-            style="width: 100%"
-            class="flex position middle"
+            style="width: 100% "
+           class="flex position middle"
             v-for="(item, index) in deptBudgetList.tranCarInfoList"
           >
         <div style="margin: 18px;color: #69708C;">航次信息</div>
             <ws-info-table>
               <!-- 姓名 -->
               <ws-form-item label="姓名" span="1" prop="driver" class="siji">
-                {{ item.driver }}
+               {{item.driver}}
               </ws-form-item>
               <el-divider direction="vertical" class="line"></el-divider>
               <!-- 电话 -->
@@ -472,7 +472,7 @@ export default {
   padding: 16px 20px;
 }
 .center {
-  width: 80%;
+  width: 106%;
   margin: 0 auto;
 }
 
@@ -508,8 +508,9 @@ export default {
   width: 16%;
 }
 /deep/.position .ws-info-table .el-form-item .el-form-item__label {
-  width: 40%;
-  text-align: center;
+  // width: 43%;
+  // text-align: center;
+  background-color: #f5f7fa;
 }
 .position .zaizhong {
   width: 16%;
@@ -623,6 +624,9 @@ export default {
 }
 /deep/.position .ws-info-table .el-form-item .el-form-item__label {
   background-color: #f5f7fa;
+  // text-align: center;
+  width: 43%;
+  
 }
 .middle {
   background: #f6f7fc;
@@ -632,6 +636,6 @@ export default {
 .line{
   height: 26px;
   margin-top: 6px;
-  left: -20px;
+  left: 2px;
 }
 </style>