Merge branch 'dev'

src/api/system/user.js

@@ -34,6 +34,14 @@ export function listServiceUser() {
     method: 'get'
   })
 }
+
+export function listServiceUser2() {
+  return request({
+    url: '/system/user/list-service-user',
+    method: 'get'
+  })
+}
+
 // 获取用户精简信息列表
 export function listAllSimpl(){
   return request({

src/views/ecw/order/edit.vue

@@ -159,7 +159,8 @@
         </el-card>
         <el-card  class="mt-10">
             <div slot="header" class="card-title">
-                <div class="card-name">{{$t('商品信息')}}</div>
+                <!--lanbm 根据需求文档改 商品信息 为 商品 -->
+                <div class="card-name">{{$t('商品')}}</div>
                 <el-button type="primary" size="mini" @click="addProduct(null)" :disabled="!canAddProduct || !productEditable || updateChannel">{{$t('添加货物')}}</el-button>
                 <el-button type="primary" size="mini" @click="showBatchImportDialog=true" :disabled="!canAddProduct || !productEditable || updateChannel">{{$t('批量添加货物')}}</el-button>
             </div>

src/views/ecw/order/penddingList.vue

 <!--空运待出列表-->
 <template>
   <div class="app-container">
-
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
       <el-form-item :label="$t('编号')" prop="orderNo">
@@ -42,21 +41,23 @@
       <el-form-item :label="$t('商品')" prop="tidanNo">
         <el-input v-model="queryParams.prodKey" :placeholder="$t('请输入商品类型、品名或品牌')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-
+      <!--根据需求文档 lanbm 2024-06-23 隐藏
       <el-form-item :label="$t('控货')" prop="isCargoControl">
         <dict-selector v-model="queryParams.isCargoControl" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable />
-      </el-form-item>
+      </el-form-item>-->
+      <!--根据需求文档 lanbm 2024-06-23 隐藏
       <el-form-item :label="$t('入仓类型')" prop="warehouseType">
         <dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="queryParams.warehouseType"  clearable/>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item :label="$t('客户经理')" >
         <user-selector manage v-model="queryParams.salesmanId" clearable @change="handleQuery"
                        :prepend="{ id: 0, nickname: $t('未分配客户经理')}"/>
       </el-form-item>
+      <!--根据需求文档 lanbm 2024-06-23 隐藏
       <el-form-item :label="$t('订单状态')" prop="status">
         <dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.status"
           @keyup.enter.native="handleQuery" clearable />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item :label="$t('报关方式')" prop="customsType">
         <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="queryParams.customsType" clearable @change="handleQuery" />
       </el-form-item>
@@ -68,9 +69,10 @@
       <el-form-item :label="$t('备案属性')" prop="productRecord">
         <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" v-model="queryParams.productRecord" clearable @change="handleQuery" />
       </el-form-item>
+      <!--lanbm 2024-06-23 根据需求文档隐藏
       <el-form-item :label="$t('快递单号')" prop="number">
         <el-input v-model="queryParams.number" :placeholder="$t('快递单号')" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item :label="$t('外部仓')" prop="number">
         <el-select v-model="queryParams.isExternalWarehouse" :placeholder="$t('请选择')" clearable @change="handleQuery">
           <el-option :label="$t('外部仓')" :value="1"></el-option>

src/views/ecw/order/pending.vue

@@ -83,7 +83,6 @@
             {{currencyMap[row.orderExceptionAmountCurrencyId]}}
             </template>
         </el-table-column>
-        </el-table-column>
         <el-table-column :label="$t('状态')" align="center">
           <template slot-scope="scope">
               <dict-tag :type="DICT_TYPE.ORDER_EXCEPTION_STATUS" :value="scope.row.orderExceptionStatus" />

src/views/ecw/order/prepayDeal.vue

@@ -1970,8 +1970,6 @@
                         >{{ currencyMap[scope.row.clearanceFreightCurrency] }} /
                         {{ unitMap[scope.row.clearanceFreightVolume] }}</span
                       >
-                      <!--              <selector v-model="scope.row.clearanceFreightCurrency"  :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2  class="w100" />
-                            / <selector v-model="scope.row.clearanceFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2  class="w100" /> -->
                     </div>
                   </div>
                   <div v-else>
@@ -2557,6 +2555,7 @@ export default {
           this.orderExceptionData.orderExceptionType ==
             "not_shipping_channel_exception"
         ) {
+          //not_shipping_channel_exception 不可出渠道异常
           this.selectLine = this.routerList.find(
             (item) => item.id == this.handlerParams.lineId
           );
@@ -2568,6 +2567,7 @@ export default {
     },
     //订单详情
     getOrderData() {
+      //not_shipping_channel_exception 不可出渠道异常
       getOrder(this.orderId).then((response) => {
         this.orderData = response.data;
         if (this.orderData.channelId != 0) {
@@ -3071,11 +3071,12 @@ export default {
         if (!item.prodId) {
           calcable = false;
         }
+        //alert(item.oneClearanceFreight);
       });
       console.log("calculationPrice", this.handlerParams.channelId);
       if (this.calculating || !calcable) return false;
       this.calculating = true;
-      console.log("calculating ---> ");
+      //console.log("calculating ---> ");
       const params = {
         lineId: this.handlerParams.lineId,
         transportId: this.orderData.transportId,
@@ -3093,8 +3094,10 @@ export default {
       calculationPrice(params)
         .then((res) => {
           this.orderData.orderItemVOList.map((item, index) => {
+            //清关价问题关键点在这，后台获取的值的变量名称换了
             item.oneClearanceFreight =
               res.data.prodCostDtoList[index].oneClearanceFee;
+            //alert( item.oneClearanceFreight);
             item.clearanceFreightCurrency =
               res.data.prodCostDtoList[index].clearanceFeeCurrency;
             item.clearanceFreightVolume =
@@ -3120,6 +3123,8 @@ export default {
         if (!tmp.quantity) tmp.quantity = 1;
         if (!tmp.num) tmp.num = 1;
         tmp.orderType = item.orderItemType;
+        //lanbm 2024-06-22 包装类型
+        tmp.packaging=item.unit;
         arr.push(tmp);
       });
       return arr;

src/views/ecw/order/stocking/components/ChooseOrderProducts.vue

@@ -121,6 +121,8 @@ export default {
     },
   },
   async created() {
+    //alert(this.orderId);
+    //alert(this.warehouseInId);
     getOrderItemCommonAttr(this.orderId, this.warehouseInId || 0).then(
       (res) => {
         this.orderItemDetails = res.data;

src/views/ecw/order/stocking/components/Package.vue

@@ -579,6 +579,7 @@ export default {
         }).then(r => {
           if (r.data) {
             this.$message.success('打包成功')
+            //this.getAttrList();
             this.handleClose()
           } else {
             this.$message.success('打包失败')

src/views/ecw/order/stocking/index.vue

@@ -117,6 +117,7 @@
                   }}</el-button>
                 </template>
               </el-table-column>
+              <!--添加箱明细 lanbm 2024-06-21 -->
               <el-table-column prop="areaName" width="220px">
                 <template v-slot="{ row }">
                   <WarehouseRecordDetail
@@ -301,13 +302,24 @@
           })
         }}
       </el-form-item>
+      <!--lanbm 2024-06-21 处理问题
       <el-form-item :label="$t('入仓统计')" class="mb-0">
         {{
           $t(`{num}箱 {weight}Kg {volume}m³ {quantity}个`, {
-            num: statistics.sumCartonsNumFinishedWarehouseIn,
-            weight: statistics.sumWeightFinishedWarehouseIn,
-            volume: statistics.sumVolumeFinishedWarehouseIn,
-            quantity: statistics.sumQuantityAllFinishedWarehouseIn,
+            num:statistics.sumCartonsNumFinishedWarehouseIn,
+            weight:statistics.sumWeightFinishedWarehouseIn,
+            volume:statistics.sumVolumeFinishedWarehouseIn,
+            quantity:statistics.sumQuantityAllFinishedWarehouseIn,
+          })
+        }}
+      </el-form-item>-->
+      <el-form-item :label="$t('入仓统计')" class="mb-0">
+        {{
+          $t(`{num}箱 {weight}Kg {volume}m³ {quantity}个`, {
+            num:form.sumNum,
+            weight:form.sumWeight,
+            volume:form.sumVolume,
+            quantity:form.sumQuantity,
           })
         }}
       </el-form-item>
@@ -502,6 +514,8 @@ export default {
         manualExceptionType: [],
         sumVolume: "",
         sumWeight: "",
+        sumNum:"",//入仓件数 lanbm 2024-06-21 add
+        sumQuantity:"",//入仓数量
       },
       currencyList: [],
       order: {},
@@ -599,6 +613,8 @@ export default {
           this.order = r.data;
           this.form.sumVolume = this.order.sumVolume;
           this.form.sumWeight = this.order.sumWeight;
+          this.form.sumNum=this.order.sumNum;
+          this.form.sumQuantity=this.order.sumQuantity;
         })
         .then(() => {
           // this.getLabelByOrder()

src/views/report/customer_analysis/index.vue

@@ -43,13 +43,20 @@
         prop="salesmanid"
         v-show="showCustomsManage"
       >
-        <user-selector
-          manage
-          v-model="queryParams.salesmanid"
+        <el-select
           clearable
-          @change="handleQuery"
-          :prepend="{ id: 0, nickname: $t('未分配客户经理') }"
+          :multiple="true"
+          v-model="queryParams.salesmanid"
+          :placeholder="$t('请选择客户经理')"
+          size="small"
+        >
+          <el-option
+            v-for="dict in customerServiceList"
+            :key="dict.id"
+            :label="dict.nickname"
+            :value="dict.id"
           />
+        </el-select>
       </el-form-item>
 
       <el-form-item label="首次成交" prop="delFlag">
@@ -71,6 +78,7 @@
       <el-form-item label="客户来源" prop="remark">
         <el-select
           v-model="queryParams.source"
+          :multiple="true"
           :placeholder="$t('请选择客户来源')"
         >
           <el-option
@@ -85,6 +93,7 @@
         <el-select
           v-model="queryParams.customerrole"
           clearable
+          :multiple="true"
           style="width: 200px"
         >
           <el-option
@@ -98,6 +107,7 @@
       <el-form-item label="客户国家" prop="country">
         <el-select
           clearable
+          :multiple="true"
           v-model="queryParams.country"
           :placeholder="$t('请选择国家')"
         >
@@ -376,6 +386,7 @@
 //国家列表接口
 import { getCountryListAll } from "@/api/ecw/country";
 import UserSelector from "@/components/UserSelector";
+import { listServiceUser2 } from "@/api/system/user";
 import Treeselect from "@riophae/vue-treeselect";
 //自定义目录数样式
 import "@/assets/styles/vue-treeselect.css";
@@ -528,12 +539,17 @@ export default {
       objEcwReportPermission: {},
       DeptEx: { id: undefined, name: undefined, parentId: undefined },
       ParentPar: {},
+      customerServiceList: [],
     };
   },
   created() {
     getCountryListAll().then((r) => {
       this.countryList = r.data;
     });
+
+    listServiceUser2().then((r) => {
+      this.customerServiceList = r.data;
+    });
     this.doLoadData();
   },
   watch: {
@@ -541,7 +557,7 @@ export default {
       //lanbm 2024-05-06 解决重新进入参数不刷新的问题
       //this.$route.name == "客户分析" 用name做逻辑判断，有时候菜单名称会变化
       //"/report/customer_analysis" lanbm 2024-05-07 调整为根据path做逻辑判断
-      if (this.$route.path== "/report/customer_analysis") {
+      if (this.$route.path == "/report/customer_analysis") {
         this.doLoadData();
       }
     },
@@ -769,19 +785,19 @@ export default {
     },
     test() {
       //当前路径
-      let sP=this.$route.path;
+      let sP = this.$route.path;
       alert(sP);
       //当前参数
-      let sPar= this.$route.params;
+      let sPar = this.$route.params;
       alert(sPar);
       //路由名称
-      let sRoute=this.$route.name;
+      let sRoute = this.$route.name;
       alert(sRoute);
       //路由查询参数
-      let sQ=this.$route.query;
+      let sQ = this.$route.query;
       alert(sQ.toString());
       //路由匹配项
-      let sM=this.$route.matched;
+      let sM = this.$route.matched;
       alert(sM.toString());
 
       return;