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

src/api/ecw/box.js

@@ -54,6 +54,15 @@ export function exportboxExcel(query) {
   });
 }
 
+// 导出预装单-异步
+export function exportPreloadGoodsList(query) {
+    return request({
+        url: "/ecw/box-preload-goods/downloadPreloadGoodsList",
+        method: "get",
+        params: query
+    });
+}
+
 // 创建费用登记
 export function createCost(data) {
   if (data.id) {

src/views/ecw/box/editAirForm.vue

@@ -25,13 +25,14 @@
             <el-option v-for="item in importWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('目的港清关')" prop="destinationClearance">
-          <el-radio-group v-model="form.destinationClearanceSelect" @input="destinationClearanceSelect">
-            <el-radio :label="1">{{$t('我司')}}</el-radio>
+        <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-group>
         </el-form-item>
-        <el-form-item v-if="form.destinationClearanceSelect==1" prop="destinationClearance" :rules="[
+        <el-form-item v-if="form.destinationClearance===1 || form.destinationClearance===2" prop="destinationClearance" :rules="[
           { required: true,  message: this.$t('清关方式不能为空'), trigger: 'blur' }
         ]">
           <el-radio-group v-model="form.destinationClearance">
@@ -79,7 +80,7 @@ export default {
   data() {
     return {
       // 表单参数
-      form: {},
+      form: { },
       channelList: [],
       // 表单校验
       rules: {
@@ -95,13 +96,20 @@ export default {
       }
     };
   },
+    watch:{
+      'form.destinationClearanceSelect'(){
+          if(!this.form.destinationClearance){
+              this.$set(this.form, 'destinationClearance', 1)
+          }
+      }
+    },
   methods: {
     getChannelList() {
       getChannelList().then((res) => (this.channelList = res.data))
     },
-    destinationClearanceSelect(val) {
+    /*destinationClearanceSelect(val) {
       this.$set(this.form,'destinationClearance',val)
-    },
+    },*/
     /** 提交按钮 */
     submitForm() {
       this.$refs['form'].validate((valid) => {

src/views/ecw/box/indexAir.vue

@@ -113,7 +113,7 @@
           <el-dropdown trigger="click" @command="(command) => handleCommand(scope.row, command)" style="marginRight:10px;">
             <el-button type="primary"> {{ $t('操作') }}<i class="el-icon-arrow-down el-icon--right"></i> </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="edit">{{$t('编辑')}}</el-dropdown-item>
+              <el-dropdown-item command="edit" :disabled="scope.row.prStatus>21">{{$t('编辑')}}</el-dropdown-item>
               <el-dropdown-item command="air">{{$t('操作')}}-{{$t('空运')}}</el-dropdown-item>
               <el-dropdown-item command="error">{{$t('异常登记')}}</el-dropdown-item>
               <el-dropdown-item command="cost">{{$t('费用登记')}}</el-dropdown-item>
@@ -194,7 +194,15 @@
 </template>
 
 <script>
-import {deletebox, getbox, getboxPage, exportboxExcel, getNoticeList, dealCustomsSplitNotify} from '@/api/ecw/box'
+import {
+    deletebox,
+    getbox,
+    getboxPage,
+    exportboxExcel,
+    getNoticeList,
+    dealCustomsSplitNotify,
+    exportPreloadGoodsList
+} from '@/api/ecw/box'
 import { getChannelList } from '@/api/ecw/channel'
 import { getWarehouseList } from '@/api/ecw/warehouse'
 import costForm from './costForm.vue'
@@ -512,7 +520,7 @@ export default {
             //   this.$t("预装单") + `(${row.selfNo}).xlsx`,
             //   "xlsx"
             // );
-            this.exportExcel(exportboxExcel, { shipmentId: row.id }, this.$t("预装单") + `(${row.selfNo}).xlsx`)
+            this.exportExcel(exportPreloadGoodsList, { shipmentId: row.id }, this.$t("预装单") + `(${row.selfNo}).xlsx`)
             break;
           case "downloadLoadGoodsList":
             downloadFile(

src/views/ecw/box/indexSea.vue

@@ -209,11 +209,11 @@
 
 <script>
 import {
-  deletebox,
-  getbox,
-  getboxPage,
-  exportboxExcel,
-  getNoticeList, dealCustomsSplitNotify,
+    deletebox,
+    getbox,
+    getboxPage,
+    exportboxExcel,
+    getNoticeList, dealCustomsSplitNotify, exportPreloadGoodsList,
 } from "@/api/ecw/box";
 import {
   downloadFile,
@@ -495,7 +495,7 @@ export default {
           //   this.$t("预装单") + `(${row.selfNo}).xlsx`,
           //   "xlsx"
           // );
-          this.exportExcel(exportboxExcel, { shipmentId: row.id }, this.$t("预装单") + `(${row.selfNo}).xlsx`)
+          this.exportExcel(exportPreloadGoodsList, { shipmentId: row.id }, this.$t("预装单") + `(${row.selfNo}).xlsx`)
           break;
         case "downloadLoadGoodsList":
           downloadFile(

src/views/ecw/box/shippingDetail.vue

@@ -26,7 +26,7 @@
           {{deliverType}}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('送货时间') + '/' + $t('自提时间')">
-          {{boxAirShipmentBackVO.deliverTime}}
+          {{parseTime(boxAirShipmentBackVO.deliverTime)}}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('送货地址') + '/' + $t('自提地址')">
           {{boxAirShipmentBackVO.deliverAddress}}
@@ -134,6 +134,7 @@ import { getChannelList } from "@/api/ecw/channel";
 import Decimal from "decimal.js";
 import ImagePreview from "@/components/ImagePreview";
 import {constantDict} from "@/views/ecw/box/shippingAir/utils";
+import {parseTime} from "../../../utils/ruoyi";
 
 /**
  * 出货审核详情
@@ -170,6 +171,7 @@ export default {
     getChannelList().then((res) => (this.channelList = res.data));
   },
   methods: {
+      parseTime,
     getTotlContent,
     /* 获取详情 */
     getApprovalDetail(processId) {

src/views/ecw/productPrice/batchEdit.vue

@@ -177,7 +177,7 @@
           </el-form-item>
         </template>
 
-        <el-form-item :label="$t('是否単询')" prop="inquiry">
+        <el-form-item :label="$t('是否单询')" prop="inquiry">
           <dict-selector :type="DICT_TYPE.NEED_ORDER_INQUIRY" v-model="form.needOrderInquiry" form-type="radio"></dict-selector>
         </el-form-item>
       </el-card>