Просмотр исходного кода

1.海运进出口 配箱页面 POD日期和场站允许在任何情况编辑
2.空箱返场 列表页新加还箱日期
3.海运进出口 报表 入货通知 新加六个字段
4.海运进出口 删除 请核 申请等按钮 允许其他人修改
5.财务管理 结算中心 待收 待付 不允许编辑金额

Qukatie 2 недель назад
Родитель
Сommit
22fe8c5998

+ 8 - 0
src/views/boxManagement/podComeback/index.vue

@@ -159,6 +159,14 @@ export default {
             overHidden: true,
             search: true,
           },
+                  {
+            label: '还箱日期',
+            prop: 'returnEmptyTime',
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+            overHidden: true,
+          },
           {
             label: '铅封号',
             prop: 'sealNo',

+ 258 - 226
src/views/iosBasicData/OceanFreightImport/bills/assembly/DistributionBox/containers.vue

@@ -1,130 +1,141 @@
 <template>
   <div>
     <basic-container>
-      <avue-crud :option="option" :table-loading="loading" :data="assemblyForm.containersList"
-        :permission="permissionList" :before-open="beforeOpen" v-model="form" id="out-table"
-        :header-cell-class-name="headerClassName" ref="crud" :row-style="{ height: '20px' }"
-        :cell-style="{ padding: '0px' }" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
-        @selection-change="selectionChange" @refresh-change="refreshChange">
+      <avue-crud
+        :option="option"
+        :table-loading="loading"
+        :data="assemblyForm.containersList"
+        :permission="permissionList"
+        :before-open="beforeOpen"
+        v-model="form"
+        id="out-table"
+        :header-cell-class-name="headerClassName"
+        ref="crud"
+        :row-style="{ height: '20px' }"
+        :cell-style="{ padding: '0px' }"
+        @row-update="rowUpdate"
+        @row-save="rowSave"
+        @row-del="rowDel"
+        @selection-change="selectionChange"
+        @refresh-change="refreshChange"
+      >
         <template slot="menuLeft">
           <div style="display: flex;align-items: center;justify-content: space-between">
             <div>
-              <!--<el-button type="primary" size="small" @click="DistributionBox">配箱</el-button>-->
-              <!--<el-button type="danger" size="small"-->
-              <!--           :disabled="detailData.seeDisabled || pleasereviewType"-->
-              <!--           @click="revokefun">撤销-->
-              <!--</el-button>-->
-              <!--<el-button type="danger" size="small"-->
-              <!--           :disabled="detailData.seeDisabled || pleasereviewType"-->
-              <!--           @click="wholeRevokefun">全部撤销-->
-              <!--</el-button>-->
-              <!-- <el-button type="warning" size="small" :disabled="detailData.seeDisabled || pleasereviewType || disabled"
-                @click="cleanCntrNofun">清除箱号
-              </el-button> -->
               <el-button type="success" size="small" plain :disabled="seeDisabled" @click.stop="equalDistribution2()">
-                  {{ $t("btn118n.generateCtnrList") }}
+                {{ $t("btn118n.generateCtnrList") }}
               </el-button>
-              <el-button type="primary" size="small" :disabled="detailData.seeDisabled || pleasereviewType || showLock"
-                @click="oneclickEditing"> {{ $t("btn118n.edit") }}
+              <el-button type="primary" size="small" :disabled="detailData.seeDisabled || pleasereviewType || showLock" @click="oneclickEditing">
+                {{ $t("btn118n.edit") }}
               </el-button>
-              <el-button type="primary" size="small" :disabled="detailData.seeDisabled || pleasereviewType || disabled"
-                @click="containersSubmitListfun"> {{ $t("btn118n.save") }}
+              <el-button type="primary" size="small" @click="containersSubmitListfun">
+                {{ $t("btn118n.save") }}
               </el-button>
-              <!-- <el-button type="danger" size="small" :disabled="detailData.seeDisabled || pleasereviewType || disabled"
-                @click="handleDelete">一键删除
-              </el-button> -->
-              <el-button type="success" size="small"
+              <el-button
+                type="success"
+                size="small"
                 :disabled="detailData.seeDisabled || !assemblyForm.id || pleasereviewType || showLock"
-                @click="oepnexcelBox">{{ $t("btn118n.importCtnr") }}
+                @click="oepnexcelBox"
+                >{{ $t("btn118n.importCtnr") }}
               </el-button>
-              <el-button type="danger" size="small" :disabled="detailData.seeDisabled || pleasereviewType || showLock"
-                @click="handleDelete">{{ $t("btn118n.deleteCtnrList") }}
+              <el-button type="danger" size="small" :disabled="detailData.seeDisabled || pleasereviewType || showLock" @click="handleDelete"
+                >{{ $t("btn118n.deleteCtnrList") }}
               </el-button>
-              <el-button type="success" size="small" plain :disabled="detailData.seeDisabled"
-                @click.stop="$refs.print.openDialog()">
-                  {{ $t("btn118n.preview") }}
+              <el-button type="success" size="small" plain :disabled="detailData.seeDisabled" @click.stop="$refs.print.openDialog()">
+                {{ $t("btn118n.preview") }}
               </el-button>
-              <!-- <el-button type="success" size="small"
-                :disabled="detailData.seeDisabled || !assemblyForm.id || pleasereviewType || disabled"
-                @click="excelBox = true">导入箱号,铅封号
-              </el-button> -->
-              <!--<el-button type="warning" size="small"-->
-              <!--           :disabled="numberfalsefun() || assemblyForm.id"-->
-              <!--           @click="equalDistribution">平均分配</el-button>-->
             </div>
-            <!--<div>-->
-            <!--    <el-button size="small">Copy</el-button>-->
-            <!--    <el-button size="small">查看箱信息</el-button>-->
-            <!--    <el-button size="small">校验箱信息</el-button>-->
-            <!--</div>-->
           </div>
         </template>
-        <!--<template slot-scope="scope" slot="menu">-->
-        <!--    <el-button v-if="scope.row.edit" :type="scope.type" :size="scope.size" icon="el-icon-edit"-->
-        <!--               @click.stop="rowSavefun(scope.row, scope.index)">保存-->
-        <!--    </el-button>-->
-        <!--    <el-button v-else :type="scope.type" :size="scope.size" icon="el-icon-edit"-->
-        <!--               :disabled="detailData.seeDisabled || pleasereviewType"-->
-        <!--               @click.stop="rowCellfun(scope.row, scope.index)">编辑-->
-        <!--    </el-button>-->
-        <!--    <el-button :type="scope.type" :size="scope.size" icon="el-icon-delete"-->
-        <!--               :disabled="detailData.seeDisabled || pleasereviewType"-->
-        <!--               @click.stop="rowDel(scope.row, scope.index)">删除-->
-        <!--    </el-button>-->
-        <!--</template>-->
         <template slot-scope="scope" slot="cntrNo">
-          <el-input v-if="scope.row.edit" v-model="scope.row.cntrNo" maxlength='11' size="small" clearable
-            placeholder="请输入箱号" @input="cntrNoInput(scope.row, 'cntrNo')"
-            @change="verifyChange(scope.row, 'cntrNo')"></el-input>
+          <el-input
+            v-if="scope.row.edit"
+            v-model="scope.row.cntrNo"
+            maxlength="11"
+            size="small"
+            clearable
+            placeholder="请输入箱号"
+            @input="cntrNoInput(scope.row, 'cntrNo')"
+            @change="verifyChange(scope.row, 'cntrNo')"
+          ></el-input>
           <span v-else>{{ scope.row.cntrNo }}</span>
         </template>
         <template slot-scope="scope" slot="sealNo">
-          <el-input v-if="scope.row.edit" v-model="scope.row.sealNo" maxlength='11' size="small" clearable
-            placeholder="请输入封号" @input="cntrNoInput(scope.row, 'sealNo')"></el-input>
+          <el-input
+            v-if="scope.row.edit"
+            v-model="scope.row.sealNo"
+            maxlength="11"
+            size="small"
+            clearable
+            placeholder="请输入封号"
+            @input="cntrNoInput(scope.row, 'sealNo')"
+          ></el-input>
           <span v-else>{{ scope.row.sealNo }}</span>
         </template>
         <template slot-scope="scope" slot="quantity">
-          <el-input v-if="scope.row.edit" v-model="scope.row.quantity" size="small" clearable
-            placeholder="请输入件数"></el-input>
+          <el-input v-if="scope.row.edit" v-model="scope.row.quantity" size="small" clearable placeholder="请输入件数"></el-input>
           <span v-else>{{ Number(scope.row.quantity).toFixed(0) }}</span>
         </template>
         <template slot-scope="scope" slot="grossWeight">
-          <el-input v-if="scope.row.edit" v-model="scope.row.grossWeight" size="small" clearable
-            placeholder="请输入毛重"></el-input>
+          <el-input v-if="scope.row.edit" v-model="scope.row.grossWeight" size="small" clearable placeholder="请输入毛重"></el-input>
           <span v-else>{{ scope.row.grossWeight }}</span>
         </template>
         <template slot-scope="scope" slot="netWeight">
-          <el-input v-if="scope.row.edit" v-model="scope.row.netWeight" size="small" clearable
-            placeholder="请输入净重"></el-input>
+          <el-input v-if="scope.row.edit" v-model="scope.row.netWeight" size="small" clearable placeholder="请输入净重"></el-input>
           <span v-else>{{ scope.row.netWeight }}</span>
         </template>
         <template slot-scope="scope" slot="measurement">
-          <el-input v-if="scope.row.edit" v-model="scope.row.measurement" size="small" clearable
-            placeholder="请输入尺码"></el-input>
+          <el-input v-if="scope.row.edit" v-model="scope.row.measurement" size="small" clearable placeholder="请输入尺码"></el-input>
           <span v-else>{{ scope.row.measurement }}</span>
         </template>
         <template slot-scope="scope" slot="remarks">
-          <el-input v-if="scope.row.edit" v-model="scope.row.remarks" size="small" clearable
-            placeholder="请输入备注"></el-input>
+          <el-input v-if="scope.row.edit" v-model="scope.row.remarks" size="small" clearable placeholder="请输入备注"></el-input>
           <span v-else>{{ scope.row.remarks }}</span>
         </template>
-        <template slot-scope="scope" slot="marks">
-          <el-input v-if="scope.row.edit" v-model="scope.row.marks" size="small" clearable
-            placeholder="请输入MARKS"></el-input>
+        <template slot-scope="scope" slot="polStationCname">
+          <el-input v-if="scope.row.edit" v-model="scope.row.marks" size="small" clearable placeholder="请输入MARKS"></el-input>
           <span v-else>{{ scope.row.marks }}</span>
         </template>
+        <template slot-scope="{ row }" slot="podStationCname">
+          <dic-select
+            v-model="row.podStationCname"
+            placeholder="场站"
+            label="cnName"
+            res="records"
+            url="/blade-los/bcorps/selectList?current=1&size=5&corpTypeName=场站&status=0"
+            :filterable="true"
+            :remote="true"
+            dataName="cnName"
+            @selectChange="rowDicChange('podStationCname', $event, row)"
+          ></dic-select>
+        </template>
+        <template slot-scope="{ row }" slot="podEmptyContainerReturnDate">
+          <el-date-picker
+            v-model="row.podEmptyContainerReturnDate"
+            type="date"
+            placeholder="选择日期"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd 00:00:00"
+            size="small"
+          >
+          </el-date-picker>
+        </template>
       </avue-crud>
     </basic-container>
-    <business-reports :id="assemblyForm.id" :itemIds="itemIds" ref="print" businessValue="HYJK" classifyCode="业务"
-      groupCode="配箱预览" :treeType="false" :type="1"></business-reports>
-    <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="onSuccess">
+    <business-reports
+      :id="assemblyForm.id"
+      :itemIds="itemIds"
+      ref="print"
+      businessValue="HYJK"
+      classifyCode="业务"
+      groupCode="配箱预览"
+      :treeType="false"
+      :type="1"
+    ></business-reports>
+    <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="onSuccess">
         <template slot="excelTemplate">
-          <el-button type="primary" @click="handleGet">
-            点击下载<i class="el-icon-download el-icon--right"></i>
-          </el-button>
+          <el-button type="primary" @click="handleGet"> 点击下载<i class="el-icon-download el-icon--right"></i> </el-button>
         </template>
       </avue-form>
       <p style="text-align: center;color: #DC0505">
@@ -143,7 +154,9 @@ import {
   containersRevoke,
   distributionBox,
   containersSubmitList,
-  containersExportContainers, containersImportBoxNo, containersList
+  containersExportContainers,
+  containersImportBoxNo,
+  containersList
 } from "@/api/iosBasicData/containers";
 import { getAccurate } from "@/api/boxManagement/buyContainer/index.js";
 import { mapGetters } from "vuex";
@@ -152,21 +165,22 @@ import bports from "@/views/iosBasicData/bports/index.vue";
 import businessReports from "@/components/tradeAgency/businessReportsJK.vue";
 import { bportsList } from "@/api/iosBasicData/bports";
 import { getToken } from "@/util/auth";
+import dicSelect from "@/components/dicSelect/main";
 
 export default {
-  components: { SearchQuery, bports, businessReports },
+  components: { SearchQuery, bports, businessReports, dicSelect },
   props: {
     assemblyForm: {},
     detailData: {},
     // 请核禁用
     pleasereviewType: {
       type: Boolean,
-      default: false,
+      default: false
     },
     disabled: {
       type: Boolean,
-      default: false,
-    },
+      default: false
+    }
   },
   data() {
     return {
@@ -216,7 +230,7 @@ export default {
       selectionList: [],
       option: {
         stripe: true,
-        height: '250',
+        height: "250",
         calcHeight: 30,
         tip: false,
         searchShow: true,
@@ -233,23 +247,23 @@ export default {
         showSummary: true,
         sumColumnList: [
           {
-            name: 'quantity',
-            type: 'sum',
+            name: "quantity",
+            type: "sum",
             decimals: 0
           },
           {
-            name: 'grossWeight',
-            type: 'sum',
+            name: "grossWeight",
+            type: "sum",
             decimals: 3
           },
           {
-            name: 'netWeight',
-            type: 'sum',
+            name: "netWeight",
+            type: "sum",
             decimals: 3
           },
           {
-            name: 'measurement',
-            type: 'sum',
+            name: "measurement",
+            type: "sum",
             decimals: 3
           }
         ],
@@ -257,25 +271,25 @@ export default {
           {
             label: this.$t("sea118n.ctnrType"),
             prop: "cntrTypeCode",
-            width: "100",
+            width: "100"
           },
           {
             label: this.$t("sea118n.ctnrNo"),
             prop: "cntrNo",
             width: "140",
-            overHidden: true,
+            overHidden: true
           },
           {
-            label:  this.$t("sea118n.sealNo"),
+            label: this.$t("sea118n.sealNo"),
             prop: "sealNo",
             width: "140",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "HB/L NO",
             prop: "hblno",
             width: "140",
-            overHidden: true,
+            overHidden: true
           },
           // {
           //   label: "票数",
@@ -285,15 +299,15 @@ export default {
             label: this.$t("sea118n.quantity"),
             prop: "quantity",
             width: "100",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: this.$t("sea118n.GW"),
             prop: "grossWeight",
             width: "120",
-            overHidden: true,
+            overHidden: true
           },
-/*          {
+          /*          {
             label: "净重(KGM)",
             prop: "netWeight",
             width: "120",
@@ -303,41 +317,41 @@ export default {
             label: this.$t("sea118n.CBM"),
             prop: "measurement",
             width: "140",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "PODCY",
             prop: "podStationCname",
             width: "140",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "podReturnDate",
             prop: "podEmptyContainerReturnDate",
-            width: "140",
-            overHidden: true,
+            width: "160",
+            overHidden: true
           },
           {
             label: "remarks",
             prop: "remarks",
-            type: 'textarea',
+            type: "textarea",
             overHidden: true,
             width: 180,
             slot: true,
             minRows: 3,
-            span: 24,
+            span: 24
           },
           {
             label: "MARKS",
             prop: "marks",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "VGM(KGM)",
             prop: "vgmWeight",
             width: "140",
-            overHidden: true,
-          },
+            overHidden: true
+          }
         ]
       },
       data: []
@@ -361,12 +375,25 @@ export default {
       return ids.join(",");
     }
   },
-  created() {
-  },
+  created() {},
   methods: {
+    rowDicChange(name, row, el, index) {
+      if (name == "podStationCname") {
+        if (row) {
+          el.podStationId = row.id;
+          el.podStationCode = row.code;
+          el.podStationEname = row.enName;
+        } else {
+          el.podStationId = null;
+          el.podStationCode = null;
+          el.podStationCname = null;
+          el.podStationEname = null;
+        }
+      }
+    },
     // 输入自动大写
     cntrNoInput(row, name) {
-      this.$set(row, name, row[name].toLocaleUpperCase().replace(/[\W]/g, ''))
+      this.$set(row, name, row[name].toLocaleUpperCase().replace(/[\W]/g, ""));
     },
     verifyChange(row, name) {
       if (row[name]) {
@@ -377,37 +404,41 @@ export default {
               if (this.calculateCheckDigit(row[name]) == row[name][10]) {
                 // this.$message.success('集装箱校验正确!')
               } else {
-                  this.$confirm(`<strong><p style='color:#F56C6C'>箱号:${row[name]},格式不正确,是否强制加入系统?</p ></strong>`, '提示', {
-                      confirmButtonText: '确定',
-                      cancelButtonText: '取消',
-                      dangerouslyUseHTMLString:true,
-                      type: 'warning'
-                  }).then(() => {
+                this.$confirm(`<strong><p style='color:#F56C6C'>箱号:${row[name]},格式不正确,是否强制加入系统?</p ></strong>`, "提示", {
+                  confirmButtonText: "确定",
+                  cancelButtonText: "取消",
+                  dangerouslyUseHTMLString: true,
+                  type: "warning"
+                })
+                  .then(() => {
+                    // this.$message({
+                    //   type: 'success',
+                    //   message: '删除成功!'
+                    // });
+                  })
+                  .catch(() => {
+                    this.$set(row, [name], null);
+                  });
+              }
+            } else {
+              this.$confirm(`<strong><p style='color:#F56C6C'>箱号:${row[name]},格式不正确,是否强制加入系统?</p ></strong>`, "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                dangerouslyUseHTMLString: true,
+                type: "warning"
+              })
+                .then(() => {
                   // this.$message({
                   //   type: 'success',
                   //   message: '删除成功!'
                   // });
-                }).catch(() => {
-                  this.$set(row, [name], null)
+                })
+                .catch(() => {
+                  this.$set(row, [name], null);
                 });
-              }
-            } else {
-                this.$confirm(`<strong><p style='color:#F56C6C'>箱号:${row[name]},格式不正确,是否强制加入系统?</p ></strong>`, '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    dangerouslyUseHTMLString:true,
-                    type: 'warning'
-                }).then(() => {
-                // this.$message({
-                //   type: 'success',
-                //   message: '删除成功!'
-                // });
-              }).catch(() => {
-                this.$set(row, [name], null)
-              });
             }
           }
-        })
+        });
       }
     },
     calculateCheckDigit(containerNo) {
@@ -418,7 +449,7 @@ export default {
         idx = idx * Math.pow(2, i);
         num += idx;
       }
-      return num = (num % 11) % 10;
+      return (num = (num % 11) % 10);
     },
     uploadBefore(file, done, loading) {
       done();
@@ -428,44 +459,41 @@ export default {
     onSuccess(res, done, loading, column) {
       this.excelBox = false;
       // this.$message.success("导入成功!");
-      this.containersListfun()
+      this.containersListfun();
       loading = false;
       done();
     },
     // 箱列表
     containersListfun() {
       containersList(1, 100, { pid: this.assemblyForm.id }).then(res => {
-        this.assemblyForm.containersList = res.data.data.records
-      })
+        this.assemblyForm.containersList = res.data.data.records;
+      });
     },
     oepnexcelBox() {
       if (!this.assemblyForm.id) {
         this.$message({
-          message: '请先点击右上角保存按钮,保存数据之后才能添加!',
-          type: 'warning'
+          message: "请先点击右上角保存按钮,保存数据之后才能添加!",
+          type: "warning"
         });
-        return
+        return;
       }
-      this.findObject(this.excelOption.column, "excelFile").action = "/api/blade-los/containers/importBoxNo?billId=" + this.assemblyForm.id
-      this.excelBox = true
+      this.findObject(this.excelOption.column, "excelFile").action = "/api/blade-los/containers/importBoxNo?billId=" + this.assemblyForm.id;
+      this.excelBox = true;
     },
     // 下载模板
     handleGet() {
-      window.open(
-        `/api/blade-los/containers/exportContainers?${this.website.tokenHeader
-        }=${getToken()}&pid=${this.assemblyForm.id}`
-      );
+      window.open(`/api/blade-los/containers/exportContainers?${this.website.tokenHeader}=${getToken()}&pid=${this.assemblyForm.id}`);
     },
     // 查询件数是否为零
     numberfalsefun() {
       if (!this.assemblyForm.containersList) {
-        return false
+        return false;
       }
       for (let item of this.assemblyForm.containersList) {
         if (Number(item.quantity) >= 0) {
-          return true
+          return true;
         } else {
-          return false
+          return false;
         }
       }
     },
@@ -476,26 +504,26 @@ export default {
           type: "warning",
           message: "请先添加集装箱数据!"
         });
-        return
+        return;
       }
       this.$confirm("确定平均分配?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
-        this.$emit('equalDistribution')
-      })
+        this.$emit("equalDistribution");
+      });
     },
     // 编辑
     rowCellfun(row, index) {
-      this.$delete(row, 'edit')
-      this.$set(row, 'edit', true)
+      this.$delete(row, "edit");
+      this.$set(row, "edit", true);
     },
     // 保存
     rowSavefun(row) {
-      this.$delete(row, 'edit')
-      this.$set(row, 'edit', false)
-      this.$emit('rowSavefun', row)
+      this.$delete(row, "edit");
+      this.$set(row, "edit", false);
+      this.$emit("rowSavefun", row);
     },
     // 清除箱号
     cleanCntrNofun() {
@@ -505,17 +533,17 @@ export default {
         type: "warning"
       }).then(() => {
         let arr = this.assemblyForm.containersList.map(item => {
-          return item.id
-        })
+          return item.id;
+        });
         // 清除箱号接口
-        containersCleanBoxNo(arr.join(',')).then(res => {
+        containersCleanBoxNo(arr.join(",")).then(res => {
           this.$message({
             type: "success",
             message: "清除箱号成功!"
           });
-          this.$emit('billsDetailfun')
-        })
-      })
+          this.$emit("billsDetailfun");
+        });
+      });
     },
     // 全部撤销
     wholeRevokefun() {
@@ -525,16 +553,16 @@ export default {
         type: "warning"
       }).then(() => {
         let arr = this.assemblyForm.containersList.map(item => {
-          return item.id
-        })
-        containersRevoke(arr.join(',')).then(res => {
+          return item.id;
+        });
+        containersRevoke(arr.join(",")).then(res => {
           this.$message({
             type: "success",
             message: "全部撤销成功!"
           });
-          this.$emit('billsDetailfun')
-        })
-      })
+          this.$emit("billsDetailfun");
+        });
+      });
     },
     // 撤销
     revokefun() {
@@ -544,8 +572,8 @@ export default {
             type: "success",
             message: "撤销成功!"
           });
-          this.$emit('billsDetailfun')
-        })
+          this.$emit("billsDetailfun");
+        });
       } else {
         this.$message({
           type: "warning",
@@ -556,15 +584,15 @@ export default {
     // 配像一键编辑
     oneclickEditing() {
       for (let item of this.assemblyForm.containersList) {
-        this.$delete(item, 'edit')
-        this.$set(item, 'edit', true)
+        this.$delete(item, "edit");
+        this.$set(item, "edit", true);
       }
     },
     // 配箱批量保存
     containersSubmitListfun() {
       if (!this.assemblyForm.id) {
-        this.$message.warning('请先大保存')
-        return
+        this.$message.warning("请先大保存");
+        return;
       }
       this.$confirm("确定全部保存配箱?", {
         confirmButtonText: "确定",
@@ -576,17 +604,17 @@ export default {
             type: "success",
             message: "操作成功!"
           });
-          this.$emit('billsDetailfun')
-        })
-      })
+          this.$emit("billsDetailfun");
+        });
+      });
     },
     equalDistribution2() {
       if (!this.assemblyForm.id) {
         this.$message({
-          message: '请先点击右上角保存按钮,保存数据之后才能添加!',
-          type: 'warning'
+          message: "请先点击右上角保存按钮,保存数据之后才能添加!",
+          type: "warning"
         });
-        return
+        return;
       }
       this.$confirm("是否确认配箱?", {
         confirmButtonText: "确定",
@@ -597,37 +625,42 @@ export default {
           this.$message({
             type: "success",
             message: "操作成功!"
-          })
-          this.$emit('billsDetailfun')
-        })
-      })
-
-    },
-    rowSave(row, done, loading) {
-      containersSubmit(row).then(() => {
-        // this.onLoad(this.page);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
+          });
+          this.$emit("billsDetailfun");
         });
-        done();
-      }, error => {
-        loading();
-        window.console.log(error);
       });
     },
+    rowSave(row, done, loading) {
+      containersSubmit(row).then(
+        () => {
+          // this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        },
+        error => {
+          loading();
+          window.console.log(error);
+        }
+      );
+    },
     rowUpdate(row, index, done, loading) {
-      containersSubmit(row).then(() => {
-        // this.onLoad(this.page);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        done();
-      }, error => {
-        loading();
-        console.log(error);
-      });
+      containersSubmit(row).then(
+        () => {
+          // this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        },
+        error => {
+          loading();
+          console.log(error);
+        }
+      );
     },
     // 删除
     rowDel(row) {
@@ -645,7 +678,7 @@ export default {
             type: "success",
             message: "操作成功!"
           });
-          this.$emit('billsDetailfun')
+          this.$emit("billsDetailfun");
         });
     },
     // 一键删除
@@ -668,7 +701,7 @@ export default {
             type: "success",
             message: "操作成功!"
           });
-          this.$emit('billsDetailfun')
+          this.$emit("billsDetailfun");
           this.$refs.crud.toggleSelection();
         });
     },
@@ -682,7 +715,7 @@ export default {
     },
     // 当选择项发生变化时会触发该事件
     selectionChange(list) {
-      this.selectionList = list
+      this.selectionList = list;
       // let arr = []
       // if (list.length > 1) {
       //     this.$refs.crud.toggleSelection() // 先清空所以选择的数据
@@ -699,7 +732,7 @@ export default {
       this.$refs.crud.toggleSelection();
     },
     refreshChange() {
-      console.log('刷新')
+      console.log("刷新");
       // this.onLoad(this.page, this.query);
     },
     // onLoad(page, params = {}) {
@@ -715,17 +748,16 @@ export default {
     // 更改表格颜色
     headerClassName(tab) {
       //颜色间隔
-      let back = ""
+      let back = "";
       if (tab.columnIndex >= 0 && tab.column.level === 1) {
         if (tab.columnIndex % 2 === 0) {
-          back = "back-one"
+          back = "back-one";
         } else if (tab.columnIndex % 2 === 1) {
-          back = "back-two"
+          back = "back-two";
         }
       }
       return back;
-    },
-
+    }
   }
 };
 </script>

+ 13 - 13
src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -100,10 +100,10 @@
             type="danger"
             plain
             size="small"
-            :disabled="!selectionDList.length || disabled || (assemblyForm.id && !selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
+            :disabled="!selectionDList.length || disabled || (assemblyForm.id && !(selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0||roleName.indexOf('允许修改他人费用') >= 0))"
             @click="batchDelete('D')"
           >
-            {{ $t("btn118n.deleted") }}
+          {{ $t("btn118n.deleted") }}
           </el-button>
           <!-- <el-button v-if="isFeeEditD" type="success" plain size="small"
                         :disabled="!selectionDList.length || disabled || pleasereviewType"
@@ -139,7 +139,7 @@
             type="primary"
             plain
             size="small"
-            :disabled="disabled || selectionDList.length == 0 || (assemblyForm.id && !selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
+            :disabled="disabled || selectionDList.length == 0 || (assemblyForm.id && !(selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0||roleName.indexOf('允许修改他人费用') >= 0))"
             @click="allClick('D费用申请')"
             >{{ $t("btn118n.applyFee") }}</el-button
           >
@@ -147,7 +147,7 @@
             type="danger"
             plain
             size="small"
-            :disabled="disabled || selectionDList.length == 0 || (assemblyForm.id && !selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
+            :disabled="disabled || selectionDList.length == 0 || (assemblyForm.id && !(selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0||roleName.indexOf('允许修改他人费用') >= 0))"
             @click="allClick('D撤销请核')"
             >{{ $t("btn118n.unApplyFee") }}</el-button
           >
@@ -155,7 +155,7 @@
             type="primary"
             plain
             size="small"
-            :disabled="selectionDList.length != 1 || disabled || (assemblyForm.id && !selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
+            :disabled="selectionDList.length != 1 || disabled || (assemblyForm.id && !(selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0||roleName.indexOf('允许修改他人费用') >= 0))"
             @click="allClick('D申请修改')"
             >{{ $t("btn118n.applyModify") }}</el-button
           >
@@ -163,7 +163,7 @@
             type="success"
             plain
             size="small"
-            :disabled="selectionDList.length != 1 || disabled || (assemblyForm.id && !selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
+            :disabled="selectionDList.length != 1 || disabled || (assemblyForm.id && !(selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0||roleName.indexOf('允许修改他人费用') >= 0))"
             @click="allClick('D申请删除')"
             >{{ $t("btn118n.applyDelete") }}</el-button
           >
@@ -171,7 +171,7 @@
             type="danger"
             plain
             size="small"
-            :disabled="selectionDList.length != 1 || disabled || (assemblyForm.id && !selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
+            :disabled="selectionDList.length != 1 || disabled || (assemblyForm.id && !(selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0||roleName.indexOf('允许修改他人费用') >= 0))"
             @click="allClick('D取消申请')"
             >{{ $t("btn118n.unAplly") }}</el-button
           >
@@ -409,7 +409,7 @@
             type="danger"
             plain
             size="small"
-            :disabled="!selectionCList.length || disabled || (assemblyForm.id && !selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
+            :disabled="!selectionCList.length || disabled || (assemblyForm.id && !(selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0||roleName.indexOf('允许修改他人费用') >= 0))"
             @click="batchDelete('C')"
             >{{ $t("btn118n.deleted") }}
           </el-button>
@@ -447,7 +447,7 @@
             type="primary"
             plain
             size="small"
-            :disabled="disabled || selectionCList.length == 0 || (assemblyForm.id && !selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
+            :disabled="disabled || selectionCList.length == 0 || (assemblyForm.id && !(selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0||roleName.indexOf('允许修改他人费用') >= 0))"
             @click="allClick('C费用申请')"
             >{{ $t("btn118n.applyFee") }}</el-button
           >
@@ -455,7 +455,7 @@
             type="danger"
             plain
             size="small"
-            :disabled="disabled || selectionCList.length == 0 || (assemblyForm.id && !selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
+            :disabled="disabled || selectionCList.length == 0 || (assemblyForm.id && !(selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0||roleName.indexOf('允许修改他人费用') >= 0))"
             @click="allClick('C撤销请核')"
             >{{ $t("btn118n.unApplyFee") }}</el-button
           >
@@ -465,7 +465,7 @@
             type="primary"
             plain
             size="small"
-            :disabled="selectionCList.length != 1 || disabled || (assemblyForm.id && !selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
+            :disabled="selectionCList.length != 1 || disabled || (assemblyForm.id && !(selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0||roleName.indexOf('允许修改他人费用') >= 0))"
             @click="allClick('C申请修改')"
             >{{ $t("btn118n.applyModify") }}</el-button
           >
@@ -473,7 +473,7 @@
             type="success"
             plain
             size="small"
-            :disabled="selectionCList.length != 1 || disabled || (assemblyForm.id && !selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
+            :disabled="selectionCList.length != 1 || disabled || (assemblyForm.id && !(selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0||roleName.indexOf('允许修改他人费用') >= 0))"
             @click="allClick('C申请删除')"
             >{{ $t("btn118n.applyDelete") }}</el-button
           >
@@ -481,7 +481,7 @@
             type="danger"
             plain
             size="small"
-            :disabled="selectionCList.length != 1 || disabled || (assemblyForm.id && !selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
+            :disabled="selectionCList.length != 1 || disabled || (assemblyForm.id && !(selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0||roleName.indexOf('允许修改他人费用') >= 0))"
             @click="allClick('C取消申请')"
             >{{ $t("btn118n.unAplly") }}</el-button
           >

+ 84 - 0
src/views/iosBasicData/OceanFreightImport/bills/assembly/reportformsFrame/PurchaseNotice.vue

@@ -170,6 +170,90 @@
           </el-time-picker>
         </el-form-item>
       </el-col>
+       <el-col :span="12">
+        <el-form-item label="RELEASE REF:" prop="releaseRef">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.releaseRef"
+            size="small"
+            autocomplete="off"
+            clearable
+            placeholder="RELEASE REF"
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="COMMODITY:" prop="commodity">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.commodity"
+            size="small"
+            autocomplete="off"
+            clearable
+            placeholder="COMMODITY"
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="PLACE OF STUFFING:" prop="placeOfStuffing"  label-width="130px">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.placeOfStuffing"
+            size="small"
+            autocomplete="off"
+            clearable
+            placeholder="PLACE OF STUFFING"
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="FULL RETURN LOCATION:" prop="fullReturnLocation"  label-width="150px">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.fullReturnLocation"
+            size="small"
+            autocomplete="off"
+            clearable
+            placeholder="FULL RETURN LOCATION"
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="ADDRESS:" prop="address">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.address"
+            size="small"
+            autocomplete="off"
+            clearable
+            placeholder="ADDRESS"
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="DLINE AMEND BILL:" prop="dlineAmendBill"  label-width="130px">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.dlineAmendBill"
+            size="small"
+            autocomplete="off"
+            clearable
+            placeholder="DLINE AMEND BILL"
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
       <el-col :span="24">
         <el-form-item label="船代:" prop="corpCnName">
           <el-input

+ 3 - 6
src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -24,7 +24,6 @@
                                 @click="rootEditfun"> {{ $t("btn118n.edit") }}
                             </el-button>
                             <el-button type="primary" size="small"
-                                :disabled="detailData.seeDisabled || pleasereviewType || showLock"
                                 @click="containersSubmitListfun"> {{ $t("btn118n.save") }}
                             </el-button>
                             <el-button type="success" size="small"
@@ -133,12 +132,10 @@
                     <span v-else>{{ row.vgmWeight }}</span>
                 </template> -->
                 <tempalte slot="podStationCname" slot-scope="{row}">
-                    <dic-select v-if="row.edit" v-model="row.podStationCname" placeholder="目的港还箱场站" label="cnName"
-                        res="records" url="/blade-los/bcorps/selectList?current=1&size=5&corpTypeName=POD堆场&status=0"
+                    <dic-select v-model="row.podStationCname" placeholder="场站" label="cnName"
+                        res="records" url="/blade-los/bcorps/selectList?current=1&size=5&corpTypeName=场&status=0"
                         :filterable="true" :remote="true" dataName="cnName"
-                        @selectChange="rowDicChange('podStationCname', $event, row)" :slotRight="true"
-                        rightLabel="code"></dic-select>
-                    <span v-else>{{ row.podStationCname }}</span>
+                        @selectChange="rowDicChange('podStationCname', $event, row)"></dic-select>
                 </tempalte>
             </avue-crud>
         </basic-container>

+ 13 - 13
src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -103,10 +103,10 @@
             :disabled="
               !selectionDList.length ||
                 disabled ||
-                (assemblyForm.id && !selectionDList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0)
+                (assemblyForm.id && (assemblyForm.id && !(selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0||roleName.indexOf('允许修改他人费用') >= 0)))
             "
             @click="batchDelete('D')"
-            >{{ $t("btn118n.deleted") }}
+            > {{ $t("btn118n.deleted") }}
           </el-button>
           <!-- <el-button v-if="isFeeEditD" type="success" plain size="small"
                         :disabled="!selectionDList.length || disabled || pleasereviewType"
@@ -145,7 +145,7 @@
             :disabled="
               disabled ||
                 selectionDList.length == 0 ||
-                (assemblyForm.id && !selectionDList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0)
+                (assemblyForm.id && !(selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0||roleName.indexOf('允许修改他人费用') >= 0))
             "
             @click="allClick('D费用申请')"
             >{{ $t("btn118n.applyFee") }}</el-button
@@ -157,7 +157,7 @@
             :disabled="
               disabled ||
                 selectionDList.length == 0 ||
-                (assemblyForm.id && !selectionDList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0)
+                (assemblyForm.id && !(selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0||roleName.indexOf('允许修改他人费用') >= 0))
             "
             @click="allClick('D撤销请核')"
             >{{ $t("btn118n.unApplyFee") }}</el-button
@@ -169,7 +169,7 @@
             :disabled="
               selectionDList.length != 1 ||
                 disabled ||
-                (assemblyForm.id && !selectionDList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0)
+                (assemblyForm.id && !(selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0||roleName.indexOf('允许修改他人费用') >= 0))
             "
             @click="allClick('D申请修改')"
             >{{ $t("btn118n.applyModify") }}</el-button
@@ -181,7 +181,7 @@
             :disabled="
               selectionDList.length != 1 ||
                 disabled ||
-                (assemblyForm.id && !selectionDList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0)
+                (assemblyForm.id && !(selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0||roleName.indexOf('允许修改他人费用') >= 0))
             "
             @click="allClick('D申请删除')"
             >{{ $t("btn118n.applyDelete") }}</el-button
@@ -193,7 +193,7 @@
             :disabled="
               selectionDList.length != 1 ||
                 disabled ||
-                (assemblyForm.id && !selectionDList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0)
+                (assemblyForm.id && !(selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0||roleName.indexOf('允许修改他人费用') >= 0))
             "
             @click="allClick('D取消申请')"
             >{{ $t("btn118n.unAplly") }}</el-button
@@ -445,7 +445,7 @@
             :disabled="
               !selectionCList.length ||
                 disabled ||
-                (assemblyForm.id && !selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0)
+                (assemblyForm.id && !(selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0||roleName.indexOf('允许修改他人费用') >= 0))
             "
             @click="batchDelete('C')"
             >{{ $t("btn118n.deleted") }}
@@ -487,7 +487,7 @@
             :disabled="
               disabled ||
                 selectionCList.length == 0 ||
-                (assemblyForm.id && !selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0)
+                (assemblyForm.id && !(selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0||roleName.indexOf('允许修改他人费用') >= 0))
             "
             @click="allClick('C费用申请')"
             >{{ $t("btn118n.applyFee") }}</el-button
@@ -499,7 +499,7 @@
             :disabled="
               disabled ||
                 selectionCList.length == 0 ||
-                (assemblyForm.id && !selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0)
+                (assemblyForm.id && !(selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0||roleName.indexOf('允许修改他人费用') >= 0))
             "
             @click="allClick('C撤销请核')"
             >{{ $t("btn118n.unApplyFee") }}</el-button
@@ -513,7 +513,7 @@
             :disabled="
               selectionCList.length != 1 ||
                 disabled ||
-                (assemblyForm.id && !selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0)
+                (assemblyForm.id && !(selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0||roleName.indexOf('允许修改他人费用') >= 0))
             "
             @click="allClick('C申请修改')"
             >{{ $t("btn118n.applyModify") }}</el-button
@@ -525,7 +525,7 @@
             :disabled="
               selectionCList.length != 1 ||
                 disabled ||
-                (assemblyForm.id && !selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0)
+                (assemblyForm.id && !(selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0||roleName.indexOf('允许修改他人费用') >= 0))
             "
             @click="allClick('C申请删除')"
             >{{ $t("btn118n.applyDelete") }}</el-button
@@ -537,7 +537,7 @@
             :disabled="
               selectionCList.length != 1 ||
                 disabled ||
-                (assemblyForm.id && !selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0)
+                (assemblyForm.id && !(selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0||roleName.indexOf('允许修改他人费用') >= 0))
             "
             @click="allClick('C取消申请')"
             >{{ $t("btn118n.unAplly") }}</el-button

+ 84 - 0
src/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/PurchaseNotice.vue

@@ -177,6 +177,90 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
+        <el-form-item label="RELEASE REF:" prop="releaseRef">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.releaseRef"
+            size="small"
+            autocomplete="off"
+            clearable
+            placeholder="RELEASE REF"
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="COMMODITY:" prop="commodity">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.commodity"
+            size="small"
+            autocomplete="off"
+            clearable
+            placeholder="COMMODITY"
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="PLACE OF STUFFING:" prop="placeOfStuffing"  label-width="130px">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.placeOfStuffing"
+            size="small"
+            autocomplete="off"
+            clearable
+            placeholder="PLACE OF STUFFING"
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="FULL RETURN LOCATION:" prop="fullReturnLocation"  label-width="150px">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.fullReturnLocation"
+            size="small"
+            autocomplete="off"
+            clearable
+            placeholder="FULL RETURN LOCATION"
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="ADDRESS:" prop="address">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.address"
+            size="small"
+            autocomplete="off"
+            clearable
+            placeholder="ADDRESS"
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="DLINE AMEND BILL:" prop="dlineAmendBill"  label-width="130px">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.dlineAmendBill"
+            size="small"
+            autocomplete="off"
+            clearable
+            placeholder="DLINE AMEND BILL"
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
         <el-form-item label="船代:" prop="corpCnName">
           <el-input
             type="age"