Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/components/CostEntry/actionBar.vue

@@ -7,7 +7,7 @@
   <div class="cost-action-bar">
     <div class="flex">
       <div>
-        <a-dropdown>
+        <a-dropdown v-if="power == '1'">
           <template #overlay>
             <a-menu>
               <a-menu-item @click="submit">提交审核</a-menu-item>
@@ -33,19 +33,19 @@
             <span class="iconfont icon-30jiantouxiangxiafill"></span>
           </a-button>
         </a-dropdown>
-        <a-button @click="openApplyModify" type="link">
+        <a-button v-if="power == '1'" @click="openApplyModify" type="link">
           <span class="iconfont icon-electronic-signature"></span> 
           申请修改
         </a-button>
-        <a-button type="link" @click="deleteApply">
+        <a-button v-if="power == '1'" type="link" @click="deleteApply">
           <span class="iconfont icon-shanchuzu"></span> 
           申请删除
         </a-button>
-        <a-button type="link" @click="cancelApply">
+        <a-button v-if="power == '1'" type="link" @click="cancelApply">
           <span class="iconfont icon-weiwancheng"></span> 
           取消申请
         </a-button>
-        <a-dropdown>
+        <a-dropdown v-if="power == '1'">
           <template #overlay>
             <a-menu>
               <a-menu-item @click="history">历史引入</a-menu-item>
@@ -210,6 +210,11 @@
     columns: {
       type: Object,
       default: {}
+    },
+    // 表格权限默认1->正常的费用录入权限， 2->整票提交审核时任何状态可编辑的权限
+    power: {
+      type: String,
+      default: '1'
     }
   })
   // 是否显示删除气泡

src/components/CostEntry/feeTable.vue

@@ -14,6 +14,7 @@
           :data="list"
           :row="row"
           :tbType="tbType"
+          :power="power"
           :id="id"
           :details="details"
           :columns="{ data: sColumns, id: colId }"
@@ -74,7 +75,6 @@
   import { GetFeeCurrencyExchangeList } from '/@/views/fee/exchangeRate/api'
   import { updateColumns } from '/@/hooks/web/common'
   import { useAppStore } from '/@/store/modules/app'
-import { Item } from 'ant-design-vue/lib/menu'
   const appStore = useAppStore()
   const { createMessage } = useMessage()
   defineComponent({
@@ -112,6 +112,11 @@ import { Item } from 'ant-design-vue/lib/menu'
     isShowBtn: {
       type: Boolean,
       default: true
+    },
+    // 表格权限默认1->正常的费用录入权限， 2->整票提交审核时任何状态可编辑的权限
+    power: {
+      type: String,
+      default: '1'
     }
   })
   const emits = defineEmits(['broInsert', 'refreshStatic', 'allBillSubmit', 'refresh'])
@@ -173,6 +178,19 @@ import { Item } from 'ant-design-vue/lib/menu'
   const someCheck = ref(false)
   // 自定义列
   const sColumns = ref([])
+  // 判断计费吨的值是毛重还是尺码
+  const jfCount = () => {
+    const mz = (props.details.kgs || 0) / 1000
+    const cm = props.details.cbm || 0
+    if (mz > cm) {
+      console.log(mz)
+      console.log(cm)
+      return mz
+    } else {
+      
+      return cm
+    }
+  }
   // 定义表格所有列
   const columns = [
     {
@@ -629,8 +647,12 @@ import { Item } from 'ant-design-vue/lib/menu'
               // 如果是箱，带出箱种类的数量
               list.value[changes[0][0]]['unitText'] = dict['defaultUnitName']
               list.value[changes[0][0]]['unit'] = dict['defaultUnit']
-              const num = props.details?.ctnInfo?.length || 0
+              const num = props.details?.ctnInfo?.length || 1
               list.value[changes[0][0]]['quantity'] = num
+            } else if (dict.defaultUnit == 'JF') {
+              list.value[changes[0][0]]['unitText'] = dict['defaultUnitName']
+              list.value[changes[0][0]]['unit'] = dict['defaultUnit']
+              list.value[changes[0][0]]['quantity'] = jfCount()
             } else {
               list.value[changes[0][0]]['unitText'] = dict['defaultUnitName']
               list.value[changes[0][0]]['unit'] = dict['defaultUnit']
@@ -724,6 +746,8 @@ import { Item } from 'ant-design-vue/lib/menu'
             // 箱带出当前主票有多少种箱
             const num = props.details?.ctnInfo?.length || 0
             list.value[changes[0][0]]['quantity'] = num
+          } else if (dict.value == 'JF') {
+            list.value[changes[0][0]]['quantity'] = jfCount()
           } else {
             list.value[changes[0][0]]['quantity'] = 0
           }
@@ -813,7 +837,17 @@ import { Item } from 'ant-design-vue/lib/menu'
       businessType: 1
     }
     // 如果不存在可保存数据限制保存按钮（后台会报错，这块后台也存在问题，现在前端限制）
