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

gongjinbao

2025-01-09 ee0692b46a9e98018b55a65b00fb11b847a0d35e

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

 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/view/addOrder.vue

@@ -16,8 +16,9 @@
              价格信息
            </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">
@@ -196,13 +197,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>
@@ -311,7 +317,6 @@
        </div>
      </el-card>
      <!-- card-three -->

      <el-card class="box-card mt-13">
        <div slot="header" class="clearfix">
          <span class="clearfix_text">收件人信息 ｜ Consignee</span>
@@ -434,6 +439,8 @@
            <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;">
@@ -449,8 +456,9 @@
          </div>


        </div>

      </el-card>
  
      <el-card class="box-card mt-13">
        <div slot="header" class="clearfix">
          <span class="clearfix_text">附件</span>
@@ -458,16 +466,16 @@
        <div class="box-carde">
          <div class="flex">
            <el-form-item label="Do：" class="mr-129" prop="DOFileUrl" label-width="88px">
              <el-upload class="upload-demo" :action="upload.url"
                :on-preview="handlePreview" :on-remove="handleRemove" :on-success="handleFileSuccesspicture" :before-remove="beforeRemove" multiple :limit="3"
                :on-exceed="handleExceed" :file-list="fileList">
                <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">
                <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>
@@ -478,24 +486,28 @@
          <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>
@@ -509,11 +521,12 @@

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


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

export default {
  components: {
    quillEditor
    quillEditor, DetailInfoTop, DetailInfo
  },
  data() {
    return {
@@ -771,6 +784,7 @@
.tab{
  padding-bottom: 35px;
}

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

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