src/pages/cargo-consolidation-request/index.vue

@@ -94,14 +94,6 @@
           label="状态"
           width="75"
         />
-        <!-- <el-table-column
-          label="修改时间"
-          min-width="190"
-        >
-          <template #default="scope">
-            {{ dayjs(scope.row.Modified_Time).format('YYYY-MM-DD HH:mm:ss') }}
-          </template>
-        </el-table-column> -->
         <el-table-column
           prop="GRN"
           label="入仓单号"
@@ -141,12 +133,6 @@
         class="flex justify-between mt-8"
       >
         <div class="flex">
-          <!-- <div class="flex items-center mr-2">
-            <span class="min-w-[150px]">选中的船名&航次:&nbsp;</span>
-            <div class="text-red-700 font-bold">
-              {{ currentRow.Name }}
-            </div>
-          </div> -->
           <div class="flex flex-wrap min-w-[800px] mr-2">
             <!-- ['可用', '已截仓'].includes(currentRow.Status) && -->
             <el-input
@@ -269,22 +255,6 @@
             >
               保存更改
             </el-button>
-            <!-- <el-tooltip
-              content="下方复选框勾上的行可以被转移到新的航次.有新增编辑删除的不能勾."
-            >
-              <el-button
-                v-if="
-                  ['Arrangement'].includes(currentTab) ||
-                  (['可用'].includes(currentRow.Status) &&
-                    ['my_request'].includes(currentTab))
-                "
-                size="small"
-                type="danger"
-                @click="dialogFlyVisible = true"
-              >
-                转移
-              </el-button>
-            </el-tooltip>-->
           </div>
         </div>
         <div>
@@ -495,22 +465,7 @@
             ></el-input>
           </template>
         </el-table-column>
