Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/americanCont...

pyt

2025-01-09 cb9a7c276a2b3d26a42dfe78c82166831a8a401e

Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/americanContainer

 src/component/AddedInformation.vue

@@ -44,7 +44,8 @@
            default: false
        },
        row: {

            type: Object,
            default: null
        }
    },
    data() {
@@ -58,6 +59,8 @@
    created() {
        getMsg({ extra: localStorage.getItem('extra') }).then(res => {
            this.tableData = res.data
            // 回显选中行
            // this.setCurrent(this.row)
        })
    },
    mounted() { },

 src/component/Header.vue

@@ -1,7 +1,7 @@
<template>
    <div>
        <div class="header_content">
            <div class="color1 fs--24 font-bold">{{ userInfo.companyName }}</div>
            <div @click="$router.push('/home')" class="color1 fs--24 font-bold pointer">{{ userInfo.companyName }}</div>
            <div class="flex a-center j-between">
                <div @click="userInfoShow = true" class="flex a-center mr--55 shrink0 pointer">
                    <div class="mr--24 fs--20 font-bold shrink0 color2">{{ $store.state.userName }}</div>

 src/component/detailInfo.vue

@@ -1,5 +1,5 @@
<template>
    <div class="contanier">
    <div class="contanier11">
        <!-- card-two -->
        <el-card class="box-card mt-13">
            <div slot="header" class="clearfix">
@@ -46,9 +46,6 @@
            </div>

        </el-card>
        <div class="btn">
            <div class="btn_close">关闭</div>
        </div>
    </div>
</template>

@@ -301,7 +298,7 @@
    font-style: normal;
}

.contanier {
.contanier11 {
    background: #ededf3;
    // padding: 13px 35px 23px 35px;
}

 src/component/detailInfoTop.vue

@@ -1,7 +1,7 @@
<template>
    <div class="contanier">
    <div class="contanier1">
        <el-form ref="form" :model="form" label-width="80px">
            <div class="box-cardes bgWhite">
            <div class="box-cardes1 bgWhite">
                <div class="flex">
                    <el-form-item label="" class="label1" prop="clientOrder" label-width="0">
                        <div class="flex a-center">
@@ -184,8 +184,8 @@
    padding: 23px 0 0px 24px;
}

.box-cardes {
    padding: 23px 0 38px 0;
.box-cardes1 {
    // padding: 23px 0 38px 0;
}

.editor {
@@ -367,7 +367,7 @@
    font-style: normal;
}

.contanier {
.contanier1 {
    background: #ededf3;
    // padding: 13px 35px 23px 35px;
}

 src/router/index.js

@@ -38,7 +38,7 @@
        meta: {
          title: "登录",
        },
        component: () => import("../view/Login.vue"),
        component: () => import("../view/login.vue"),
      },
      {
        path: "/addOrder",
@@ -60,11 +60,13 @@
  routes,
});

