前端 司机样式及部分Bug修改

src/views/contractManagement/salesContractEdit.vue

@@ -451,7 +451,7 @@
           </ws-form-item>
 
           <!--已开发票（元）-->
-          <ws-form-item label="已开发票（元）" span="1" prop="contractNo">
+          <ws-form-item label="已开发票（元）" span="1" prop="goodsName">
             <ws-input
               v-model="deptBudgetList.contractProcessInfo.goodsName"
               placeholder="请输入已开发票（元））"

src/views/tranManagement/tranManagementDriverAdd.vue

@@ -106,7 +106,27 @@
         v-for="(item, index) in freightspace"
       >
         <div class="trucks">
-          <div class="driver">货车信息-{{ index + 1 }}</div>
+          <div class="driver">
+            <span class="driver">货车信息-{{ index + 1 }}</span>
+            
+            <img
+              width="22"
+              height="22"
+              class="add"
+              @click="add"
+              src="../../../public/img/add.png"
+              alt=""
+            />
+            <img
+              width="22"
+              height="22"
+              class="del"
+              @click="del(index)"
+              src="../../../public/img/del.png"
+              alt=""
+            />
+          </div>
+
           <ws-info-table class="el-table">
             <!--车牌号-->
             <ws-form-item
@@ -188,22 +208,6 @@
               />
             </ws-form-item>
           </ws-info-table>
-          <img
-            width="22"
-            height="22"
-            class="add"
-            @click="add"
-            src="../../../public/img/add.png"
-            alt=""
-          />
-          <img
-            width="22"
-            height="22"
-            class="del"
-            @click="del(index)"
-            src="../../../public/img/del.png"
-            alt=""
-          />
         </div>
       </div>
     </ws-form>
@@ -219,7 +223,25 @@
         v-for="(item, index) in freightspace1"
       >
         <div class="gathering">
-          <div class="driver">收款人账户信息-{{ index + 1 }}</div>
+          <div class="driver">
+        收款人账户信息-{{ index + 1 }}
+            <img
+              width="22"
+              height="22"
+              class="add"
+              @click="add1"
+              src="../../../public/img/add.png"
+              alt=""
+            />
+            <img
+              width="22"
+              height="22"
+              class="del"
+              @click="del1(index)"
+              src="../../../public/img/del.png"
+              alt=""
+            />
+          </div>
           <ws-info-table class="el-table">
             <!--账户类型-->
             <ws-form-item
@@ -375,22 +397,6 @@
               </ws-select>
             </ws-form-item>
           </ws-info-table>
-          <img
-            width="22"
-            height="22"
-            class="add"
-            @click="add1"
-            src="../../../public/img/add.png"
-            alt=""
-          />
-          <img
-            width="22"
-            height="22"
-            class="del"
-            @click="del1(index)"
-            src="../../../public/img/del.png"
-            alt=""
-          />
         </div>
       </div>
     </ws-form>
