1.优化拆单功能

2.放箱号 修改放箱号 新加字段 放箱号类型不允许编辑
3.海运进出口 文本框内容 保存的时候全部转换为大写
4.海运出口 费用明细 画存为模板弹窗
5.OW拿 OW放 优化Pick up和Per diem切换上下票不更新的问题

src/views/boxManagement/boxTrack/index.vue

@@ -231,6 +231,12 @@ export default {
             overHidden: true
           },
           {
+            label: "POD港口",
+            prop: "podCname",
+            width: 80,
+            overHidden: true
+          },
+          {
             label: "ETD",
             prop: "etd",
             width: 100,

src/views/boxManagement/containerNumber/components/changeCn.vue

@@ -62,6 +62,22 @@
             rightLabel="code"
           ></dic-select>
         </tempalte>
+        <tempalte slot="podStationCname">
+          <dic-select
+            v-model="form.podStationCname"
+            placeholder="实际场站"
+            key="id"
+            label="cnName"
+            res="records"
+            url="/blade-los/bcorps/selectList?current=1&size=5&corpTypeName=场站&status=0"
+            :filterable="true"
+            :remote="true"
+            dataName="cnName"
+            @selectChange="dicChange('podStationCname', $event)"
+            :slotRight="true"
+            rightLabel="code"
+          ></dic-select>
+        </tempalte>
       </avue-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false" size="mini">取 消</el-button>
@@ -144,22 +160,14 @@ export default {
             disabled: false
           },
           {
+            label: "目的港场站",
+            prop: "podStationCname",
+            disabled: false
+          },
+          {
             label: "放箱号类型",
             prop: "boxClass",
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxCategory",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
-            disabled: false,
-            rules: [
-              {
-                required: true,
-                message: " ",
-                trigger: "blur"
-              }
-            ]
+            disabled: true
           }
         ]
       }
@@ -167,10 +175,11 @@ export default {
   },
   created() {},
   methods: {
-    openDialog(id, list) {
+    openDialog(val, list) {
       this.form = {};
       this.selectionList = [];
-      this.form.id = id;
+      this.form.id = val.id;
+      this.form.boxClass = val.boxClass;
       this.selectionList = list;
       this.dialogVisible = true;
     },
@@ -212,6 +221,18 @@ export default {
           this.form.polStationCname = null;
         }
       }
+      if (name == "podStationCname") {
+        if (row) {
+          this.form.podStationId = row.id;
+          this.form.podStationCode = row.code;
+          this.form.podStationEname = row.enName;
+        } else {
+          this.form.podStationId = null;
+          this.form.podStationCode = null;
+          this.form.podStationEname = null;
+          this.form.podStationCname = null;
+        }
+      }
     },
     submit() {
       this.$refs["form"].validate((valid, done) => {

src/views/boxManagement/containerNumber/detailsPage.vue

@@ -2032,7 +2032,7 @@ export default {
         //     return this.$message.error("请选择待使用箱状态的数据");
         //   }
         // }
-        this.$refs.changeCn.openDialog(this.form.id,this.selectionList)
+        this.$refs.changeCn.openDialog(this.form,this.selectionList)
         // this.$DialogForm.show({
         //   title: "更改放箱号",
         //   width: "30%",

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

@@ -58,7 +58,7 @@
           v-if="
             bigtabs != 'dz' &&
               (roleName.includes('admin') ||
-              (roleName.includes('应付查看') && roleName.includes('应收查看')) ||
+                (roleName.includes('应付查看') && roleName.includes('应收查看')) ||
                 (roleName.includes('应付修改') && roleName.includes('应收修改')))
           "
           size="small"
@@ -80,7 +80,7 @@
         <!-- <el-button v-if="form.id && form.changeOrdersStatus == '已换单'" size="small" type="danger"
                     @click.stop="allClick('撤销换单')">{{ $t("sea118n.unChangeDoc") }}
                 </el-button> -->
-                
+
         <el-button size="small" type="warning" :disabled="!form.id || showLock" v-if="form.billType == 'MM'" @click.stop="allClick('同步主单到分单')"
           >{{ $t("btn118n.setInfoMMToMH") }}
         </el-button>
@@ -1460,7 +1460,7 @@ export default {
           });
         });
       }
