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

89404983 · 我在何方 · 456565a2 · 1f3c1889 · 89404983 · 89404983
Commit 89404983 authored Dec 09, 2022 by 我在何方
30 changed files
--- a/README.md
+++ b/README.md
@@ -3,4 +3,6 @@
 后台：
 本地运行：npm run dev
 测试环境：npm run build:dev
-生产环境：npm run build:prod
\ No newline at end of file
+生产环境：npm run build:prod
+
+vue node14
\ No newline at end of file
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -457,4 +457,10 @@ export function dataURLtoBlob(base64Data) {
      type: mimeString
  });
  return blob;
+}
+
+// 将字符串转成数组
+export function str2arr(str, separator = ','){
+  if(!str) return []
+  return str.split(separator).filter(item => item)
 }
\ No newline at end of file
--- a/src/views/ecw/box/indexSea.vue
+++ b/src/views/ecw/box/indexSea.vue
@@ -33,24 +33,24 @@
        </el-select>
      </el-form-item>

-      <el-form-item label="" prop="date">
+      <el-form-item label="" prop="dateType">
        <el-select v-model="queryParams.dateType" :placeholder="$t('请选择时间类型')" clearable size="small">
          <el-option v-for="item in dateTypes" :key="item.value" :label="$l(item, 'label')" :value="item.value" />
        </el-select>
      </el-form-item>

-      <el-form-item label="">
+      <el-form-item label="" prop="dateRangeCreateTime">
        <el-date-picker v-model="queryParams.dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
      </el-form-item>

-      <el-form-item :label="$t('状态')">
+      <el-form-item :label="$t('状态')" prop="boxStatus">
        <el-select v-model="queryParams.boxStatus" :placeholder="$t('请选择状态')" clearable size="small">
          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BOX_ORDER_SHIPMENT_STATE)" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value" />
        </el-select>
      </el-form-item>

-      <el-form-item :label="$t('国家')">
-        <el-select v-model="queryParams.countryId" :placeholder="$t('请选择国家')">
+      <el-form-item :label="$t('国家')" prop="countryId">
+        <el-select v-model="queryParams.countryId" :placeholder="$t('请选择国家')" clearable size="small">
          <el-option v-for="item in countryList" :key="item.id" :label="$l(item, 'title')" :value="item.id">
          </el-option>
        </el-select>
@@ -156,7 +156,7 @@
        <costForm v-if="dialogCfg.open" @closeDialog="closeDialog" :shipmentObj="currRow" />
      </template>
      <template v-if="dialogCfg.dialogType === 'error'">
-        <regError v-if="dialogCfg.open" @closeDialog="closeDialog" :shipmentObj="currRow" :allUsers="allUsers"/>
+        <regError v-if="dialogCfg.open" @closeDialog="closeDialog" :shipmentObj="currRow" :allUsers="allUsers" />
      </template>
      <template v-if="dialogCfg.dialogType === 'editLadingBill'">
        <ladingBill v-if="dialogCfg.open" @closeDialog="closeDialog" :shipmentObj="currRow" :getCabinetName="getCabinetName" />
@@ -350,10 +350,14 @@ export default {
    },
    /** 重置按钮操作 */
    resetQuery() {
+      this.queryParams = {};
      this.dateRangeCreateTime = [];
      this.resetForm("queryForm");
      this.handleQuery();
    },
