前端孟祥旭

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -25,10 +25,10 @@
         <el-radio label="4">退库并出库</el-radio>-->
       </el-radio-group>
       <div class="nav">
-      <span class="ziti">
-        任务类型：
-        <h1 class="ziti1">{{dataList.inOutType}}</h1>
-      </span>
+        <span class="ziti">
+          任务类型：
+          <h1 class="ziti1">{{dataList.inOutType}}</h1>
+        </span>
       </div>
       <div class="nav2"></div>
       <div v-if="dataList.taskTypeKey != 2" class="center1">
@@ -912,27 +912,27 @@ export default {
   background: #e8ecf6;
   margin-top: 15px;
 }
-.ziti[data-v-492ee0c6] {
-    width: 72px;
-    height: 20px;
-    font-size: 14px;
-    font-family: PingFangSC-Regular, PingFang SC;
-    font-weight: 400;
-    color: #8890b1;
-    line-height: 20px;
-    margin-left: 130px;
-    /* margin-top: 112px; */
+.ziti {
+  width: 72px;
+  height: 20px;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 20px;
+  margin-left: 130px;
+  /* margin-top: 112px; */
 }
 /deep/.ziti1 {
-    height: 40px;
-    font-size: 16px;
-    font-family: PingFangSC-Medium, PingFang SC;
-    font-weight: 500;
-    color: #262626;
-    line-height: 20px;
-    margin-left: 206px;
-    margin-top: -23px;
-    width: 100px;
+  height: 40px;
+  font-size: 16px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #262626;
+  line-height: 20px;
+  margin-left: 206px;
+  margin-top: -23px;
+  width: 100px;
 }
 .winseaview-view {
   padding: 0 0 20px;
@@ -960,7 +960,7 @@ export default {
   color: #232323;
   line-height: 14px;
 }
-.nav{
+.nav {
   width: 200px;
   height: 20px;
 }

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -29,7 +29,12 @@
         <el-radio label="3" class="a">移库</el-radio>
         <el-radio label="4" class="a">退库并出库</el-radio> -->
       </el-radio-group>
-        <span class="ziti">任务类型：<b><h1 class="ziti1">{{dataList.inOutType}}</h1></b></span>
+        <div class="nav">
+        <span class="ziti">
+          任务类型：
+          <h1 class="ziti1">{{dataList.inOutType}}</h1>
+        </span>
+      </div>
       </div>
       <div class="ding"></div>
        <div v-if="dataList.taskTypeKey != 2&&dataList.taskTypeKey != 4" class="center1">
@@ -1407,26 +1412,26 @@ export default {
   background: #E8ECF6;
   box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
 }
-.ziti{
-  width: 70px;
+.ziti {
+  width: 72px;
   height: 20px;
   font-size: 14px;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
-  color: #8890B1;
+  color: #8890b1;
   line-height: 20px;
-  margin-left: 80px;
-  margin-top: 5px;
+  margin-left: 130px;
+  /* margin-top: 112px; */
 }
-.ziti1{
-  font-size: 16px;
-  font-family: PingFangSC-Medium, PingFang SC;
-  font-weight: 500;
-  color: #262626;
-  line-height: 22px;
-  margin-left: 240px;
-  margin-top: -27px;
-
+.ziti1 {
+    width: 100px;
+    font-size: 16px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #262626;
+    line-height: 22px;
+    margin-left: 197px;
+    margin-top: -22px;
 }
 .winseaview-view {
   padding: 0 0 20px;
@@ -1435,4 +1440,8 @@ export default {
   overflow: scroll;
   height: 93vh;
 }
+.nav {
+  width: 200px;
+  height: 20px;
+}
 </style>

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -110,7 +110,7 @@
                 </span>
               </template>
           <div>
-              <p style="margin-top: 0; padding-left: 10px">XXXXX</p>
+              <p style="margin-top: 0; padding-left: 10px">历史记录</p>
               <div v-for="(item, index) in historyList" class="flex">
                 <div class="vertical-text vertical-text-left">
                   {{ item.updateDate }}

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -133,24 +133,36 @@
               </ws-form-item>
               <!--磅单-->
               <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
-                <template slot-scope="scope">
-                  <img
+              <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="
-                    vertical-align: text-top;
-                    position: relative;
-                    top: -1px;
-                  "
+                      vertical-align: text-top;
+                      position: relative;
+                    "
                     src="../../../public/img/fujian.png"
-                    @click="fujian(scope.row)"
-                    alt
+                    alt=""
                   />
-                  <span
-                    v-if="scope.row.loadPoundImgArray.length >0"
-                  >{{scope.row.loadPoundImgArray.length}}</span>
-                </template>
-              </ws-form-item>
+                </el-upload>
+                <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
+                  {{ item.signStatus }}
+                </div>
+                <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'" class="signStatus1">
+                  {{ item.signStatus }}
+                </div>
+              </template>
+            </ws-form-item>
             </ws-info-table>
           </div>
           <div
@@ -167,7 +179,7 @@
 <script>
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import { seeCat, packList, feedback } 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 {
@@ -235,7 +247,7 @@ export default {
     total: function() {
       var maxStorage = 0
       for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-        maxStorage == Number(this.deptBudgetList.tranCarInfoList[i].loadWeight)
+        maxStorage += Number(this.deptBudgetList.tranCarInfoList[i].unloadNetWeight)
       }
       return maxStorage
     }
@@ -254,15 +266,21 @@ export default {
         this.deptBudgetList.tranCarInfoList.splice(index, 1)
       }
     },
-    fujian(row) {
-      if (row.loadPoundImg === null || row.loadPoundImg === '') {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
+    uploadSuccessHandle1(index, e, fileList) {
+      const that = this
+      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
+            }
+          }
+        })
     },
     selectwaterContent() {},
     //提交按钮
@@ -294,6 +312,7 @@ export default {
               this.tranCarInfoList.loadNetWeight = this.deptBudgetList.loadNetWeight
               this.tranCarInfoList.tranType = this.tranType
               this.tranCarInfoList.loadPoundImg = this.deptBudgetList.loadPoundImg
+              this.tranCarInfoList.unloadNetWeight = this.deptBudgetList.unloadNetWeight
               for (var i = 0; i < this.tranCarInfoList.length; i++) {
                 this.tranCarInfoList[i].id = this.freightspace[i].id
                 if (this.tranCarInfoList[i].temporaryDriverFlag != 0) {

src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -764,6 +764,7 @@ export default {
   background: #F6F7FC;
 border-radius: 4px;
 border: 1px solid #D8DCE6;
+margin-top: 20px;
 }
 .catNos{
   width: 100%;

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -69,14 +69,15 @@
             <!--合同编号-->
             <ws-form-item label="合同编号" span="1" prop="contractNo">{{deptBudgetList.contractNo}}</ws-form-item>
           </ws-info-table>
+          <div class="small-title">联络员及航次</div>
           <div
             class="position siji"
-            v-for="(item,index) in deptBudgetList.tranCarInfoList"
-            :key="index+'siji'"
+            v-for="(item, index) in deptBudgetList.tranCarInfoList"
+            :key="index"
           >
-            <div class="small-title">联络员及航次</div>
             <div class="zhong">
               <ws-info-table>
+                -->
                 <!--姓名-->
                 <ws-form-item label="姓名" span="1" prop="driver" class="siji">
                   <el-select
@@ -103,7 +104,7 @@
                     maxlength="20"
                     size="small"
                   />
-                </ws-form-item>
+                </ws-form-item>-->
                 <!--发船日期-->
                 <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
                   <ws-date-picker
@@ -112,7 +113,7 @@
                     placeholder="请选择发货日期"
                     value-format="yyyy-MM-dd"
                   />
-                </ws-form-item>
+                </ws-form-item>-->
                 <!--预计到港日-->
                 <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
                   <ws-date-picker
@@ -121,7 +122,7 @@
                     placeholder="请选择发货日期"
                     value-format="yyyy-MM-dd"
                   />
-                </ws-form-item>
+                </ws-form-item>-->
                 <!-- 船名 -->
                 <ws-form-item label="船名" span="1" prop="shipName" class="siji">
                   <ws-input
@@ -130,11 +131,11 @@
                     maxlength="100"
                     size="small"
                   ></ws-input>
-                </ws-form-item>
+                </ws-form-item>-->
                 <!-- 航次 -->
                 <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
                   <ws-input v-model="item.shipNo" placeholder="请选择航次" maxlength="100" size="small"></ws-input>
-                </ws-form-item>
+                </ws-form-item>-->
                 <!-- 类型 -->
                 <ws-form-item label="类型" span="1" prop="shipType" class="siji">
                   <ws-select v-model="item.shipType" placeholder="请输入" class="typeselect">
@@ -161,29 +162,14 @@
               style="width: 530px"
               class="xia"
               v-for="(items, index) in freightspace"
-              :key="index"
               v-show="item.shipType=='散船'"
             >
               <ws-info-table>
-                <ws-form-item
-                  :label="'仓位号-'+ (index +1 )"
-                  span="1"
-                  prop="impurity"
-                  class="bot"
-                >
-                <el-input
-                  v-model="items.impurity"
-                ></el-input>
+                <ws-form-item :label="'仓位号-'+ (index +1 )" span="1" prop="impurity" class="bot">
+                  <el-input v-model="items.impurity"></el-input>
                 </ws-form-item>
-                <ws-form-item
-                  label="重量(吨)"
-                  span="1"
-                  prop="positionWeight"
-                  class="bot"
-                >
-                <el-input
-                  v-model="items.positionWeight"
-                ></el-input>
+                <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot">
+                  <el-input v-model="items.positionWeight"></el-input>
                 </ws-form-item>
                 <span
                   width="22"
@@ -194,7 +180,7 @@
                   alt
                 >X</span>
               </ws-info-table>
-            </div>
+            </div>-->
             <div>
               <el-button
                 class="add bg-bottom"
@@ -231,9 +217,9 @@ export default {
     Pagination
   },
   watch: {
-    // vesselId(val) {
-    //   this.getList()
-    // },
+    vesselId(val) {
+      this.getList()
+    },
     isShow(val) {
       this.showType = val
     }
@@ -475,14 +461,14 @@ export default {
         }
         if (!this.deptBudgetList.tranCarInfoList[i].impurity) {
           this.$message({
-            message:'仓位号不能为空',
+            message: '仓位号不能为空',
             type: 'warning'
           })
         }
         if (!this.deptBudgetList.tranCarInfoList[i].positionWeight) {
           this.$message({
-            message:'重量不能为空',
-            type : 'warning'
+            message: '重量不能为空',
+            type: 'warning'
           })
         }
         if (
@@ -573,9 +559,9 @@ export default {
           this.searchType = this.taskTypeList[i].type
         }
       }
-    },
-    approve() {},
-    listQuery() {}
+    }
+    // approve() {},
+    // listQuery() {}
   }
 }
 </script>