前端孟祥旭

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -25,19 +25,17 @@
       </template>
       <!-- 接单开始 -->
       <template slot="left">
-            <ws-date-picker
-              v-model="deptBudgetList.startDate"
-              type="date"
-              placeholder="请选择开始日期"
-              value-format="yyyy-MM-dd"
-            />
-            <span>至</span>
-            <ws-date-picker
-              v-model="deptBudgetList.endDate"
-              type="date"
-              placeholder="请选择结束日期"
-              value-format="yyyy-MM-dd"
-            />
+            <el-date-picker
+          v-model="value2"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :picker-options="pickerOptions"
+        >
+        </el-date-picker>
         <ws-input
           v-model="searchKeyWord"
           placeholder="可按照合同编号、买方名称、卖方名称进行查找"
@@ -157,16 +155,19 @@
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <ws-button class="completed" @click="trainSee(scope.row)">
-              查看
-            </ws-button>
-            <ws-button
+            <div
+              class="completed"
+              @click="trainSee(scope.row)"
+            >
+            查看
+            </div>
+            <div
               class="putstorage"
               @click="feedback(scope.row)"
               v-show="scope.row.tranType == '汽运'"
             >
-              反馈
-            </ws-button>
+            反馈
+            </div>
             </template>
         </el-table-column>
         <!-- <el-table-column prop="address" label="操作" width="200">

src/views/tranManagement/tranManagementShipping.vue

@@ -25,8 +25,7 @@
       </template>
       <!-- 接单开始 -->
       <template slot="left">
-       <h1>654565</h1>
-            <el-date-picker
+        <el-date-picker
           v-model="value2"
           type="daterange"
           align="right"
@@ -147,28 +146,32 @@
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <ws-button
-              class="completed"
+            <div
+              class="record"
               @click="handleLook(scope.row)"
               
             >
               查看
-            </ws-button>
-            <ws-button
-              class="putstorage"
+            </div>
+            <div
+              class="adjustment"
               @click="shipping(scope.row)"
             >
               船次
-            </ws-button>
+            </div>
           </template>
         </el-table-column>
-        <!-- <el-table-column prop="address" label="操作" width="200">
-          <template slot-scope="scope">
-            <div class="record" @click="record(scope.row)">记录</div>
-            <div class="adjustment" @click="loss(scope.row)">盘损</div>
-          </template>
-        </el-table-column> -->
       </el-table>
+      <!-- 页数 -->
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-size="deptCircularPage.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"
+    >
+      </el-pagination>
     </div>
   </div>
 </template>
@@ -210,6 +213,11 @@ export default {
       showType: true,
       // 年
       year: '',
+      pickerOptions:{
+        
+      },
+      value2: '',
+      deptBudgetTotal:0,
       currentPage: 1,
       tranTypeKey:3,
       pageSize: 10,
@@ -255,7 +263,11 @@ export default {
       })
       .toPromise()
       .then((response)=>{
-        this.warehouseList = response 
+        this.warehouseList = response
+        this.deptCircularPage.currentPage = response.current
+          this.deptCircularPage.pageSize = response.size
+          this.deptBudgetTotal = response.total
+        
         
       })
     },

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -24,7 +24,7 @@
     <div class="center">
     <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
       <div class="basicInformation">
-        <h2> 任务编号 </h2>
+         <div class="small-title">任务详情</div>
         <ws-info-table>
           <!-- 任务编号 -->
           <ws-form-item label="任务编号" span="1" prop="processNo">
@@ -87,7 +87,7 @@
           
         </ws-info-table>
       
-        <div class="small-title"><h2>联络员及航次</h2></div>
+        <div class="small-title">联络员及航次</div>
         <div
           style="width: 100%"
           class=" position siji"
@@ -181,10 +181,10 @@
           ></ws-input>
           </ws-form-item>
           </ws-info-table>
-          <div  >
+          <div class="aa">
             <div
           style="width: 100%"
-          class="flex position"
+          class="xia"
           v-for="(items, index) in freightspace"
           :key="index"
           v-show="item.shipType=='散船'"
@@ -205,21 +205,22 @@
           size="small"
           ></ws-input>
         </ws-form-item>
-          <img
+          <!-- <img
             width="22"
             height="22"
             class="del"
             @click="del(index)"
             src="../../../public/img/del.png"
             alt=""
-          />  
-         
+          />   -->
+            <span class="del" @click="del(index)">x</span>
         </ws-info-table> 
-         
       </div> 
-        <el-button
+      </div>
+      <div class="aa">
+         <el-button
           v-show="item.shipType=='散船'"
