Merge remote-tracking branch 'origin/dev' into dev

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

@@ -201,7 +201,7 @@ export default {
         /* doc.save("a4.pdf");
         return Promise.reject() */
         let form = new FormData()
-        let file = this.currRow.orderNo + '-' + orderData.marks + '.pdf' //this.selfNo + '-' + this.currRow.tidanNo + '.pdf'
+        let file = this.selfNo + "-" + this.currRow.tidanNo + ' ' + orderData.marks + '.pdf' //this.selfNo + '-' + this.currRow.tidanNo + '.pdf'
 
         form.append('file', new File([doc.output('arraybuffer')], file, {type: 'application/pdf'}))
         form.append('path', `admin/shipment/${this.selfNo}/pdf/${file}`) // 最前面不能有/，否则返回的url会有两个/

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

@@ -85,8 +85,10 @@
         prop="address"
         :label="$t('操作')">
         <template v-slot="{ row, column, $index }">
-          <el-button v-if="row.packStatus == 1" size="mini" type="warning" @click="noNeedPack(row)">{{$t('无需打包')}}</el-button>
-          <el-button v-if="row.packStatus == 1" size="mini" type="primary" @click="package(row, $t('打包'))">{{$t('打包')}}</el-button>
+          <template v-if="wareItemPackStatus(row.orderItemId) == 1">
+            <el-button size="mini" type="warning" @click="noNeedPack(row)">{{$t('无需打包')}}</el-button>
+            <el-button size="mini" type="primary" @click="package(row, $t('打包'))">{{$t('打包')}}</el-button>
+          </template>
           <el-button v-else size="mini" type="primary" @click="package(row, $t('修改打包'))">{{$t('修改打包')}}</el-button>
         </template>
       </el-table-column>
@@ -159,7 +161,7 @@
       :order-item-b="packageWarehouseItem"
       :title="packageTitle"
       v-if="!!packageOrderItem"
-      @close="packageOrderItem=null;packageOrderItem=null"
+      @close="onPackageClose"
     ></package>
   </div>
 </template>
@@ -313,13 +315,23 @@ export default {
     },
     // 完成备货
     async handleSubmit() {
-      // TODO 判断是否有未完成打包
+      let unpackProds = []
+      this.orderItemList.forEach(item => {
+        if(item.packStatus == 1){
+          unpackProds.push(this.$l(item, 'prodTitle'))
+        }
+      })
+      if(unpackProds.length){
+        return this.$alert(`商品${unpackProds.join(',')}未完成打包,无法完成备货`, this.$t('提示'))
+      }
 
       let form = {...this.form}
       form.orderId = this.orderId
       form.manualExceptionType = form.manualExceptionType.join(',')
       finishStock(form).then(res => {
-        this.$message.success(this.$t('操作成功'))
+        return this.$alert(this.$t('操作成功'))
+      }).then(() => {
+        this.$tab.closePage()
       })
     },
     // 显示打包弹层
@@ -334,6 +346,11 @@ export default {
         this.$message.success(this.$t('操作成功'))
       })
     },
