3

src/views/basicData/container/archives.vue

@@ -60,6 +60,7 @@ export default {
     return {
       boxTrack: false,
       dataTrackList: [],
+      loadingTwo: false,
       searchTwo: {},
       formTrack: {},
       optionTrack: {},
@@ -357,21 +358,6 @@ export default {
             }
           },
           {
-            label: '空闲状态',
-            width: 100,
-            overHidden: true,
-            disabled: true,
-            search: true,
-            filterable: true,
-            prop: 'status',
-            type: 'select',
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=box_archives_status",
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            }
-          },
-          {
             label: '动态日期',
             prop: 'newDate',
             width: 100,
@@ -386,6 +372,21 @@ export default {
             valueFormat: "yyyy-MM-dd HH:mm:ss"
           },
           {
+            label: '箱状态',
+            width: 100,
+            overHidden: true,
+            disabled: true,
+            search: true,
+            filterable: true,
+            prop: 'status',
+            type: 'select',
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=box_archives_status",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            }
+          },
+          {
             label: '箱属',
             prop: 'boxBelongsTo',
             width: 100,
@@ -627,32 +628,22 @@ export default {
     // 箱轨迹里合同号跳转
     contractNoJump(row) {
       this.boxTrack = false
-      if (row.status == '买箱') {
-        this.$router.push({
-          path: '/boxManagement/buyContainer/index?srcId=' + row.srcId
-        });
-      } else if (row.status == '卖箱') {
-        this.$router.push({
-          path: '/boxManagement/sellingContainers/index?srcId=' + row.srcId
-        });
-      } else if (row.status == '出口装运') {
-        this.$router.push({
-          path: '/boxManagement/exportShipment/index?srcId=' + row.srcId
-        });
-      } else if (row.status == '进口返程') {
-        this.$router.push({
-          path: '/boxManagement/importReturnTrip/index?srcId=' + row.srcId
-        });
-      } else if (row.status == '租入') {
+      if (row.billType == 'BUY') {
         this.$router.push({
-          path: '/boxManagement/leaseIn/index?srcId=' + row.srcId
+          path: '/boxManagement/buyContainer/index',
+          query: {
+            id:row.srcId
+          },
         });
-      } else if (row.status == '租出') {
+      }
+      if (row.billType == 'OW-F') {
         this.$router.push({
-          path: '/boxManagement/leaseOut/index?srcId=' + row.srcId
+          path: '/ow/owPut/index',
+          query: {
+            id:row.srcId
+          },
         });
-      } else { }
-
+      }
     },
     track(row) {
       // this.dataTrackList = row
@@ -689,7 +680,6 @@ export default {
       archivestrajectory(params).then(res => {
         this.dataTrackList = res.data.data.records
         this.pageTwo.total = res.data.data.total
-        this.loadingTwo = false
         this.$nextTick(() => {
           this.$refs.crudTrack.doLayout();
           this.$refs.crudTrack.dicInit();

src/views/boxManagement/agentBox/detailsPage.vue

@@ -317,7 +317,7 @@
       <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun"></check-schedule>
     </el-dialog>
     <!-- 启用 -->
-    <el-dialog append-to-body title="放箱号" :visible.sync="activationDialog" width="30%" :before-close="activationClose">
+    <el-dialog append-to-body title="放箱号" :visible.sync="activationDialog" width="30%" :before-close="activationClose" v-dialog-drag>
       <span>
         <avue-form ref="form2" v-model="activationForm" :option="activationOption">
           <tempalte slot="polCname">

src/views/boxManagement/agentBox/index.vue

@@ -84,13 +84,21 @@ export default {
           }
         ],
         column: [
+        {
+            label: '箱号',
+            prop: 'code',
+            width: 100,
+            search: true,
+            searchOrder: 1,
+            overHidden: true,
+          },
           {
             label: '代理名称',
             prop: 'purchaseCompanyName',
             width: 200,
             overHidden: true,
             search: true,
-            searchOrder: 1,
+            searchOrder: 2,
             type: 'select',
             filterable: true,
             remote: true,
@@ -112,7 +120,7 @@ export default {
             prop: 'contractNo',
             width: 150,
             search: true,
-            searchOrder: 2,
+            searchOrder: 3,
             overHidden: true
           },
           {
@@ -120,7 +128,7 @@ export default {
             prop: 'effectiveDate',
             width: 100,
             search: true,
-            searchOrder: 3,
+            searchOrder: 4,
             searchProp: 'effectiveDateList',
             overHidden: true,
             type: "date",
@@ -134,7 +142,7 @@ export default {
             prop: 'expiryDate',
             width: 100,
             search: true,
-            searchOrder: 4,
+            searchOrder: 5,
             searchProp: 'expiryDateList',
             overHidden: true,
             type: "date",
@@ -144,16 +152,6 @@ export default {
             valueFormat: "yyyy-MM-dd HH:mm:ss"
           },
           {
-            label: '箱号',
-            prop: 'code',
-            width: 140,
-            hide:true,
-            showColumn:false,
-            search: true,
-            searchOrder: 5,
-            overHidden: true
-          },
-          {
             label: '场站',
             prop: 'stationCname',
             width: 80,

src/views/boxManagement/boxAdjustment/index.vue

@@ -64,7 +64,7 @@ export default {
         searchLabelWidth: 90,
         tip: false,
         searchShow: true,
-        searchMenuSpan:18 ,
+        searchMenuSpan:12 ,
         border: true,
         index: true,
         addBtn: false,
@@ -237,6 +237,24 @@ export default {
             overHidden: true
           },
           {
+            label: '业务状态',
+            prop: 'buxStaus',
+            overHidden: true,
+            search: true,
+            searchOrder: 10,
+            type: 'select',
+            dicData: [
+              {
+                label: '录入',
+                value: '录入',
+              },
+              {
+                label: '已确认',
+                value: '已确认',
+              }
+            ]
+          },
+          {
             label: "制单人",
             prop: "createUserName",
             overHidden: true,

src/views/boxManagement/boxCost/detailsPage.vue

@@ -262,7 +262,7 @@
       <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun"></check-schedule>
     </el-dialog>
     <!-- 启用 -->
-    <el-dialog append-to-body title="放箱号" :visible.sync="activationDialog" width="30%" :before-close="activationClose">
+    <el-dialog append-to-body title="放箱号" :visible.sync="activationDialog" width="30%" :before-close="activationClose" v-dialog-drag>
       <span>
         <avue-form ref="form2" v-model="activationForm" :option="activationOption">
           <tempalte slot="polCname">

src/views/boxManagement/boxPoolDynamics/index.vue

@@ -239,11 +239,11 @@ export default {
                         prop: 'portName',
                         overHidden: true,
                     },
-                    {
-                        label: '场站',
-                        prop: 'stationName',
-                        overHidden: true,
-                    },
+                    // {
+                    //     label: '场站',
+                    //     prop: 'stationName',
+                    //     overHidden: true,
+                    // },
                     {
                         label: '放箱号类型',
                         prop: 'busType',

src/views/boxManagement/buyContainer/detailsPage.vue

@@ -251,7 +251,7 @@
       <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun"></check-schedule>
     </el-dialog>
     <!-- 启用 -->
-    <el-dialog append-to-body title="放箱号" :visible.sync="activationDialog" width="30%" :before-close="activationClose">
+    <el-dialog append-to-body title="放箱号" :visible.sync="activationDialog" width="30%" :before-close="activationClose" v-dialog-drag>
       <span>
         <avue-form ref="form2" v-model="activationForm" :option="activationOption">
           <tempalte slot="polCname">
@@ -1116,9 +1116,6 @@ export default {
       // this.optionForm.disabled = true
       this.getDetail(this.detailData.id)
     }
-    if (this.$route.query.params) {
-      this.getDetail(this.$route.query.params)
-    }
     if (this.detailData.copyId) {
       this.getCopydate(this.detailData.copyId)
     }
@@ -1429,7 +1426,10 @@ export default {
         pid: this.form.id,
         feesType: 1,
         dc: 'C',
-        billType: '船公司',
+        billType: '箱东',
+        corpId:this.form.purchaseCompanyId,
+        shortName:this.form.purchaseCompanyName,
+        corpCnName:this.form.purchaseCompanyName,
         curCode: 'CNY',
         exrate: 1,
         $cellEdit: true
@@ -1451,6 +1451,7 @@ export default {
       this.selectionfeecList = list;
     },
     getDetail(id) {
+      console.log(1111111111111,id)
       const loading = this.$loading({
         lock: true,
         text: '加载中',

src/views/boxManagement/buyContainer/index.vue

@@ -12,7 +12,7 @@
           </el-button>
           <el-button type="success" size="small" :disabled="selectionList.length != 1" @click="copyButton">复制单据
           </el-button>
-          <el-button type="warning" size="small"  disabled @click="outExport">导 出
+          <el-button type="warning" size="small" disabled @click="outExport">导 出
           </el-button>
         </template>
         <template slot="menu" slot-scope="{ row, index }">
@@ -84,17 +84,25 @@ export default {
           }
         ],
         column: [
+        {
+            label: '箱号',
+            prop: 'code',
+            width: 100,
+            search: true,
+            searchOrder: 1,
+            overHidden: true,
+          },
           {
             label: '出售方',
             prop: 'purchaseCompanyName',
             width: 150,
             overHidden: true,
             search: true,
-            searchOrder: 1,
+            searchOrder: 2,
             type: 'select',
             filterable: true,
             remote: true,
-            dicUrl: "/api/blade-los/bcorps/selectList?status=0current=1&size=5&corpTypeName=箱东&shortName={{key}}",
+            dicUrl: "/api/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=箱东&shortName={{key}}",
             props: {
               label: 'shortName',
               value: 'shortName',
@@ -113,7 +121,7 @@ export default {
             prop: 'contractNo',
             width: 100,
             search: true,
-            searchOrder: 2,
+            searchOrder: 3,
             overHidden: true
           },
           {
@@ -121,7 +129,7 @@ export default {
             prop: 'purchaseDate',
             width: 100,
             search: true,
-            searchOrder: 3,
+            searchOrder: 4,
             searchProp: 'purchaseDateList',
             overHidden: true,
             type: "date",
@@ -143,16 +151,6 @@ export default {
             width: 100
           },
           {
-            label: '箱号',
-            prop: 'code',
-            width: 140,
-            hide:true,
-            showColumn:false,
-            search: true,
-            searchOrder: 4,
-            overHidden: true,
-          },
-          {
             label: '提/送箱',
             prop: 'agreement',
             width: 90,
@@ -222,6 +220,12 @@ export default {
   },
   activated() {
     setTimeout(() => {
+      if (this.$route.query.id) {
+        this.detailData = {
+          id: this.$route.query.id
+        };
+        this.isShow = false
+      }
     }, 100);
   },
   methods: {
@@ -346,7 +350,7 @@ export default {
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
-        this.selectionList=[]
+        this.selectionList = []
         this.searchReset()
       }
     },
@@ -357,7 +361,7 @@ export default {
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
-        this.selectionList=[]
+        this.selectionList = []
         this.searchReset()
       }
     },

src/views/boxManagement/containerNumber/detailsPage.vue

@@ -204,7 +204,7 @@
       :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
       <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun"></check-schedule>
     </el-dialog>
-    <el-dialog append-to-body title="更改箱东" :visible.sync="activationDialog" width="30%" :before-close="activationClose">
+    <el-dialog append-to-body title="更改箱东" :visible.sync="activationDialog" width="30%" :before-close="activationClose" v-dialog-drag>
       <span>
         <avue-form ref="form2" v-model="activationForm" :option="activationOption">
           <tempalte slot="boxEastName">

src/views/boxManagement/containerNumber/index.vue

@@ -61,7 +61,7 @@ export default {
                 menuWidth: 140,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 18,
+                searchMenuSpan: 12,
                 border: true,
                 index: true,
                 addBtn: false,
@@ -79,7 +79,7 @@ export default {
                         width: 150,
                         overHidden: true,
                         search: true,
-                        searchOrder: 6,
+                        searchOrder: 7,
                         type: "select",
                         filterable: true,
                         remote: true,
@@ -106,6 +106,14 @@ export default {
                         searchOrder: 1,
                     },
                     {
+                        label: '箱号',
+                        prop: 'code',
+                        width: 100,
+                        overHidden: true,
+                        search: true,
+                        searchOrder: 2,
+                    },
+                    {
                         label: '内部放箱号',
                         prop: 'internalContainerNumber',
                         width: 100,
@@ -117,7 +125,7 @@ export default {
                         width: 100,
                         overHidden: true,
                         search: true,
-                        searchOrder: 8,
+                        searchOrder: 9,
                         type: 'select',
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxCategory",
                         props: {
@@ -131,7 +139,7 @@ export default {
                         width: 100,
                         search: true,
                         overHidden: true,
-                        searchOrder: 11,
+                        searchOrder: 12,
                         type: 'select',
                         dicData: [{
                             label: 'OW(拿)',
@@ -147,7 +155,7 @@ export default {
                         width: 100,
                         search: true,
                         overHidden: true,
-                        searchOrder: 12,
+                        searchOrder: 13,
                     },
                     {
                         label: '来源放箱号',
@@ -155,7 +163,7 @@ export default {
                         width: 100,
                         search: true,
                         overHidden: true,
-                        searchOrder: 13,
+                        searchOrder: 14,
                     },
                     {
                         label: '箱属',
@@ -165,7 +173,7 @@ export default {
                         // hide: true,
                         // showColumn: false,
                         search: true,
-                        searchOrder: 9,
+                        searchOrder: 10,
                         type: 'select',
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxBelongsTo",
                         props: {
@@ -185,7 +193,7 @@ export default {
                         width: 140,
                         overHidden: true,
                         search: true,
-                        searchOrder: 4,
+                        searchOrder: 5,
                         searchLabelWidth: 120,
                         type: "select",
                         filterable: true,
@@ -204,7 +212,7 @@ export default {
                         width: 140,
                         overHidden: true,
                         search: true,
-                        searchOrder: 5,
+                        searchOrder: 6,
                         searchLabelWidth: 120,
                         type: "select",
                         filterable: true,
@@ -223,7 +231,7 @@ export default {
                         width: 90,
                         overHidden: true,
                         search: true,
-                        searchOrder: 2,
+                        searchOrder: 3,
                         type: "select",
                         filterable: true,
                         remote: true,
@@ -241,7 +249,7 @@ export default {
                         width: 90,
                         overHidden: true,
                         search: true,
-                        searchOrder: 3,
+                        searchOrder: 4,
                         type: "select",
                         filterable: true,
                         remote: true,
@@ -259,7 +267,7 @@ export default {
                         width: 80,
                         overHidden: true,
                         search: true,
-                        searchOrder: 7,
+                        searchOrder: 5,
                         type: "select",
                         filterable: true,
                         remote: true,

src/views/boxManagement/rentalBox/detailsPage.vue

@@ -327,7 +327,7 @@
       <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun"></check-schedule>
     </el-dialog>
     <!-- 启用 -->
-    <el-dialog append-to-body title="放箱号" :visible.sync="activationDialog" width="30%" :before-close="activationClose">
+    <el-dialog append-to-body title="放箱号" :visible.sync="activationDialog" width="30%" :before-close="activationClose" v-dialog-drag>
       <span>
         <avue-form ref="form2" v-model="activationForm" :option="activationOption">
           <tempalte slot="polCname">
@@ -1731,8 +1731,9 @@ export default {
         feesType: 1,
         dc: 'C',
         billType: '箱东',
-        corpId: this.form.purchaseCompanyId,
-        corpCnName: this.form.purchaseCompanyName,
+        corpId:this.form.purchaseCompanyId,
+        shortName:this.form.purchaseCompanyName,
+        corpCnName:this.form.purchaseCompanyName,
         curCode: 'CNY',
         exrate: 1,
         $cellEdit: true
@@ -2454,13 +2455,13 @@ export default {
       handler(oldValue, newValue) {
         if (this.form.tradingBoxItemsList.length > 0) {
           this.optionForm.column.forEach(item => {
-            if (item.prop == 'contractNo' || item.prop == 'effectiveDate' || item.prop == 'expiryDate' || item.prop == 'standard' || item.prop == 'totalAmountC' || item.prop == 'purchaseDate') {
+            if (item.prop == 'contractNo' || item.prop == 'effectiveDate' || item.prop == 'expiryDate' || item.prop == 'standard' || item.prop == 'totalAmountC' ) {
               item.disabled = true
             }
           })
         } else {
           this.optionForm.column.forEach(item => {
-            if (item.prop == 'contractNo' || item.prop == 'effectiveDate' || item.prop == 'expiryDate' || item.prop == 'standard' || item.prop == 'totalAmountC' || item.prop == 'purchaseDate') {
+            if (item.prop == 'contractNo' || item.prop == 'effectiveDate' || item.prop == 'expiryDate' || item.prop == 'standard' || item.prop == 'totalAmountC') {
               item.disabled = false
             }
           })

src/views/boxManagement/rentalBox/index.vue

@@ -84,13 +84,21 @@ export default {
           }
         ],
         column: [
+        {
+            label: '箱号',
+            prop: 'code',
+            width: 100,
+            search: true,
+            searchOrder: 1,
+            overHidden: true,
+          },
           {
             label: '出租方',
             prop: 'purchaseCompanyName',
             width: 200,
             overHidden: true,
             search: true,
-            searchOrder: 1,
+            searchOrder: 2,
             type: 'select',
             filterable: true,
             remote: true,
@@ -113,7 +121,7 @@ export default {
             prop: 'contractNo',
             width: 150,
             search: true,
-            searchOrder: 2,
+            searchOrder: 3,
             overHidden: true
           },
           {
@@ -121,7 +129,7 @@ export default {
             prop: 'effectiveDate',
             width: 100,
             search: true,
-            searchOrder: 3,
+            searchOrder: 4,
             searchProp: 'effectiveDateList',
             overHidden: true,
             type: "date",
@@ -131,16 +139,6 @@ export default {
             valueFormat: "yyyy-MM-dd HH:mm:ss"
           },
           {
-            label: '箱号',
-            prop: 'code',
-            width: 140,
-            hide: true,
-            showColumn: false,
-            search: true,
-            searchOrder: 5,
-            overHidden: true
-          },
-          {
             label: '租/还箱标准',
             prop: 'standard',
             width: 100,

src/views/iosBasicData/UnpaidPaymentsDetails/index.vue

@@ -158,12 +158,12 @@ export default {
                     },
                     {
                         label: "起运港",
-                        prop: "pod",
+                        prop: "pol",
                         overHidden: true,
                     },
                     {
                         label: "目的港",
-                        prop: "pol",
+                        prop: "pod",
                         overHidden: true,
                     },
                     {

src/views/iosBasicData/costcenter/soc/detailsPage.vue

@@ -2682,7 +2682,7 @@ export default {
                     status: 0,
                     type: 'CBMB-POL',
                     addressId: this.form.podId,
-                    shippingCompanyId: this.form.actualShippingCompanyId,
+                    shippingCompanyId: this.form.shippingCompanyId,
                     transportationTerms: this.form.transportationTerms,
                 }
                 const loading = this.$loading({
@@ -2712,7 +2712,7 @@ export default {
                     status: 0,
                     type: 'CBMB-POD',
                     addressId: this.form.destinationId,
-                    shippingCompanyId: this.form.actualShippingCompanyId,
+                    shippingCompanyId: this.form.shippingCompanyId,
                     transportationTerms: this.form.transportationTerms,
                 }
                 const loading = this.$loading({

src/views/iosBasicData/financeProfit/index.vue

@@ -269,12 +269,12 @@ export default {
                     },
                     {
                         label: "起运港",
-                        prop: "pod",
+                        prop: "pol",
                         overHidden: true,
                     },
                     {
                         label: "目的港",
-                        prop: "pol",
+                        prop: "pod",
                         overHidden: true,
                     },
                     {

src/views/ow/owPut/detailsPage.vue

@@ -439,7 +439,7 @@
       <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun"></check-schedule>
     </el-dialog>
     <!-- 启用 -->
-    <el-dialog append-to-body title="放箱号" :visible.sync="activationDialog" width="30%" :before-close="activationClose">
+    <el-dialog append-to-body title="放箱号" :visible.sync="activationDialog" width="30%" :before-close="activationClose" v-dialog-drag>
       <span>
         <avue-form ref="form2" v-model="activationForm" :option="activationOption">
           <tempalte slot="polCname">
@@ -634,7 +634,8 @@ export default {
       editDisabled: false,
       form: {
         type: "OW-F",
-        pickupFee:0,
+        dc:'d',
+        pickupFee:50,
         boxCondition: '新',
         conditions: 'CW',
         freeDay: 30,
@@ -662,7 +663,12 @@ export default {
           {
             label: 'USER',
             prop: 'purchaseCompanyName',
-            disabled: false
+            disabled: false,
+            rules: [{
+              required: true,
+              message: "",
+              trigger: "blur"
+            }]
           },
           {
             label: '放箱号',
@@ -783,13 +789,9 @@ export default {
           },
           {
             label: 'Pickup fee',
-            prop: 'pickupFee',
-            disabled: false
-          }, 
-          {
-            label: '收/付',
             prop: 'dc',
             disabled: false,
+            placeholder:'请选择 收付',
             type: 'select',
             dicData: [{
               label: '收',
@@ -798,6 +800,15 @@ export default {
               label: '付',
               value: 'c',
             }],
+            span:4
+          }, 
+          {
+            label: '',
+            labelWidth: 0,
+            placeholder:'请输入 Pickup fee',
+            prop: 'pickupFee',
+            disabled: false,
+            span:2
           },
           {
             label: 'Condition',
@@ -1822,6 +1833,7 @@ export default {
       this.getDetail(this.detailData.id)
     }
     if (this.$route.query.params) {
+      console.log(44444)
       this.getDetail(this.$route.query.params)
     }
     if (this.detailData.copyId) {
@@ -2200,7 +2212,10 @@ export default {
         pid: this.form.id,
         feesType: 1,
         dc: 'D',
-        billType: '船公司',
+        billType: '箱东',
+        corpId:this.form.purchaseCompanyId,
+        shortName:this.form.purchaseCompanyName,
+        corpCnName:this.form.purchaseCompanyName,
         curCode: 'CNY',
         exrate: 1,
         $cellEdit: true
@@ -2214,7 +2229,10 @@ export default {
         pid: this.form.id,
         feesType: 1,
         dc: 'C',
-        billType: '船公司',
+        billType: '箱东',
+        corpId:this.form.purchaseCompanyId,
+        shortName:this.form.purchaseCompanyName,
+        corpCnName:this.form.purchaseCompanyName,
         curCode: 'CNY',
         exrate: 1,
         $cellEdit: true
@@ -2248,6 +2266,7 @@ export default {
       this.selectionfeecList = list;
     },
     getDetail(id) {
+      console.log(1111111111111,id)
       const loading = this.$loading({
         lock: true,
         text: '加载中',

src/views/ow/owPut/index.vue

@@ -421,6 +421,12 @@ export default {
   },
   activated() {
     setTimeout(() => {
+      if (this.$route.query.id) {
+        this.detailData = {
+          id: this.$route.query.id
+        };
+        this.isShow = false
+      }
     }, 100);
   },
   methods: {

src/views/ow/owTask/detailsPage.vue

@@ -442,7 +442,7 @@
       <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun"></check-schedule>
     </el-dialog>
     <!-- 启用 -->
-    <el-dialog append-to-body title="放箱号" :visible.sync="activationDialog" width="30%" :before-close="activationClose">
+    <el-dialog append-to-body title="放箱号" :visible.sync="activationDialog" width="30%" :before-close="activationClose" v-dialog-drag>
       <span>
         <avue-form ref="form2" v-model="activationForm" :option="activationOption">
           <tempalte slot="polCname">
@@ -638,7 +638,8 @@ export default {
       editDisabled: false,
       form: {
         type: "OW-N",
-        pickupFee:0,
+        dc:'d',
+        pickupFee:50,
         boxCondition: '新',
         conditions: 'CW',
         freeDay: 30,
@@ -666,7 +667,12 @@ export default {
           {
             label: '箱东',
             prop: 'purchaseCompanyName',
-            disabled: false
+            disabled: false,
+            rules: [{
+              required: true,
+              message: "",
+              trigger: "blur"
+            }]
           },
           {
             label: '放箱号',
@@ -787,13 +793,9 @@ export default {
           },
           {
             label: 'Pickup fee',
-            prop: 'pickupFee',
-            disabled: false
-          },
-          {
-            label: '收/付',
             prop: 'dc',
             disabled: false,
+            placeholder:'请选择 收付',
             type: 'select',
             dicData: [{
               label: '收',
@@ -802,6 +804,15 @@ export default {
               label: '付',
               value: 'c',
             }],
+            span:4
+          }, 
+          {
+            label: '',
+            labelWidth: 0,
+            placeholder:'请输入 Pickup fee',
+            prop: 'pickupFee',
+            disabled: false,
+            span:2
           },
           {
             label: 'Condition',
@@ -1824,9 +1835,9 @@ export default {
       // this.optionForm.disabled = true
       this.getDetail(this.detailData.id)
     }
-    if (this.$route.query.params) {
-      this.getDetail(this.$route.query.params)
-    }
+    // if (this.$route.query.params) {
+    //   this.getDetail(this.$route.query.params)
+    // }
     if (this.detailData.copyId) {
       this.getCopydate(this.detailData.copyId)
     }
@@ -2203,7 +2214,10 @@ export default {
         pid: this.form.id,
         feesType: 1,
         dc: 'D',
-        billType: '船公司',
+        billType: '箱东',
+        corpId:this.form.purchaseCompanyId,
+        shortName:this.form.purchaseCompanyName,
+        corpCnName:this.form.purchaseCompanyName,
         curCode: 'CNY',
         exrate: 1,
         $cellEdit: true
@@ -2217,7 +2231,10 @@ export default {
         pid: this.form.id,
         feesType: 1,
         dc: 'C',
-        billType: '船公司',
+        billType: '箱东',
+        corpId:this.form.purchaseCompanyId,
+        shortName:this.form.purchaseCompanyName,
+        corpCnName:this.form.purchaseCompanyName,
         curCode: 'CNY',
         exrate: 1,
         $cellEdit: true

src/views/ow/owTask/index.vue

@@ -449,6 +449,12 @@ export default {
   },
   activated() {
     setTimeout(() => {
+      if (this.$route.query.id) {
+        this.detailData = {
+          id: this.$route.query.id
+        };
+        this.isShow = false
+      }
     }, 100);
   },
   methods: {