src/benyun/utils/auth.ts

@@ -6,7 +6,7 @@ const ExpiresInKey = 'AdminOMS-Expires-In'
 
 export function getToken() {
   if(process.env.NODE_ENV === 'development'){
-    return 'eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjAwYTM1NDQ1LWU0NjMtNGE1Ni04ODAwLWM2ZWY0NWVkOTZiMyIsInVzZXJuYW1lIjoiYWRtaW4ifQ.vCwETSaP31hNDl17XLM6DKA7vnk4UYTSRn584xkpxo1bYoRjQ3oASyhcMRJIec6xFuavZSa5FyQMJlUGF3rD0g'
+    return 'eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6ImQzYmQyMjQyLWEyZjktNDU5MC1hNTM0LTE0NjI2MjY2NGNhMyIsInVzZXJuYW1lIjoiYWRtaW4ifQ.x7TydRDIx1BXI_34cyeEHGXW5LDV50F9KkWIJw6BNgCL6aq-DFqDlEM0S5zeW2Sp3Kgg-hYmRj3RO2t3KBjovg'
   }else{
     return Cookies.get(TokenKey)
   }

src/views/packing/setupPacking/components/openLogModal.vue

@@ -0,0 +1,111 @@
+<template>
+  <vxe-modal
+    v-model="value"
+    id="openLogModal"
+    title="操作日志"
+    width="50%"
+    height="60%"
+    min-width="460"
+    min-height="320"
+    show-zoom
+    resize
+    transfer
+    :show-footer="!hideBtn"
+    v-loading="load"
+  >
+    <by-table :propConfig="config" ref="table">
+      <!-- <template v-slot:num="{row}">
+        <vxe-input v-model="row.num" v-if="row.splitNum > 0" placeholder="请输入" type="integer" @input="onChangeRow(row)"></vxe-input>
+      </template> -->
+    </by-table>
+    <template #footer>
+      <div class="page">
+        <el-pagination
+          v-if="page.total > 0"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="page.pageNo"
+          :page-size="page.pageSize"
+          :layout="'total, sizes, prev, pager, next, jumper'"
+          :total="page.total"
+        ></el-pagination>
+      </div>
+      <!-- <div class="btn">
+        <el-button plain size="small" @click="value = false">取消</el-button>
+      </div> -->
+    </template>
+  </vxe-modal>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+@Component({ components: {} })
+export default class openLogModal extends Vue {
+  value = false;
+  load = false;
+  billData: any = null;
+  hideBtn = false;
+  data: Array<any> = [];
+  page: any = {
+    pageNo: 1, //当前页
+    pageSize: 10, //每页条数
+    total: 0, //总条数
+  };
+  config: any = {
+    attr: {
+      size: "small",
+      align: "center",
+      seq: true,
+    },
+    columns: [
+      {
+        title: "操作内容",
+        field: "content",
+      },
+      {
+        title: "操作人",
+        field: "userName",
+      },
+      {
+        title: "创建时间",
+        field: "createTime",
+      },
+    ],
+  };
+
+  setShow(v: boolean) {
+    this.hideBtn = false;
+    console.log("数据111111111========", v);
+    this.value = v;
+  }
+  setValue(data: any) {
+    this.$nextTick(() => {
+      // const data = localStorage.getItem("logLsit");
+      // console.log("数据111111111datas========", JSON.parse(data)||null);
+      this.data=data.reverse();
+      this.page.total=data.length
+      // let height = (document.getElementById('openLogModal') as any).parentNode.offsetHeight;
+      // this.config.attr.height=height - 36;
+      if (this.$refs.table) {
+        (this.$refs.table as any).setConfig(this.config);
+        (this.$refs.table as any).setValue(this.data);
+      }
+    });
+  }
+  handleSizeChange(v: number) {
+    this.page.pageSize = v;
+  }
+  handleCurrentChange(v: number) {
+    this.page.pageNo = v;
+  }
+}
+</script>
+<style lang="scss" scoped>
+.page {
+  width: 100%;
+  display: flex;
+  justify-content: flex-end;
+  padding: 8px;
+  box-sizing: border-box;
+}
+</style>

src/views/packing/setupPacking/index.vue

@@ -0,0 +1,83 @@
+<template>
+  <div class="print-count">
+    <!-- <el-divider></el-divider> -->
+    <el-form ref="form" :model="form" label-width="80px">
+      <el-form-item>
+        <span>仓位找货优先级 （生成新的仓位后务必重新设定一下优先级）</span>
+        <el-input
+          class="textarea"
+          type="textarea"
+          v-model="form.content"
+          placeholder="请输入内容"
+          maxlength="300"
+          show-word-limit
+        ></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="saveLog()">保存日志</el-button>
+        <el-button @click="lookeLog()">操作日志</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- 操作日志 -->
+    <openLogModal ref="openLogModal" :data="data" />
+  </div>
+</template>
+  
+  <script lang="ts">
+import openLogModal from "./components/openLogModal.vue"; //拆分
+import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+
+@Component({ components: { openLogModal } })
+export default class packing extends Vue {
+  form = {
+    userName: (this as any).$store.getters.userInfo.userName,
+    content: "",
+    createTime: "",
+  };
+  index = 0;
+  data: Array<any> = [];
+  saveLog() {
+    const now = new Date();
+    this.form.createTime = now.toLocaleString();
+
+    if (this.form.content) {
+      this.$message({
+        message: "保存日志成功！",
+        type: "success",
+      });
+      // const aa=this.form
+      this.index++;
+      console.log("this.index========", this.index);
+      // if()
+      let from = JSON.stringify(this.form);
+      this.data.push(JSON.parse(from));
+      localStorage.setItem('logLsit', JSON.stringify(this.data));
+      console.log("提交的数据========", this.data);
+    } else {
+      this.$message({
+        message: "输入内容不能为空！",
+        type: "warning",
+      });
+    }
+  }
+  lookeLog() {
+    (this.$refs.openLogModal as any).setShow(true);
+    (this.$refs.openLogModal as any).setValue(this.data);
+  }
+}
+</script>
+  
+  <style lang="scss" >
+.print-count {
+  padding: 16px;
+  width: 100%;
+  height: 100%;
+  overflow-y: hidden;
+}
+.textarea textarea {
+  height: 400px !important;
+}
+.el-textarea__inner {
+  height: 400px !important;
+}
+</style>