前端sdy

src/views/tranManagement/tranManagementDriver.vue

@@ -55,8 +55,6 @@
             alt=""
           />
         </ws-button>
-
-        <ws-button type="primary" @click="handleLook()">查找</ws-button>
       </template>
     </BaseHeaderLayout>
     <div>
@@ -165,9 +163,9 @@
         </el-table-column>
         <el-table-column prop="numberCard" label="身份证号" width="200">
         </el-table-column>
-        <el-table-column prop="driverPhone" label="手机号" width="120">
+        <el-table-column prop="driverPhone" label="手机号" width="160">
         </el-table-column>
-        <el-table-column prop="carNumber" label="车牌号" width="120">
+        <el-table-column prop="carNumber" label="车牌号" width="160">
           <template scope="scope">
             <ws-select
               v-model="scope.row.carNumber"
@@ -184,15 +182,15 @@
             </ws-select>
           </template>
         </el-table-column>
-        <el-table-column prop="binNumber" label="常驻城市" width="120">
+        <el-table-column prop="binNumber" label="常驻城市" width="160">
           <template slot-scope="scope">
             {{ scope.row.residentCityProvincial
             }}{{ scope.row.residentCityMunicipal }}
           </template>
         </el-table-column>
-        <el-table-column prop="carModel" label="车型" width="80">
+        <el-table-column prop="carModel" label="车型" width="120">
         </el-table-column>
-        <el-table-column prop="carLength" label="车长" width="80">
+        <el-table-column prop="carLength" label="车长" width="120">
         </el-table-column>
         <el-table-column label="结款账户" width="120">
           <template slot-scope="scope">
@@ -241,24 +239,25 @@
         </el-table-column>
         <el-table-column prop="address" label="操作" width="500">
           <template slot-scope="scope">
-            <el-button size="medium" type="text" @click="look(scope.row)"
+            <el-button size="medium" type="text" class="record" @click="look(scope.row)"
               >查看</el-button
             >
-            <el-button size="medium" type="text" @click="edit(scope.row)"
+            <el-button size="medium" type="text" class="record" @click="edit(scope.row)"
               >编辑</el-button
             >
-            <el-button size="medium" type="text" @click="deletes(scope.row)"
+            <el-button size="medium" type="text" class="record" @click="deletes(scope.row)"
               >删除</el-button
             >
             <el-button
               v-if="scope.row.disableStatusFlag != 1"
               size="medium"
+              class="record"
               type="text"
               @click="stop(scope.row)"
               >禁用</el-button
             >
             <el-tooltip
-              class="item"
+              class="item record"
               effect="dark"
               :content="scope.row.disableReasons"
               placement="right-start"
@@ -707,7 +706,7 @@ export default {
   display: none;
 }
 
