Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -134,16 +134,18 @@
           ></el-input>
         </el-form-item>
         <el-form-item
-          label="收获库点"
+          label="收货库点"
           span="1"
           prop="contractNo"
           class="start-address"
+          style="width: 33.333%"
         >
           <el-select
             v-model="deptBudgetList.receiveWarehouse"
             :disabled="warehouse"
-            placeholder="货名"
+            placeholder="请输入收货库点"
             class="typeselect"
+            style="width: 100%"
           >
             <el-option
               v-for="item in warehouseList"
@@ -182,7 +184,7 @@
             size="small"
           ></el-input>
         </el-form-item>
-        <div>
+        <div class="check-box">
           <span class="check-box">运输方式</span>
           <el-checkbox-group v-model="checkList" prop="tranType">
             <el-checkbox label="汽运"></el-checkbox>
@@ -629,17 +631,41 @@ export default {
 <style lang="scss" scoped>
 .position {
   position: relative;
+  border-radius: 5px;
+  border: 1px solid #5473e8;
+  margin-top: 20px;
+  background: #f6f7fc;
+  border-left: 5px solid #5473e8;
+}
+.position .ws-info-table .el-form-item {
+  width: 25%;
+}
+/deep/.position .ws-info-table .el-form-item .el-form-item__label,
+/deep/.position .ws-info-table .el-form-item .el-form-item__content {
+  background: #f6f7fc;
+}
+/deep/.position .el-select {
+  width: 100%;
 }
 .del,
 .add {
   cursor: pointer;
+  margin-left: 10px;
 }
 .el-checkbox-group {
   font-size: 0;
   float: right;
+  margin-left: 24px;
+  color: #8890b1;
 }
-.check-box[data-v-5c5ac25d] {
-  float: left;
+/deep/.el-checkbox__label {
+  color: #8890b1;
+}
+.check-box {
+  margin-top: 10px;
+  margin-left: 16px;
+  color: #8890b1;
+  font-size: 14px;
 }
 .el-form {
   padding: 0 10%;
@@ -648,8 +674,8 @@ export default {
   border: none;
 }
 /deep/.ws-info-table .el-form-item {
-  border-right: 1px solid #cdd2dc;
-  border-bottom: 1px solid #cdd2dc;
+  border: none;
+  height: 50px;
 }
 .readonly {
   position: relative;
@@ -716,4 +742,29 @@ export default {
     }
   }
 }
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  background: #fff;
+  text-align: center;
+  color: #8890b1;
+  font-size: 14px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+.start-address {
+  width: 33.333%;
+}
+/deep/.start-address .ws-info-table .el-form-item .el-form-item__content {
+  width: 100%;
+  color: #8890b1;
+  font-size: 14px;
+}
+.driver {
+  height: 30px;
+  margin-left: 20px;
+  margin-top: 10px;
+  line-height: 30px;
+  font-size: 16px;
+  color: #5473e8;
+}
 </style>

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -14,20 +14,6 @@
         <div>
            <span style="display: inline-block; width: 300px;color: #8890B1;">接单日期</span>
         </div>
- 
-        <!-- <ws-date-picker
-          v-model="deptBudgetList.inOutDate"
-          type="date"
-          placeholder="请选择开始日期"
-          value-format="yyyy-MM-dd"
-        />
-        <span>至</span>
-        <ws-date-picker
-          v-model="deptBudgetList.inOutDate"
-          type="date"
-          placeholder="请选择结束日期"
-          value-format="yyyy-MM-dd"
-        /> -->
          <el-date-picker
           v-model="deptBudgetList.inOutDate"
           type="daterange"

vue.config.js

@@ -144,7 +144,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
-        target: 'http://192.168.1.119:8090/',
+        target: 'http://192.168.1.115:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',