+    resetForm() {
+      this.$refs["queryForm"].resetFields();
+    },
    /** 新增按钮操作 */
    handleAdd() {
      this.$set(this.dialogCfg, "title", this.$t("添加出货"));

--- a/src/views/ecw/box/ladingBill/index.vue
+++ b/src/views/ecw/box/ladingBill/index.vue
@@ -51,7 +51,7 @@
            {{ scope.row.loadWeight }}kg
          </template>
        </el-table-column>
-        <el-table-column :label="$t(' 跟进客服')" align="center" prop="" />
+        <el-table-column :label="$t('客户经理')" align="center" prop="salesmanId" />
        <el-table-column :label="$t('制作')" align="center" class-name="small-padding fixed-width">
          <template slot-scope="scope">
            <!-- 0 （未制作提货单）  1（审核中） 2（审核通过） 3（审核拒绝） -->
@@ -244,7 +244,7 @@ export default {
    getSumData() {
      return `${this.billData.totalNum ?? 0}箱 ${
        this.billData.totalVolume ?? 0
-      }m³ ${this.billData.totalVolume ?? 0}kg`;
+      }m³ ${this.billData.totalWeight ?? 0}kg`;
    },
    /* 容量 */
    calcCapacity() {

--- a/src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue
+++ b/src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue
@@ -64,7 +64,9 @@
              </el-table-column>
              <el-table-column :label="$t('报关方式')" align="center" prop="customsType">
                <template slot-scope="scope">
-                  <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
+                  <div :class="scope.row.customsType !== 1 ? 'custom_type_red' : ''">
+                    <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
+                  </div>
                </template>
              </el-table-column>
              <el-table-column :label="$t('计划箱数')" align="center" prop="num">

--- a/src/views/ecw/box/shippingSea/nodePage/cabinet/supplementOrder.vue
+++ b/src/views/ecw/box/shippingSea/nodePage/cabinet/supplementOrder.vue
@@ -71,7 +71,7 @@
              <el-row class="table-title">
                <div>{{item.orderNo}}</div>
                <div>{{$t('发往')}}：{{item.destWarehouseName}}</div>
-                <div>
+                <div :class="item.customsType !== 1 ? 'custom_type_red' : ''">
                  <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" />
                </div>
                <div>{{$t('入仓时间')}}：{{formatDate(item.rucangTime)}}</div>

--- a/src/views/ecw/box/shippingSea/nodePage/preinstall.vue
+++ b/src/views/ecw/box/shippingSea/nodePage/preinstall.vue
@@ -147,7 +147,9 @@
                    </el-table-column>
                    <el-table-column :label="$t('报关方式')" align="center" prop="customsType" width="120">
                      <template slot-scope="scope">
-                        <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
+                        <div :class="scope.row.customsType !== 1 ? 'custom_type_red' : ''">
+                          <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
+                        </div>
                      </template>
                    </el-table-column>
                    <el-table-column :label="$t('备案')" align="center" prop="productRecord" width="100">
@@ -205,7 +207,7 @@
                  <p>{{item.destWarehouseName}}</p>
                </div>
                <div>
-                  <p>
+                  <p :class="item.customsType !== 1 ? 'custom_type_red' : ''">
                    <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" />
                  </p>
                </div>
@@ -247,7 +249,9 @@
                  </template>
                </el-table-column>
                <el-table-column :label="$t('报关方式')" align="center" prop="">
-                  <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" />
+                  <div :class="item.customsType !== 1 ? 'custom_type_red' : ''">
+                    <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" />
+                  </div>
                </el-table-column>
                <el-table-column :label="$t('包装类型')" align="center" prop="">
                  <template slot-scope="scope">
@@ -379,7 +383,11 @@ export default {
      // 校验
      rules: {
        noticeUser: [
-          { required: true, message: this.$t("目的地操作员必填"), trigger: "change" },
+          {
+            required: true,
+            message: this.$t("目的地操作员必填"),
+            trigger: "change",
+          },
        ],
      },
      // 出货信息
@@ -426,7 +434,7 @@ export default {
    /* 获取城市 */
    importCityName(id) {
      var arr = this.$attrs.warehouseList.filter((item) => item.id == id);
-      return arr.length > 0 ? this.$l(arr[0], 'title') : this.$t("无");
+      return arr.length > 0 ? this.$l(arr[0], "title") : this.$t("无");
    },
    /* 选中行 */
    checkboxSelect(selection, part) {
@@ -472,7 +480,8 @@ export default {
    },
    /** 重置按钮操作 */
    resetQuery() {
-      this.resetForm("queryForm");
+      this.queryParams = {};
+      this.$refs["queryForm"].resetFields();
    },
    /** 提交 */
    onSubmit() {
@@ -559,9 +568,13 @@ export default {
    },
    /* 删除部分 */
    deletePart(part) {
-      this.$confirm(this.$t("确认删除该部分及其已预装订单？"), this.$t("提示"), {
-        type: "warning",
-      })
+      this.$confirm(
+        this.$t("确认删除该部分及其已预装订单？"),
+        this.$t("提示"),
+        {
+          type: "warning",
+        }
+      )
        .then((_) => {
          deleteSection(part.id).then((res) => {
            serviceMsg(res, this).then(() => {
@@ -583,10 +596,11 @@ export default {
          ),
        };

-        createGoods(params).then((res) => {
-          const { data } = res;
-          if(data.relationMsg) {
-              const msg = data.relationMsg.replaceAll(',',"，");
+        createGoods(params)
+          .then((res) => {
+            const { data } = res;
+            if (data.relationMsg) {
+              const msg = data.relationMsg.replaceAll(",", "，");
              this.$confirm(msg, this.$t("提示"), {
                type: "warning",
              })
@@ -594,27 +608,28 @@ export default {
                  loadRelationOrder(data).then((res) => {
                    serviceMsg(res, this).then(() => {
                      this.queryAllData();
-                    })
-                  })
+                    });
+                  });
                })
                .catch((_) => {});
-          } else {
-            serviceMsg(res, this).then(() => {
-              this.queryAllData();
-            })
-          }
-        }).catch((res) => {
-            if(res.code === 555) {
-              const msg = res.msg && res.msg.replaceAll(',',"，");
+            } else {
+              serviceMsg(res, this).then(() => {
+                this.queryAllData();
+              });
+            }
+          })
+          .catch((res) => {
+            if (res.code === 555) {
+              const msg = res.msg && res.msg.replaceAll(",", "，");
              this.$confirm(msg, this.$t("提示"), {
                type: "warning",
              })
                .then((_) => {
-                  createGoods({...params, relationStatus: 1}).then((res) => {
+                  createGoods({ ...params, relationStatus: 1 }).then((res) => {
                    serviceMsg(res, this).then(() => {
                      this.queryAllData();
-                    })
-                  })
+                    });
+                  });
                })
                .catch((_) => {});
            }

--- a/src/views/ecw/box/shippingSea/nodePage/tally/index.vue
+++ b/src/views/ecw/box/shippingSea/nodePage/tally/index.vue
@@ -47,7 +47,9 @@
              </el-table-column>
              <el-table-column :label="$t('报关方式')" align="center" prop="customsType">
                <template slot-scope="scope">
-                  <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
+                  <div :class="scope.row.customsType !== 1 ? 'custom_type_red' : ''">
+                    <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
+                  </div>
                </template>
              </el-table-column>
              <el-table-column :label="$t('箱数')" align="center" prop="num">

--- a/src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue
+++ b/src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue
@@ -45,7 +45,9 @@
        </el-table-column>
        <el-table-column :label="$t('报关方式')" align="center" prop="customsType">
          <template slot-scope="scope">
-            <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
+            <div :class="scope.row.customsType !== 1 ? 'custom_type_red' : ''">
+              <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
+            </div>
          </template>
        </el-table-column>
        <el-table-column :label="$t('实装箱数')" align="center" prop="installNum" />

--- a/src/views/ecw/box/shippingSea/shippingSea.vue
+++ b/src/views/ecw/box/shippingSea/shippingSea.vue
@@ -121,6 +121,9 @@ export default {
 <style lang="scss">
 // 海运操作统一弹窗样式
 .shipping-dialog {
+  .custom_type_red {
+    color: red;
+  }
  .el-dialog__body {
    height: calc(100% - 54px);
    > :first-child {

--- a/src/views/ecw/coupon/detail.vue
+++ b/src/views/ecw/coupon/detail.vue
+<script>
+import Edit from './edit'
+Edit.name = 'CouponDetail'
+export default Edit
+</script>
\ No newline at end of file
--- a/src/views/ecw/coupon/edit.vue
+++ b/src/views/ecw/coupon/edit.vue
--- a/src/views/ecw/coupon/index.vue
+++ b/src/views/ecw/coupon/index.vue
@@ -161,7 +161,7 @@
      </el-table-column>
      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
        <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row, true)"
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row, true)"
                     v-hasPermi="['ecw:coupon:update']">查看</el-button>
          <el-button v-if="scope.row.status != 1" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                     v-hasPermi="['ecw:coupon:update']">编辑</el-button>
@@ -287,6 +287,9 @@ export default {
      }
      return this.$router.push(url)
    },
+    handleDetail(row){
+      this.$router.push('detail?id=' + row.couponId + '&readonly=1')
+    },
    handleCopy(row){
      this.$router.push('edit?action=copy&id=' + row.couponId)
    },

--- a/src/views/ecw/customer/edit.vue
+++ b/src/views/ecw/customer/edit.vue
@@ -106,7 +106,7 @@
            </el-col>
            <el-col :span="12">
              <el-form-item :label="$t('客户经理')" prop="customerService">
-                <el-select  v-model="form.customerService" :placeholder="$t('请选择客户经理')" :disabled="(!!(customerId !== '0' && form.customerService) || isCustomerServiceConfirmed)">
+                <el-select  v-model="form.customerService" :placeholder="$t('请选择客户经理')" :disabled="(customerId !== '0' || isCustomerServiceConfirmed)">
                  <el-option v-for="item in serviceUserList"
                             :key="item.id" :label="item.nickname" :value="item.id" />
                </el-select>

--- a/src/views/ecw/customer/index.vue
+++ b/src/views/ecw/customer/index.vue
@@ -117,7 +117,7 @@
          <span>{{ parseTime(scope.row.enterOpenSeaTime) }}</span>
        </template>
      </el-table-column>
-      <el-table-column :label="$t('客户经理')" align="center" prop="customerService" :formatter="customerServiceFn">
+      <el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName">
      </el-table-column>
      <el-table-column :label="$t('出货渠道')">
        <template slot-scope="{row}">
@@ -609,14 +609,6 @@ export default {
      const country = this.countryList.find((e) => e.id === cellValue)
      return country?.nameZh
    },
-    customerServiceFn(val){
-      if(this.customerServiceList.length > 0){
-        let index =this.customerServiceList.findIndex(item => item.id === val.customerService);
-        return index !== -1  ? this.customerServiceList[index]?.nickname :''
-      }else {
-        return ''
-      }
-    },
    /** 查询列表 */
    getList() {
      this.loading = true;

--- a/src/views/ecw/customerConfirm/index.vue
+++ b/src/views/ecw/customerConfirm/index.vue
@@ -98,7 +98,7 @@
          <span>{{ parseTime(scope.row.createTime) }}</span>
        </template>
      </el-table-column>
-      <el-table-column :label="$t('客户经理')" align="center" prop="customerService" :formatter="customerServiceFn">
+      <el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName">
      </el-table-column>
      <el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>
      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
@@ -414,10 +414,6 @@ export default {
      const country = this.countryList.find((e) => e.id === cellValue)
      return country?.nameZh
    },
-    customerServiceFn(row){
-     let obj =  this.serviceStaffOptions.find(item => item.id === row.customerService)
-      return obj ? obj.nickname : '';
-    },
    /** 查询列表 */
    getList() {
      this.loading = true;

--- a/src/views/ecw/customerToBeAssigned/index.vue
+++ b/src/views/ecw/customerToBeAssigned/index.vue
@@ -110,7 +110,7 @@
          <span>{{ parseTime(scope.row.createTime) }}</span>
        </template>
      </el-table-column>
-      <el-table-column :label="$t('客户经理')" align="center" prop="customerService" :formatter="customerServiceFn">
+      <el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName">
      </el-table-column>
      <el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>
      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
@@ -159,9 +159,11 @@ import {listServiceUser} from "@/api/system/user";
 import {getCountryListAll} from "@/api/ecw/country";
 import {getCreditPage} from "@/api/customer/credit";
 import transferCustomer from "@/views/ecw/customer/transferCustomer";
+import Template from "@/views/cms/template/index.vue";
 export default {
  name: "customerToBeAssigned",
  components: {
+    Template,
    upload,
    transferCustomer
  },
@@ -426,14 +428,6 @@ export default {
        this.exportLoading = false;
      }).catch(() => {});
    },
-    customerServiceFn(val){
-      if(this.customerServiceList.length > 0){
-        let index =this.customerServiceList.findIndex(item => item.id === val.customerService);
-        return index !== -1  ? this.customerServiceList[index]?.nickname :''
-      }else {
-        return ''
-      }
-    }
  },
  watch:{
    selectCustomerList(val){

--- a/src/views/ecw/myCustomerService/index.vue
+++ b/src/views/ecw/myCustomerService/index.vue
@@ -98,7 +98,7 @@
          <span>{{ parseTime(scope.row.createTime) }}</span>
        </template>
      </el-table-column>
-      <el-table-column :label="$t('客户经理')" align="center" prop="customerService" :formatter="customerServiceFn">
+      <el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName">
      </el-table-column>
      <el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>
      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
@@ -227,14 +227,6 @@ export default {
      const country = this.countryList.find((e) => e.id === cellValue)
      return country?.nameZh
    },
-    customerServiceFn(val){
-      if(this.customerServiceList.length > 0){
-        let index =this.customerServiceList.findIndex(item => item.id === val.customerService);
-        return index !== -1  ? this.customerServiceList[index]?.nickname :''
-      }else {
-        return ''
-      }
-    },
    /** 查询列表 */
    getList() {
      this.loading = true;

--- a/src/views/ecw/oceanCustomer/index.vue
+++ b/src/views/ecw/oceanCustomer/index.vue
@@ -104,7 +104,7 @@
          <span>{{ parseTime(scope.row.createTime) }}</span>
        </template>
      </el-table-column>
-      <el-table-column :label="$t('客户经理')" align="center" prop="customerService" :formatter="customerServiceFn">
+      <el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName" >
      </el-table-column>
      <el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>
      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
@@ -393,14 +393,6 @@ export default {
      this.isBatch = false;

    },
-    customerServiceFn(val){
-      if(this.customerServiceList.length > 0){
-        let index =this.customerServiceList.findIndex(item => item.id === val.customerService);
-        return index !== -1  ? this.customerServiceList[index]?.nickname :''
-      }else {
-        return ''
-      }
-    },
    transferFn(val){
      if(!this.service){
        return this.$message.warning(this.$t('请选择客户经理！'));

--- a/src/views/ecw/offer/components/Commossion.vue
+++ b/src/views/ecw/offer/components/Commossion.vue
@@ -18,7 +18,7 @@
      <el-row v-if="!form.charging">
        <el-col :span="12">
          <el-form-item :label="$t('运费')">
-            {{form.seaFreight}} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
+            {{form.orgSeaFreight}} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
          </el-form-item>
        </el-col>
        <el-col :span="12">
@@ -28,7 +28,7 @@
        </el-col>
      </el-row>
      <el-form-item :label="$t('全包价')" v-if="form.charging">
-        {{form.seaFreight}} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
+        {{form.orgSeaFreight}} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
      </el-form-item>
      <el-form-item :label="$t('佣金类型')" prop="commissionType">
        <dict-selector :type="DICT_TYPE.COMMISSION_TYPE" v-model="form.commissionType" form-type="radio" formatter="number" />

--- a/src/views/ecw/offer/components/SpecialDetail.vue
+++ b/src/views/ecw/offer/components/SpecialDetail.vue
@@ -19,7 +19,7 @@
      </div>
      <div class="item">
        {{$t('佣金规则')}}：{{$t('从【{oldType}】改为【{newType}】', {
-          oldType: getDictDataLabel(DICT_TYPE.COMMISSION_TYPE, offer.commissionType) ,
+          oldType: getDictDataLabel(DICT_TYPE.COMMISSION_TYPE, form.orgCommissionType) ,
          newType: getDictDataLabel(DICT_TYPE.COMMISSION_TYPE, form.commissionType),
        })}}
      </div>

--- a/src/views/ecw/order/components/ApprovalDetail.vue
+++ b/src/views/ecw/order/components/ApprovalDetail.vue
@@ -24,10 +24,10 @@
            <el-descriptions-item :label="$t('申请理由')" v-if="type == 1 || type == 2" :span="4">
                <div class="bold">
                    <div>
-                        {{$t('原运费')}}：{{detail.orgFreight}} {{ currencyMap[detail.freightCurrency] }} / {{ unitMap[detail.freightVolume] }}，
-                        {{$t('新运费')}}：{{detail.freight}} {{ currencyMap[detail.freightCurrency] }} / {{ unitMap[detail.freightVolume] }}
+                        {{detail.charging ? $t('原全包价') : $t('原运费')}}：{{detail.orgFreight}} {{ currencyMap[detail.freightCurrency] }} / {{ unitMap[detail.freightVolume] }}，
+                        {{detail.charging ? $t('新全包价') : $t('新运费')}}：{{detail.freight}} {{ currencyMap[detail.freightCurrency] }} / {{ unitMap[detail.freightVolume] }}
                    </div>
-                    <div>
+                    <div v-if="!detail.charging">
                        {{$t('原清关费')}}：{{detail.orgClearanceFreight}} {{ currencyMap[detail.clearanceFreightCurrency] }} / {{ unitMap[detail.clearanceFreightVolume] }}，
                        {{$t('新清关费')}}：{{detail.clearanceFreight}} {{ currencyMap[detail.clearanceFreightCurrency] }} / {{ unitMap[detail.clearanceFreightVolume] }}
                    </div>
@@ -58,7 +58,7 @@
                    </div>
                    <div class="item">
                        {{$t('佣金规则')}}：{{$t('从【{oldType}】改为【{newType}】', {
-                        oldType: getDictDataLabel(DICT_TYPE.COMMISSION_TYPE, detail.commissionType) ,
+                        oldType: getDictDataLabel(DICT_TYPE.COMMISSION_TYPE, detail.orgCommissionType) ,
                        newType: getDictDataLabel(DICT_TYPE.COMMISSION_TYPE, detail.commissionType),
                        })}}
                    </div>
@@ -67,10 +67,10 @@
                        {{$t('原运费')}}：{{detail.orgFreight}}{{currencyMap[detail.freightCurrency]}} / {{unitMap[detail.freightVolume]}}
                    </div>
                    <div>
-                        {{$t('新运费')}}：{{Decimal(detail.orgFreight || 0).minus(detail.lightCommissionAmount || 0).plus(detail.lightCommissionAmount || 0)}}{{currencyMap[detail.freightCurrency]}} / {{unitMap[detail.freightVolume]}}
+                        {{$t('新运费')}}：{{Decimal(detail.orgFreight || 0).minus(detail.orgLightCommissionAmount || 0).plus(detail.lightCommissionAmount || 0)}}{{currencyMap[detail.freightCurrency]}} / {{unitMap[detail.freightVolume]}}
                    </div>
                    <div>
-                       {{$t('成本价')}}：{{Decimal(detail.orgFreight || 0).minus(detail.lightCommissionAmount || 0).minus(detail.shadeCommissionAmount || 0)}} {{ currencyMap[detail.freightCurrency] }} / {{ unitMap[detail.freightVolume] }}
+                       {{$t('成本价')}}：{{Decimal(detail.orgFreight || 0).minus(detail.orgLightCommissionAmount || 0).minus(detail.shadeCommissionAmount || 0)}} {{ currencyMap[detail.freightCurrency] }} / {{ unitMap[detail.freightVolume] }}
                    </div>
                    <div>
                        {{$t('明佣')}}：{{ detail.lightCommissionAmount}}{{currencyMap[detail.freightCurrency]}} / {{unitMap[detail.freightVolume]}}

--- a/src/views/ecw/order/edit.vue
+++ b/src/views/ecw/order/edit.vue
@@ -811,6 +811,9 @@ export default {
            })
        }
    },
+    'form.isCargoControl'(isCargoControl){
+        this.$set(this.form, 'drawee', isCargoControl ? 1 : 2)
+    },
    /* 'form.orderItemVOList'(){
        console.log('form.orderItemVOList', this.form.orderItemVOList.length, this.form.orderItemVOList)
    }, */

--- a/src/views/ecw/order/index.vue
+++ b/src/views/ecw/order/index.vue
@@ -146,8 +146,22 @@
      <el-table-column :label="$t('体积/重量')" align="center" prop="sumWeight">
        <template slot-scope="{row}">
          <!--入仓前是填单数据，入仓后是入仓数据-->
-          <template v-if="row.inWarehouseState <= 1">{{row.costVO.totalVolume}}m³ /{{row.costVO.totalWeight}}Kg</template>
-          <template v-else>{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</template>
+          <component
+          :is="row.orderType ==  2 ? 'el-tooltip' : 'div'"
+          class="item"
+          :style="{
+            color: row.orderType ==  2 ? 'red' : null
+          }"
+          effect="dark"
+          :content="(row.wvolume||0)+'m³'"
+          placement="bottom">
+            <div v-if="row.inWarehouseState <= 1">{{row.costVO.totalVolume}}m³ /{{row.costVO.totalWeight}}Kg</div>
+            <div v-else>{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</div>
+          </component>
+          <!-- <el-tooltip v-if="scope.row.orderExceptionType=='order_heavy_cargo_exception'" class="item" effect="dark" :content="(scope.row.wvolume||0)+'m³'" placement="bottom">
+            <span style="color:#ff4949" v-if="scope.row.orderStatus >= 5 ">{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>
+            <span style="color:#ff4949" v-else>{{scope.row.totalVolume+"m³/"+scope.row.totalWeight+"kg"}}</span>
+          </el-tooltip> -->
        </template>
      </el-table-column>
      <el-table-column :label="$t('始发仓')" align="center" prop="startWarehouseName">

--- a/src/views/ecw/order/special/Commission.vue
+++ b/src/views/ecw/order/special/Commission.vue
@@ -23,7 +23,7 @@
        <el-col :span="12">
          <el-form-item :label="$t('运费')">
            <!-- {{orderItem.oneSeaFreight}} -->
-            {{originPrice}}
+            {{form.orgFreight}}
            {{ currencyMap[orderItem.seaFreightCurrency] }} / {{ unitMap[orderItem.seaFreightVolume] }}
          </el-form-item>
        </el-col>
@@ -35,7 +35,7 @@
      </el-row>
      
      <el-form-item :label="$t('全包价')" v-if="orderItem.charging">
-        {{orderItem.oneSeaFreight}} {{ currencyMap[orderItem.seaFreightCurrency] }} / {{ unitMap[orderItem.seaFreightVolume] }}
+        {{form.orgFreight}} {{ currencyMap[orderItem.seaFreightCurrency] }} / {{ unitMap[orderItem.seaFreightVolume] }}
      </el-form-item>

      <el-form-item :label="$t('佣金类型')" prop="commissionType">
@@ -213,7 +213,6 @@ export default {
        this.$set(this.form, 'shadeCommissionAmount', 0)
      }
      
-      
      // 暗佣需要查询暗佣设置
      if(val == 2){
        this.getCommission()

--- a/src/views/ecw/order/transferWarehousing.vue
+++ b/src/views/ecw/order/transferWarehousing.vue
@@ -68,7 +68,7 @@
    <el-descriptions style="margin-top: 20px" :column="4" border>
      <el-descriptions-item :label="$t('集运仓库')">{{ warehouseDetails && warehouseDetails.warehouseOutName  ?  warehouseDetails.warehouseOutName : '' }}</el-descriptions-item>
      <el-descriptions-item :label="$t('储位')">
-         <div v-for="item in storageSpaceList"  style="display: flex;"><div>{{item.warehouseName ? item.warehouseName : ''}}{{$t('仓')}}</div><div>{{item.warehouseName ? item.regionName :''}} {{$t('区')}}</div> <div>{{item.code}}</div></div>
+        {{ ($refs.area ? $refs.area.selected : []).join(',') }}
      </el-descriptions-item>
      <el-descriptions-item v-if="type == 2" :label="$t('选择储位')">
        <div @click="areaVisible = true" style="color: #0a84ff;cursor: pointer;">{{$t('选择储位')}}</div>
@@ -122,7 +122,7 @@
      <el-button v-if="type == 1" size="medium" @click="cancellationOfOrder">{{$t('取消调仓')}}</el-button>
      <el-button size="medium" @click="$tab.closeOpenPage({path:'/order/order'})">{{$t('返回')}}</el-button>
    </div>
-    <warehouse-location ref="area" :city-id="warehouseInShi"  :visible.sync="areaVisible" v-model="params.orderLocationCreateReqVOList" :warehouse-id="warehouseDetails.warehouseInId" :order-id="Number(orderId)"></warehouse-location>
+    <warehouse-location ref="area" :visible.sync="areaVisible" v-model="params.orderLocationCreateReqVOList" :warehouse-id="warehouseDetails.warehouseInId" :order-id="Number(orderId)"></warehouse-location>
    <el-dialog :title="$t('订单转异')" center :visible.sync="escapeBol">
      <el-form label-position="top" label-width="200">
        <el-form-item :label="$t('原因类型')">
@@ -160,7 +160,7 @@ import ImageAndVideoUpload from "@/components/ImageAndVideoUpload/index";
 import {getSupplierPage} from "@/api/ecw/supplier";
 import {getByWarehouseId} from "@/api/ecw/warehouseArea";
 import {adjustLastWithStatus, warehouseApprovalCancel} from "@/api/ecw/batchSingleApplication";
-import warehouseLocation from "@/views/ecw/order/components/warehouseLocation";
+import warehouseLocation from "@/components/WarehouseAreaDialog";
 import imageUpload from "@/components/ImageUpload";
 import {getProductBrankPage} from "@/api/ecw/productBrank";
 import {parseTime} from "@/utils/ruoyi";
@@ -280,35 +280,11 @@ export default {
      this.warehouseDetails = r.data[r.data.length - 1]
      listByOrderId({orderId:this.orderId}).then(res => {
        if(res.code === 0){
-          getByWarehouseId().then(r =>{
-            let obj = [];
-            res.data.forEach(item => {
-              r.data.forEach(itemm => {
-                if(item.wareId === itemm.id){
-                  itemm.children.forEach(itemmm => {
-                   if(itemmm.id === item.areaId){
-                     if(itemmm.positionList.length > 0){
-                       itemmm.positionList.forEach(ic =>{
-                         if(ic.children && ic.children.length > 0){
-                           ic.children.forEach(icc => {
-                             if(icc.id === item.locationId){
-                               obj.push({
-                                 warehouseName:itemm.name,
-                                 regionName:itemmm.name,
-                                 code:icc.code
-                               })
-                             }
-                           })
-                         }
-                       })
-                     }
-                   }
-                  })
-                }
-              })
-            })
-            console.log(obj)
-            this.storageSpaceList = obj;
+          this.params.orderLocationCreateReqVOList = res.data
+
+          // 等待仓库id和已选的储位后初始化储位信息
+          this.$nextTick(() => {
+            this.$refs.area.updateArea()
          })
        }
      })
@@ -392,37 +368,8 @@ export default {
    },
  },
  watch:{
-    'params.orderLocationCreateReqVOList'(val){
-      console.log(val,'val');
-      getByWarehouseId().then(r =>{
-        let obj = [];
-        val.forEach(item => {
-          r.data.forEach(itemm => {
-            if(item.wareId === itemm.id){
-              itemm.children.forEach(itemmm => {
-                if(itemmm.id === item.areaId){
-                  if(itemmm.positionList && itemmm.positionList.length > 0){
-                    itemmm.positionList.forEach(ic =>{
-                    if(ic.children && ic.children.length > 0){
-                      ic.children.forEach(icc => {
-                        if(icc.id === item.locationId){
-                          obj.push({
-                            warehouseName:itemm.name,
-                            regionName:itemmm.name,
-                            code:icc.code
-                          })
-                        }
-                      })
-                    }
-                    })
-                  }
-                }
-              })
-            }
-          })
-        })
-        this.storageSpaceList = obj;
-      })
+    'params.orderLocationCreateReqVOList'(vo, vn){
+      console.log(vo, vn)
    }
  }
 }

--- a/src/views/ecw/order/warehousing/index.vue
+++ b/src/views/ecw/order/warehousing/index.vue
@@ -223,11 +223,16 @@ export default {
  mounted() {
    if(this.$route.query.id){
      this.orderId = parseInt(this.$route.query.id || undefined)
-      this.getOrder()
      getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data.reverse())
      getSpecialListByOrderId(this.orderId).then(r => this.specialList = r.data)
-      listByOrderId({ orderId: this.orderId }).then(r => {
-        this.form.orderLocationCreateReqVOList = r.data
+
+      Promise.all([
+        this.getOrder(),
+        listByOrderId({ orderId: this.orderId }).then(r => {
+          this.form.orderLocationCreateReqVOList = r.data
+        })
+      ]).then(() => {
+        // 等待仓库id和已选的储位后初始化储位信息
        this.$nextTick(() => {
          this.$refs.area.updateArea()
        })
@@ -313,7 +318,7 @@ export default {
      this.form.sumWeight = this.order.sumWeight// || sumWeight
    },
    getOrder(){
-      getOrder(this.orderId).then(r => {
+      return getOrder(this.orderId).then(r => {
        this.order = r.data
        this.getTowSum()
      })

--- a/src/views/ecw/product/index.vue
+++ b/src/views/ecw/product/index.vue
@@ -275,7 +275,7 @@ export default {
        attrArray: [{ required: true, message: this.$t("商品特性不能为空"), trigger: "change" }],
        titleZh: [{ required: true, message: this.$t("中文标题不能为空"), trigger: "blur" }],
        titleEn: [{ required: true, message: this.$t("英文标题不能为空"), trigger: "blur" }],
-        materialType: [{ required: true, message: this.$t("商品材质不能为空"), trigger: "blur" }],
+        // materialType: [{ required: true, message: this.$t("商品材质不能为空"), trigger: "blur" }],
        // packaging: [{ required: true, message: "包装要求不能为空", trigger: "blur" }],
        // containerLocation: [{ required: true, message: "默认货柜位置不能为空", trigger: "blur" }],
        // square: [{ required: true, message: "订单方数上线不能为空", trigger: "blur" }],

--- a/src/views/ecw/productPrice/edit.vue
+++ b/src/views/ecw/productPrice/edit.vue
@@ -97,7 +97,7 @@
              -
              <el-input v-model="item.endNum" type="number" placeholder="" class="w-100"></el-input>
              /
-              <selector v-model="form.weightUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2  class="w-100" />
+              <selector v-model="item.weightUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2  class="w-100" />
            </el-form-item>
            <el-form-item :label="$t('默认运费')" v-if="form.priceType != 1" :prop="`priceStepList.${index}.transportPrice`" :rules="{validator: priceValidator, trigger: 'blur',   message: '价格错误'}">
              <inputor default2="0" v-model.number="item.transportPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10"/>
@@ -117,7 +117,7 @@
              :rules="{validator: priceValidator, trigger: 'blur',   message: '价格错误'}"
              >
              <selector v-model="item.allPriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable2  class="w-100" />
-              <inputor default2="0" v-model.number="item.allPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" :rules="{validator: priceValidator, trigger: 'blur',   message: '价格错误'}"/>
+              <inputor default2="0" v-model.number="item.allPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 ml-10" :rules="{validator: priceValidator, trigger: 'blur',   message: '价格错误'}"/>
              / <selector v-model="item.allVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2  class="w-100" />
            </el-form-item>
          </div>
@@ -426,6 +426,7 @@ export default {
        stepPrice: 0,
        advanceStatus: 0,
        needBook: 0,
+        specialList: [],
        // dayLimit: 10000,
        validateEndDate: undefined,
        validateStartDate: undefined,
@@ -471,20 +472,37 @@ export default {
    getCurrencyList().then(res => this.currencyList = res.data)
    getUnitList().then(res => this.unitList = res.data)

-    if(!this.form.specialList){
+    /* if(!this.form.specialList || !this.form.specialList.length){
+      console.log('specialList默认给[]')
      this.$set(this.form, 'specialList', [])
-    }
-    this.getDictDatas(this.DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS).forEach(item => {
-      this.form.specialList.push({
-        "clearancePrice": !this.$route.query.action ? 0 : null, // 新建默认给0，否则默认是null
-        "clearancePriceUnit": null,
-        "clearanceVolumeUnit": null,
-        "specialDictType": item.value,
-        "transportPrice": !this.$route.query.action ? 0 : null, // 新建默认给0，否则默认是null
-        "transportPriceUnit": null,
-        "transportVolumeUnit": null,
+      this.getDictDatas(this.DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS).forEach(item => {
+        this.form.specialList.push({
+          "clearancePrice": !this.$route.query.action ? 0 : null, // 新建默认给0，否则默认是null
+          "clearancePriceUnit": null,
+          "clearanceVolumeUnit": null,
+          "specialDictType": item.value,
+          "transportPrice": !this.$route.query.action ? 0 : null, // 新建默认给0，否则默认是null
+          "transportPriceUnit": null,
+          "transportVolumeUnit": null,
+        })
      })
+    } */
+    console.log(this.getDictDatas(this.DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS))
+    this.getDictDatas(this.DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS).forEach(item => {
+      if(!this.form.specialList.find(special => special.specialDictType == item.value)){
+        this.form.specialList.push({
+          "clearancePrice": !this.$route.query.action ? 0 : null, // 新建默认给0，否则默认是null
+          "clearancePriceUnit": null,
+          "clearanceVolumeUnit": null,
+          "specialDictType": item.value,
+          "transportPrice": !this.$route.query.action ? 0 : null, // 新建默认给0，否则默认是null
+          "transportPriceUnit": null,
+          "transportVolumeUnit": null,
+        })
+      }
+      
    })
+    
  },
  methods: {
    priceValidator(rule, value, callback){
@@ -522,7 +540,7 @@ export default {
        }
        let data = Object.assign({}, this.form, {
          // lineChannelList: this.selectedRoutes,
-          specialList: this.specialProducts,
+          // specialList: this.specialProducts,
          isAllProduct: 0
        })
        if(this.form.stepPrice != 1){

--- a/src/views/ecw/productPrice/index.vue
+++ b/src/views/ecw/productPrice/index.vue
@@ -48,7 +48,7 @@
        </el-select>
      </el-form-item>  
      
-      <el-form-item :label="$t('审核状态')" prop="auditStatus">
+      <el-form-item :label="$t('上架状态')" prop="auditStatus">
          <dict-selector :type="DICT_TYPE.ECW_PRICE_AUDIT_STATUS" v-model="queryParams.auditStatus" clearable/>
      </el-form-item>
      <el-form-item :label="$t('状态')" prop="combStatus">
@@ -349,7 +349,7 @@ export default {
        }
        let setPriceText = notSetPrice ? '(' + this.$t('未设置价格') + ')' : '';
        if(row.blacklist) return this.$t('黑名单') + setPriceText;
-        if(row.auditStatus === AuditStatusEnum.PASS) return this.$t('已审核') + setPriceText;
+        if(row.auditStatus === AuditStatusEnum.PASS) return this.$t('已上架') + setPriceText;
        return this.$t('已下架') + setPriceText;
      }
    },