Merge branch 'test' into pre-release

src/main.js

@@ -15,7 +15,7 @@ import './permission' // permission control
 import './tongji' // 百度统计
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/infra/config";
-import { parseTime, resetForm, addDateRange, addBeginAndEndTime, handleTree} from "@/utils/ruoyi";
+import { parseTime, resetForm, addDateRange, addBeginAndEndTime, addBeginAndEndTimeNew, handleTree} from "@/utils/ruoyi";
 import Pagination from "@/components/Pagination";
 // 自定义表格工具扩展
 import RightToolbar from "@/components/RightToolbar"
@@ -33,6 +33,7 @@ Vue.prototype.parseTime = parseTime
 Vue.prototype.resetForm = resetForm
 Vue.prototype.addDateRange = addDateRange
 Vue.prototype.addBeginAndEndTime = addBeginAndEndTime
+Vue.prototype.addBeginAndEndTimeNew = addBeginAndEndTimeNew
 Vue.prototype.getDictDatas = getDictDatas
 Vue.prototype.getDictDatas2 = getDictDatas2
 Vue.prototype.getDictDataLabel = getDictDataLabel

src/utils/ruoyi.js

@@ -105,6 +105,31 @@ export function addBeginAndEndTime(params, dateRange, propName,isTime = true) {
   return params;
 }
 