@@ -978,16 +984,21 @@ export default {
 <style lang="scss" scoped>
 .position {
   position: relative;
+  background: #f6f7fc;
+  height: 124px;
+  margin-top: 20px;
+  border: 1px solid #D8DCE6;
+  border-radius: 3px;
 }
 .add,
 .del {
   position: absolute;
-  right: -38px;
-  top: 9px;
+  top: 10px;
   cursor: pointer;
+  margin-left: 17px;
 }
 .del {
-  right: -70px;
+  margin-left: 50px;
 }
 .amap-page-container {
   width: 300px;
@@ -1098,7 +1109,9 @@ export default {
   height: 93vh;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 80px;
+  // width: 110px;
+  width: 40%;
+  text-align: center;
 }
 /deep/.ws-info-table .el-form-item {
   width: 25%;
@@ -1125,20 +1138,28 @@ export default {
   width: 20%;
 }
 .el-form-item.el-car.el-form-item--small {
-  width: 33.3%;
+  width: 33.33%;
+  border-top: 1px solid #D8DCE6;
+  border-bottom: 0px;
+  background: #F6F7FC;
 }
 .trucks {
   color: #69708c;
   border: 1px solid #d8dce6;
-  width: 90%;
   padding: 12px;
   border-radius: 3px;
   margin: 10px 0;
+  border: 0px;
+  font-size: 14px;
+  color: #8890b1;
+  width: 100%;
 }
 /deep/.trucks .ws-info-table,
 /deep/.trucks .ws-info-table .el-form-item,
 /deep/.trucks .ws-info-table .el-form-item .el-form-item__content {
   border: none;
+  background: #f6f7fc;
+  border-radius: 4px;
 }
 /deep/.trucks .el-table__expanded-cell,
 /deep/.trucks .ws-info-table .el-form-item .el-form-item__label,
@@ -1153,28 +1174,34 @@ export default {
 }
 .gathering {
   background: #f5f7fa;
-  border: 1px solid #d8dce6;
-  border-radius: 3px;
-  width: 90%;
+  
 }
 /deep/.gathering .ws-info-table {
   border-left: none;
-  border-top: 1px solid #d8dce6;
+  border: none;
 }
 /deep/.gathering .driver {
   padding: 10px;
 }
+.driver {
+  color: #5473e8;
+  line-height: 20px;
+  font-size: 14px;
+}
 /deep/.gathering .el-form-item .el-form-item__label {
   background: #f5f7fa;
   text-align: center;
+  border-right: 1px solid #D8DCE6;
+  width: 140px;
 }
 /deep/.gathering .ws-info-table .el-form-item .el-form-item__content {
-  border-left: 1px solid #d8dce6;
+  border:none;
+  background: #F6F7FC;
 }
 /deep/.gathering .ws-info-table .el-form-item.compname,
 /deep/.gathering .ws-info-table .el-form-item.bankDeposit,
 /deep/.gathering .ws-info-table .el-form-item.bankDeposit1 {
-  border-right: 1px solid transparent;
+  border:none;
 }
 /deep/.gathering .ws-info-table .el-form-item.compname {
   width: 100%;

src/views/tranManagement/tranManagementDriverEdit.vue

@@ -105,7 +105,24 @@
         v-for="(item, index) in deptBudgetList.driverCarInfoList"
       >
         <div class="trucks">
-          <div class="driver">货车信息-{{ index + 1 }}</div>
+          <div class="driver">货车信息-{{ index + 1 }}
+             <img
+            width="22"
+            height="22"
+            class="add"
+            @click="add"
+            src="../../../public/img/add.png"
+            alt=""
+          />
+          <img
+            width="22"
+            height="22"
+            class="del"
+            @click="del(item, index)"
+            src="../../../public/img/del.png"
+            alt=""
+          />
+          </div>
           <ws-info-table class="el-table">
             <!--车牌号-->
             <ws-form-item
@@ -192,22 +209,7 @@
               />
             </ws-form-item>
           </ws-info-table>
-          <img
-            width="22"
-            height="22"
-            class="add"
-            @click="add"
-            src="../../../public/img/add.png"
-            alt=""
-          />
-          <img
-            width="22"
-            height="22"
-            class="del"
-            @click="del(item, index)"
-            src="../../../public/img/del.png"
-            alt=""
-          />
+         
         </div>
       </div>
     </ws-form>
@@ -223,7 +225,24 @@
         v-for="(item, index) in deptBudgetList.driverPayeeInfoList"
       >
         <div class="gathering">
-          <div class="driver">收款人账户信息-{{ index + 1 }}</div>
+          <div class="driver">收款人账户信息-{{ index + 1 }}
+             <img
+            width="22"
+            height="22"
+            class="add"
+            @click="add1"
+            src="../../../public/img/add.png"
+            alt=""
+          />
+          <img
+            width="22"
+            height="22"
+            class="del"
+            @click="del1(item, index)"
+            src="../../../public/img/del.png"
+            alt=""
+          />
+          </div>
           <ws-info-table class="el-table">
             <!--账户类型-->
             <ws-form-item
@@ -379,22 +398,7 @@
               </ws-select>
             </ws-form-item>
           </ws-info-table>
-          <img
-            width="22"
-            height="22"
-            class="add"
-            @click="add1"
-            src="../../../public/img/add.png"
-            alt=""
-          />
-          <img
-            width="22"
-            height="22"
-            class="del"
-            @click="del1(item, index)"
-            src="../../../public/img/del.png"
-            alt=""
-          />
+         
         </div>
       </div>
     </ws-form>
@@ -883,12 +887,12 @@ export default {
 .add,
 .del {
   position: absolute;
-  right: -38px;
-  top: 9px;
+ margin-left: 23px;
+  top: 27px;
   cursor: pointer;
 }
 .del {
-  right: -70px;
+  margin-left: 70px;
 }
 .el-form {
   padding: 0 10%;
@@ -935,7 +939,6 @@ export default {
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   padding: 0 25px;
   border-left: 1px solid #cdd2dc;
-  background: #fafbfc;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   width: 140px;
@@ -1010,9 +1013,6 @@ export default {
 .el-form-item__label {
   text-align: center;
 }
-.el-table {
-  width: 1240px;
-}
 .ce {
   width: 900px;
   margin: 0 auto;
@@ -1062,15 +1062,16 @@ export default {
   width: 20%;
 }
 .el-form-item.el-car.el-form-item--small {
-  width: 33.3%;
+  width: 33.333%;
 }
 .trucks {
   color: #69708c;
   border: 1px solid #d8dce6;
-  width: 90%;
+  width: 100%;
   padding: 12px;
   border-radius: 3px;
   margin: 10px 0;
+  background: #F6F7FC;
 }
 /deep/.trucks .ws-info-table,
 /deep/.trucks .ws-info-table .el-form-item,
@@ -1080,7 +1081,7 @@ export default {
 /deep/.trucks .el-table__expanded-cell,
 /deep/.trucks .ws-info-table .el-form-item .el-form-item__label,
 /deep/.trucks .ws-info-table .el-form-item .el-form-item__content {
-  background: transparent;
+  background: #F6F7FC;
 }
 /deep/.trucks .ws-info-table .el-form-item .el-form-item__label {
   color: #8890b1;
@@ -1092,7 +1093,8 @@ export default {
   background: #f5f7fa;
   border: 1px solid #d8dce6;
   border-radius: 3px;
-  width: 90%;
+  width: 100%;
+  margin-top: 15px;
 }
 /deep/.gathering .ws-info-table {
   border-left: none;
@@ -1162,7 +1164,7 @@ export default {
   line-height: 16px;
   position: absolute;
   right: -50px;
-  top: 44px;
+  top: 6px;
   border: 1px solid #ccc;
   padding: 5px 10px;
   border-radius: 20px;

src/views/tranManagement/tranManagementDriverLook.vue

@@ -33,13 +33,7 @@
             prop="contractNo"
             class="readonly bg-right"
           >
-            <ws-input
-              disabled
-              v-model="deptBudgetList.driverName"
-              placeholder="请输入司机姓名"
-              maxlength="20"
-              size="small"
-            />
+            {{deptBudgetList.driverName}}
           </ws-form-item>
           <!--手机号-->
           <ws-form-item
@@ -48,13 +42,7 @@
             prop="driverPhone"
             class="readonly"
           >
-            <ws-input
-              disabled
-              v-model="deptBudgetList.driverPhone"
-              placeholder="请输入手机号"
-              maxlength="100"
-              size="small"
-            />
+            {{deptBudgetList.driverPhone}}
           </ws-form-item>
 
           <!--常驻城市-->
@@ -70,13 +58,7 @@
             prop="driverNo"
             class="readonly"
           >
-            <ws-input
-              disabled
-              v-model="deptBudgetList.numberCard"
-              placeholder="请输入身份证号"
-              maxlength="100"
-              size="small"
-            />
+            {{deptBudgetList.numberCard}}
           </ws-form-item>
         </ws-info-table>
         <span v-if="age && age < 60" class="small">{{ age }}岁</span>
@@ -550,7 +532,7 @@ export default {
   background: #f5f7fa;
   color: #69708c;
   border: 1px solid #d8dce6;
-  width: 90%;
+  width: 100%;
   padding: 12px;
   border-radius: 3px;
 }
@@ -564,8 +546,8 @@ export default {
   background: #f5f7fa;
   border: 1px solid #d8dce6;
   border-radius: 3px;
-  width: 90%;
-  border-bottom: 1px solid transparent;
+  border-bottom: 1px solid #d8dce6;
+  height: 125px;
 }
 /deep/.gathering .ws-info-table {
   border-left: none;
@@ -615,6 +597,7 @@ export default {
 }
 .drivermessage .ws-info-table {
   border: none;
+  width: 100%;
 }
 /deep/.drivermessage .ws-info-table .el-form-item__label {
   background: #fff;
@@ -622,14 +605,16 @@ export default {
 }
 /deep/.drivermessage .ws-info-table .el-form-item__content,
 /deep/.drivermessage .ws-info-table .el-form-item {
-  border: none;
+  background: #F5F7FA;
+border-radius: 5px;
+border: none;
 }
 .small,
 .big {
   color: #ccc;
   line-height: 16px;
   position: absolute;
-  right: -50px;
+  right: -60px;
   top: 5px;
   border: 1px solid #ccc;
   padding: 5px 10px;

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -176,7 +176,17 @@
             <!--磅单-->
             <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
               <template slot-scope="scope">
-                <img
+                <el-upload
+                action="https://www.zthymaoyi.com/upload/admin"
+                :show-file-list="false"
+                :on-success="
+                  (res, file) => {
+                    uploadSuccessHandle1(index, res, file)
+                  }
+                "
+                class="avatar-uploader"
+                accept=".jpg, .jpeg, .png, .gif"
+                ><img
                   width="18"
                   height="20"
                   style="
@@ -185,9 +195,9 @@
                     top: -1px;
                   "
                   src="../../../public/img/fujian.png"
-                  @click="fujian(scope.row)"
                   alt=""
                 />
+              </el-upload>
                 <div v-show="item.temporaryDriverFlag == 0">
                   {{ item.signStatus }}
                 </div>
@@ -254,7 +264,7 @@
 </template>
 <script>
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { seeCat, packList, feedback } from '@/model/transport/index'
+import { seeCat, packList, feedback ,getbank} from '@/model/transport/index'
 import { getstaff } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
@@ -309,6 +319,17 @@ export default {
       size: 10,
       value1: '',
       unitList: [],
+      freightspace1: [
+        {
+          accountTypeFlag: '1',
+          payeeName: '',
+          payeeNumberCard: '',
+          compName: '',
+          bankDeposit: '',
+          addressUrlArray: [],
+          bankCard: '',
+        },
+      ],
       freightspace: [
         {
           driver: '',
@@ -584,21 +605,39 @@ 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
+    uploadSuccessHandle1(index, e, fileList) {
+      console.log(index, e, fileList)
+      const that = this
+      // this.deptBudgetList.cardAddressUrl = e.url
+      getbank({ bankImg: e.url })
+        .toPromise()
+        .then((response) => {
+          for (var i = 0; i < this.freightspace1.length; i++) {
+            if (i == index) {
+              this.freightspace1[i].payeeAddressUrl = e.url
+              this.freightspace1[i].bankCard = response.bankNo
+              this.freightspace1[i].bankDeposit = response.bankName
+              this.freightspace1[i].bankDepositBranchList =
+                response.bankNameZhihang
+            }
+          }
+        })
     },
+    //上传
+    // fujian(row) {
+    //   if (
+    //     row.receiveAttachmentPath === null ||
+    //     row.receiveAttachmentPath === ''
+    //   ) {
+    //     EventBus.$emit(
+    //       'warning',
+    //       this.$t('system.noticeCircular.NoInformation')
+    //     )
+    //   } else {
+    //     this.accessoryTFs = true
+    //   }
+    //   this.appendixIdss = row.receiveAttachmentPath
+    // },
   },
 }
 </script>

src/views/tranManagement/tranManagementTransporFeedbackLook.vue

@@ -86,8 +86,8 @@
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
         <!-- 运输方式 -->
-        <ws-form-item label="运输方式" span="1" prop="contractNo">
-          {{ deptBudgetList.contractNo }}
+        <ws-form-item label="运输方式" span="1" prop="tranType">
+          {{ deptBudgetList.tranType }}
         </ws-form-item>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px;">装车详情</div>

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -198,6 +198,7 @@ export default {
       contractType: 2,
       tranTypeKey: 2,
       searchType: 1,
+      searchTypeOne : 1,
       // 提交类型
       submitType: true,
       size: 10,
@@ -291,7 +292,7 @@ export default {
       })
     },
      statusquery(status){
-      this.searchType = status
+      this.searchTypeOne = status
       this.getList()
     },
     dateFormat(fmt, date) {
@@ -333,7 +334,7 @@ export default {
       automobileList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         contractType: this.contractType,
-          searchType: this.searchType,
+          searchTypeOne :this.searchTypeOne,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
       })

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -193,7 +193,6 @@
           </div>
         </ws-info-table> 
       </div>
-      
       <el-button class="add bg-bottom" type="primary" size="small" @click="add">
         <img
           width="22"
@@ -448,7 +447,6 @@ export default {
                 this.arr.push(num)
               }
               this.deptBudgetList.totalStorage = this.totalStorage
-
               this.tranCarInfoList.driver = this.deptBudgetList.driver
               this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
               this.tranCarInfoList.sendDateStart =

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -432,7 +432,6 @@ export default {
             }
           }
           this.deptBudgetList = response
-          console.log(this.deptBudgetList.tranCarInfoList, '集合')
           if (this.deptBudgetList.tranCarInfoList.length == 0) {
             this.deptBudgetList.tranCarInfoList = [
               {

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.115:8090/',
+        target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',