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

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

@@ -207,7 +207,7 @@ export default {
     onSubmit(operateType) {
       this.$refs['cusClearanceForm'].validate((valid) => {
         if (valid) {
-          if (this.cusClearanceObj.clearanceType == 1) {
+          if (this.cusClearanceObj.clearanceType == 1 && this.cusClearanceObj.clearanceOrderIdList.length > 0) {
             this.$refs['airArrivalForm'].validate((arrvalid) => {
               if (arrvalid) {
                 updateOrderArrival({

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

@@ -111,7 +111,7 @@
             </el-radio-group>
           </div>
           <un-pkg-page v-if="pkgPageType == 1" :pkgData="pkgData" :shipmentObj="shipmentObj" />
-          <pkg-page v-if="pkgPageType == 2" :pkgData="pkgData" :shipmentObj="shipmentObj" @closeDialog="closeDialog" />
+          <pkg-page v-if="pkgPageType == 2" :pkgData="pkgData" :shipmentObj="shipmentObj" @closeDialog="closeDialog" @reload="getList" />
         </el-dialog>
         <!-- 打印标签 -->
         <el-dialog :title="$t('集运封箱标签')" :visible.sync="printdialogVisible" width="350px" :modal-append-to-body="false" append-to-body>

src/views/ecw/box/shippingAir/nodePage/mergePkg/pkgPage.vue

@@ -196,6 +196,7 @@ export default {
       deleteRelate(this.pkgData.id, row.orderId).then(() => {
         this.$message.success(this.$t('移出成功'))
         this.getList()
+        this.$emit('reload')
       })
     },
     // 选中

src/views/ecw/box/shippingAir/nodePage/mergePkg/unPkgPage.vue

@@ -22,7 +22,7 @@
           </el-table-column>
           <el-table-column :label="$t('备案')" align="center">
             <template slot-scope="{ row }">
-              <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.productRecord" />
+              <dict-tag :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="row.productRecord" />
             </template>
           </el-table-column>
           <el-table-column :label="$t('箱数')" align="center" prop="sumNum">

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

@@ -285,7 +285,7 @@
                 <el-table-column :label="$t('包装类型')" align="center" prop="">
                   <template slot-scope="scope">
                     <span v-for="(unit,index) in scope.row.warehouseInInfoVO && scope.row.warehouseInInfoVO.units.split(',')" :key="index">
-                      <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />
+                      <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" /><span v-if="index>0&&index<scope.row.warehouseInInfoVO.units.split(',').length-1">, </span>
                     </span>
                   </template>
                 </el-table-column>

src/views/ecw/channel/index.vue

@@ -81,18 +81,18 @@
       <!-- <el-table-column label="内部名称-英文" align="center" prop="internalNameEn" />
       <el-table-column :label="$t('类型编码')" align="center" prop="typeNumber" />-->
       <!-- <el-table-column label="仓库id字符串" align="center" prop="warehouseIds" /> -->
-      <el-table-column :label="$t('仓库名')" align="center" prop="warehouseNameList" width="180">
-       <template slot-scope="scope">
-       <el-scrollbar style="margin-right: 6px;">
-           <div class="left">
-          <el-tag v-for="warehouseName in scope.row.warehouseNameList"
-             :key="warehouseName.index">
-             <span>{{warehouseName}}</span>
-           </el-tag>
-          </div>
-       </el-scrollbar>
-       </template>
-      </el-table-column>
+<!--      <el-table-column :label="$t('仓库名')" align="center" prop="warehouseNameList" width="180">-->
+<!--       <template slot-scope="scope">-->
+<!--       <el-scrollbar style="margin-right: 6px;">-->
+<!--           <div class="left">-->
+<!--          <el-tag v-for="warehouseName in scope.row.warehouseNameList"-->
+<!--             :key="warehouseName.index">-->
+<!--             <span>{{warehouseName}}</span>-->
+<!--           </el-tag>-->
+<!--          </div>-->
+<!--       </el-scrollbar>-->
+<!--       </template>-->
+<!--      </el-table-column>-->
       <el-table-column :label="$t('简码')" align="center" prop="code" />
       <el-table-column :label="$t('排序')" align="center" prop="sort" />
       <el-table-column :label="$t('快递公司')" align="center" prop="companyName" />

src/views/ecw/customer/index.vue

@@ -109,9 +109,7 @@
       </el-table-column>
       <el-table-column :label="$t('客户编号')" align="center" prop="number" >
         <template v-slot="{row}">
-          <router-link :to="'/customer/query/' + row.id">
-            {{row.number}}
-          </router-link>
+          {{row.number}}
         </template>
       </el-table-column>
       <el-table-column :label="$t('客户名称')" align="center" prop="name">
@@ -164,7 +162,7 @@
 <!--          <el-button size="mini" type="text" v-show="'development' === env && scope.row.isInOpenSea"  @click="seasPond(scope.row)"-->
 <!--                     v-hasPermi="['ecw:customer:query']">{{$t('掉入公海池')}}</el-button>-->
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
-                     v-hasPermi="[selectAuthorityFn('ecw:customer:query')]">{{$t('查看')}}</el-button>
+                     v-hasPermi="[selectAuthorityFn('ecw:customer:index-query')]">{{$t('查看')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="[selectAuthorityFn('ecw:customer:update')]">{{$t('修改')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"

src/views/ecw/deptTarget/index.vue

@@ -73,7 +73,12 @@
           <span>{{ getShipChannelName(scope.row.shippingChannel) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('已完成目标值')" align="center" prop="completeCubeNum"/>
+      <el-table-column :label="$t('已完成目标值')" align="center" prop="completeCubeNum">
+        <template v-slot="{row}">
+          {{row.completeCubeNum}}
+          <dict-tag :type="DICT_TYPE.CEBE_UNIT" :value="row.cubeUnit"  ></dict-tag>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('完成比例')" align="center">
         <template slot-scope="scope">
           <span>{{ (scope.row.completeCubeNum/scope.row.cubeNum*100).toFixed(2)+'%' }}</span>

src/views/ecw/deptTarget/myDeptTarget.vue

@@ -73,7 +73,12 @@
           <span>{{ getShipChannelName(scope.row.shippingChannel) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('已完成目标值')" align="center" prop="completeCubeNum"/>
+      <el-table-column :label="$t('已完成目标值')" align="center" prop="completeCubeNum">
+        <template v-slot="{row}">
+          {{row.completeCubeNum}}
+          <dict-tag :type="DICT_TYPE.CEBE_UNIT" :value="row.cubeUnit"  ></dict-tag>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('完成比例')" align="center">
         <template slot-scope="scope">
           <span>{{ (scope.row.completeCubeNum/scope.row.cubeNum*100).toFixed(2)+'%' }}</span>

src/views/ecw/order/warehousing/components/Warehouse.vue

@@ -743,7 +743,7 @@ export default {
       this.form.orderId = this.warehousing.orderId
       this.form.orderItemId = this.warehousing.orderItemId
       this.form.orderNo = this.warehousing.orderNo
-      if (this.edit || this.isAdd) {
+      if ((this.edit || this.isAdd) && this.warehousing.warehouseInProdAttrIds !== null ) {
         this.form.warehouseInProdAttrIds = this.warehousing.warehouseInProdAttrIds?.split(',').map(e => +e) || []
       } else {
         this.form.warehouseInProdAttrIds =

src/views/ecw/productAttr/edit.vue

@@ -3,14 +3,14 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
 
       <el-form-item :label="$t('适用商品')" prop="idList">
-        <products-selector :defaultIds="form.idList" v-model="form.idList" show-all @setall="toggleAll" />
+        <products-selector ref="productsSelector" :defaultIds="form.idList" v-model="form.idList" show-all @setall="toggleAll" />
       </el-form-item>
 
       <el-form-item :label="$t('货柜位置')" prop="containerLocation">
         <dict-selector :type="DICT_TYPE.ECW_CONTAINER_LOCATION" v-model="form.containerLocation" />
       </el-form-item>
       <el-form-item :label="$t('出运要求')" prop="requirements">
-        <el-checkbox true-label="1" v-model="form.requirements">{{$t('证书要求（支持多证书）')}}</el-checkbox>
+        <el-checkbox :true-label="1" :false-label="0"   v-model="form.requirements">{{$t('证书要求（支持多证书）')}}</el-checkbox>
       </el-form-item>
       <el-form-item :label="$t('订单方数上限')" prop="square">
         <el-input v-model="form.square" placeholder="" class="w-200"></el-input>
@@ -208,7 +208,7 @@ export default {
         "isAllProduct": 0,
         "needBook": undefined,
         "packaging": undefined,
-        "requirements": undefined,
+        "requirements": 0,
         "square": undefined,
         "materialType": undefined,
         priceStepClearanceList:[],
@@ -219,6 +219,8 @@ export default {
       };
       this.attrIds = []
       this.resetForm("form");
+      this.lineNum = 0;
+      this.$refs.productsSelector.empty()
     },
     verify(row){
       return (row.startNum !== '' && row.endNum !== '' && row.clearancePrice !== '' && row.clearancePriceUnit !== '' && row.clearanceVolumeUnit !== '')