-/deep/.el-pagination{
+/deep/.el-pagination {
   text-align: center;
 }
 .ws-info-table {
@@ -721,6 +720,8 @@ export default {
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   text-align: center;
   background: #f6f7fc;
+  color: #8890b1;
+  font-size: 12px;
 }
 
 /deep/.ws-info-table .el-form-item.company,
@@ -741,10 +742,33 @@ export default {
 /deep/.el-table .el-table__body .cell {
   text-align: center;
 }
+.el-table th.is-leaf,
+.el-table td {
+  border-right: 1px solid #eee;
+}
 .el-button--text {
   color: #5878e8;
 }
 .el-button--primary {
   background: #5878e8;
 }
+//操作按钮
+.record,
+.adjustment {
+  display: inline-block;
+  color: #5878e8;
+  padding: 0 4px !important;
+  position: relative;
+  font-size: 14px;
+}
+.record:after {
+  position: absolute;
+  content: '';
+  display: block;
+  top: 9px;
+  right: -7px;
+  width: 1px;
+  height: 12px;
+  background: #e9ecf7;
+}
 </style>

src/views/tranManagement/tranManagementDriverEdit.vue

@@ -92,7 +92,6 @@
         <span v-if="age && age > 60" class="big">{{ age }}岁</span>
       </div>
     </ws-form>
-
     <ws-form
       ref="deptBudgetList"
       :rules="mainReportAdd"

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -10,8 +10,12 @@
         <ws-button class="but" @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
-      <template slot="left">
-        <ws-date-picker
+      <template slot="right">
+        <div>
+          <span style="display: inline-block; width: 300px; color: #8890B1;">接单日期</span>
+        </div>
+         
+        <!-- <ws-date-picker
           v-model="deptBudgetList.inOutDate"
           type="date"
           placeholder="请选择开始日期"
@@ -23,7 +27,18 @@
           type="date"
           placeholder="请选择结束日期"
           value-format="yyyy-MM-dd"
-        />
+        /> -->
+        <el-date-picker
+          v-model="deptBudgetList.inOutDate"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+         
+        >
+        </el-date-picker>
         <ws-input
           v-model="searchKeyWord"
           placeholder="可按照合同编号、买方名称、卖方名称进行查找"

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -1,7 +1,7 @@
 //火运调度
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="20">
+    <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
         <ws-button class="but" type="primary" @click="statusquery(1)">
           执行中</ws-button
@@ -10,9 +10,12 @@
         <ws-button class="but" @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
-      <template slot="left">
-         <span style="display: inline-block; width: 300px;color: #8890B1;">接单日期</span>
-        <ws-date-picker
+      <template slot="right">
+        <div>
+           <span style="display: inline-block; width: 300px;color: #8890B1;">接单日期</span>
+        </div>
+ 
+        <!-- <ws-date-picker
           v-model="deptBudgetList.inOutDate"
           type="date"
           placeholder="请选择开始日期"
@@ -24,7 +27,17 @@
           type="date"
           placeholder="请选择结束日期"
           value-format="yyyy-MM-dd"
-        />
+        /> -->
+         <el-date-picker
+          v-model="deptBudgetList.inOutDate"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
         <ws-input
           v-model="searchKeyWord"
           placeholder="可按照合同编号、买方名称、卖方名称进行查找"
@@ -33,6 +46,7 @@
           type="input"
           class="findValue"
         ></ws-input>
+
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
         <ws-button class="find" type="primary" @click="find()"
           ><img

src/views/tranManagement/tranManagementVehicle.vue

@@ -1,7 +1,7 @@
 //汽运调度
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="20">
+    <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
         <ws-button class="but" type="primary" @click="statusquery(1)">
           执行中</ws-button
@@ -10,9 +10,12 @@
         <ws-button class="but" @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
-      <template slot="left">
-        <span style="display: inline-block; width: 290px;color: #8890B1;">接单日期</span>
-        <ws-date-picker
+      <template slot="right">
+        <div>
+          <span style="display: inline-block; width: 300px;color: #8890B1;">接单日期</span>
+        </div>
+        
+        <!-- <ws-date-picker
           v-model="deptBudgetList.inOutDate"
           type="date"
           placeholder="请选择开始日期"
@@ -24,7 +27,18 @@
           type="date"
           placeholder="请选择结束日期"
           value-format="yyyy-MM-dd"
-        />
+        /> -->
+        <el-date-picker
+          v-model="deptBudgetList.inOutDate"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+
+        >
+        </el-date-picker>
         <ws-input
           v-model="searchKeyWord"
           placeholder="可按发货人、收货人、任务编号查找"
@@ -539,6 +553,7 @@ export default {
 }
 .but {
   margin-top: 150px;
+  margin-left: 110px;
 }
 .el-input--small .el-input__inner {
   margin-left: 20px;

src/views/warehouse/warehouseManagementList.vue

@@ -168,7 +168,7 @@
               style="height: 24px"
               v-for="(item, i) in scope.row.warehouseNumViewList"
             >
-               {{ item.goodsName}}({{item.inNetWeight}})
+               {{ item.goodsName}}({{item.inNetWeight == null ? 0 : item.inNetWeight}})
             </div>
           </template>
         </el-table-column>
@@ -178,7 +178,7 @@
               style="height: 24px"
               v-for="(item, i) in scope.row.warehouseNumViewList"
             >
-             {{ item.goodsName}}({{item.outNetWeight}})
+             {{ item.goodsName}}({{item.outNetWeight == null ? 0:item.outNetWeight}})
             </div>
           </template>
         </el-table-column>
@@ -187,8 +187,8 @@
             <div
               style="height: 24px"
               v-for="(item, i) in scope.row.warehouseNumViewList"
-            >
-              {{ item.inNetWeight - item.outNetWeight }}
+            >{{ item.goodsName}}
+             ({{ item.inNetWeight - item.outNetWeight }}) 
 
               {{item.storage }}
             </div>

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/',