Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/box/batchMarkup.vue

@@ -12,7 +12,7 @@
         <selector :disabled="approval" v-model="form.freightUnitId" :options="unitList" :label-field="$l('title')" value-field="id" defaultable  class="w-100 ml-10" />
     </div>
     <div class="mt-10">
-        {{$t('清关费加价价')}}
+        {{$t('清关费加价')}}
         <!--货币-->
         <selector  :disabled="approval" v-model="form.clearanceCurrencyId" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable  class="w-100 ml-10" />
         <!--金额-->
@@ -273,9 +273,8 @@ export default {
   methods:{
     // 检查正数
     checkPositive(object, field){
-      object[field] = parseInt(object[field])
-      if(isNaN(object[field]) || object[field] < 0) object[field] = ''
-      else object[field] = object[field].toString()
+      object[field] = parseFloat(object[field])
+      object[field] = isNaN(object[field]) ? '' : object[field].toString()
     },
     // 表格多选
     handleSelectionChange(selection) {

src/views/ecw/box/editAirForm.vue

@@ -27,9 +27,24 @@
         </el-form-item>
         <el-form-item :label="$t('目的港清关')" prop="destinationClearanceSelect">
           <el-radio-group v-model="form.destinationClearance">
-            <el-radio v-if="form.destinationClearance != 2" :label="1">{{$t('我司')}}</el-radio>
-            <el-radio v-else :label="2">{{$t('我司')}}</el-radio>
-            <el-radio :label="3">{{$t('客户')}}</el-radio>
+            <el-radio v-if="form.destinationClearance != 2" :label="1">
+              {{$t('我司')}}
+              <el-tooltip effect="dark" :content="$t('我司承接')" placement="top">
+                <i class="el-icon-question"></i>
+              </el-tooltip>
+            </el-radio>
+            <el-radio v-else :label="2">
+              {{$t('我司')}}
+              <el-tooltip effect="dark" :content="$t('我司承接')" placement="top">
+                <i class="el-icon-question"></i>
+              </el-tooltip>
+            </el-radio>
+            <el-radio :label="3">
+              {{$t('客户')}}
+              <el-tooltip effect="dark" :content="$t('客户自清')" placement="top">
+                <i class="el-icon-question"></i>
+              </el-tooltip>
+            </el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item v-if="form.destinationClearance===1 || form.destinationClearance===2" prop="destinationClearance" :rules="[

src/views/ecw/box/indexAir.vue

@@ -511,7 +511,7 @@ export default {
           case "editLadingBill":
             const cabinetLabel = this.getCabinetName(row.cabinetId);
             const title = this.$t(
-              "查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}",
+              "查看提单 {selfNo}",
               {
                 selfNo: row.selfNo,
                 cubNo: row.cubNo,

src/views/ecw/box/ladingBill/index.vue

@@ -95,7 +95,7 @@
     <el-row>
       <el-col class="totle-info">
         <div>{{$t('总计')}}：{{getSumData}}</div>
-        <div>{{$t('容量')}}：{{calcCapacity}}</div>
+        <!--<div>{{$t('容量')}}：{{calcCapacity}}</div>-->
       </el-col>
     </el-row>
 
@@ -172,7 +172,7 @@ export default {
         this.shipmentObj.cubNo ?? ""
       } 柜型：${cabinetLabel}`; */
       const title = this.$t(
-        "查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}",
+        "查看提单 {selfNo}",
         {
           selfNo: this.shipmentObj.selfNo,
           cubNo: this.shipmentObj.cubNo,

src/views/ecw/box/shippingAir/nodePage/tally/index.vue

@@ -239,7 +239,7 @@ export default {
           this.$message.error(this.$t("请选择需要移出的订单"));
           return;
         }
-        orderNos = this.selectedRows.map((item) => item.orderNo);
+        orderNos = [...new Set(this.selectedRows.map((item) => item.orderNo))];
         orderIds = this.selectedRows.map((item) => item.orderId);
       } else {
         orderNos = [data.orderNo];

src/views/ecw/customerComplaint/index.vue

@@ -31,6 +31,12 @@
         <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
       </el-form-item>
+      <el-form-item label="登记客服">
+        <el-select v-model="queryParams.adminId" :placeholder="$t('请选择客户经理')">
+          <el-option v-for="item in serviceUserList"
+                     :key="item.id" :label="item.nickname" :value="item.id" />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
@@ -299,6 +305,7 @@ import { DICT_TYPE, getDictDataLabel, getDictDatas } from '@/utils/dict'
 import { getBillNoSearch, getOrderNoSearch } from '@/api/ecw/order'
 import customerSelect from '@/views/ecw/customer/customerSelect'
 import { getCurrencyPage } from "@/api/ecw/currency";
+import {listServiceUser} from "@/api/system/user";
 
 export default {
   name: "CustomerComplaint",
@@ -376,10 +383,14 @@ export default {
         page: 1,
         rows: 20,
       },
-      currencyList:[]
+      currencyList:[],
+    serviceUserList:[]
     };
   },
   created() {
+    listServiceUser().then(r => {
+      this.serviceUserList = r.data
+    })
     this.getList();
      getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
 
@@ -459,6 +470,7 @@ export default {
     resetQuery() {
       this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
+      this.queryParams.adminId = null;
       this.handleQuery();
     },
     /** 新增按钮操作 */

src/views/ecw/order/edit.vue

@@ -130,8 +130,18 @@
             <div class="form-section" v-if="form.transportId == 3">
               <el-form-item :label="$t('目的港清关')">
                 <el-radio-group v-model="form.portDestCustomsClear">
-                  <el-radio :label="1">{{$t('我司')}}</el-radio>
-                  <el-radio :label="2">{{$t('客户')}}</el-radio>
+                  <el-radio :label="1">
+                    {{$t('我司')}}
+                    <el-tooltip effect="dark" :content="$t('我司承接')" placement="top">
+                      <i class="el-icon-question"></i>
+                    </el-tooltip>
+                  </el-radio>
+                  <el-radio :label="2">
+                    {{$t('客户')}}
+                    <el-tooltip effect="dark" :content="$t('客户自清')" placement="top">
+                      <i class="el-icon-question"></i>
+                    </el-tooltip>
+                  </el-radio>
                 </el-radio-group>
               </el-form-item>
             </div>
@@ -340,6 +350,12 @@
                     <el-input v-model="form.marks" ></el-input>
                 </el-form-item>
                 <el-form-item :label="$t('是否控货')" prop="isCargoControl" class="ml-20">
+                    <template #label>
+                      {{$t('是否控货')}}
+                      <el-tooltip effect="dark" :content="$t('是指由发货人与收货人约定在货物的国际运输过程中，我司作为第三方对该货物货权的控制;需由发货人授权我司放货的情况下收货人才能提取该票货物的一种交易方式')" placement="top">
+                        <i class="el-icon-question"></i>
+                      </el-tooltip>
+                    </template>
                     <dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING"
                          v-model="form.isCargoControl"
                          formatter="bool"
@@ -363,6 +379,12 @@
             </div>
             <div class="form-section">
                 <el-form-item :label="$t('单证报关')" :span="2" prop="customsType">
+                    <template #label>
+                      {{$t('单证报关')}}
+                      <el-tooltip effect="dark" :content="$t('我司全代 : 该货物的出口手续由我司代为办理 ; 自单代报: 该货物由发货人提供相关出口单证并委托我司代为办理 ;混单代报该货物有以上两种情况出现')" placement="top">
+                        <i class="el-icon-question"></i>
+                      </el-tooltip>
+                    </template>
                     <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="form.customsType" form-type="radio" defaultable :disabled="false" />
                     <!--自单代报显示提示-->
                     <div v-if="+form.customsType === 2"  style="color:red;font-size:14px">{{$t('报关退税，请备齐资料。')}}</div>
@@ -515,6 +537,12 @@
             </div>
             <div class="form-section">
                 <el-form-item :label="$t('特殊要求')" >
+                    <template #label>
+                      {{$t('特殊要求')}}
+                      <el-tooltip effect="dark" :content="$t('如需我司打包，请勾选相应选项，费用付款人及打包要求可备注补充')" placement="top">
+                        <i class="el-icon-question"></i>
+                      </el-tooltip>
+                    </template>
                     <dict-selector v-model="form.packageTypeArr" form-type="checkbox" :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" multiple  :disabled="false"/>
                 </el-form-item>
             </div>

src/views/ecw/order/index.vue

@@ -76,7 +76,7 @@
       </el-form-item>
       <el-form-item :label="$t('订单状态')" prop="status">
         <dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.status"
-          @keyup.enter.native="handleQuery" clearable />
+          @keyup.enter.native="handleQuery" :filter="statusDictFilter" clearable />
       </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" />
@@ -963,6 +963,20 @@ export default {
     printTag(order){
       this.printTagOrderId=order.orderId
       this.printTagWarehouseInNum = order.sumNum
+    },
+    // 过滤订单状态筛选字典内容
+    statusDictFilter(item){
+      console.log('statusDictFilter', item)
+      if(this.transportId == 3 && item.cssClass && item.cssClass != 'air'){
+        return false
+      }
+      if(this.transportId == 1 && item.cssClass && item.cssClass != 'sea'){
+        return false
+      }
+      if(this.transportId == 4 && item.cssClass && item.cssClass != 'sea-air'){
+        return false
+      }
+      return true
     }
   }
 };

src/views/ecw/productAttr/edit.vue

@@ -180,7 +180,7 @@ export default {
           type: 'warning'
         }).then(() => {
           this.form.priceLineCount = val.id;
-          this.lineNum = val.priceStepClearanceCount;
+          this.lineNum = val.priceLineCount;
           this.form.productTemplateId = val.id;
           this.isCopyProductPriceTemplate = true;
           copy()

src/views/member/user/index.vue

@@ -31,7 +31,7 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
-        <el-button :loading="exportLoading" type="primary" @click="exportFn">{{$t('导 出')}}</el-button>
+        <el-button v-has-permi="['member:export']" :loading="exportLoading" type="primary" @click="exportFn">{{$t('导 出')}}</el-button>
       </el-form-item>
     </el-form>
 
@@ -88,11 +88,11 @@
       </el-table-column>
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="200px">
         <template slot-scope="scope" >
-          <el-button size="mini" type="text"  @click="guarantee(scope.row)">{{$t('保函/证书')}}</el-button>
-          <el-button size="mini" type="text"  @click="operationLogFn(scope.row)">{{$t('操作日志')}}</el-button>
-          <el-button size="mini" type="text"  @click="identityFn(scope.row , '1')">{{$t('身份证')}}</el-button>
-          <el-button  size="mini" type="text"  @click="identityFn(scope.row, '2')">{{$t('营业执照')}}</el-button>
-          <el-button  size="mini" type="text" @click="deleteFn(scope.row)">{{$t('删 除')}}</el-button>
+          <el-button v-has-permi="['member:certificate']" size="mini" type="text"  @click="guarantee(scope.row)">{{$t('保函/证书')}}</el-button>
+            <el-button v-has-permi="['member:log']" size="mini" type="text"  @click="operationLogFn(scope.row)">{{$t('操作日志')}}</el-button>
+          <el-button v-has-permi="['member:id-card']" size="mini" type="text"  @click="identityFn(scope.row , '1')">{{$t('身份证')}}</el-button>
+          <el-button v-has-permi="['member:business-license']"  size="mini" type="text"  @click="identityFn(scope.row, '2')">{{$t('营业执照')}}</el-button>
+          <el-button v-has-permi="['member:delete']" size="mini" type="text" @click="deleteFn(scope.row)">{{$t('删 除')}}</el-button>
         </template>
       </el-table-column>
     </el-table>