-          class="add bg-bottom"
+          class="add "
           type="primary"
           size="small"
           @click="add"
@@ -228,7 +229,6 @@
       </div>
         </div>
       </div>
-      
     </ws-form>
     <div style="text-align: right; padding: 10px">
         <el-button
@@ -391,6 +391,7 @@ export default {
       for (var i = 0; i < this.staffList.length; i++) {
         if (this.staffList[i].staffName == e) {
           this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
+          this.deptBudgetList.tranCarInfoList[0].driverPhone = this.staffList[i].staffMobilePhone
           this.deptBudgetList.personChargeKey = this.staffList[i].staffId
         }
       }
@@ -464,7 +465,6 @@ export default {
               this.tranCarInfoList.shipName = this.deptBudgetList.shipName
               this.tranCarInfoList.shipNo = this.deptBudgetList.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
@@ -526,6 +526,7 @@ export default {
     border: none;
   }
   .el-form-item {
+    border: 1px solid #D8DCE6;
     width: 33.3333%;
     border: none;
     .el-form-item__label {
@@ -593,12 +594,11 @@ export default {
   left: 0px;
   top: 13px;
   padding: 4px 2px;
-}
-.position{
-  width: 90%;
-}
-.position .siji{
-  width: 16%;
+  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%;
@@ -610,13 +610,13 @@ export default {
 //减号
 .del {
   right: -70px;
+  width: 20px;
+  height: 20px;
 }
 .bot{
   width: 30%;
 }
-.position .siji {
-  width: 20.5%;
-}
+//去边框
 /deep/.el-form-item {
   border-right: 0px;
   border-bottom: 0px;
@@ -657,14 +657,81 @@ export default {
   color: #8890b1;
   line-height: 16px;
 }
-// .flex .position{
-//   margin-top: 150px;
-//   margin-left: 20px;
-// }
 .position{
-  width: 100%;
+  width: 90%;
+}
+//下表格样式
+/deep/.position.siji{
+  background: #F6F7FC;
+  border-radius: 4px;
+  border: 1px solid #D8DCE6;
+}
+/deep/.zi{
+  width: 64px;
+  height: 22px;
+  font-size: 16px;
+  font-family: PingFangSC-Semibold, PingFang SC;
+  font-weight: 600;
+  color: #323233;
+  line-height: 22px;
+}
+//表格文字
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  text-align: left;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
 }
-.position .siji{
-  width: 20.6%;
+//小标题文字
+.small-title::before {
+  position: absolute;
+  content: '';
+  display: block;
+  background: #5473e8;
+  width: 4px;
+  height: 14px;
+  left: 0px;
+  top: 13px;
+  padding: 4px 2px;
+}
+/deep/.basicInformation {
+  .el-form-item {
+    width: 25%;
+    
+    .el-form-item__label {
+      background: transparent;
+       border: none;
+    }
+    .el-form-item__content {
+      // border: none;
+    }
+  }
+}
+//下方表格
+// .biao{
+//   background: #F6F7FC;
+//   border-radius: 4px;
+//   border: 1px solid #D8DCE6;
+//   margin-top: 10px;
+  
+// }
+//添加仓位样式
+.add{
+  width: 90px;
+  height: 20px;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  line-height: 20px;
+  border: none;
+}
+//
+.xia{
+  width: 600px;
+  height:54px ;
+  // background: #F6F7FC;
+  border-radius: 4px;
+  border: 1px solid #D8DCE6;
 }
 </style>

src/views/tranManagement/tranManagementShippingLook.vue

@@ -28,23 +28,23 @@
         <ws-info-table>
           <!-- 任务编号 -->
           <ws-form-item label="任务编号" span="1"  prop="processNo">
-            <ws-input
+            <!-- <ws-input
               v-model="deptBudgetList.processNo" 
               placeholder="请输入任务编号"
               maxlength="20"
               size="small"
-            />
-            <!-- {{deptBudgetList.processNo}} -->
+            /> -->
+            {{deptBudgetList.processNo}}
           </ws-form-item>
         <!-- 货名 -->
           <ws-form-item label="货名" span="1" prop="goodsName">
-            <ws-input
+            <!-- <ws-input
               v-model="deptBudgetList.goodsName"
               placeholder="请输入货名"
               maxlength="20"
               size="small"
-              />
-              <!-- {{deptBudgetList.goodsName}} -->
+              /> -->
+              {{deptBudgetList.goodsName}}
           </ws-form-item>
           <!--重量（吨）-->
           <ws-form-item
@@ -53,13 +53,13 @@
             prop="weight"
             class="readonly"
           >
-            <ws-input
+            <!-- <ws-input
               v-model="deptBudgetList.weight"
               placeholder="请输入重重"
               maxlength="100"
               size="small"
-            />
-            <!-- {{deptBudgetList.weight}} -->
+            /> -->
+            {{deptBudgetList.weight}}
           </ws-form-item>
 
           <!--发货地址-->
@@ -75,24 +75,24 @@
           </ws-form-item>
          <!--发货人-->
           <ws-form-item label="发货人" span="1" prop="sender">
-            <ws-input
+            <!-- <ws-input
               v-model="deptBudgetList.sender"
               placeholder="请输入发货人姓名"
               maxlength="100"
               size="small"
-          />
-          <!-- {{deptBudgetList.sender}} -->
+          /> -->
+          {{deptBudgetList.sender}}
           </ws-form-item>
 
           <!--发货人电话-->
           <ws-form-item label="发货人电话" span="1" prop="senderPhone">
-            <ws-input
+            <!-- <ws-input
               v-model="deptBudgetList.senderPhone"
               placeholder="请输入发货人电话"
               maxlength="100"
               size="small"
-            />
-            <!-- {{deptBudgetList.senderPhone}} -->
+            /> -->
+            {{deptBudgetList.senderPhone}}
           </ws-form-item>
           <!--收货地址-->
         <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
@@ -107,157 +107,169 @@
         </ws-form-item>
          <!--收货人-->
           <ws-form-item label="收货人" span="1" prop="receiver">
-            <ws-input
+            <!-- <ws-input
               v-model="deptBudgetList.receiver"
               placeholder="请输入发货人"
               maxlength="100"
               size="small"
-          />
-          <!-- {{deptBudgetList.receiver}} -->
+          /> -->
+          {{deptBudgetList.receiver}}
           </ws-form-item>
 
           <!--收货人电话-->
           <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
-            <ws-input
+            <!-- <ws-input
               v-model="deptBudgetList.receiverPhone"
               placeholder="请输入收货人电话"
               maxlength="100"
               size="small"
-            />
-            <!-- {{deptBudgetList.receiverPhone}} -->
+            /> -->
+            {{deptBudgetList.receiverPhone}}
           </ws-form-item>
          
           <!--发船日期-->
         <ws-form-item label="发船日期" span="1" prop="deliveryDateStart">
-          <ws-input
-           
+          <!-- <ws-input
             v-model="deptBudgetList.deliveryDateStart"
             placeholder=""
             maxlength="20"
             size="small"
-          />
+          /> -->
+          {{deptBudgetList.deliveryDateStart}}
         </ws-form-item>
+      
            <!--最晚发货日期-->
           <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
-          <ws-input
-          
+            <!-- <ws-input
             v-model="deptBudgetList.deliveryDateEnd"
             placeholder=""
             maxlength="20"
             size="small"
-          />
+          /> -->
+          {{deptBudgetList.deliveryDateEnd}}
         </ws-form-item>
           <!--合同编号-->
           <ws-form-item label="合同编号" span="1" prop="contractNo">
-          <ws-input
-          
+            <!-- <ws-input
             v-model="deptBudgetList.contractNo"
             placeholder="请输入合同编号"
             maxlength="20"
             size="small"
-          />
+          /> -->
+          {{deptBudgetList.contractNo}}
         </ws-form-item>
           
         </ws-info-table>
-      <div class="small-title"><h2>联络员及航次</h2></div>
+       <div class="small-title">联络员及航次</div>
+       <div class="aa">
+       <div  class="small-title">航次信息</div>
       <div
           style="width: 100%"
           class="flex position"
            v-for="(item, index) in deptBudgetList.tranCarInfoList"
            :key="index.id"
         >
+        
         <ws-info-table>
           <!-- 姓名 -->
           <ws-form-item label="姓名" span="1" prop="driver" class="siji">
-            <ws-input
+            <!-- <ws-input
             v-model="item.driver"
             placeholder="请选择联络员"
             size="small"
-            ></ws-input>
+            ></ws-input> -->
+            {{item.driver}}
           </ws-form-item>
           <!-- 电话 -->
           <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
-            <ws-input
+            <!-- <ws-input
             v-model="item.driverPhone"
             placeholder="联络员电话"
             size="small"
-            ></ws-input>
-
+            ></ws-input> -->
+          {{item.driverPhone}}
           </ws-form-item>
           <!--发船日期-->
           <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
-            <ws-input
+            <!-- <ws-input
                 v-model="item.sendDateStart"
                 placeholder="请选择日期"
-                
-            ></ws-input>
+            ></ws-input> -->
+            {{item.sendDateStart}}
           </ws-form-item>
         <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
-          <ws-input
+          <!-- <ws-input
               v-model="item.receiveDateEnd"
               placeholder="请选择日期"
               value-format="yyyy-MM-dd"
               size="small"
-            />
-           
+            /> -->
+          {{item.receiveDateEnd}}
         </ws-form-item>
           <!-- 船名 -->
           <ws-form-item label="船名" span="1" prop="shipName" class="siji">
-            <ws-input 
+            <!-- <ws-input 
               v-model="item.shipName"
               placeholder="请输入船名"
               maxlength="100"
               size="small"
-            ></ws-input>
+            ></ws-input> -->
+            {{item.shipName}}
           </ws-form-item>
           <!-- 航次 -->
           <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
-            <ws-input 
+            <!-- <ws-input 
               v-model="item.shipNo"
               placeholder="请选择航次"
               maxlength="100"
               size="small"
-            ></ws-input>
+            ></ws-input> -->
+            {{item.shipNo}}
           </ws-form-item>
         <!-- 类型 -->
         <ws-form-item label="类型" span="1" prop="shipType" class="siji">
-          <ws-input
+          <!-- <ws-input
           v-model="item.shipType"
           placeholder=""
           size="small"
-          ></ws-input>
-          
+          ></ws-input> -->
+          {{item.shipType}}
         </ws-form-item>
         <ws-form-item label="数量" span="1" prop="boxNumber" class="siji" v-show="item.shipType=='集装箱'"> 
-          <ws-input
+          <!-- <ws-input
           v-model="item.boxNumber"
           placeholder="请输入数量"
           size="small"
-          ></ws-input>
+          ></ws-input> -->
+          {{item.boxNumber}}
         </ws-form-item>
         </ws-info-table>
         </div>
+        </div>
+        <div class="xia">
       <div
           style="width: 100%"
-          class="flex position"
+          class=""
          v-for="(item, index) in freightspace"
          :key="index"
         >
      <ws-info-table>
         <ws-form-item :label="'仓位号-'+ (index + 1 )" span="1" prop="impurity" class="bot">
-            <ws-input
+            <!-- <ws-input
           v-model="item.impurity"
           placeholder="请输入仓位号"
           size="small"
-          ></ws-input>
+          ></ws-input> -->
+          {{item.impurity}}
           </ws-form-item>
           <!-- 重量（吨） -->
           <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot">
-          <ws-input
+          <!-- <ws-input
           v-model="item.positionWeight"
           placeholder="请输入装仓重量"
           size="small"
-          ></ws-input>
+          ></ws-input> -->
+          {{item.positionWeight}}
         </ws-form-item>
         
      </ws-info-table>
@@ -270,6 +282,7 @@
             alt=""
           /> -->
       </div>
+      </div>
       <!-- <el-button
           class="add"
           type="primary"
@@ -524,20 +537,6 @@ export default {
         }
       }
     },
-    // fujian(row) {
-    //   if (
-    //     row.receiveAttachmentPath === null ||
-    //     row.receiveAttachmentPath === ''
-    //   ) {
-    //     EventBus.$emit(
-    //       'warning',
-    //       this.$t('system.noticeCircular.NoInformation')
-    //     )
-    //   } else {
-    //     this.accessoryTFs = true
-    //   }
-    //   this.appendixIdss = row.receiveAttachmentPath
-    // },
     approve() {},
     listQuery() {},
   },
@@ -636,6 +635,7 @@ export default {
 }
 .bot{
   width: 30%;
+  border: none;
 }
 .siji{
   width: 300px;
@@ -708,6 +708,44 @@ export default {
     font-size: 14px;
     cursor: text;
     padding: 0 !important;
+    border: none;
   }
 }
+//联络员及航次样式
+.aa{
+  width: 100%;
+  height: 90px;
+  background: #F5F7FA;
+  border-radius: 4px;
+  border: 1px solid #D8DCE6;
+}
+.xia{
+  width:70%;
+  height: 46px;
+  background: #F5F7FA;
+  border-radius: 4px;
+  border: 1px solid #D8DCE6;
+  margin-top: 10px;
+  border: none;
+}
+.xiaxia{
+  width: 70%;
+  height: 46px;
+  background: #F5F7FA;
+  border-radius: 4px;
+  // border: 1px solid #D8DCE6;
+  margin-top: 10px;
+  // border: none;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+    background-color: #f5f7fa;
+    font-size: 14px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #8890b1;
+    line-height: 16px;
+}
+.position .siji {
+    width: 14.2%;
+}
 </style>