船运查看

src/views/tranManagement/tranManagementShippingLook.vue

@@ -76,80 +76,59 @@
             <ws-form-item label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
           </ws-info-table>
           <div class="small-title" style="font-size: 16px">联络员及航次</div>
+          <div v-if='deptBudgetList.tranCarInfoList'>
           <div
             style="width: 100% "
             class="flex position middle"
-            v-for="(item, index) in deptBudgetList.tranCarInfoList"
+             v-for="(item, index) in deptBudgetList.tranCarInfoList"
+            :key="index"
           >
-            <div style="margin: 18px;color: #69708C;">航次信息</div>
+             <div style="margin: 18px;color: #69708C;">航次信息</div>
             <ws-info-table>
-              <!-- 姓名 -->
-              <ws-form-item label="姓名:" span="1" prop="driver" class="siji">{{item.driver}}</ws-form-item>
-              <!-- <el-divider direction="vertical" class="line"></el-divider> -->
-              <!-- 电话 -->
-              <ws-form-item
-                label="电话:"
-                span="1"
-                prop="driverPhone"
-                class="siji"
-              >{{ item.driverPhone }}</ws-form-item>
-              <!-- <el-divider direction="vertical" class="line"></el-divider> -->
-              <!--发船日期-->
+            <ws-form-item label="姓名:" span="1" prop="driver" class="siji">{{item.driver}}</ws-form-item>
+           <div style="width:200px">
+            <ws-form-item label="电话:" span="1" prop="driverPhone" style="width:180px">{{item.driverPhone}}</ws-form-item>
+            </div>
               <ws-form-item
                 label="发船日期:"
                 span="1"
                 prop="sendDateStart"
                 class="siji"
               >{{ item.sendDateStart }}</ws-form-item>
-              <!-- <el-divider direction="vertical" class="line"></el-divider> -->
               <ws-form-item
                 label="预计到港日期:"
                 span="1"
                 prop="receiveDateEnd"
                 class="siji"
               >{{ item.receiveDateEnd }}</ws-form-item>
-              <!-- <el-divider direction="vertical" class="line"></el-divider> -->
-              <!-- 船名 -->
               <ws-form-item label="船名:" span="1" prop="shipName" class="siji">{{ item.shipName }}</ws-form-item>
-              <!-- <el-divider direction="vertical" class="line"></el-divider> -->
-              <!-- 航次 -->
               <ws-form-item label="航次:" span="1" prop="shipNo" class="siji">{{ item.shipNo }}</ws-form-item>
-
-              <!-- <el-divider direction="vertical" class="line"></el-divider> -->
-              <!-- 类型 -->
               <ws-form-item label="类型:" span="1" prop="shipType" class="siji">{{ item.shipType }}</ws-form-item>
               <ws-form-item
-                label="数量"
+                label="数量:"
                 span="1"
                 prop="boxNumber"
                 class="siji"
-                v-show="item.shipType == '集装箱'"
+                v-if="item.shipType == '集装箱'"
               >{{ item.boxNumber }}</ws-form-item>
-            </ws-info-table>
-          </div>
-          <div class="xia">
-            <div
-              style="width: 100%"
-              class="flex position cangno"
-              v-for="(items, index) in freightspace"
-            >
-              <ws-info-table>
-                <ws-form-item
-                  :label="'仓位号-' + (index + 1)"
+              <ws-form-item
+                  label="仓位号:"
                   span="1"
                   prop="impurity"
-                  class="bot"
-                >{{ items.impurity }}</ws-form-item>
-                <!-- 重量（吨） -->
+                  class="siji"
+                   v-if="item.shipType == '散船'"
+                >{{ item.binNumber }}</ws-form-item>
                 <ws-form-item
-                  label="重量(吨)"
+                  label="重量(吨):"
                   span="1"
                   prop="positionWeight"
-                  class="bot"
-                >{{ items.positionWeight }}</ws-form-item>
-              </ws-info-table>
-            </div>
+                  class="siji"
+                   v-if="item.shipType == '散船'"
+                >{{ item.positionWeight }}</ws-form-item>
+            </ws-info-table> 
           </div>
+          </div>
+          
           <div style="text-align: right; padding: 10px">
             <el-button class="bg-bottom-up" type="primary" size="small" @click="returnsales()">关闭</el-button>
           </div>