-    if (postData.items.length == 0) return createMessage.warning('暂无可保存的数据！')
+    if (postData.items.length == 0 && props.power == '1') return createMessage.warning('暂无可保存的数据！')
+    // 如果是整票审核，将费用状态改成2，并保存
+    if (props.power == '2') {
+      const allItems = JSON.parse(JSON.stringify(list.value))
+      allItems.forEach((res) => {
+        if (!res.taxRate) res.taxRate = 0
+        res.feeStatus = 2
+        res.feeStatusText = '提交审核'
+      })
+      postData.items = allItems
+    }
     loading.value = true
     SubmitFee(postData)
       .then((res) => {
@@ -1033,7 +1067,7 @@ import { Item } from 'ant-design-vue/lib/menu'
           hotTb.value.hotInstance.updateSettings({
             cells: function (row, col) {
               // 设置费用状态不是录入状态或驳回状态的行为只读
-              const props = { readOnly: true }
+              const hprops = { readOnly: true }
               // 审核通过（STATUS=0）
               // 录入状态（STATUS=1）
               // 提交审核（STATUS=2）
@@ -1044,23 +1078,24 @@ import { Item } from 'ant-design-vue/lib/menu'
               // 驳回申请（STATUS=7）
               // 部分结算（STATUS=8）
               // 结算完毕（STATUS=9）
-              if (!(data[row]?.feeStatus == 6 || data[row]?.feeStatus == 1) && col != 0) {
+              if (data[row]?.feeStatus == 0 && col == 3) {
+                hprops['className'] = 'hot-green'
+              }
+              if (data[row]?.feeStatus == 2 && col == 3) {
+                hprops['className'] = 'hot-yellow'
+              }
+              if (data[row]?.feeStatus == 6 && col == 3) {
+                hprops['className'] = 'hot-red'
+              }
+              if ((data[row]?.feeStatus == 4 || data[row]?.feeStatus == 3) && col == 3) {
+                hprops['className'] = 'hot-red'
+              }
+              if (!(data[row]?.feeStatus == 6 || data[row]?.feeStatus == 1) && col != 0 && props.power == '1') {
                 // 配置不同状态的行颜色
-                if (data[row]?.feeStatus == 0 && col == 3) {
+                return hprops
-                  props['className'] = 'hot-green'
-                }
-                if (data[row]?.feeStatus == 2 && col == 3) {
-                  props['className'] = 'hot-yellow'
-                }
-                if (data[row]?.feeStatus == 7 && col == 3) {
-                  props['className'] = 'hot-red'
-                }
-                if ((data[row]?.feeStatus == 4 || data[row]?.feeStatus == 3) && col == 3) {
-                  props['className'] = 'hot-red'
-                }
-                return props
               } else {
-                return
+                delete hprops.readOnly
+                return hprops
               }
             }
           })

src/components/File/list.vue

@@ -71,7 +71,7 @@
                 </span>
                 <span class="iconfont icon-yonghu"></span>
                 <span class="mr15">
-                  {{ item.createByName }}
+                  {{ item.createUserName }}
                 </span>
                 <span class="iconfont icon-calendar"></span>
                 <span class="mr15">
@@ -220,6 +220,7 @@
           item['type'] = item?.filePath?.split('.')[1]
         })
         fileList.value = res.data
+        console.log(res.data)
       })
       .catch(() => {
         loading.value = false

src/design/ant/table.less

@@ -213,9 +213,11 @@
     font-weight: 600;
   }
   .hot-yellow {
-    background: #e1a200 !important;
+    color: #e1a200 !important;
+    font-weight: 600;
   }
   .hot-red {
-    background-color: #f5222d;
+    background-color: #D43030;
+    font-weight: 600;
   }
 }

src/views/approve/fee/components/feeTable.vue

@@ -8,10 +8,10 @@
     <div class="ds-approve-fee-table-sf">
       <div class="fee-check-opt">
         <h4>{{ status == 'BILL_RECV_AUDIT' ? '应收费用确认' : '应收应付费用' }}
-          <!-- <a-button type="link" @click="editHandle">
+          <a-button type="link" @click="editHandle">
             <span class="iconfont icon-dengjizongshu"></span>
             编辑
-          </a-button> -->
+          </a-button>
         </h4>
         <span v-if="status != 'BILL_RECV_AUDIT' && status != 'BILL_PAY_AUDIT'">
           <a-dropdown>
@@ -142,15 +142,19 @@
       :visible="editVisible"
       :title="status == 'BILL_RECV_AUDIT' ? '应收确认费用调整' : '应付确认费用调整'"
       width="90%"
+      @cancel="editVisible = false"
     > 
-      <!-- <FeeTable
+      <FeeTable
         ref="rtb"
         :tbType="status == 'BILL_RECV_AUDIT' ? 'receive' : 'pay'"
         :height="500"
         :type="1"
         :id="route.query.id"
