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

同步状态不允许显示删除

qukaidi 2 дней назад
Родитель
Сommit
79019cccff

+ 1 - 1
src/views/boxManagement/enterRecord/detailsPage.vue

@@ -58,7 +58,7 @@
             <el-button size="small" type="text" @click="rowRevoke(row, index)" v-if="row.whetherSynchronous == 1">
               撤销
             </el-button>
-            <el-button size="small" type="text" @click="rowDel(row, index)" v-if="row.srcStatus == 1">
+            <el-button size="small" type="text" @click="rowDel(row, index)" v-if="row.whetherSynchronous == 0&&row.srcStatus == 1">
               删除
             </el-button>
             <el-popover placement="left" width="400" trigger="click">

+ 1 - 1
src/views/boxManagement/exitRecord/detailsPage.vue

@@ -58,7 +58,7 @@
             <el-button size="small" type="text" @click="rowRevoke(row, index)" v-if="row.whetherSynchronous == 1">
               撤销
             </el-button>
-            <el-button size="small" type="text" @click="rowDel(row, index)" v-if="row.srcStatus == 1">
+            <el-button size="small" type="text" @click="rowDel(row, index)" v-if="row.whetherSynchronous == 0&&row.srcStatus == 1">
               删除
             </el-button>
             <el-popover placement="left" width="400" trigger="click">

+ 47 - 4
src/views/iosBasicData/OceanFreightImport/bills/assembly/DistributionBox/containers.vue

@@ -60,14 +60,18 @@
             @click.stop="rowCellfun(scope.row, scope.index)"
             >编辑
           </el-button> -->
-          <el-button
+          <!-- <el-button
             :type="scope.type"
             :size="scope.size"
             icon="el-icon-delete"
             :disabled="detailData.seeDisabled || pleasereviewType || showLock"
             @click.stop="rowDel(scope.row, scope.index)"
             >{{ $t("btn118n.deleted") }}
-          </el-button>
+          </el-button> -->
+          <el-popover placement="left" width="400" trigger="click">
+            <avue-crud :option="recordOption" :data="recordData"></avue-crud>
+            <el-button slot="reference" size="small" type="text" @click="rowRecord(scope.row)" style="margin-left: 6px;">记录</el-button>
+          </el-popover>
         </template>
         <template slot-scope="scope" slot="cntrNo">
           <el-input
@@ -218,7 +222,8 @@ import {
   containersSubmitList,
   containersExportContainers,
   containersImportBoxNo,
-  containersList
+  containersList,
+  getRecordlist
 } from "@/api/iosBasicData/containers";
 import { getAccurate } from "@/api/boxManagement/buyContainer/index.js";
 import { mapGetters } from "vuex";
@@ -249,6 +254,34 @@ export default {
       headers: { "Blade-Auth": "Bearer " + getToken() },
       // 是否禁用
       extendedDisabled: false,
+      recordData: [],
+      recordOption: {
+        align: "center",
+        menu: false,
+        header: false,
+        column: [
+          {
+            label: "操作类型",
+            prop: "operatorType",
+            overHidden: true
+          },
+          {
+            label: "操作内容",
+            prop: "operatorContent",
+            overHidden: true
+          },
+          {
+            label: "操作人",
+            prop: "operatorName",
+            overHidden: true
+          },
+          {
+            label: "操作时间",
+            prop: "operatorDate",
+            overHidden: true
+          }
+        ]
+      },
       // 装货港数据
       polData: [],
       // 附件配置
@@ -303,8 +336,9 @@ export default {
         selection: true,
         dialogClickModal: false,
         refreshBtn: false,
+        delBtn:false,
         columnBtn: false,
-        menu: false,
+        menu: true,
         menuWidth: 70,
         summaryText: "合计",
         showSummary: true,
@@ -785,6 +819,15 @@ export default {
         }
       );
     },
+    rowRecord(row) {
+      this.recordData = [];
+      let obj = {
+        pid: row.id
+      };
+      getRecordlist(1, 50, obj).then(res => {
+        this.recordData = res.data.data.records;
+      });
+    },
     // 删除
     rowDel(row) {
       this.$confirm("确定将选择数据删除?", {

+ 3 - 3
src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -2062,13 +2062,13 @@ export default {
         },
         shortcuts: [
           {
-            text: "today",
+            text: this.$t("btn118n.today"),
             onClick(picker) {
               picker.$emit("pick", new Date());
             }
           },
           {
-            text: "tomorrow",
+            text: this.$t("btn118n.tomorrow"),
             onClick(picker) {
               const date = new Date();
               date.setTime(date.getTime() + 3600 * 1000 * 24);
@@ -2076,7 +2076,7 @@ export default {
             }
           },
           {
-            text: "week",
+            text: this.$t("btn118n.week"),
             onClick(picker) {
               const date = new Date();
               date.setTime(date.getTime() + 3600 * 1000 * 24 * 7);