-        <!-- <el-table-column
-          v-show="['Arrangement', 'my_request'].includes(currentTab)"
-          fixed="right"
-          label="更新时间"
-          width="90"
-        >
-          <template #default="scope">
-            <div v-if="scope.row.id">
-              {{
-                dayjs(scope.row.update_time || new Date()).format(
-                  'YYYY-MM-DD HH:mm:ss',
-                )
-              }}
-            </div>
-          </template>
-        </el-table-column> -->
+
         <el-table-column
           v-show="
             [
@@ -660,7 +615,10 @@
       @close="closeCubeDialog"
       width="400px"
     >
-      <el-form>
+      <el-form
+        label-position="right"
+        label-width="95px"
+      >
         <el-form-item label="length (m)">
           <el-input v-model="cubeForm.l"></el-input>
         </el-form-item>
@@ -670,6 +628,9 @@
         <el-form-item label="height (m)">
           <el-input v-model="cubeForm.h"></el-input>
         </el-form-item>
+        <el-form-item label="箱数(整数)">
+          <el-input v-model="cubeForm.Carton"></el-input>
+        </el-form-item>
         <el-form-item label="cube (m³)">
           <el-input v-model="cubeForm2.c"></el-input>
         </el-form-item>
@@ -692,43 +653,6 @@
         </el-form-item>
       </el-form>
     </el-dialog>
-    <!--<el-dialog
-      style="margin-top: 35vh"
-      title="将已选记录转移到新的航次"
-      :modelValue="dialogFlyVisible"
-      @close="closeFlyDialog"
-      width="600px"
-    >
-      <el-form>
-        <el-form-item label="航次">
-          <el-select v-model="flyTarget">
-            <el-option
-              v-for="item in computedList"
-              :key="item.id"
-              :label="item.Name"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <div class="w-full flex justify-center">
-            <el-button
-              size="small"
-              type="primary"
-              @click="fly"
-            >
-              确定
-            </el-button>
-            <el-button
-              size="small"
-              @click="closeFlyDialog"
-            >
-              取消
-            </el-button>
-          </div>
-        </el-form-item>
-      </el-form>
-    </el-dialog> -->
   </div>
 </template>
 
@@ -1553,8 +1477,6 @@ let computedSelectedTotalFOB = computed(() => {
 let mapDrawerVisible = ref(false)
 const openMapDrawer = (row: any) => {
   mapDrawerVisible.value = true
-  // console.log(row.Carrier, 'row.value.Carrier')
-  // console.log(row.Booking_Number, 'row.value.Booking_Number')
   if ((window as any).Sgld) {
     nextTick(() => {
       ;(window as any).Sgld.createContainerTrack({
@@ -1573,9 +1495,10 @@ let cubeForm = ref({
   l: '',
   w: '',
   h: '',
+  Carton: '' as string | number, // 箱数
 })
 let cubeForm2 = ref({
-  c: '' as string | number,
+  c: '' as string | number, // 体积
 })
 watch(
   cubeForm,
@@ -1583,7 +1506,8 @@ watch(
     cubeForm2.value.c =
       Number(cubeForm.value.l) *
       Number(cubeForm.value.w) *
-      Number(cubeForm.value.h)
+      Number(cubeForm.value.h) *
+      Number(cubeForm.value.Carton)
   },
   {
     immediate: true,
@@ -1593,13 +1517,18 @@ watch(
 let openCubeDialog = (obj: any) => {
   let index = obj.$index
   if (index < 0 || index >= subList.value.length) return
+
   const row = subList.value[index]
-  cubeForm2.value.c = row.Cube || ''
+  cubeForm.value.Carton = row.Carton || '1'
   cubeDialogVisible.value = index
+  nextTick(() => {
+    cubeForm2.value.c = row.Cube || ''
+  })
 }
 let commitCube = () => {
   const row = subList.value[cubeDialogVisible.value]
   row.Cube = Number(cubeForm2.value.c).toFixed(2) || ''
+  row.Carton = Number(cubeForm.value.Carton) || '1'
   row.editFlag = true
   closeCubeDialog()
 }
@@ -1608,6 +1537,7 @@ let closeCubeDialog = () => {
   cubeForm.value.l = ''
   cubeForm.value.w = ''
   cubeForm.value.h = ''
+  cubeForm.value.Carton = '1'
   cubeForm2.value.c = ''
 }
 let customSort1 = (a: any, b: any) => {
@@ -1671,51 +1601,12 @@ let batchRecordSort = (a: any, b: any) => {
   return 0
 }
 
-// ===== 控制把部分行数据飞(转移)到另一个航次, 选中子表的行, 然后弹窗展示航次列表选一个航次提交, 实际上是把选中子表行的parent_id改为新航次的id ======
 let selectedRow = ref([] as any[])
 const handleSelectionChange = (val: any[]) => {
   selectedRow.value = val
 }
 let calcSelectAble = (row: any) =>
   !row.addFlag && !row.deleteFlag && !row.editFlag
-// let dialogFlyVisible = ref(false)
-// let flyTarget = ref('')
-/* let closeFlyDialog = () => {
-  dialogFlyVisible.value = false
-  flyTarget.value = ''
-} */
-/*let fly = () => {
-  console.log(selectedRow.value, 'selectedRow')
-  if (!flyTarget.value || !selectedRow.value.length) {
-    ElMessage.error('请选择航次和要转移的记录')
-    return
-  }
-  zoho.CRM.API.updateRecord({
-    Entity: 'Sea_Freight_Details',
-    Trigger: ['workflow'],
-    APIData: selectedRow.value.map((i: any) => {
-      return {
-        id: i.id,
-        Parent_Id: flyTarget.value,
-      }
-    }),
-  }).then((res: any) => {
-    if (
-      Array.isArray(res.data) &&
-      res.data.length &&
-      res.data[0].code === 'SUCCESS'
-    ) {
-      ElMessage.success('操作成功, 正在刷新数据')
-      loading.value = false
-      closeFlyDialog()
-      clearSubList()
-      getSubList(currentRow.value)
-    } else {
-      loading.value = false
-      ElMessage.error('操作失败, 请稍后再试或者联系管理员')
-    }
-  })
-}*/
 </script>
 <style lang="scss">
 .page-cargo-consolidation {