前端sdy

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -454,8 +454,13 @@ export default {
           tmp[2]=TextToCode[this.warehouseList[i].warehousePrivate][this.warehouseList[i].warehouseCity][this.warehouseList[i].warehouseArea].code
           this.selectedOptions=tmp
           this.deptBudgetList.tranProcessInfoList[0].selectedOptions=tmp
+<<<<<<< HEAD
           this.deptBudgetList.startDetailedAddress =  this.warehouseList[i].detailedAddress
           this.deptBudgetList.tranProcessInfoList[0].sendDetailedAddress = this.deptBudgetList.startDetailedAddress
+=======
+          this.$set(this.deptBudgetList,'startDetailedAddress',this.warehouseList[i].detailedAddress)
+          this.$set(this.deptBudgetList.tranProcessInfoList[0],'sendDetailedAddress',this.warehouseList[i].detailedAddress)
+>>>>>>> e6daec5cb47b44b717d48840c4539dc5d238525f
         }
       }
     },
@@ -467,7 +472,7 @@ export default {
           tmp[1]=TextToCode[this.warehouseList1[i].warehousePrivate][this.warehouseList1[i].warehouseCity].code
           tmp[2]=TextToCode[this.warehouseList1[i].warehousePrivate][this.warehouseList1[i].warehouseCity][this.warehouseList1[i].warehouseArea].code
           this.selectedOptions1=tmp
-          this.deptBudgetList.endDetailedAddress=this.warehouseList1[i].detailedAddress
+          this.$set(this.deptBudgetList,'endDetailedAddress',this.warehouseList1[i].detailedAddress)
         }
       }
     },

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -323,7 +323,7 @@ export default {
       ) {
         text = '相同任务编号的任务将一并删除且不可恢复，是否确定删除？'
       } else {
-        text = `运输任务删除后不可恢复，是否确定删除？`
+        text = `任务删除后不可恢复，是否确定删除？`
       }
       //cancelButtonClass: "btn-custom-cancel"
       this.$confirm(text, {
@@ -613,7 +613,7 @@ export default {
   display: block;
   top: 5px;
   right: -2px;
-  width: 1px;
+  // width: 1px;
   height: 12px;
   background: #e9ecf7;
 }

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -320,7 +320,7 @@
           <el-form-item label="货名" class="huom">
             <el-select
             :disabled='dataList.taskTypeKey != 3'
-              v-model="dataList1.goodsName"
+              v-model="dataList.goodsName"
               placeholder="货名"
               class="huom"
               @change="selectgoodsName1"

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -89,27 +89,68 @@
               <div class="catNos" v-show="item.temporaryDriverFlag == 0">司机-{{index+1}}</div>
               <div class="catNos catNosCor" v-show="item.temporaryDriverFlag != 0">司机-{{index+1}}(临)</div>
               <!--姓名-->
-              <ws-form-item label="姓名：" span="1" prop="driver">
+              <ws-form-item
+                label="姓名："
+                span="1"
+                prop="driver"
+                v-show="item.temporaryDriverFlag == 0"
+              >
                 <span v-show="item.temporaryDriverFlag == 0">{{ item.driver }}</span>
               </ws-form-item>
-               <el-divider direction="vertical" class="line"></el-divider>
-              <!--电话-->
-              <ws-form-item label="电话：" span="1" prop="driverPhone">
+              <!-- 姓名 -->
+              <ws-form-item
+                label="姓名："
+                span="1"
+                prop="driver"
+                v-show="item.temporaryDriverFlag != 0"
+              >
+                <!-- <el-input
+                  v-show="item.temporaryDriverFlag != 0"
+                  v-model="item.driver"
+                  filterable
+                  :filter-method="dataFilter"
+                  @change="selectstaff"
+                >
+                  <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.staffName"
+                    :value="item.staffName"
+                  />
+                </el-input>-->
+                <span v-show="item.temporaryDriverFlag != 0">{{item.driver}}</span>
+              </ws-form-item>
+              <el-divider direction="vertical" class="line"></el-divider>
+              <!-- 电话 -->
+              <ws-form-item label="司机电话：" span="1" prop="driverPhone">
+                <!-- <ws-input
+                  v-show="item.temporaryDriverFlag != 0"
+                  v-model="item.driverPhone"
+                  maxlength="20"
+                  size="small"
+                />-->
+                <span v-show="item.temporaryDriverFlag != 0">{{ item.driverPhone }}</span>
                 <span v-show="item.temporaryDriverFlag == 0">{{ item.driverPhone }}</span>
               </ws-form-item>
-               <el-divider direction="vertical" class="line"></el-divider>
+              <el-divider direction="vertical" class="line"></el-divider>
               <!--车牌号-->
               <ws-form-item label="车牌号：" span="1" prop="carNo">
+                <!-- <ws-input
+                  v-show="item.temporaryDriverFlag != 0"
+                  v-model="item.carNo"
+                  maxlength="20"
+                  size="small"
+                />-->
+                <span v-show="item.temporaryDriverFlag != 0">{{ item.carNo }}</span>
                 <span v-show="item.temporaryDriverFlag == 0">{{ item.carNo }}</span>
               </ws-form-item>
-               <el-divider direction="vertical" class="line"></el-divider>
+
+              <el-divider direction="vertical" class="line"></el-divider>
               <!--装车净重-->
-              <ws-form-item label="装车(吨)：" span="1" prop="loadNetWeight">
-                {{item.loadNetWeight}}
-              </ws-form-item>
-               <el-divider direction="vertical" class="line"></el-divider>
+              <ws-form-item label="装车(吨)：" span="1" prop="loadNetWeight">{{item.loadNetWeight}}</ws-form-item>
+              <el-divider direction="vertical" class="line"></el-divider>
               <!--卸车净重(吨)-->
-              <ws-form-item label="卸车净重(吨)：" span="1" prop="unloadNetWeight">
+              <ws-form-item label="卸车净重(吨):" span="1" prop="unloadNetWeight">
                 <ws-input
                   v-model="item.unloadNetWeight"
                   placeholder="请输入卸车净重"
@@ -117,33 +158,34 @@
                   size="small"
                 />
               </ws-form-item>
-               <el-divider direction="vertical" class="line"></el-divider>
+              <el-divider direction="vertical" class="line"></el-divider>
               <!--磅单-->
               <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
-              <template slot-scope="scope">
-                <el-upload
-                  action="https://www.zthymaoyi.com/upload/admin"
-                  :show-file-list="false"
-                  :on-success="
+                <template slot-scope="scope">
+                  <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="
+                    class="avatar-uploader"
+                    accept=".jpg, .jpeg, .png, .gif"
+                  >
+                    <img
+                      width="18"
+                      height="20"
+                      style="
                       vertical-align: text-top;
                       position: relative;
                     "
-                    src="../../../public/img/fujian.png"
-                    alt=""
-                  />
-                </el-upload>
-              </template>
-            </ws-form-item>
+                      src="../../../public/img/fujian.png"
+                      alt
+                    />
+                  </el-upload>
+                </template>
+              </ws-form-item>
             </ws-info-table>
           </div>
           <div
@@ -160,7 +202,7 @@
 <script>
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import { seeCat, packList, feedback,getbank } from '@/model/transport/index'
+import { seeCat, packList, feedback, getbank } from '@/model/transport/index'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
 import { dayjs, EventBus } from 'base-core-lib'
 export default {
@@ -229,7 +271,9 @@ export default {
     total: function() {
       var maxStorage = 0
       for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-        maxStorage += Number(this.deptBudgetList.tranCarInfoList[i].unloadNetWeight)
+        maxStorage += Number(
+          this.deptBudgetList.tranCarInfoList[i].unloadNetWeight
+        )
       }
       return maxStorage
     }
@@ -252,7 +296,7 @@ export default {
       const that = this
       getbank({ bankImg: e.url })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           for (var i = 0; i < this.freightspace1.length; i++) {
             if (i == index) {
               this.freightspace1[i].payeeAddressUrl = e.url
@@ -518,14 +562,14 @@ export default {
   background: #f5f7fa;
   border-radius: 4px;
   color: #8890b1;
-  font-size: 12px;
+  font-size: 14px;
   font-weight: 400;
 }
 /deep/.driver .ws-info-table .el-form-item .el-form-item__label {
   width: 72px;
 }
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 14.66%;
+  width: 15.66%;
   color: #8890b1;
   font-size: 14px;
 }
@@ -534,7 +578,7 @@ export default {
   height: 50px;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width:55%;
+  width: 53.46%;
   border: 0px solid #d8dce6;
   background: #f5f7fa;
   text-align: center;
@@ -610,22 +654,24 @@ export default {
   overflow: scroll;
   height: 93vh;
 }
-.line{
+.line {
   height: 26px;
   margin-top: 6px;
   left: 2px;
+  margin: 0 auto;
 }
-/deep/.ws-info-table .el-form-item .el-form-item__label {
+/deep/.ws-info-table.el-form-item .el-form-item__label {
     // background-color: #eee;
     // padding-right: 8px;
     // padding-left: 8px;
-    // width: 100px;
-    font-size: 12px;
+    font-size: 13px;
     font-weight: bold;
     // color: #333;
     // overflow: hidden;
-    // text-overflow: ellipsis;
-    white-space: nowrap;
+    // height: 40px;
+    /* text-overflow: ellipsis; */
+    // white-space: nowrap;
+    // width: 120px;
     // line-height: 40px;
 }
 </style>

src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -105,6 +105,9 @@
             <ws-form-item label="姓名:" span="1" prop="driver" v-show="freightspace[index].temporaryDriverFlag == 0">
               <span>{{ item.driver }} </span>
             </ws-form-item>
+            <ws-form-item label="姓名：" span="1" prop="driver" v-show="freightspace[index].temporaryDriverFlag != 0">
+              <span>{{ item.driver }}</span>
+            </ws-form-item>
            <el-divider direction="vertical" class="line"></el-divider>
             <!--电话-->
             <ws-form-item label="电话:" span="1" prop="driverPhone">

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -795,15 +795,15 @@ export default {
 }
 .biao2{
   margin-left: 441px;
-  margin-top: -57px;
+  margin-top: -59px;
 }
 .biao3{
    margin-left: 722px;
-  margin-top: -57px;
+  margin-top: -60px;
 }
 .biao4{
   margin-left: 1016px;
-  margin-top: -57px;
+  margin-top: -60px;
 }
 .biao5{
   margin-left: 200px;

src/views/tranManagement/tranManagementShippingLook.vue

@@ -20,7 +20,7 @@
     <div class="center">
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
         <div class="basicInformation">
-          <div class="small-title">任务详情</div>
+          <div class="small-title" style="font-size: 16px;">任务详情</div>
           <ws-info-table>
             <!-- 任务编号 -->
             <ws-form-item label="任务编号" span="1" prop="processNo">{{ deptBudgetList.processNo }}</ws-form-item>
@@ -75,7 +75,7 @@
             <!--合同编号-->
             <ws-form-item label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
           </ws-info-table>
-          <div class="small-title">联络员及航次</div>
+          <div class="small-title" style="font-size: 16px">联络员及航次</div>
           <div
             style="width: 100% "
             class="flex position middle"
@@ -488,7 +488,7 @@ export default {
   font-family: PingFangSC-Regular, PingFang SC;
   margin-bottom: 5px;
   background-color: #fff;
-  font-size: 12px;
+  font-size: 13px;
   font-weight: 400;
   color: #8890b1;
   line-height: 16px;
@@ -535,7 +535,7 @@ export default {
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   // background-color: #f5f7fa;
-  font-size: 12px;
+  font-size: 13px;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #8890b1;
@@ -553,7 +553,7 @@ export default {
 /deep/.position .ws-info-table .el-form-item .el-form-item__label {
   background-color: #f5f7fa;
   // text-align: center;
-  width: 48%;
+  width: 51%;
 }
 .middle {
   background: #f6f7fc;
@@ -581,5 +581,6 @@ export default {
 }
 /deep/.cangno .ws-info-table .el-form-item .el-form-item__content {
   border: none;
+  
 }
 </style>

src/views/warehouse/component/router/index.js

@@ -243,7 +243,23 @@ const warehouseManagementRouter = {
         // module: 'procurement.sparepart.applDetail'
       },
       hidden: true
-    },                        
+    }, 
+    // 出入库任务列表
+    {
+      path: 'tranManagementWarehouseInOutTask',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTask'),
+      name: 'tranManagementWarehouseInOutTask',
+      meta: {
+        title: 'tranManagementWarehouseInOutTask',
+        shortcutEntrance: 'tranManagementWarehouseInOutTask',
+        module: 'warehouseManagement.warehouse.warehouseInfoTask',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden: true
+    },                                     
   ],
 };
 export default warehouseManagementRouter;

src/views/warehouse/warehouseManagementList.vue

@@ -492,7 +492,7 @@ export default {
     },
     //任务
     handlTask(){
-      this.$router.push({ path: 'warehouseManagementPutOut' })
+      this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
     },
     dateFormat(fmt, date) {
       let ret