+export function addBeginAndEndTimeNew(params, dateRange, prefixName, propName, isTime = true) {
+  // 必须传入参数
+  if (!dateRange) {
+    return params;
+  }
+  // 如果未传递 propName 属性，默认为 time
+  if (!propName) {
+    propName = 'Time';
+  } else {
+    propName = propName.charAt(0).toUpperCase() + propName.slice(1);
+  }
+  if (!prefixName) {
+    prefixName = ''
+  }
+  console.log('dateRange', dateRange)
+  // 设置参数
+  if (dateRange[0]) {
+    params[prefixName + 'Begin' + propName] = dateRange[0] + (isTime ? ' 00:00:00':'');
+  }
+  if (dateRange[1]) {
+    params[prefixName + 'End' + propName] = dateRange[1] + (isTime ? ' 23:59:59' : '');
+  }
+  return params;
+}
+
 // 字符串格式化(%s )
 export function sprintf(str) {
   var args = arguments, flag = true, i = 1;

src/views/ecw/box/query.vue

@@ -252,15 +252,20 @@
                 align="center"
                 width="120px"
               >
+
                 <template slot-scope="scope">
-                  <el-button
-                    type="primary"
-                    size="small"
-                    :disabled="scope.row.abnormalDealStatus === 1"
-                    @click="() => updateStatus('single', scope.row)"
+                    <el-button
+                      type="primary"
+                      size="small"
+                      :disabled="scope.row.abnormalDealStatus === 1"
+                      @click="() => updateStatus('single', scope.row)"
+                      style="margin-top: 5px"
                     >{{ $t("更新状态") }}</el-button
-                  >
+                    >
+
+                    <el-button type="danger" style="margin-top: 5px;" size="small" @click="openError(scope.row)">{{$t('异常')}}</el-button>
                 </template>
+
               </el-table-column>
             </el-table>
           </el-tab-pane>
@@ -590,6 +595,7 @@ import { listUser } from "@/api/system/user";
 //lanbm 2024-05-16 add
 import { getCurrencyList } from "@/api/ecw/currency";
 import unloadingError from "@/views/ecw/box/shippingSea/nodePage/unloading/unloadingError.vue";
+import Template from "@/views/cms/template/index.vue";
 
 export default {
   name: "EcwBoxQuery",
@@ -597,6 +603,7 @@ export default {
     shipmentId: String,
   },
   components: {
+    Template,
     costForm,
     regError,
     editForm,
@@ -746,6 +753,11 @@ export default {
       this.currRow = row;
       this.dialogVisible = true;
     },
+    /* 打开异常 */
+    openError(row) {
+      this.currRow = row;
+      this.dialogVisible = true;
+    },
     /* 更新状态 */
     updateStatus(type, row) {
       let orders = [];

src/views/ecw/box/queryAir.vue

@@ -323,7 +323,7 @@
                     >{{ $t("撤销清关申请") }}</el-button
                   >
 
-                  <!-- <el-button type="danger" style="margin-top: 5px;" size="small" @click="openError(scope.row)">{{$t('异常')}}</el-button> -->
+                   <el-button type="danger" style="margin-top: 5px;" size="small" @click="openError(scope.row)">{{$t('异常')}}</el-button>
                 </template>
               </el-table-column>
             </el-table>

src/views/ecw/box/shippingAir/nodePage/agent.vue

@@ -3,7 +3,7 @@
     <el-form ref="agentForm" :model="agentObj" :rules="rules" label-width="120px">
       <el-form-item :label="$t('代理商Agent')" prop="agentId">
         <supplierOutSelect v-model="agentObj.agentId" :companyType="'1'" :areaType="1" :placeholder="$t('请选择代理商')" :allSupplier="this.$attrs.allSupplier" />
-        <el-button v-hasPermi="['ecw:supplier:query']" type="text" style="font-size: 13px; margin-left: 240px;" @click="SupplierDetail">{{$t('查看代理商详情')}}</el-button>
+        <el-button v-if="agentObj.agentId" v-hasPermi="['ecw:supplier:query']" type="text" style="font-size: 13px; margin-left: 240px;" @click="SupplierDetail">{{$t('查看代理商详情')}}</el-button>
       </el-form-item>
     </el-form>
     <el-row class="operate-button">

src/views/ecw/box/shippingSea/nodePage/agent.vue

@@ -3,7 +3,7 @@
     <el-form ref="agentForm" :model="agentObj" :rules="rules" label-width="120px">
       <el-form-item :label="$t('代理商Agent')" prop="agentId">
         <supplierOutSelect v-model="agentObj.agentId" :companyType="'1'" :areaType="1" :placeholder="$t('请选择代理商')" :allSupplier="this.$attrs.allSupplier" />
-        <el-button v-hasPermi="['ecw:supplier:query']" type="text" style="font-size: 13px; margin-left: 240px;" @click="SupplierDetail">{{$t('查看代理商详情')}}</el-button>
+        <el-button v-hasPermi="['ecw:supplier:query']" v-if="agentObj.agentId" type="text" style="font-size: 13px; margin-left: 240px;" @click="SupplierDetail">{{$t('查看代理商详情')}}</el-button>
       </el-form-item>
     </el-form>
     <el-row class="operate-button">

src/views/ecw/box/shippingSea/nodePage/common/supplierSelect.vue

@@ -43,8 +43,8 @@ export default {
         (item) => item.areaType == this.areaType
       );
       if(this.areaType == 1 || !this.companyType) return allSupplier;
-      return allSupplier.filter((item) =>
-        item.companyTypes.includes(this.companyType)
+      return allSupplier?.filter((item) =>
+        item.companyTypes?.includes(this.companyType)
       );
     },
   },

src/views/ecw/customer/components/customerFollow.vue

@@ -39,6 +39,12 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('联系方式')">
+              <el-input v-model="form.contactPhone" disabled />
+            </el-form-item>
+          </el-col>
+
           <el-col :span="12">
             <el-form-item :label="$t('客户经理')" required>
               <el-select v-model="form.followUserId" clearable :placeholder="$t('请选择')" :disabled="isView">
@@ -135,6 +141,7 @@
 
 <script>
 import { createCustomerFollow, getCustomerFollowPage, getCustomerFollowPage2, addCustomerFollow, getCustomerFollowList, editCustomerFollow, getFollowupNewNumber } from "@/api/ecw/customerFollow"
+import { getCustomerContactsSelect } from "@/api/ecw/customerContacts"
 import { getOfferPage } from "@/api/ecw/offer"
 import { DICT_TYPE, getDictDataLabel } from "@/utils/dict"
 import { getCustomerContactsListByCustomer } from "@/api/ecw/customerContacts"
@@ -212,12 +219,26 @@ export default {
   },
   methods: {
     init() {
-      if (!!this.form.customerId)
+      if (this.form.customerId) {
         getCustomerContactsListByCustomer({
           customerId: this.form.customerId
         }).then((r) => {
           this.customerContactsList = r.data
         })
+      } else {
+        getCustomerContactsSelect().then((res) => {
+          this.customerContactsList = res.data.list.map((item) => {
+            return {
+              name: item.contactsName,
+              id: item.customerContactsId,
+              customerId: item.customerId,
+              phoneNew: item.phoneNew,
+              areaCode: item.areaCode,
+              customerNumber: item.customerNumber
+            }
+          })
+        })
+      }
     },
     getOfferList() {
       getOfferPage(this.queryParams).then((response) => {
@@ -276,7 +297,9 @@ export default {
         for (const item of this.customerContactsList) {
           if (item.id == val) {
             this.form.contactName = item.name
-            // this.form.contactPhone = `+${item.areaCode}${item.phoneNew}`
+            this.form.customerId = item.customerId
+            this.form.contactPhone = "+" + item.areaCode + item.phoneNew
+            if (item.customerNumber) this.form.customerNumber = item.customerNumber
             break
           }
         }
@@ -362,7 +385,10 @@ export default {
       let r = await getFollowupNewNumber()
       console.log(r)
       this.form.customerId = this.customerId
-      this.form.number = r.data
+      this.form.number = r.data.number
+      this.form.nubmerId = r.data.nubmerId
+      this.form.numberVersion = r.data.numberVersion
+      this.form.status = 0
       this.init()
     },
     async handleUpdate(row, flag) {
@@ -380,8 +406,11 @@ export default {
           parentNumber: row.number,
           followTime: row.nextTime,
           nextTime: "",
-          number: r.data,
-          nextPlan: ""
+          number: r.data.number,
+          nubmerId: r.data.nubmerId,
+          numberVersion: r.data.numberVersion,
+          nextPlan: "",
+          status: 0
         }
       }
       this.init()

src/views/ecw/customer/edit.vue

@@ -370,7 +370,7 @@
           <span class="title-text">{{ $t("设置") }}</span>
           <el-button style="float: right" size="small" type="primary" @click="showSettingFlag = !showSettingFlag">{{ showSettingFlag ? $t("隐藏") : $t("更多") }}</el-button>
         </div>
-        <el-form ref="setForm" label-width="150px" v-if="showSettingFlag">
+        <el-form ref="setForm" label-width="150px" v-show="showSettingFlag">
           <el-row :gutter="10">
             <el-col :span="12">
               <el-form-item :label="$t('是否显示提单价格')" prop="isShowTidanPrice">
@@ -437,7 +437,7 @@
           <span class="title-text">{{ $t("财务") }}</span>
           <el-button style="float: right" size="small" type="primary" @click="showFinanceFlag = !showFinanceFlag">{{ showFinanceFlag ? $t("隐藏") : $t("更多") }}</el-button>
         </div>
-        <el-form ref="financeForm" label-width="150px" v-if="showFinanceFlag">
+        <el-form ref="financeForm" label-width="150px" v-show="showFinanceFlag">
           <el-row :gutter="10">
             <el-col :span="12">
               <el-form-item :label="$t('公司名称')" prop="company">
@@ -518,7 +518,7 @@
           </el-row>
         </el-form>
 
-        <el-form ref="bankForm" :model="form" v-if="showFinanceFlag">
+        <el-form ref="bankForm" :model="form" v-show="showFinanceFlag">
           <el-row type="flex" class="row-bg" justify="space-between">
             <span style="font-size: 15px; line-height: 30px">{{ $t("银行信息") }}</span>
             <el-button size="small" type="primary" @click="addBankData">+</el-button>
@@ -1001,10 +1001,17 @@ export default {
       }
       this.$refs["contactForm"].validate((valid1, err1) => {
         this.$refs["form"].validate((valid2, err2) => {
+          console.log(valid2, "valid2", err2)
           this.$refs.bankForm.validate((valid3, err3) => {
-            console.log(valid3, "valid3")
+            console.log(valid3, "valid3", err3)
             if (!valid1 || !valid2 || !valid3) {
+              console.log(333)
               this.$showFormValidateErrors({ ...err1, ...err2, ...err3 })
+
+              this.showBaseFlag = true
+              this.showShippingFlag = true
+              this.showSettingFlag = true
+              this.showFinanceFlag = true
               return
             }
             if (this.form.customerContacts.length === 0) {

src/views/ecw/offer/logListCommon.vue

@@ -195,8 +195,8 @@ export default {
         exportCustomerFollow({
           ...this.followForm,
           ...this.formatQuery(),
-          pageNo: 1,
-          pageSize: 10000000
+          pageNo: null,
+          pageSize: null
         }).then((r) => {
           this.$message.success(this.$t("已加入导出队列，请稍后在下载日志中下载"))
         })

src/views/ecw/productPrice/index.vue

@@ -63,7 +63,7 @@
       >
         <el-select
           v-model="queryParams.attrId"
-          :placeholder="$t('选择商品类型')"
+          :placeholder="$t('选择商品属性')"
           clearable
           @change="handleQuery"
         >
@@ -133,6 +133,7 @@
       <el-form-item :label="$t('目的国')" prop="destCountryId">
         <el-select
           v-model="destCountryId"
+          multiple
           :label="destCountryId"
           clearable
           @change="handleQuery"
@@ -147,7 +148,10 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('目的地')" prop="destCityId">
-        <el-select v-model="destCityId" clearable @change="handleQuery">
+        <el-select v-model="destCityId"
+        multiple
+        clearable
+        @change="handleQuery">
           <el-option
             v-for="item in AddressCity"
             :key="item.shi"
@@ -157,7 +161,10 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('目的仓')" prop="destWarehouseId">
-        <el-select v-model="destWarehouseId" clearable @change="handleQuery">
+        <el-select v-model="destWarehouseId"
+          clearable
+          multiple
+          @change="handleQuery">
           <el-option
             v-for="item in AddressTown"
             :key="item.id"