-      
+
       if (name == "同步主单到分单") {
         this.$confirm("是否同步主单到分单?", "提示", {
           confirmButtonText: "确定",
@@ -2377,7 +2377,7 @@ export default {
         let obj = data.split("\n");
         let res = [];
         obj.forEach(item => {
-          res.push(_.trimEnd(item));
+          res.push(_.toUpper(_.trimEnd(item)));
         });
         return res.join("\n");
       } else {

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -379,9 +379,8 @@ import dicSelect from "@/components/dicSelect/main";
 import businessReports from "@/components/tradeAgency/businessReportsJK.vue";
 import { isProcurement } from "@/api/basicData/configuration";
 import splitOrder from "../components/splitOrder.vue";
-import mergeOrder from "../components/mergeOrder.vue";
 export default {
-  components: { SearchQuery, bports, extractBoxInformation, dicSelect, businessReports, splitOrder, mergeOrder },
+  components: { SearchQuery, bports, extractBoxInformation, dicSelect, businessReports, splitOrder },
   props: {
     assemblyForm: {},
     detailData: {},

src/views/iosBasicData/SeafreightExportF/bills/assembly/components/splitOrder.vue

@@ -1,10 +1,9 @@
 <template>
   <div>
     <el-dialog title="拆单" :visible.sync="dialogVisible" append-to-body width="50%" :before-close="handleClose">
-      <avue-form :option="optionForm" v-model="query" ref="form"></avue-form>
-      <div style="display: flex;justify-content: flex-end;">
+      <!-- <div style="display: flex;justify-content: flex-end;">
         <el-button type="success" size="small" plain @click="getList">查询</el-button>
-      </div>
+      </div> -->
       <avue-crud
         v-if="dialogVisible"
         :option="option"
@@ -12,9 +11,14 @@
         :data="data"
         ref="crud"
         id="out-table"
+        :search.sync="query"
         :header-cell-class-name="headerClassName"
+        @search-change="getList"
         @current-row-change="handleCurrentRowChange"
       >
+        <template slot="menuLeft" slot-scope="{ size }">
+          <avue-form :option="optionForm" v-model="query" ref="form"></avue-form>
+        </template>
       </avue-crud>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false" size="mini">取 消</el-button>
@@ -36,11 +40,11 @@ export default {
       pickObj: {},
       dialogVisible: false,
       loading: false,
-
       optionForm: {
         menuBtn: false,
         span: 8,
         disabled: false,
+        labelWidth:70,
         column: [
           {
             label: "客户名称",
@@ -48,11 +52,6 @@ export default {
             disabled: true
           },
           {
-            label: "所属公司",
-            prop: "branchName",
-            disabled: true
-          },
-          {
             label: "起运港",
             prop: "polCnName",
             disabled: true
@@ -61,16 +60,6 @@ export default {
             label: "目的港",
             prop: "podCnName",
             disabled: true
-          },
-          {
-            label: "箱属",
-            prop: "boxBelongsTo",
-            disabled: true
-          },
-          {
-            label: "分单号",
-            prop: "hblno",
-            disabled: false
           }
         ]
       },
@@ -84,8 +73,14 @@ export default {
         delBtn: false,
         editBtn: false,
         menu: false,
-        header: false,
+        header: true,
+        emptyBtn: false,
+        refreshBtn: false,
+        columnBtn: false,
         align: "center",
+        searchBtnText: "查询",
+        searchSpan:8,
+        searchMenuSpan: 16,
         highlightCurrentRow: true,
         column: [
           {
@@ -96,6 +91,12 @@ export default {
           {
             label: "分单号",
             prop: "hblno",
+            search: true,
+            overHidden: true
+          },
+          {
+            label: "主单号",
+            prop: "mblno",
             overHidden: true
           },
           {
@@ -124,14 +125,15 @@ export default {
       this.ids = null;
       this.query = {};
       this.pickObj = {};
-      this.data=[]
+      this.data = [];
       this.query = {
         ...val,
-        hblno:null
+        hblno: null
       };
       this.ids = ids;
     },
-    getList() {
+    getList(params,done) {
+      done();
       let obj = {
         branchId: this.query.branchId,
         corpId: this.query.corpId,

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

@@ -176,6 +176,7 @@
             >{{ $t("btn118n.unAplly") }}</el-button
           >
           <el-button plain size="small" :disabled="disabled || isFeedDisabled" @click="allClick('同步结算单位', 'D')">同步收费对象</el-button>
+          <el-button type="success" plain size="small" :disabled="selectionDList.length == 0" @click="allClick('存为模板', 'D')">存为模板</el-button>
         </template>
         <template slot="indexHeader" slot-scope="scope">
           <el-button v-if="isFeeEditD" type="primary" size="small" icon="el-icon-plus" circle :disabled="disabled" @click="addDfun"></el-button>
@@ -356,7 +357,7 @@
             :controls="false"
             :precision="5"
             placeholder="请输入"
-            :disabled="row.curCode==getLocalCurrency()"
+            :disabled="row.curCode == getLocalCurrency()"
             style="width: 100%;"
           ></el-input-number>
           <span v-else>{{ row.exrate }}</span>
@@ -521,6 +522,8 @@
             >{{ $t("btn118n.unAplly") }}</el-button
           >
           <el-button plain size="small" :disabled="disabled || isFeecDisabled" @click="allClick('同步结算单位', 'C')">同步付费对象</el-button>
+
+          <el-button type="success" plain size="small" :disabled="selectionCList.length == 0" @click="allClick('存为模板', 'C')">存为模板</el-button>
         </template>
         <template slot="indexHeader" slot-scope="scope">
           <el-button v-if="isFeeEditC" type="primary" size="small" icon="el-icon-plus" circle :disabled="disabled" @click="addCfun"> </el-button>
@@ -688,7 +691,7 @@
             :controls="false"
             :precision="5"
             placeholder="请输入"
-            :disabled="row.curCode==getLocalCurrency()"
+            :disabled="row.curCode == getLocalCurrency()"
             style="width: 100%;"
           ></el-input-number>
           <span v-else>{{ row.exrate }}</span>
@@ -3905,6 +3908,65 @@ export default {
       this.$emit("billsDetailfun");
     },
     allClick(name, type) {
+      if (name == "存为模板") {
+        this.$DialogForm.show({
+          title: "费用模板",
+          width: "30%",
+          menuPosition: "right",
+          submitText: "保存",
+          option: {
+            submitText: "确定",
+            emptyText: "取消",
+            labelWidth: 130,
+            column: [
+              {
+                label: "模版编号",
+                span: 24,
+                prop: "code",
+                rules: [
+                  {
+                    required: true,
+                    message: "请选择日期",
+                    trigger: "blur"
+                  }
+                ]
+              },
+              {
+                label: "模版中文名称",
+                span: 24,
+                prop: "cnName",
+                rules: [
+                  {
+                    required: true,
+                    message: "请输入模版中文名称",
+                    trigger: "blur"
+                  }
+                ]
+              },
+              {
+                label: "模版英文名称",
+                span: 24,
+                prop: "enName",
+                rules: [
+                  {
+                    required: true,
+                    message: "请输入模版英文名称",
+                    trigger: "blur"
+                  }
+                ]
+              }
+            ]
+          },
+          beforeClose: done => {
+            done();
+          },
+          callback: res => {
+            res.done();
+            let obj = {};
+            res.close();
+          }
+        });
+      }
       if (name == "同步结算单位") {
         this.$refs.sysnCorpName.openDialog(this.assemblyForm.id, type);
       }
@@ -4652,13 +4714,13 @@ export default {
     },
     rowStyle({ row, column, rowIndex }) {
       //已结算金额
-      if (Number(row.stlTtlAmount?row.stlTtlAmount:0) != 0) {
+      if (Number(row.stlTtlAmount ? row.stlTtlAmount : 0) != 0) {
         return {
           color: "#0000FF"
         };
       }
       //发票金额和付费申请金额
-      if (Number(row.appliedAmount?row.appliedAmount:0) != 0 || Number(row.appliedInvoiceAmount?row.appliedInvoiceAmount:0) != 0) {
+      if (Number(row.appliedAmount ? row.appliedAmount : 0) != 0 || Number(row.appliedInvoiceAmount ? row.appliedInvoiceAmount : 0) != 0) {
         return {
           color: "#FFC300"
         };
@@ -4791,7 +4853,7 @@ export default {
   padding: 0 2px !important;
 }
 ::v-deep .el-input__inner {
-  padding-left:5px !important;
+  padding-left: 5px !important;
 }
 .textoverflow {
   width: 100%;

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

@@ -2510,7 +2510,7 @@ export default {
         let obj = data.split("\n");
         let res = [];
         obj.forEach(item => {
-          res.push(_.trimEnd(item));
+          res.push(_.toUpper(_.trimEnd(item)));
         });
         return res.join("\n");
       } else {

src/views/ow/owPut/detailsPage.vue

@@ -263,7 +263,9 @@
                 <el-button type="primary" size="small" :disabled="editDisabled || selectionList.length == 0" @click="allClick('批量修改POD场站')">
                   批量修改POD场站
                 </el-button>
-                <el-button type="success" size="small" :disabled="!form.id||form.tradingBoxItemsList.length==0" @click="allClick('客户还箱')">客户还箱</el-button>
+                <el-button type="success" size="small" :disabled="!form.id || form.tradingBoxItemsList.length == 0" @click="allClick('客户还箱')"
+                  >客户还箱</el-button
+                >
                 <el-button type="success" size="small" :disabled="!form.id" @click="allClick('导出箱号')">导出箱号</el-button>
                 <!-- <el-button type="info" size="small" @click="allClick('启用')">启用</el-button> -->
                 <!-- <el-button type="primary" size="small" @click="allClick('卖箱')">卖箱</el-button> -->
@@ -2394,7 +2396,7 @@ export default {
           {
             label: "是否生成",
             prop: "whetherGenerateCost",
-            width:70,
+            width: 70,
             overHidden: true,
             type: "select",
             dicData: [
@@ -2411,7 +2413,7 @@ export default {
           {
             label: "Customer",
             prop: "corpCnName",
-            width:80,
+            width: 80,
             overHidden: true
           },
           {
@@ -2429,7 +2431,7 @@ export default {
           {
             label: "Type/Size",
             prop: "unitNo",
-            width:60,
+            width: 60,
             overHidden: true
           },
           {
@@ -2455,19 +2457,19 @@ export default {
           {
             label: "free days",
             prop: "freeDay",
-            width:60,
+            width: 60,
             overHidden: true
           },
           {
             label: "charge days",
             prop: "days",
-            width:80,
+            width: 80,
             overHidden: true
           },
           {
             label: "RATE",
             prop: "price",
-            width:60,
+            width: 60,
             overHidden: true
           },
           {
@@ -2478,13 +2480,13 @@ export default {
           {
             label: "Currency",
             prop: "curCode",
-            width:60,
+            width: 60,
             overHidden: true
           },
           {
             label: "Amount",
             prop: "amount",
-            width:60,
+            width: 60,
             overHidden: true
           },
           {
@@ -3918,6 +3920,11 @@ export default {
             this.searchStatus = false;
             this.searchChange(this.boxQuery);
           }
+
+          if (res.data.data.id) {
+            this.getPick();
+            this.getPer();
+          }
         })
         .finally(() => {
           loading.close();
@@ -4411,7 +4418,7 @@ export default {
               .then(res => {
                 this.$message.success("操作成功！");
                 this.getDetail(this.form.id);
-                this.getPer();
+                // this.getPer();
               })
               .finally(() => {
                 loading.close();
@@ -4438,7 +4445,7 @@ export default {
             .then(res => {
               this.$message.success("操作成功！");
               this.getDetail(this.form.id);
-              this.getPer();
+              // this.getPer();
             })
             .finally(() => {
               loading.close();
@@ -4811,7 +4818,7 @@ export default {
         mergeGenerateCost(obj).then(res => {
           this.$message.success("操作成功");
           this.getDetail(this.form.id);
-          this.getPick();
+          // this.getPick();
         });
       }
       if (name == "撤销生成") {
@@ -4827,7 +4834,7 @@ export default {
         revokeMergeGenerateCost(obj).then(res => {
           this.$message.success("操作成功");
           this.getDetail(this.form.id);
-          this.getPick();
+          // this.getPick();
         });
       }
       if (name == "撤销导入") {
@@ -4846,7 +4853,7 @@ export default {
         revokePickUpCost(obj).then(res => {
           this.$message.success("操作成功");
           this.getDetail(this.form.id);
-          this.getPick();
+          // this.getPick();
         });
       }
       if (name == "合并生成2") {
@@ -4862,7 +4869,7 @@ export default {
         mergeGenerateCost(obj).then(res => {
           this.$message.success("操作成功");
           this.getDetail(this.form.id);
-          this.getPer();
+          // this.getPer();
         });
       }
       if (name == "撤销生成2") {
@@ -4878,7 +4885,7 @@ export default {
         revokeMergeGenerateCost(obj).then(res => {
           this.$message.success("操作成功");
           this.getDetail(this.form.id);
-          this.getPer();
+          // this.getPer();
         });
       }
       if (name == "D申请修改") {

src/views/ow/owTask/detailsPage.vue

@@ -319,7 +319,9 @@
                 <el-button type="primary" size="small" :disabled="editDisabled" @click="allClick('批量修改POD场站')">
                   批量修改POD场站
                 </el-button>
-                <el-button type="success" size="small" :disabled="!form.id||form.tradingBoxItemsList.length==0" @click="allClick('客户还箱')">客户还箱</el-button>
+                <el-button type="success" size="small" :disabled="!form.id || form.tradingBoxItemsList.length == 0" @click="allClick('客户还箱')"
+                  >客户还箱</el-button
+                >
                 <el-button type="success" size="small" :disabled="!form.id" @click="allClick('导出箱号')"> 导出箱号</el-button>
                 <!-- <el-button type="primary" size="small" @click="allClick('卖箱')">卖箱</el-button> -->
                 <!-- <el-button size="small" style="margin-right: 8px" :disabled="!form.id || true"
@@ -3013,7 +3015,7 @@ export default {
           {
             label: "是否生成",
             prop: "whetherGenerateCost",
-            width:70,
+            width: 70,
             overHidden: true,
             type: "select",
             dicData: [
@@ -3030,7 +3032,7 @@ export default {
           {
             label: "Customer",
             prop: "corpCnName",
-            width:80,
+            width: 80,
             overHidden: true
           },
           {
@@ -3048,7 +3050,7 @@ export default {
           {
             label: "Type/Size",
             prop: "unitNo",
-            width:60,
+            width: 60,
             overHidden: true
           },
           {
@@ -3074,19 +3076,19 @@ export default {
           {
             label: "free days",
             prop: "freeDay",
-            width:60,
+            width: 60,
             overHidden: true
           },
           {
             label: "charge days",
             prop: "days",
-            width:80,
+            width: 80,
             overHidden: true
           },
           {
             label: "RATE",
             prop: "price",
-            width:60,
+            width: 60,
             overHidden: true
           },
           {
@@ -3097,13 +3099,13 @@ export default {
           {
             label: "Currency",
             prop: "curCode",
-            width:60,
+            width: 60,
             overHidden: true
           },
           {
             label: "Amount",
             prop: "amount",
-            width:60,
+            width: 60,
             overHidden: true
           },
           {
@@ -4398,6 +4400,10 @@ export default {
             this.searchStatus = false;
             this.searchChange(this.boxQuery);
           }
+          if (res.data.data.id) {
+            this.getPick();
+            this.getPer();
+          }
           // if (res.data.data.status != '录入') {
           //   this.editButton = true
           //   this.editDisabled = true
@@ -4976,7 +4982,7 @@ export default {
               .then(res => {
                 this.$message.success("操作成功！");
                 this.getDetail(this.form.id);
-                this.getPer();
+                // this.getPer();
               })
               .finally(() => {
                 loading.close();
@@ -5001,7 +5007,7 @@ export default {
             .then(res => {
               this.$message.success("操作成功！");
               this.getDetail(this.form.id);
-              this.getPer();
+              // this.getPer();
             })
             .finally(() => {
               loading.close();
@@ -5394,7 +5400,7 @@ export default {
         mergeGenerateCost(obj).then(res => {
           this.$message.success("操作成功");
           this.getDetail(this.form.id);
-          this.getPick();
+          // this.getPick();
         });
       }
       if (name == "撤销生成") {
@@ -5410,7 +5416,7 @@ export default {
         revokeMergeGenerateCost(obj).then(res => {
           this.$message.success("操作成功");
           this.getDetail(this.form.id);
-          this.getPick();
+          // this.getPick();
         });
       }
       if (name == "撤销导入") {
@@ -5429,7 +5435,7 @@ export default {
         revokePickUpCost(obj).then(res => {
           this.$message.success("操作成功");
           this.getDetail(this.form.id);
-          this.getPick();
+          // this.getPick();
         });
       }
       if (name == "合并生成2") {
@@ -5445,7 +5451,7 @@ export default {
         mergeGenerateCost(obj).then(res => {
           this.$message.success("操作成功");
           this.getDetail(this.form.id);
-          this.getPer();
+          // this.getPer();
         });
       }
       if (name == "撤销生成2") {
@@ -5461,7 +5467,7 @@ export default {
         revokeMergeGenerateCost(obj).then(res => {
           this.$message.success("操作成功");
           this.getDetail(this.form.id);
-          this.getPer();
+          // this.getPer();
         });
       }
       if (name == "D申请修改") {