修改签单地点 仓库 配箱顺序

src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation.vue

@@ -901,7 +901,8 @@ export default {
                         this.$set(this.assemblyForm, name + 'NamePrint', item.enName)
                         // 签单地点 默认 装货港
                         if (name == 'pol') {
-                            this.$set(this.assemblyForm, 'issueAt', this.assemblyForm.polCnName)
+                            this.$set(this.assemblyForm, 'issueAt', this.assemblyForm.polEnName)
+                            this.$set(this.assemblyForm, 'issueAtId', this.assemblyForm.polId)
                         }
                         // 选择卸货港带出目的地
                         if (name == 'pod') {

src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -227,7 +227,7 @@ export default {
                         width: "120"
                     },
                     {
-                        label: "是否货主自有箱",
+                        label: "SOC",
                         prop: "isSoc",
                         width: '120',
                         type: 'select',
@@ -241,7 +241,20 @@ export default {
                         }]
                     },
                     {
-                        label: "是否冻代干",
+                        label: "单程",
+                        prop: "isOneway",
+                        type: 'select',
+                        cell: true,
+                        dicData: [{
+                            label: '否',
+                            value: 0
+                        }, {
+                            label: '是',
+                            value: 1
+                        }]
+                    },
+                    {
+                        label: "NOR",
                         prop: "nor",
                         width: '100',
                         type: 'select',
@@ -255,7 +268,7 @@ export default {
                         }]
                     },
                     {
-                        label: "是否超尺寸特种箱",
+                        label: "OOG",
                         prop: "oog",
                         width: '120',
                         type: 'select',
@@ -304,19 +317,6 @@ export default {
                         controls: false,
                     },
                     {
-                        label: "是否单程",
-                        prop: "isOneway",
-                        type: 'select',
-                        cell: true,
-                        dicData: [{
-                            label: '否',
-                            value: 0
-                        }, {
-                            label: '是',
-                            value: 1
-                        }]
-                    },
-                    {
                         label: "备注",
                         prop: "remarks",
                         span: 24,

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -1227,7 +1227,8 @@ export default {
                         this.$set(this.assemblyForm, name + 'NamePrint', item.enName)
                         // 签单地点 默认 装货港
                         if (name == 'pol') {
-                            this.$set(this.assemblyForm, 'issueAt', this.assemblyForm.polCnName)
+                            this.$set(this.assemblyForm, 'issueAt', this.assemblyForm.polEnName)
+                            this.$set(this.assemblyForm, 'issueAtId', this.assemblyForm.polEnName)
                         }
                         // // 选择卸货港带出目的地
                         // if(name == 'pod') {

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -225,7 +225,7 @@ export default {
                         width: "120"
                     },
                     {
-                        label: "是否货主自有箱",
+                        label: "SOC",
                         prop: "isSoc",
                         width: '120',
                         type: 'select',
@@ -239,7 +239,20 @@ export default {
                         }]
                     },
                     {
-                        label: "是否冻代干",
+                        label: "单程",
+                        prop: "isOneway",
+                        type: 'select',
+                        cell: true,
+                        dicData: [{
+                            label: '否',
+                            value: 0
+                        }, {
+                            label: '是',
+                            value: 1
+                        }]
+                    },
+                    {
+                        label: "NOR",
                         prop: "nor",
                         width: '100',
                         type: 'select',
@@ -253,7 +266,7 @@ export default {
                         }]
                     },
                     {
-                        label: "是否超尺寸特种箱",
+                        label: "OOG",
                         prop: "oog",
                         width: '120',
                         type: 'select',
@@ -302,19 +315,6 @@ export default {
                         controls: false,
                     },
                     {
-                        label: "是否单程",
-                        prop: "isOneway",
-                        type: 'select',
-                        cell: true,
-                        dicData: [{
-                            label: '否',
-                            value: 0
-                        }, {
-                            label: '是',
-                            value: 1
-                        }]
-                    },
-                    {
                         label: "备注",
                         prop: "remarks",
                         span: 24,

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -68,7 +68,6 @@
                 </el-dropdown>
             </div>
         </div>
-
         <div style="margin-top: 50px">
             <el-tabs type="border-card" v-model="bigtabs" @tab-click="bigHandleClick">
                 <el-tab-pane label="委托信息" name="wt" class="scrollable-container">
@@ -1016,7 +1015,9 @@ export default {
                 this.form.polCode = res.data.data.polCode
                 this.form.polNamePrint = res.data.data.polEnName
                 // 签单地点 默认 装货港
+                this.$set(this.form, 'issueAtId', this.form.polId)
                 this.$set(this.form, 'issueAt', this.form.polEnName)
+                
                 // 主单单付费地点 默认  如果主单付费方式 为PP 取装货港 如果主单付费地点为CC 取卸货港
                 if (this.form.mpaymode == 'PP') {
                     this.$set(this.form, 'mpayplace', this.form.polEnName)

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -1346,23 +1346,23 @@ export default {
                 this.findObject(this.optionContactsBack.column, "goodsId").dicData = res.data.data
             })
         },
-        'form.orderItemsList.length'(newformContacts, oldformContacts) {
-            console.log(this.formContacts);
-            console.log(this.form.orderItemsList);
-            // for (let i = 0; i < this.form.orderItemsList.length - 1; i++) {
-            //     const currentItem = this.form.orderItemsList[i];
-            //     const nextItem = this.form.orderItemsList[i + 1];
-
-            //     if (currentItem.sharedCompanyId !== nextItem.sharedCompanyId) {
-            //         console.log('不能添加');
-            //     }
-            // }
-            if (this.form.orderItemsList.length) {
-                this.findObject(this.optionForm.column, 'storageId').disabled = true
-            } else {
-                this.findObject(this.optionForm.column, 'storageId').disabled = false
-            }
-        },
+        // 'form.orderItemsList.length'(newformContacts, oldformContacts) {
+        //     console.log(this.formContacts);
+        //     console.log(this.form.orderItemsList);
+        //     // for (let i = 0; i < this.form.orderItemsList.length - 1; i++) {
+        //     //     const currentItem = this.form.orderItemsList[i];
+        //     //     const nextItem = this.form.orderItemsList[i + 1];
+
+        //     //     if (currentItem.sharedCompanyId !== nextItem.sharedCompanyId) {
+        //     //         console.log('不能添加');
+        //     //     }
+        //     // }
+        //     if (this.form.orderItemsList.length) {
+        //         this.findObject(this.optionForm.column, 'storageId').disabled = true
+        //     } else {
+        //         this.findObject(this.optionForm.column, 'storageId').disabled = false
+        //     }
+        // },
         'form.sharedCompanyId'(newSharedCompanyId, oldSharedCompanyId) {
             console.log(newSharedCompanyId, oldSharedCompanyId);
             if (newSharedCompanyId != oldSharedCompanyId) {