-      ></FeeTable> -->
+        :details="details"
-      <template #footer></template>
+        power="2"
+      ></FeeTable>
+      <template #footer>
+      </template>
     </a-modal>
   </a-spin>
 </template>
@@ -169,6 +173,7 @@
   // import emitter from '/@/utils/Bus'
   // 应收表格组件
   import FeeTable from '/@/components/CostEntry/feeTable.vue'
+  import { BookingOrderGet } from '/@/views/operation/seaexport/api/BookingLedger'
   import { useRoute } from 'vue-router'
   const route = useRoute()
   // 当前页面状态
@@ -245,7 +250,13 @@
       }
     ]
   }
-  
+  // 订单详情数据
+  const details = ref({})
+  const getOrderDetail = () => {
+    BookingOrderGet({ id: route.query.id }).then(res => {
+      console.log(res)
+    })
+  }
   // 应收应付表格数据整体
   const tableData = ref([])
   const RData = ref([])
@@ -415,6 +426,10 @@
       RData.value = []
     }
   }
+  // 如果是全票提交审核，调用订单详情接口
+  if (status == 'BILL_RECV_AUDIT' || status == 'BILL_PAY_AUDIT') {
+    getOrderDetail()
+  }
   // 校验费用利润
   // const checkProfit = () => {
   //   const receiveData = getSelectRows1()

src/views/operation/seaexport/detail/components/ladingInfo.vue

@@ -63,17 +63,30 @@
       </div>
       <div class="flex">
         <!-- 提单信息表 -->
-        <div class="card-box bill-list">
+        <div class="bill-list">
-          <h4>分提单号</h4>
+          <div class="card-box">
-          <div v-if="list.length == 0" class="mt15">
+            <h4>分提单号</h4>
-            <img src="../../../../../assets/images/nodata.png" alt="">
+            <div v-if="list.length == 0" class="mt15">
-            <div class="no-message">暂无数据</div>
+              <img src="../../../../../assets/images/nodata.png" alt="">
+              <div class="no-message">暂无数据</div>
+            </div>
+            <ul class="h-list">
+              <li v-for="item in list" :key="item.id" class="mt10" :class="{ 'active-li': item.id == activeId }" @click="setFormValue(item)">
+                <span class="iconfont icon-renwu_"></span> <span>{{ item.hblno }}</span>
+              </li>
+            </ul>
+          </div>
+          <div class="card-box mt15">
+            <DsFile ref="dsFile" :id="activeId" :show="false" height="300">
+              <div style="position: relative;">
+                <h4>附件</h4>
+                <a-button class="file-header" type="link" size="mini" style="padding-right: 3px!important;" @click="addFile">
+                  <span class="iconfont icon-fujian1"></span>
+                  新增附件
+                </a-button>
+              </div>
+            </DsFile>
           </div>
-          <ul class="h-list">
-            <li v-for="item in list" :key="item.id" class="mt10" :class="{ 'active-li': item.id == activeId }" @click="setFormValue(item)">
-              <span class="iconfont icon-renwu_"></span> <span>{{ item.hblno }}</span>
-            </li>
-          </ul>
         </div>
         <!-- <BasicTable
           class="ds-table-detail"
@@ -184,6 +197,8 @@
   const container = defineAsyncComponent(() => import("./container.vue"))
   // 历史提单弹窗
   const ladingHistory = defineAsyncComponent(() => import("./ladingHistory.vue"))
+  // 引入附件上传组件
+  const DsFile = defineAsyncComponent(() => import("/@/components/File/index.vue"))
   import { EditSeaExportBillManage, BatchDelBillManage, GetSeaExportBillManageList, GetSeaExportBillManageInfo } from '../../api/BookingLedger'
   // 引入提示信息
   import { useMessage } from '/@/hooks/web/useMessage'
@@ -388,6 +403,11 @@
       }
     }
   }
+  // 附件上传（添加附件）
+  const dsFile = ref(null)
+  function addFile() {
+    dsFile.value.init()
+  }
   // 列表数据
   const list = ref([])
   onMounted(() => {
@@ -853,6 +873,12 @@
     padding: 10px 20px;
     border: 1px solid #E8EBED;
     border-radius: 2px;
+    .file-header {
+      position: absolute;
+      z-index: 10;
+      right: -4px;
+      top: -6px;
+    }
   }
   .ant-tabs-content {
     height: calc(100vh - 200px);

src/views/operation/seaexport/detail/modules/baseInfo.tsx

@@ -244,6 +244,7 @@ export const basicInfoFormSchema: FormSchema[] = [
   {
     field: 'contractNo',
     label: '约号',
+    labelSlot: 'contractNo',
     component: 'ApiSelect',
     colProps: { span: 5 },
     componentProps: ({ formModel, formActionType }) => {