Merge branch 'ljj_dev' into dev

src/views/operation/seaexport/api/BookingLedger.js

@@ -2118,3 +2118,12 @@ export function GetBookingContractNoList(params) {
     params
   })
 }
+
+// 集装箱报价删除
+export function BatchDelBusinessCtnPrice(data) {
+  return request({
+    url: '/opApi/BusinessCtnPrice/BatchDelBusinessCtnPrice',
+    method: 'post',
+    data
+  })
+}

src/views/operation/seaexport/detail/index.vue

@@ -30,7 +30,6 @@
                 <operationArea
                   :id="id"
                   :details="bookingDetails"
-                  :inChildLoading="inChildLoading"
                   :source="source"
                   @refresh="refreshPage"
                   @SetOCR="SetOCR"
@@ -133,7 +132,6 @@
                 @changeDetail="changeDetailFun"
                 @handleComplete="handleComplete"
                 @rules="getRules"
-                @upDateRight="upDateRightFun"
                 @inGoodsSave="inGoodsSaveFun"
                 @handleRefsh="handleRefshRight"
                 @openFlag="setOpenFlag"
@@ -228,7 +226,6 @@
   const bookingDetails = ref({ ...initDetail })
   // // const bookingDetails = ref()
   const tabActiveKey = ref('1')
-  const inChildLoading = ref(false)
   const RefrightContent = ref()
   const excuteRules = ref([])
   const excuteRulesType = ref('')
@@ -240,7 +237,6 @@
   const RefediMore = ref(null)
   const RefNoteInfo = ref(null)
   const mainOrderActiveKey = ref('1-1')
-  const inPageLoading = ref(false)
   const detailsLoadOver = ref(false)
   // const cargoRules = ref(rules.cargoRules)
   const isLockBooking = ref(false)
@@ -300,7 +296,6 @@
     Showtabs.value = false
     if (id.value) {
       getDetail()
-      getRightAll()
     } else {
       detailsLoadOver.value = false
       isLockBooking.value = false
@@ -308,11 +303,6 @@
   }
   // 获取详情
   function getDetail() {
-    if (inPageLoading.value) {
-      return false
-    }
-    inPageLoading.value = true
-    inChildLoading.value = true
     detailsLoadOver.value = false
     loading.value = true
     BookingOrderGet({
@@ -329,9 +319,12 @@
           }
         }
         loading.value = false
-        setDeatilsFun(res, false)
+        if (!res.data.ctnPriceInfo.length) {
+          res.data.ctnPriceInfo = [{}]
+        }
+        console.log(res)
+        bookingDetails.value = res.data
         appStore.settopDown(false)
-        inPageLoading.value = false
         // 解决 业务来源 联动问题
         // if (res.data.sourceId) {
         //   let sourceDetailIdArr: any = []
@@ -594,7 +587,6 @@
   // }
   // OCR 赋值
   function SetOCR(data) {
-    console.log(data)
     bookingDetails.value = { ...bookingDetails.value, ...data }
   }
   // 组件的值发生变化时
@@ -754,9 +746,6 @@
   function handleComplete() {
     checkSaveFun({ type: 'details', hasChange: false })
   }
-  function upDateRightFun() {
-    getRightAll()
-  }
   function inGoodsSaveFun(data) {
     inGoodsSave.value = data
   }
@@ -889,15 +878,6 @@
       tabStore.closeTabByKey(fullPath, router)
     })
   }
-  function setDeatilsFun(res, overSet = false) {
-    let newData = res.data
-    bookingDetails.value = {
-      ...bookingDetails.value,
-      ...newData,
-    }
-  }
-  function getRightAll() {
-  }
 </script>
 
 <style lang="less">

src/views/operation/seaexport/detail/modules/cargoInfo.vue

@@ -66,7 +66,7 @@
                   <a-input-number v-model:value="item.quotePrice" size="small" :min="0" :max="999999999" placeholder="报价" />
                   <a-input-number v-model:value="item.guidePrice" size="small" :min="0" :max="999999999" placeholder="指导价" />
                   <a-input-number v-model:value="item.floorPrice" size="small" :min="0" :max="999999999" placeholder="底价" />
-                  <span v-show="model.ctnPriceInfo.length > 1" @click="model.ctnPriceInfo.splice(index, 1)" class="iconfont icon-del"></span>
+                  <span v-show="model.ctnPriceInfo.length > 1" @click="deleteCtnPrice(model.ctnPriceInfo, index, item)" class="iconfont icon-del"></span>
                   <span v-show="model.ctnPriceInfo.length != 3" @click="model.ctnPriceInfo.push({})" class="iconfont icon-zengjiatianjiajiajian"></span>
                 </div>
               </div>
@@ -88,8 +88,11 @@
   import { ref, watch, onMounted, computed } from 'vue'
   import { useRoute } from 'vue-router'
   import { getDictOption } from '/@/utils/dictUtil'
+  import { BatchDelBusinessCtnPrice } from '/@/views/operation/seaexport/api/BookingLedger'
   // 更新表单数据
   import { updateFormItem } from '/@/hooks/web/common'
+  import { useOptionsStore } from '/@/store/modules/options'
+  const optionsStore = useOptionsStore()
   const FncargoId = ref([])
   getDictOption('cargo_tag').then((res) => {
     FncargoId.value = res
@@ -347,9 +350,8 @@
   }
   // 箱型价格配置
   const options = ref([])
-  getDictOption('ctn_code').then((res) => {
+  const ctnDict = optionsStore.getOptionsByCode('GetCtnSelectList')
-    options.value = res
+  console.log(ctnDict)
-  })
   const filterOption = (input, option) => {
     return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0;
   }
@@ -587,6 +589,15 @@
       ...getFieldsValue4(),
     }
   }
+  // 删除箱型价格
+  const deleteCtnPrice = (model, index, item) => {
+    if (item.id) {
+      BatchDelBusinessCtnPrice({ ids: [item.id] }).then(res => {
+        console.log(res)
+      })
+    }
+    model.splice(index, 1)
+  }
   async function validateFields() {
     const v1 = await validate1()
     const v2 = await validate2()

src/views/operation/seaexport/detail/modules/operationArea.vue

@@ -965,10 +965,6 @@
       type: Number,
       default: 0,
     },
-    inChildLoading: {
-      type: Boolean,
-      default: false,
-    },
     // 业务id
     id: {
       type: String