// 前置路由拦截器
// 路由拦截
router.beforeEach((to, from, next) => {
  // 没有登录并且要去的页面不是登录页面，强制跳转到登录
  if (!localStorage.getItem('extra') && to.path !== '/login') {
  const extra = localStorage.getItem('extra');
  if (!extra && to.path !== '/login') {
    next('/login');
  } else if (extra && to.path === '/login') {
    next('/home');
  } else {
    if (to.path === '/login') {
      localStorage.clear();

 src/view/Login.vue

@@ -39,8 +39,16 @@
    created() {
        this.codeStr = generateVerificationCode()
    },
    mounted() { },
    mounted() {
        document.addEventListener("keydown", this.handleKeyDown);
    },
    methods: {
        // 监听当前页面是否按下了回车
        handleKeyDown(event) {
            if (event.key === "Enter") {
                this.loginFun();
            }
        },
        loginFun() {
            if (!this.account) {
                this.$message({

 src/view/addOrder.vue

@@ -1,4 +1,6 @@
<template>
  <div>
    <Header style="position: sticky;top: 0;z-index: 1999;" />
  <div class="contanier">
    <el-form ref="form" :rules="rules" :model="form" label-width="80px">
      <!-- card-one -->
@@ -15,10 +17,10 @@
            <div @click="activeTab = 2" :class="activeTab == 2 ? 'active ml-56'  : 'noactive ml-56'">
              价格信息
            </div>

          </div>
          <div class="flex">

            <div v-if="activeTab == 1">
              <div class="flex">
            <el-form-item label="" class="label1" prop="container" label-width="0">
              <div class="flex">
                <div class="box">
@@ -197,13 +199,18 @@
            </el-form-item>
          </div>
        </div>
        <div class="bg">
            <div v-else>
              <DetailInfoTop />
            </div>
          </div>

          <div class="bg" v-if="activeTab == 1">
          <span>如果是OT/FR等特种柜型，请提供具体包装明细</span>
          <span>Pls supply detailed packing list for an OT or FR conainer</span>
        </div>
      </el-card>
        <div v-if="activeTab == 1">
      <!-- card-two -->

      <el-card class="box-card mt-13">
        <div slot="header" class="clearfix">
          <span class="clearfix_text">货柜信息 ｜ Container Det</span>
@@ -312,7 +319,6 @@
        </div>
      </el-card>
      <!-- card-three -->

      <el-card class="box-card mt-13">
        <div slot="header" class="clearfix">
          <span class="clearfix_text">收件人信息 ｜ Consignee</span>
@@ -432,9 +438,11 @@
              </div>
              <div class="box_text3">Other Information</div>
            </div>
            <quill-editor class="editor" v-model="content" ref="myQuillEditor" :options="editorOption"
                <quill-editor class="editor" v-model="form.specialRequest" ref="myQuillEditor" :options="editorOption"
              @blur="onEditorBlur($event)" @focus="onEditorFocus($event)" @change="onEditorChange($event)">
            </quill-editor>
              </div>


          </div>
          <div class="flex " style="padding-bottom: 27px;">
@@ -444,14 +452,15 @@
              </div>
              <div class="box_text3">Remark</div>
            </div>
            <quill-editor class="editor" v-model="content" ref="myQuillEditor" :options="editorOption"
              <quill-editor class="editor" v-model="form.remark" ref="myQuillEditor" :options="editorOption"
              @blur="onEditorBlur($event)" @focus="onEditorFocus($event)" @change="onEditorChange($event)">
            </quill-editor>
          </div>


        </div>

      </el-card>

      <el-card class="box-card mt-13">
        <div slot="header" class="clearfix">
          <span class="clearfix_text">附件</span>
@@ -460,15 +469,15 @@
          <div class="flex">
            <el-form-item label="Do：" class="mr-129" prop="DOFileUrl" label-width="88px">
              <el-upload class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/"
                :on-preview="handlePreview" :on-remove="handleRemove" :before-remove="beforeRemove" multiple :limit="3"
                :on-exceed="handleExceed" :file-list="fileList">
                    :on-preview="handlePreview" :on-remove="handleRemove" :before-remove="beforeRemove" multiple
                    :limit="3" :on-exceed="handleExceed" :file-list="fileList">
                <div class="upload_btn">+上传附件</div>
              </el-upload>
            </el-form-item>
            <el-form-item label="PU#：" class="mr-129" prop="PUFileUrl" label-width="88px">
              <el-upload class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/"
                :on-preview="handlePreview" :on-remove="handleRemove" :before-remove="beforeRemove" multiple :limit="3"
                :on-exceed="handleExceed" :file-list="fileList">
                    :on-preview="handlePreview" :on-remove="handleRemove" :before-remove="beforeRemove" multiple
                    :limit="3" :on-exceed="handleExceed" :file-list="fileList">
                <div class="upload_btn">+上传附件</div>
              </el-upload>
            </el-form-item>
@@ -479,26 +488,31 @@
          <div class="flex">
            <el-form-item label="POD：" class="mr-129" prop="PODFileUrls" label-width="88px">
              <el-upload class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/"
                :on-preview="handlePreview" :on-remove="handleRemove" :before-remove="beforeRemove" multiple :limit="3"
                :on-exceed="handleExceed" :file-list="fileList">
                    :on-preview="handlePreview" :on-remove="handleRemove" :before-remove="beforeRemove" multiple
                    :limit="3" :on-exceed="handleExceed" :file-list="fileList">
                <div class="upload_btn">+上传附件</div>
              </el-upload>
            </el-form-item>
            <el-form-item label="其他附件：" class="" prop="otherFileUrls" label-width="88px">
              <el-upload class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/"
                :on-preview="handlePreview" :on-remove="handleRemove" :before-remove="beforeRemove" multiple :limit="3"
                :on-exceed="handleExceed" :file-list="fileList">
                    :on-preview="handlePreview" :on-remove="handleRemove" :before-remove="beforeRemove" multiple
                    :limit="3" :on-exceed="handleExceed" :file-list="fileList">
                <div class="upload_btn">+上传附件</div>
              </el-upload>
            </el-form-item>
          </div>
        </div>
      </el-card>
        </div>
        <!-- 详情的table -->
        <DetailInfo v-else />

      <div class="btn">
        <div class="btn_close">关闭</div>
        <div class="btn_comfirm" @click="submitForm('form')">确认</div>
          <div v-if="activeTab == 1" class="btn_comfirm" @click="submitForm('form')">确认</div>
      </div>
    </el-form>
    </div>
  </div>
</template>

@@ -510,11 +524,13 @@

import { quillEditor, Quill } from 'vue-quill-editor' //引入插件


import DetailInfoTop from '@/component/detailInfoTop'
import DetailInfo from '../component/detailInfo.vue'
import Header from '@/component/Header.vue'

export default {
  components: {
    quillEditor
    quillEditor, DetailInfoTop, DetailInfo, Header
  },
  data() {
    return {
@@ -587,8 +603,9 @@
        // 设置上传的请求头部
        // headers: { Authorization: "Bearer " + getToken() },
        // 上传的地址
        // url: process.env.VUE_APP_BASE_API + "/common/upload"
        url: 'http://47.108.239.173:2020' + "/api/oss/new_temp_upload"
      },
      fileList: [],
      options: [
        {
          value: "20GP",
@@ -739,6 +756,30 @@
        }
      });
    },
    handleFileSuccesspicture(resp, file, fileList) {
      console.log(resp, file, fileList);


    },

    handlePreview(e) {
      console.log(e, 'e');

    },

    handleRemove(e) {
      console.log(e, 'e');


    },
    beforeRemove(e) {
      console.log(e, 'e');

    },
    handleExceed(e) {
      console.log(e, 'e');

    },
  },
};
</script>
@@ -747,6 +788,7 @@
.tab{
  padding-bottom: 35px;
}

.noactive {
  font-weight: 500;
  font-size: 18px;
@@ -755,6 +797,7 @@
  text-align: left;
  font-style: normal;
}

.ml-56{
  margin-left: 56px;
}