@@ -159,8 +138,7 @@
   </div>
 </template>
 <script>
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { shippingList, shippingLook } from '@/model/transport/index'
+import { seeCat } from '@/model/transport/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import { dayjs, EventBus } from 'base-core-lib'
@@ -171,9 +149,6 @@ export default {
     Pagination
   },
   watch: {
-    // vesselId(val) {
-    //   this.getList()
-    // },
     isShow(val) {
       this.showType = val
     }
@@ -208,159 +183,49 @@ export default {
       uploadSuccess: {},
       onChange: {},
       gradeList: [],
-      tranCarInfoList: [],
       list: [],
       arr: [],
-      freightspace: [],
-      rules: {
-        netWeight: [
-          {
-            required: true,
-            type: 'number',
-            message: '请输入活动名称',
-            trigger: 'blur'
-          }
-        ]
-      },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       packtypeList: {},
+      deptBudgetList: {
+        totalStorage: 0,
+        tranCarInfoList: [],
+      },
+      tranCarInfoList: {},
       date: {
         year: dayjs().format('YYYY'),
         month: dayjs().format('MM')
       },
       contractList: [],
       deptBudgetList: {
-        warehouseInOutDetail: {},
-        tranCarInfoList: []
-      },
-      historyList: [],
-
-      pickerBeginDateBefore: {
-        disabledDate: time => {
-          return time.getTime() > Date.now()
-        }
       },
-      accessoryTFs: false
     }
   },
-  mounted() {
-    this.deptBudgetList.baseId = this.$route.query.baseId
-    this.deptBudgetList.positionId = this.$route.query.positionId
-    this.deptBudgetList.warehouseName = this.$route.query.warehouseName
-    this.deptBudgetList.binNumber = this.$route.query.binNumber
-    // this.getList()
-  },
   activated() {
-    this.loaddata()
+    this.deptBudgetList.id = this.$route.query.id
+    this.getList()
   },
+
   methods: {
-    loaddata() {
-      shippingLook({ id: this.$route.query.id })
+    getList() {
+     seeCat({ id: this.$route.query.id })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.deptBudgetList = response
-          for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-            var num = this.deptBudgetList.tranCarInfoList[
-              i
-            ].positionWeight.split(',')
-            for (var j = 0; j < num.length; j++) {
-              var num2 = num[j].split('/')
-              this.freightspace.push({
-                impurity: num2[i],
-                positionWeight: num2[num2.length - 1]
-              })
-            }
-          }
+          this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
+          console.log(this.deptBudgetList.tranCarInfoList[0].driverPhone)
+          console.log(this.deptBudgetList.tranCarInfoList[1].driverPhone)
         })
     },
-    // getList() {
-    //   shippingList({
-    //     compId: sessionStorage.getItem('ws-pf_compId'),
-    //     currentPage: this.currentPage,
-    //     pageSize: this.pageSize,
-    //     contractType: this.contractType,
-    //     tranTypeKey: this.tranTypeKey,
-    //   })
-    //     .toPromise()
-    //     .then((response) => {
-    //       this.warehouseList = response
-    //     })
-    // },
     //返回按钮
     revert() {
-      this.freightspace = []
       this.$router.go(-1)
     },
-    del(index) {
-      if (this.freightspace.length > 1) {
-        this.freightspace.splice(index, 1)
-      }
-    },
-    add() {
-      this.freightspace.push({
-        binNumber: '',
-        maxStorage: '',
-        remark: ''
-      })
-    },
-    //提交按钮
-    submit() {
-      this.$confirm(`暂存后可在待完成页面查看，确定暂存`, {
-        cancelButtonText: '取消',
-        confirmButtonText: '确定',
-        type: 'warning'
-      })
-        .then(() => {
-          this.$refs.deptBudgetList.validate(valid => {
-            if (valid) {
-              this.deptBudgetList.compId = sessionStorage.getItem(
-                'ws-pf_compId'
-              )
-              this.deptBudgetList.inOutFlag = 2
-              this.deptBudgetList.statusFlag = 1
-              addstorageputList(this.deptBudgetList)
-                .toPromise()
-                .then(response => {
-                  this.$message.success('暂存成功')
-                  this.$router.push({ path: 'warehouseManagementList' })
-                })
-            } else {
-              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-              return false
-            }
-          })
-        })
-        .catch(() => {
-          return false
-        })
-    },
     returnsales() {
       this.$router.go(-1)
     },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      // this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      // this.getList()
-    },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
-        }
-      }
-    },
-    approve() {},
-    listQuery() {}
   }
 }
 </script>
@@ -544,6 +409,9 @@ export default {
 .position .siji {
   width: 14.28%;
 }
+.phone{
+  width: 100%;
+}
 .el-form {
   height: 1000px;
 }