收货人限制修改申请

src/api/ecw/orderCargoControl.js

@@ -157,3 +157,12 @@ export function getControlLogList(orderId){
     method: 'get'
   })
 }
+
+// 控货业务审批申请
+export function applyCargoControlApproval(data){
+  return request({
+    url: 'ecw/order-cargo-control/update/apply',
+    method: 'put',
+    data
+  })
+}

src/components/FileUpload/index.vue

@@ -73,7 +73,7 @@ export default {
       number: 0,
       uploadList: [],
       baseUrl: process.env.VUE_APP_BASE_API,
-      uploadFileUrl: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/org-name/up", // 上传的文件服务器地址
+      uploadFileUrl: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/upload", // 上传的文件服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },

src/views/ecw/order/cargoControl.vue

@@ -143,6 +143,8 @@
 
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="150px">
         <template slot-scope="scope">
+          <!--修改放货限制-->
+          <el-button type="text"  size="mini" @click="showUpdateReleaseLimit=scope.row" v-hasPermi="['ecw:cargo_control:update']">{{$t('修改放货限制')}}</el-button>
           <!--控货中,已入仓-->
           <template v-if="[0,2].indexOf(scope.row.cargoControlStatus) > -1 && scope.row.sumNum > 0">
             <el-button type="text"  size="mini" @click="showReleaseOrderId=scope.row.orderId" v-hasPermi="['ecw:cargo_control:release']">{{$t('放货')}}</el-button>
@@ -184,6 +186,14 @@
     <fallback       v-if="showFallbackOrder !== null" :order="showFallbackOrder"            @close="showFallbackOrder=null"         @success="onFallbackSuccess" :index="null"   />
     <!--控货日志-->
     <cargo-log-list v-if="showLogOrderId" :order-id="showLogOrderId" @close="showLogOrderId=null" />
+
+    <!--修改放货限制-->
+    <update-release-limit
+      v-if="showUpdateReleaseLimit"
+      :order="showUpdateReleaseLimit"
+      @close="showUpdateReleaseLimit=null"
+      @submit="onUpdateReleaseLimitSuccess"
+    />
   </div>
 </template>
 
@@ -192,6 +202,7 @@ import Selector from '@/components/Selector'
 import ProductSelector from '@/components/ProductSelector'
 import { getProductAttrList } from '@/api/ecw/productAttr'
 import CustomerSelector from '@/components/CustomerSelector'
+import UpdateReleaseLimit from '@/views/ecw/order/components/updateReleaseLimit.vue'
 /* import { getTradeCityList } from '@/api/ecw/region' */
 import Transfer from '@/views/ecw/order/components/Transfer'
 import Release from './components/Release'
@@ -204,6 +215,7 @@ import CargoLogList from "@/views/ecw/order/components/CargoLogList.vue";
 export default {
   name: "EcwOrderCargocontrol",
   components: {
+    UpdateReleaseLimit,
     CargoLogList,
     CustomerSelector, ProductSelector, Selector, Transfer, Release,CargoControlEdit, TransferCargo, Fallback
   },
@@ -245,6 +257,7 @@ export default {
       showFallbackOrder: null, // 调货订单
       pickInfo: null, // 当前操作的提货信息
       showLogOrderId: null, // 显示控货日志的订单ID
+      showUpdateReleaseLimit: null, // 显示修改放货限制的订单
     };
   },
   computed: {
@@ -372,6 +385,11 @@ export default {
     onTransferCargoSuccess(){
       this.showTransferCargoOrderId = null
       this.getList()
+    },
+    // 修改放货审批限制成功
+    onUpdateReleaseLimitSuccess(){
+      this.showUpdateReleaseLimit = null
+      this.getList()
     }
   }
 };

src/views/ecw/order/components/updateReleaseLimit.vue

+<template>
+  <el-dialog :visible="show" @close="handleClose" :title="$t('收货人限制修改申请')" width="1000px">
+    <el-form label-position="left" label-width="150px" :model="form">
+      <el-row :gutter="20">
+        <!-- 订单号 -->
+        <el-col :span="8">
+          <el-form-item :label="$t('订单号')">
+            <span>{{ order.orderNo }}</span>
+          </el-form-item>
+        </el-col>
+        <!-- 总箱数 -->
+        <el-col :span="8">
+          <el-form-item :label="$t('总箱数')">
+            <span>{{ order.sumNum }}</span>
+          </el-form-item>
+        </el-col>
+        <!-- 体积 -->
+        <el-col :span="8">
+          <el-form-item :label="$t('体积')">
+            <span>{{ order.sumVolume }}m³</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <!-- 重量 -->
+        <el-col :span="8">
+          <el-form-item :label="$t('重量')">
+            <span>{{ order.sumWeight }}Kg</span>
+          </el-form-item>
+        </el-col>
+        <!-- 总控箱数 -->
+        <el-col :span="8">
+          <el-form-item :label="$t('总控货箱数')">
+            <span>{{ order.sumNum }}</span>
+          </el-form-item>
+        </el-col>
+        <!-- 剩余放货箱数 -->
+        <el-col :span="8">
+          <el-form-item :label="$t('剩余放货箱数')">
+            <span>{{order.sumNum - order.releaseNum	}}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <!-- 邮库/到仓时间 -->
+        <el-col :span="8">
+          <el-form-item :label="$t('卸柜/到仓时间')">
+            <span>{{ order.unloadTime }}</span>
+          </el-form-item>
+        </el-col>
+        <!-- 订单限制修改收货人 -->
+        <el-col :span="8">
+          <el-form-item :label="$t('订单限制修改收货人')">
+            <span>{{ order.isLimitUpdateConsignee ? $t('是') : $t('否') }}</span>
+          </el-form-item>
+        </el-col>
+        <!-- 订单锁定收货人天数 -->
+        <el-col :span="8" v-if="order.isLimitUpdateConsignee">
+          <el-form-item :label="$t('订单锁定收货人天数')">
+            <span>{{ order.lockConsigneeDay }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20" v-if="order.isLimitUpdateConsignee">
+        <!-- 放货锁定收货人到期时间 -->
+        <el-col :span="12">
+          <el-form-item :label="$t('放货锁定收货人到期时间')" label-width="180px">
+            <span>{{ order.lockConsigneeTime }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-divider>{{$t('修改信息')}}</el-divider>
+
+      <el-row :gutter="20">
+        <!-- 订单限制修改收货人 -->
+        <el-col :span="8">
+          <el-form-item :label="$t('订单限制修改收货人')">
+            <el-radio-group v-model="form.newIsLimitUpdateConsignee">
+              <el-radio :label="true">{{$t('是')}}</el-radio>
+              <el-radio :label="false">{{$t('否')}}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <!-- 订单锁定收货人天数 -->
+        <el-col :span="8">
+          <el-form-item :label="$t('订单锁定收货人天数')" required>
+            <el-input-number :min="0" v-model="form.newLockConsigneeDay" :disabled="!form.newIsLimitUpdateConsignee"></el-input-number>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <!-- 放货锁定收货人到期时间 -->
+        <el-col :span="12">
+          <el-form-item :label="$t('放货锁定收货人到期时间')" label-width="180px">
+            <span>{{ newLockConsigneeTime }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <!-- 修改原因 -->
+        <el-col :span="24">
+          <el-form-item :label="$t('修改原因')">
+            <el-input type="textarea" v-model="form.reasonZh"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <!-- 附件 -->
+        <el-col :span="24">
+          <el-form-item :label="$t('附件')">
+            <file-upload v-model="form.annex" :fileType="fileType"></file-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <work-flow xmlkey="shipment_change_release_goods_limit" v-model="form.ccIds"></work-flow>
+      </el-row>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="handleClose">{{$t('取消')}}</el-button>
+      <el-button type="primary" @click="handleSubmit">{{$t('确定')}}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import WorkFlow from '@/components/WorkFlow/index.vue'
+import FileUpload from '@/components/FileUpload/index.vue'
+import { applyCargoControlApproval } from '@/api/ecw/orderCargoControl'
+export default {
+  components:{
+    FileUpload,
+    WorkFlow
+  },
+  props:{
+    order: Object
+  },
+  data() {
+    return {
+      // 是否显示弹窗
+      show: true,
+      fileType: ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt", "pdf", 'jpg', 'jpeg', 'png', 'mp4', 'mov', 'avi', 'mp3'],
+      form: {
+        // 申请类型：此处应该是 61 放货限制修改申请 62 海外仓修改申请
+        applyType: 61,
+        // 新的是否限制修改收货人
+        newIsLimitUpdateConsignee: false,
+        // 新的放货锁定收货人天数
+        newLockConsigneeDay: '',
+        // 修改原因
+        reasonZh: '',
+        // 附件
+        annex: '',
+        ccIds: []
+      }
+    }
+  },
+  computed:{
+    // 当订单已卸柜/到仓，则时间为卸柜/到仓时间 + 锁定收货人天数，否则为空
+    newLockConsigneeTime(){
+      if(!this.order.unloadTime || !this.form.newIsLimitUpdateConsignee || !this.form.newLockConsigneeDay){
+        return '-'
+      }
+      return new Date(new Date().getTime() + this.form.newLockConsigneeDay * 86400 * 1000).toLocaleString()
+    }
+  },
+  watch:{
+    // 不限制则天数清空
+    'form.newIsLimitUpdateConsignee'(val){
+      if(!val){
+        this.form.newLockConsigneeDay = ''
+      }
+    }
+  },
+  mounted() {
+    this.form.newIsLimitUpdateConsignee = !!this.order.isLimitUpdateConsignee
+    if(this.form.newIsLimitUpdateConsignee){
+      this.form.newLockConsigneeDay = this.order.lockConsigneeDay
+    }
+  },
+  methods:{
+    handleClose(){
+      this.show = false
+      this.$emit("close")
+    },
+    handleSubmit(){
+      const data = {
+        ...this.form,
+        ccIds: this.form.ccIds.join(','),
+        orderId: this.order.orderId
+      }
+      applyCargoControlApproval(data).then(res => {
+        this.$message.success(this.$t('操作成功'))
+        this.$emit('success')
+      })
+    }
+  }
+}
+</script>