+    onPackageClose(){
+      this.packageOrderItem=null;
+      this.packageOrderItem=null;
+      this.getOrderItemList()
+    }
   },
   watch: {
     /*orderSpecialNeeds(val){

src/views/ecw/productPrice/index.vue

@@ -169,6 +169,7 @@
                 {{$t('全包价')}}:{{ getCurrencySymbol(scope.row.priceStepList[0].allPriceUnit) + scope.row.priceStepList[0].allPrice}} 
                 {{ getCurrencyTitle(scope.row.priceStepList[0].allPriceUnit) + '/' + getUnitTitle(scope.row.priceStepList[0].allVolumeUnit)}}
               </div>
+              <el-button type="text" @click="showMoreStepPriceItem=scope.row">{{$t('查看更多')}}</el-button>
             </template>
             <template v-else>
               <div v-if="scope.row.priceType == 0">
@@ -238,6 +239,60 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
                 @pagination="getList"/>
 
+    <el-dialog :visible="!!showMoreStepPriceItem" :before-close="closeMoreStepPrice" :title="$t('查看阶梯价')">
+
+      <el-row :gutter="20" v-if="showMoreStepPriceItem">
+        <el-col :span="12">
+          <div v-for="(item, index) in showMoreStepPriceItem.priceStepList">
+            <div class="page-title">
+              {{$t("第{no}阶梯（{start}~{end}{weightUnit}）", {
+              no: index + 1,
+              start: item.startNum,
+              end: item.endNum,
+              weightUnit:  getUnitTitle(item.weightUnit),
+              })}}
+            </div>
+
+            <div v-if="showMoreStepPriceItem.priceType == 0">
+              {{$t('运费')}}:{{ getCurrencySymbol(item.transportPriceUnit) + item.transportPrice}}&nbsp;
+              {{ getCurrencyTitle(item.transportPriceUnit) + '/' + getUnitTitle(item.transportVolumeUnit)}}
+              <br />
+              <template v-if="[3,4].indexOf(+showMoreStepPriceItem.warehouseLineDO.transportType) > -1">
+                <!--空运的清关费单独显示-->
+              </template>
+              <template v-else>
+                <!--海运的清关费-->
+                {{$t('清关费')}}:{{ getCurrencySymbol(item.clearancePriceUnit) + item.clearancePrice}}&nbsp;
+                {{ getCurrencyTitle(item.clearancePriceUnit) + '/' + getUnitTitle(item.clearanceVolumeUnit)}}
+              </template>
+            </div>
+            <div v-if="showMoreStepPriceItem.priceType == 1">
+              {{$t('全包价')}}:{{ getCurrencySymbol(item.allPriceUnit) + item.allPrice}}&nbsp;
+              {{ getCurrencyTitle(item.allPriceUnit) + '/' + getUnitTitle(item.allVolumeUnit)}}
+            </div>
+          </div>
+        </el-col>
+        <!--空运的清关费单独显示-->
+        <el-col :span="12" v-if="[3,4].indexOf(+showMoreStepPriceItem.warehouseLineDO.transportType) > -1">
+          <template v-if="showMoreStepPriceItem.clearPriceStepList.length">
+            <div v-for="(item, index) in showMoreStepPriceItem.clearPriceStepList">
+              <div  class="page-title">
+                {{$t("第{no}阶梯（{start}~{end}{weightUnit}）", {
+                no: index + 1,
+                start: item.startNum,
+                end: item.endNum,
+                weightUnit:  getUnitTitle(item.weightUnit),
+                })}}
+              </div>
+              {{$t('清关费')}}:{{ getCurrencySymbol(item.clearancePriceUnit) + item.clearancePrice}}&nbsp;
+              {{ getCurrencyTitle(item.clearancePriceUnit) + '/' + getUnitTitle(item.clearanceVolumeUnit)}}
+            </div>
+          </template>
+          <template v-else>{{$t('暂无清关费设置')}}</template>
+        </el-col>
+      </el-row>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -296,9 +351,6 @@ export default {
       routeParams:{},    //路线搜索条件
       isUpdate: false,   //更新操作
 
-      //货柜位置
-      locationList:[],
-
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -353,7 +405,8 @@ export default {
       /* advanceStatusDictDatas: getDictDatas(DICT_TYPE.ADVANCE_STATUS), */
       AuditStatusEnum: AuditStatusEnum,
       locationList: getDictDatas(DICT_TYPE.ECW_CONTAINER_LOCATION),
-
+      // 查看更多阶梯价
+      showMoreStepPriceItem: null
     };
   },
 
@@ -824,6 +877,10 @@ export default {
     copyTemplate(row){
       // 跳转到批量设置页面，并填充数据
       this.$router.push(`../../lineProject/batch-edit-${row.transportType == 3 || row.transportType == 4 ? 'air' : 'sea'}?templateId=${row.id}`)
+    },
+    // 关闭更多阶梯价格窗口
+    closeMoreStepPrice(){
+      this.showMoreStepPriceItem=null
     }
 
   }