Merge branch 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

src/components/boxInformation/index.vue

@@ -482,6 +482,7 @@ export default {
         ...params,
         current: page.currentPage,
         size: page.pageSize,
+        ...Object.assign(params, this.search)
       }
       this.loading = true
       getList(params).then(res => {

src/views/basicData/container/archives.vue

@@ -30,7 +30,7 @@
         </el-button>
       </template>
       <template slot="leasingCompanyIdForm">
-        <crop-select v-model="form.leasingCompanyId" disabled @getCorpData="getGSData" corpType="GS"/>
+        <crop-select v-model="form.leasingCompanyId" disabled @getCorpData="getGSData" corpType="KH"/>
       </template>
       <template slot="addressIdForm">
         <port-info v-model="form.addressId" type="id" @balabalaTow="balabala"/>
@@ -48,7 +48,7 @@
         {{ row.leasingCompany }}
       </template>
     </avue-crud>
-    <el-dialog title="导入客户" append-to-body :visible.sync="excelBox" width="555px" :close-on-click-modal="false"
+    <el-dialog title="导入箱档案" append-to-body :visible.sync="excelBox" width="555px" :close-on-click-modal="false"
                v-dialog-drag>
       <avue-form :option="excelOption" v-model="excelForm" table-loading="excelLoading"
                  :upload-before="uploadBefore" :upload-after="uploadAfter">
@@ -391,14 +391,11 @@ export default {
       })
     },
     derivation() {
-      window.open(
-          `/api/blade-box-tube/archives/export-archives-info?${this.website.tokenHeader
-          }=${getToken()}`
-      );
+      window.open(`/api/blade-box-tube/archives/export-archives-info?${this.website.tokenHeader}=${getToken()}`);
     },
     uploadBefore(file, done, loading) {
-      done();
       loading = true;
+      done();
     },
     uploadAfter(res, done, loading, column) {
       this.excelBox = false;

src/views/boxManagement/exportShipment/detailsPage.vue

@@ -10,6 +10,9 @@
         </el-button>
       </div>
       <div class="add-customer-btn">
+        <el-button class="el-button--small-yh" style="margin-right: 10px" type="primary" size="small" :disabled="form.status>0"
+                   @click="confirmEdit" v-if="optionForm.disabled === true">编辑
+        </el-button>
         <el-dropdown style="margin-right: 10px">
           <el-button type="primary" size="small">
             审核处理<i class="el-icon-arrow-down el-icon--right"></i>
@@ -17,7 +20,8 @@
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item @click.native="pleaseCheck" :disabled="form.status>0">请核数据</el-dropdown-item>
             <el-dropdown-item @click.native="checkScheduleDialog = true,checkId = form.id">审核进度</el-dropdown-item>
-            <el-dropdown-item @click.native="repealCancel" :disabled="form.status === 0 || !form.status" v-if="!detailData.id">撤销请核
+            <el-dropdown-item @click.native="repealCancel" :disabled="form.status === 0 || !form.status"
+                              v-if="!detailData.id">撤销请核
             </el-dropdown-item>
             <!--            <el-dropdown-item @click.native="changeApproveOpen">特殊审批</el-dropdown-item>-->
           </el-dropdown-menu>
@@ -170,7 +174,7 @@
       </span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="confirmChange">确 定</el-button>
+        <el-button type="primary" :disabled="disabledVisible" @click="confirmChange">确 定</el-button>
       </span>
     </el-dialog>
     <el-dialog
@@ -234,6 +238,7 @@ export default {
       importList: [],
       title: '',
       loading: false,
+      disabledVisible: false,
       boxTrack: false,
       importOpen: false,
       dialogVisible: false,
@@ -368,13 +373,23 @@ export default {
           prop: 'corpId',
           width: 100,
           search: true,
-          overHidden: true
+          overHidden: true,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '船公司',
           prop: 'shippingCompany',
           width: 100,
           search: true,
-          overHidden: true
+          overHidden: true,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '提单号',
           prop: 'billNo',
@@ -407,13 +422,23 @@ export default {
           prop: 'departureHarbor',
           width: 100,
           search: true,
-          overHidden: true
+          overHidden: true,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '目的港',
           prop: 'objectiveHarbor',
           width: 100,
           search: true,
-          overHidden: true
+          overHidden: true,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '合同生效日期',
           prop: 'effectiveDate',
@@ -423,6 +448,12 @@ export default {
           type: "date",
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
+          labelWidth:100,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '合同失效日期',
           prop: 'expiryDate',
@@ -432,6 +463,12 @@ export default {
           type: "date",
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
+          labelWidth:100,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '起租日期',
           prop: 'startingRentDate',
@@ -441,6 +478,11 @@ export default {
           type: "date",
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '出场日期',
           prop: 'exitDate',
@@ -529,12 +571,22 @@ export default {
           props: {
             label: "code",
             value: "code"
-          }
+          },
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '地点',
           prop: 'address',
           overHidden: true,
-          width: 100
+          width: 100,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '日期',
           prop: 'newDate',
@@ -543,6 +595,11 @@ export default {
           type: "date",
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '箱类型',
           prop: 'boxTypeId',
@@ -554,7 +611,12 @@ export default {
             label: 'name',
             value: 'id'
           },
-          dicUrl: '/api/blade-client/container/listMessage'
+          dicUrl: '/api/blade-client/container/listMessage',
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '币别',
           prop: 'currency',
@@ -566,7 +628,12 @@ export default {
           props: {
             label: "dictValue",
             value: "dictKey"
-          }
+          },
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '租金收入',
           prop: 'amount',
@@ -574,6 +641,11 @@ export default {
           value:0,
           controls: false,
           overHidden: true,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '超期单价/天',
           prop: 'price',
@@ -581,6 +653,11 @@ export default {
           value:0,
           controls: false,
           overHidden: true,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '超期箱使收入',
           prop: 'overdueAmount',
@@ -635,13 +712,42 @@ export default {
       })
     }
     if (this.onLoad.id && this.detailData.id) {
-      this.refresh(this.onLoad.id)
+      this.refresh(this.onLoad.id, true)
     }else if (this.onLoad.id){
-      this.refresh(this.onLoad.id)
+      this.refresh(this.onLoad.id, true)
     }
     this.key++
   },
   methods: {
+    confirmEdit() {
+      if (this.form.status > 0) {
+        //基础资料
+        this.$set(this.optionForm, "disabled", true)
+        //箱信息
+        this.$set(this.option, "disabled", true)
+        this.$set(this.option, "addBtn", false)
+        this.$set(this.option, "menu", false)
+        //费用信息
+        this.$set(this.$refs.boxCost.option, "disabled", true)
+        this.$set(this.$refs.boxCost.option, "addBtn", false)
+        this.$set(this.$refs.boxCost.option, "menu", false)
+        //附件和顶部按钮
+        this.disabled = true
+      } else {
+        //基础资料
+        this.$set(this.optionForm, "disabled", false)
+        //箱信息
+        this.$set(this.option, "disabled", false)
+        this.$set(this.option, "addBtn", true)
+        this.$set(this.option, "menu", true)
+        //费用信息
+        this.$set(this.$refs.boxCost.option, "disabled", false)
+        this.$set(this.$refs.boxCost.option, "addBtn", true)
+        this.$set(this.$refs.boxCost.option, "menu", true)
+        //附件和顶部按钮
+        this.disabled = false
+      }
+    },
     //打开箱档案导入
     importBox() {
       this.importOpen = true
@@ -690,14 +796,18 @@ export default {
       this.$refs["formState"].validate((valid, done) => {
         done()
         if (valid) {
+          this.disabledVisible = true
           statusUpdate({
             ...this.formState,
             ids: data.join(',')
           }).then(res => {
             this.$message.success("操作成功")
             this.dialogVisible = false
+            this.disabledVisible = false
             this.formState = {}
             this.refresh(this.form.id)
+          }).catch(()=>{
+            this.disabledVisible = false
           })
         }
       })
@@ -742,7 +852,6 @@ export default {
             }
           }
         }
-        console.log(this.formState)
         this.dialogVisible = true
       } else {
         this.$message.error('请保存后操作')
@@ -875,6 +984,12 @@ export default {
       for (let item of this.dataList) {
         if (item.status !== "空箱入场") return this.$message.error("有未空箱入场的明细，禁止请核！")
       }
+      if (this.dataList.length === 0) {
+        return this.$message.error("箱信息不能为空")
+      }
+      if (this.dataListTwo.length === 0) {
+        return this.$message.error("费用信息不能为空")
+      }
       this.$confirm("您确定提交请核申请吗?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -883,18 +998,13 @@ export default {
         this.$refs["form"].validate((valid, done) => {
           done()
           if (valid) {
-            if (this.dataList.length === 0) {
-              return this.$message.error("箱信息不能为空")
-            }
-            if (this.dataListTwo.length === 0) {
-              return this.$message.error("费用信息不能为空")
-            }
             let data = {
               ...this.form,
               transportItemList: this.dataList,
               transportItemFeesList: this.dataListTwo,
               transportFilesList: this.tradingBoxFilesList,
-              billType: "CKZY"
+              billType: "CKZY",
+              checkFlag: 1
             }
             const loading = this.$loading({
               lock: true,
@@ -917,6 +1027,8 @@ export default {
                 loading.close();
                 this.$message.success('请核成功')
                 this.refresh(res.data.data.id)
+              }).catch(()=>{
+                loading.close();
               })
             }).catch(()=>{
               loading.close();
@@ -929,7 +1041,7 @@ export default {
     choceScheduleFun() {
       this.checkScheduleDialog = false
     },
-    refresh(id) {
+    refresh(id, type) {
       const loading = this.$loading({
         lock: true,
         text: '加载中',
@@ -945,7 +1057,7 @@ export default {
         delete this.form.transportItemFeesList
         delete this.form.transportFilesList
         loading.close();
-        if (this.form.status > 0) {
+        if (type) {
           //基础资料
           this.$set(this.optionForm, "disabled", true)
           //箱信息
@@ -958,19 +1070,34 @@ export default {
           this.$set(this.$refs.boxCost.option, "menu", false)
           //附件和顶部按钮
           this.disabled = true
-        } else {
-          //基础资料
-          this.$set(this.optionForm, "disabled", false)
-          //箱信息
-          this.$set(this.option, "disabled", false)
-          this.$set(this.option, "addBtn", true)
-          this.$set(this.option, "menu", true)
-          //费用信息
-          this.$set(this.$refs.boxCost.option, "disabled", false)
-          this.$set(this.$refs.boxCost.option, "addBtn", true)
-          this.$set(this.$refs.boxCost.option, "menu", true)
-          //附件和顶部按钮
-          this.disabled = false
+        }else {
+          if (this.form.status > 0) {
+            //基础资料
+            this.$set(this.optionForm, "disabled", true)
+            //箱信息
+            this.$set(this.option, "disabled", true)
+            this.$set(this.option, "addBtn", false)
+            this.$set(this.option, "menu", false)
+            //费用信息
+            this.$set(this.$refs.boxCost.option, "disabled", true)
+            this.$set(this.$refs.boxCost.option, "addBtn", false)
+            this.$set(this.$refs.boxCost.option,"menu",false)
+            //附件和顶部按钮
+            this.disabled = true
+          } else {
+            //基础资料
+            this.$set(this.optionForm, "disabled", false)
+            //箱信息
+            this.$set(this.option, "disabled", false)
+            this.$set(this.option, "addBtn", true)
+            this.$set(this.option, "menu", true)
+            //费用信息
+            this.$set(this.$refs.boxCost.option, "disabled", false)
+            this.$set(this.$refs.boxCost.option, "addBtn", true)
+            this.$set(this.$refs.boxCost.option, "menu", true)
+            //附件和顶部按钮
+            this.disabled = false
+          }
         }
       })
     },
@@ -1109,21 +1236,36 @@ export default {
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
       }
     },
-    resetTrigger(){
-      if (this.form.status > 0) {
-        //基础资料
-        this.$set(this.optionForm, "disabled", true)
-        //箱信息
-        this.$set(this.option, "disabled", true)
-        this.$set(this.option, "addBtn", false)
-        this.$set(this.option, "menu", false)
-        //费用信息
-        this.$set(this.$refs.boxCost.option,"disabled",true)
-        this.$set(this.$refs.boxCost.option,"addBtn",false)
-        this.$set(this.$refs.boxCost.option,"menu",false)
-        //附件和顶部按钮
-        this.disabled = true
-      } else {
+    resetTrigger() {
+      if (this.optionForm.disabled == true) {
+        if (this.form.status > 0) {
+          //基础资料
+          this.$set(this.optionForm, "disabled", true)
+          //箱信息
+          this.$set(this.option, "disabled", true)
+          this.$set(this.option, "addBtn", false)
+          this.$set(this.option, "menu", false)
+          //费用信息
+          this.$set(this.$refs.boxCost.option, "disabled", true)
+          this.$set(this.$refs.boxCost.option, "addBtn", false)
+          this.$set(this.$refs.boxCost.option,"menu",false)
+          //附件和顶部按钮
+          this.disabled = true
+        } else {
+          //基础资料
+          this.$set(this.optionForm, "disabled", false)
+          //箱信息
+          this.$set(this.option, "disabled", false)
+          this.$set(this.option, "addBtn", true)
+          this.$set(this.option, "menu", true)
+          //费用信息
+          this.$set(this.$refs.boxCost.option, "disabled", false)
+          this.$set(this.$refs.boxCost.option, "addBtn", true)
+          this.$set(this.$refs.boxCost.option, "menu", true)
+          //附件和顶部按钮
+          this.disabled = false
+        }
+      }else {
         //基础资料
         this.$set(this.optionForm, "disabled", false)
         //箱信息
@@ -1131,9 +1273,9 @@ export default {
         this.$set(this.option, "addBtn", true)
         this.$set(this.option, "menu", true)
         //费用信息
-        this.$set(this.$refs.boxCost.option,"disabled",false)
-        this.$set(this.$refs.boxCost.option,"addBtn",true)
-        this.$set(this.$refs.boxCost.option,"menu",true)
+        this.$set(this.$refs.boxCost.option, "disabled", false)
+        this.$set(this.$refs.boxCost.option, "addBtn", true)
+        this.$set(this.$refs.boxCost.option, "menu", true)
         //附件和顶部按钮
         this.disabled = false
       }

src/views/boxManagement/importReturnTrip/detailsPage.vue

@@ -10,6 +10,9 @@
         </el-button>
       </div>
       <div class="add-customer-btn">
+        <el-button class="el-button--small-yh" style="margin-right: 10px" type="primary" size="small" :disabled="form.status>0"
+                   @click="confirmEdit" v-if="optionForm.disabled === true">编辑
+        </el-button>
         <el-dropdown style="margin-right: 10px">
           <el-button type="primary" size="small">
             审核处理<i class="el-icon-arrow-down el-icon--right"></i>
@@ -170,7 +173,7 @@
       </span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="confirmChange">确 定</el-button>
+        <el-button type="primary" :disabled="disabledVisible" @click="confirmChange">确 定</el-button>
       </span>
     </el-dialog>
     <el-dialog
@@ -237,6 +240,7 @@ export default {
       boxTrack: false,
       importOpen: false,
       dialogVisible: false,
+      disabledVisible:false,
       checkScheduleDialog: false,
       checkId: '',
       batchNo: '',
@@ -368,7 +372,12 @@ export default {
           prop: 'corpId',
           width: 100,
           search: true,
-          overHidden: true
+          overHidden: true,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '船公司',
           prop: 'shippingCompany',
@@ -407,13 +416,23 @@ export default {
           prop: 'departureHarbor',
           width: 100,
           search: true,
-          overHidden: true
+          overHidden: true,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '目的港',
           prop: 'objectiveHarbor',
           width: 100,
           search: true,
-          overHidden: true
+          overHidden: true,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '合同生效日期',
           prop: 'effectiveDate',
@@ -423,6 +442,12 @@ export default {
           type: "date",
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
+          labelWidth:100,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '合同失效日期',
           prop: 'expiryDate',
@@ -432,6 +457,12 @@ export default {
           type: "date",
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
+          labelWidth:100,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '起租日期',
           prop: 'startingRentDate',
@@ -441,6 +472,11 @@ export default {
           type: "date",
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '出场日期',
           prop: 'exitDate',
@@ -450,6 +486,11 @@ export default {
           type: "date",
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '入场日期',
           prop: 'admissionDate',
@@ -459,6 +500,11 @@ export default {
           type: "date",
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '租金合计',
           prop: 'totalAmount',
@@ -529,12 +575,22 @@ export default {
           props: {
             label: "code",
             value: "code"
-          }
+          },
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '地点',
           prop: 'address',
           overHidden: true,
-          width: 100
+          width: 100,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '日期',
           prop: 'newDate',
@@ -543,6 +599,11 @@ export default {
           type: "date",
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '箱类型',
           prop: 'boxTypeId',
@@ -554,7 +615,12 @@ export default {
             label: 'name',
             value: 'id'
           },
-          dicUrl: '/api/blade-client/container/listMessage'
+          dicUrl: '/api/blade-client/container/listMessage',
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '币别',
           prop: 'currency',
@@ -566,7 +632,12 @@ export default {
           props: {
             label: "dictValue",
             value: "dictKey"
-          }
+          },
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '租金收入',
           prop: 'amount',
@@ -574,6 +645,11 @@ export default {
           value:0,
           controls: false,
           overHidden: true,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '超期单价/天',
           prop: 'price',
@@ -581,6 +657,11 @@ export default {
           value:0,
           controls: false,
           overHidden: true,
+          rules: [{
+            required: true,
+            message: " ",
+            trigger: "blur"
+          }]
         }, {
           label: '超期箱使收入',
           prop: 'overdueAmount',
@@ -635,13 +716,42 @@ export default {
       })
     }
     if (this.onLoad.id && this.detailData.id) {
-      this.refresh(this.onLoad.id)
+      this.refresh(this.onLoad.id,true)
     }else if (this.onLoad.id){
-      this.refresh(this.onLoad.id)
+      this.refresh(this.onLoad.id,true)
     }
     this.key++
   },
   methods: {
+    confirmEdit() {
+      if (this.form.status > 0) {
+        //基础资料
+        this.$set(this.optionForm, "disabled", true)
+        //箱信息
+        this.$set(this.option, "disabled", true)
+        this.$set(this.option, "addBtn", false)
+        this.$set(this.option, "menu", false)
+        //费用信息
+        this.$set(this.$refs.boxCost.option, "disabled", true)
+        this.$set(this.$refs.boxCost.option, "addBtn", false)
+        this.$set(this.$refs.boxCost.option, "menu", false)
+        //附件和顶部按钮
+        this.disabled = true
+      } else {
+        //基础资料
+        this.$set(this.optionForm, "disabled", false)
+        //箱信息
+        this.$set(this.option, "disabled", false)
+        this.$set(this.option, "addBtn", true)
+        this.$set(this.option, "menu", true)
+        //费用信息
+        this.$set(this.$refs.boxCost.option, "disabled", false)
+        this.$set(this.$refs.boxCost.option, "addBtn", true)
+        this.$set(this.$refs.boxCost.option, "menu", true)
+        //附件和顶部按钮
+        this.disabled = false
+      }
+    },
     //打开箱档案导入
     importBox() {
       this.importOpen = true
@@ -690,14 +800,18 @@ export default {
       this.$refs["formState"].validate((valid, done) => {
         done()
         if (valid) {
+          this.disabledVisible = true
           statusUpdate({
             ...this.formState,
             ids: data.join(',')
           }).then(res => {
             this.$message.success("操作成功")
             this.dialogVisible = false
+            this.disabledVisible = false
             this.formState = {}
             this.refresh(this.form.id)
+          }).catch(()=>{
+            this.disabledVisible = false
           })
         }
       })
@@ -742,7 +856,6 @@ export default {
             }
           }
         }
-        console.log(this.formState)
         this.dialogVisible = true
       } else {
         this.$message.error('请保存后操作')
@@ -855,7 +968,7 @@ export default {
         const data = {
           id: this.form.id,
           pageLabel: "出库装运",
-          checkFlag: 1,
+          checkFlag: 2,
         }
         const loading = this.$loading({
           lock: true,
@@ -875,6 +988,12 @@ export default {
       for (let item of this.dataList) {
         if (item.status !== "空箱入场") return this.$message.error("有未空箱入场的明细，禁止请核！")
       }
+      if (this.dataList.length === 0) {
+        return this.$message.error("箱信息不能为空")
+      }
+      if (this.dataListTwo.length === 0) {
+        return this.$message.error("费用信息不能为空")
+      }
       this.$confirm("您确定提交请核申请吗?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -883,12 +1002,6 @@ export default {
         this.$refs["form"].validate((valid, done) => {
           done()
           if (valid) {
-            if (this.dataList.length === 0) {
-              return this.$message.error("箱信息不能为空")
-            }
-            if (this.dataListTwo.length === 0) {
-              return this.$message.error("费用信息不能为空")
-            }
             let data = {
               ...this.form,
               transportItemList: this.dataList,
@@ -908,7 +1021,7 @@ export default {
                 url: '/boxManagement/exportShipment/index',
                 pageStatus: "this.$store.getters.domSaleStatus",
                 pageLabel: "出口装运",
-                checkFlag: 1,
+                checkFlag: 2,
               }
               pleaseCheck({
                 ...data,
@@ -917,6 +1030,8 @@ export default {
                 loading.close();
                 this.$message.success('请核成功')
                 this.refresh(res.data.data.id)
+              }).catch(()=>{
+                loading.close();
               })
             }).catch(()=>{
               loading.close();
@@ -929,7 +1044,7 @@ export default {
     choceScheduleFun() {
       this.checkScheduleDialog = false
     },
-    refresh(id) {
+    refresh(id,type) {
       const loading = this.$loading({
         lock: true,
         text: '加载中',
@@ -945,7 +1060,7 @@ export default {
         delete this.form.transportItemFeesList
         delete this.form.transportFilesList
         loading.close();
-        if (this.form.status > 0) {
+        if (type) {
           //基础资料
           this.$set(this.optionForm, "disabled", true)
           //箱信息
@@ -958,20 +1073,37 @@ export default {
           this.$set(this.$refs.boxCost.option, "menu", false)
           //附件和顶部按钮
           this.disabled = true
-        } else {
-          //基础资料
-          this.$set(this.optionForm, "disabled", false)
-          //箱信息
-          this.$set(this.option, "disabled", false)
-          this.$set(this.option, "addBtn", true)
-          this.$set(this.option, "menu", true)
-          //费用信息
-          this.$set(this.$refs.boxCost.option, "disabled", false)
-          this.$set(this.$refs.boxCost.option, "addBtn", true)
-          this.$set(this.$refs.boxCost.option, "menu", true)
-          //附件和顶部按钮
-          this.disabled = false
+        }else {
+          if (this.form.status > 0) {
+            //基础资料
+            this.$set(this.optionForm, "disabled", true)
+            //箱信息
+            this.$set(this.option, "disabled", true)
+            this.$set(this.option, "addBtn", false)
+            this.$set(this.option, "menu", false)
+            //费用信息
+            this.$set(this.$refs.boxCost.option, "disabled", true)
+            this.$set(this.$refs.boxCost.option, "addBtn", false)
+            this.$set(this.$refs.boxCost.option,"menu",false)
+            //附件和顶部按钮
+            this.disabled = true
+          } else {
+            //基础资料
+            this.$set(this.optionForm, "disabled", false)
+            //箱信息
+            this.$set(this.option, "disabled", false)
+            this.$set(this.option, "addBtn", true)
+            this.$set(this.option, "menu", true)
+            //费用信息
+            this.$set(this.$refs.boxCost.option, "disabled", false)
+            this.$set(this.$refs.boxCost.option, "addBtn", true)
+            this.$set(this.$refs.boxCost.option, "menu", true)
+            //附件和顶部按钮
+            this.disabled = false
+          }
         }
+      }).catch(()=>{
+        loading.close();
       })
     },
     //新增修改
@@ -1109,21 +1241,36 @@ export default {
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
       }
     },
-    resetTrigger(){
-      if (this.form.status > 0) {
-        //基础资料
-        this.$set(this.optionForm, "disabled", true)
-        //箱信息
-        this.$set(this.option, "disabled", true)
-        this.$set(this.option, "addBtn", false)
-        this.$set(this.option, "menu", false)
-        //费用信息
-        this.$set(this.$refs.boxCost.option,"disabled",true)
-        this.$set(this.$refs.boxCost.option,"addBtn",false)
-        this.$set(this.$refs.boxCost.option,"menu",false)
-        //附件和顶部按钮
-        this.disabled = true
-      } else {
+    resetTrigger() {
+      if (this.optionForm.disabled == true) {
+        if (this.form.status > 0) {
+          //基础资料
+          this.$set(this.optionForm, "disabled", true)
+          //箱信息
+          this.$set(this.option, "disabled", true)
+          this.$set(this.option, "addBtn", false)
+          this.$set(this.option, "menu", false)
+          //费用信息
+          this.$set(this.$refs.boxCost.option, "disabled", true)
+          this.$set(this.$refs.boxCost.option, "addBtn", false)
+          this.$set(this.$refs.boxCost.option,"menu",false)
+          //附件和顶部按钮
+          this.disabled = true
+        } else {
+          //基础资料
+          this.$set(this.optionForm, "disabled", false)
+          //箱信息
+          this.$set(this.option, "disabled", false)
+          this.$set(this.option, "addBtn", true)
+          this.$set(this.option, "menu", true)
+          //费用信息
+          this.$set(this.$refs.boxCost.option, "disabled", false)
+          this.$set(this.$refs.boxCost.option, "addBtn", true)
+          this.$set(this.$refs.boxCost.option, "menu", true)
+          //附件和顶部按钮
+          this.disabled = false
+        }
+      }else {
         //基础资料
         this.$set(this.optionForm, "disabled", false)
         //箱信息
@@ -1131,9 +1278,9 @@ export default {
         this.$set(this.option, "addBtn", true)
         this.$set(this.option, "menu", true)
         //费用信息
-        this.$set(this.$refs.boxCost.option,"disabled",false)
-        this.$set(this.$refs.boxCost.option,"addBtn",true)
-        this.$set(this.$refs.boxCost.option,"menu",true)
+        this.$set(this.$refs.boxCost.option, "disabled", false)
+        this.$set(this.$refs.boxCost.option, "addBtn", true)
+        this.$set(this.$refs.boxCost.option, "menu", true)
         //附件和顶部按钮
         this.disabled = false
       }