edi添加业务备注

src/api/modular/main/TaskmanageList.js

@@ -131,6 +131,7 @@ export function DownloadAttach (parameter) {
     data: parameter
 	})
 }
+
 /**
  * 获取详情
  */
@@ -141,3 +142,14 @@ export function GetBookingOrderInfo (parameter) {
 		params: parameter
 	})
 }
+
+/**
+ * lara 记录
+ */
+export function LaraPaperRegistPost (parameter) {
+	return axios({
+		url: '/TaskManage/LaraPaperRegistPost',
+		method: 'post',
+    data: parameter
+	})
+}

src/layouts/BasicLayout.vue

@@ -41,7 +41,8 @@
       />
 
       <!-- layout content -->
-      <a-layout-content :style="{ height: '100%', margin: '24px 24px 0', paddingTop: fixedHeader ? '55px' : '0' }">
+      <!-- height: '100%', -->
+      <a-layout-content :style="{ height: '600px', margin: '24px 24px 0', paddingTop: fixedHeader ? '55px' : '0' }">
         <multi-tab v-if="multiTab"></multi-tab>
         <transition name="page-transition">
           <route-view />

src/views/main/BookingLedger/detail/components/ediMore.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="more-edi" :style="{paddingTop:'25px'}">
     <a-form-model ref="ediFrom" :model="details" :rules="rules">
-      <a-row :gutter="16">
       <div class="normal">
+        <a-row :gutter="16">
           <a-col :span="8">
             <a-form-model-item
               label="发送方EDI代码"
@@ -201,13 +201,70 @@
               has-feedback
               prop="bookingEDIExt.weiTuoFang"
             >
-              <a-textarea v-model="details.bookingEDIExt.weiTuoFang" />
+              <a-textarea v-model="details.bookingEDIExt.weiTuoFang" :auto-size="{ minRows: 2, maxRows: 5 }"/>
             </a-form-model-item>
           </a-col>
+        </a-row>
+      </div>
+      <div class="ex-remark">
+        <div class="title">
+          <span class="line left"></span>
+          <span class="text">业务备注</span>
+          <span class="line right"></span>
+        </div>
+        <div class="ex-remark-content">
+          <a-row :gutter="16">
+            <a-col :span="12">
+              <a-form-model-item
+                label="辅助字段1"
+                :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
+                :wrapperCol="{ xs: { span: 24 }, sm: { span: 17 } }"
+                has-feedback
+                prop="bookingEDIExt.exRemark1"
+              >
+                <a-textarea :allowClear="true" v-model="details.bookingEDIExt.exRemark1" :auto-size="{ minRows: 2, maxRows: 5 }"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-model-item
+                label="辅助字段2"
+                :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
+                :wrapperCol="{ xs: { span: 24 }, sm: { span: 17 } }"
+                has-feedback
+                prop="bookingEDIExt.exRemark2"
+              >
+                <a-textarea :allowClear="true" v-model="details.bookingEDIExt.exRemark2" :auto-size="{ minRows: 2, maxRows: 5 }"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-model-item
+                label="辅助字段3"
+                :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
+                :wrapperCol="{ xs: { span: 24 }, sm: { span: 17 } }"
+                has-feedback
+                prop="bookingEDIExt.exRemark3"
+              >
+                <a-textarea :allowClear="true" v-model="details.bookingEDIExt.exRemark3" :auto-size="{ minRows: 2, maxRows: 5 }"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-model-item
+                label="辅助字段4"
+                :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
+                :wrapperCol="{ xs: { span: 24 }, sm: { span: 17 } }"
+                has-feedback
+                prop="bookingEDIExt.exRemark4"
+              >
+                <a-textarea :allowClear="true" v-model="details.bookingEDIExt.exRemark4" :auto-size="{ minRows: 2, maxRows: 5 }"/>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+        </div>
       </div>
       <!-- === 太平添加 start === -->
       <template v-if="details.carrierid == 'PIL'">
         <div class="taiping">
+          <a-row :gutter="16">
             <a-col :span="12">
               <a-form-model-item
                 label="收货人EDI代码"
@@ -230,7 +287,6 @@
                 <a-input :allowClear="true" v-model="details.bookingEDIExt.shipperEdiCode" />
               </a-form-model-item>
             </a-col>
-
             <a-col :span="12">
               <a-form-model-item
                 label="通知方EDI代码"
@@ -242,7 +298,6 @@
                 <a-input :allowClear="true" v-model="details.bookingEDIExt.notifyCdoe" />
               </a-form-model-item>
             </a-col>
-
             <a-col :span="12">
               <a-form-model-item
                 label="太平销售EDI代码"
@@ -292,7 +347,7 @@
                 has-feedback
                 prop="bookingEDIExt.s0CC0C"
               >
-                <a-textarea :allowClear="true" v-model="details.bookingEDIExt.s0CC0C" />
+                <a-textarea :allowClear="true" v-model="details.bookingEDIExt.s0CC0C" :auto-size="{ minRows: 2, maxRows: 5 }"/>
               </a-form-model-item>
             </a-col>
             <a-col :span="12">
@@ -303,11 +358,13 @@
                 has-feedback
                 prop="bookingEDIExt.ckhi"
               >
-                <a-textarea v-model="details.bookingEDIExt.ckhi" />
+                <a-textarea v-model="details.bookingEDIExt.ckhi" :auto-size="{ minRows: 2, maxRows: 5 }"/>
               </a-form-model-item>
             </a-col>
+          </a-row>
         </div>
         <div class="taiping-2">
+          <a-row :gutter="16">
             <a-col :span="12">
               <a-form-model-item
                 label="南美东"
@@ -316,7 +373,7 @@
                 has-feedback
                 prop="bookingEDIExt.cncm"
               >
-                <a-textarea v-model="details.bookingEDIExt.cncm" />
+                <a-textarea v-model="details.bookingEDIExt.cncm" :auto-size="{ minRows: 2, maxRows: 5 }"/>
               </a-form-model-item>
             </a-col>
             <a-col :span="12">
@@ -327,7 +384,7 @@
                 has-feedback
                 prop="bookingEDIExt.wncm"
               >
-                <a-textarea v-model="details.bookingEDIExt.wncm" />
+                <a-textarea v-model="details.bookingEDIExt.wncm" :auto-size="{ minRows: 2, maxRows: 5 }"/>
               </a-form-model-item>
             </a-col>
             <a-col :span="12">
@@ -341,10 +398,10 @@
                 <a-input :allowClear="true" v-model="details.bookingEDIExt.acihbl" />
               </a-form-model-item>
             </a-col>
+          </a-row>
         </div>
       </template>
       <!-- === 太平添加 END === -->
-      </a-row>
     </a-form-model>
   </div>
 </template>
@@ -464,9 +521,44 @@ export default {
   overflow: hidden;
 }
 .taiping{
-  border-top: 1px dashed #ddd;
+  border-top: 1px dashed #ccc;
   margin-top: 10px;
   padding-top: 10px;
   overflow: hidden;
 }
+.ex-remark{
+  overflow: hidden;
+  .title{
+    height: 40px;
+    display: flex;
+    width: 100%;
+    margin-bottom:20px;
+    .text{
+      width: 87px;
+      height: 40px;
+      line-height: 40px;
+      font-size: 14px;
+      color: #666;
+      font-weight: 600;
+      text-align: center;
+    }
+    span{
+      display: block;
+      vertical-align: top;
+    }
+    .line{
+      border-bottom: 1px dashed #ccc;
+      height: 19px;
+    }
+    .left{
+      width:100px;
+    }
+    .right{
+      flex: 1;
+    }
+  }
+  .ex-remark-content{
+    overflow: hidden;
+  }
+}
 </style>

src/views/main/DjyApiAuth/index.vue

@@ -394,7 +394,14 @@ export default {
           if (res.success) {
             this.$message.success('保存成功')
             this.$refs.addForm.handleCancel()
-            this.init()
+            const {
+              form: { validateFields }
+            } = this
+            validateFields((err, values) => {
+              if (!err) {
+                this.init(values)
+              }
+            })
           } else {
             this.$message.error(res.message)
           }

src/views/main/Taskmanage/TaskmanageDetail/index.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="task-detail">
-    <div class="nav-btn">
+    <div class="nav-btn-box">
-      <a-button type="primary">完成任务</a-button>
+      <a-button class="nav-btn" type="primary">完成任务</a-button>
-      <a-button type="primary">保存</a-button>
+      <a-button class="nav-btn" type="primary">保存</a-button>
-      <a-button type="primary">发送SI</a-button>
+      <a-button class="nav-btn" type="primary">发送SI</a-button>
-      <a-button type="primary">提单确认</a-button>
+      <a-button class="nav-btn" type="primary">提单确认</a-button>
-      <a-button type="primary">取消完成任务</a-button>
+      <a-button class="nav-btn" type="primary">取消完成任务</a-button>
-      <a-button type="primary">关闭</a-button>
+      <a-button class="nav-btn" type="primary">关闭</a-button>
     </div>
     <x-card>
-      <div slot="content" style="padding-top:0;" class="mail-info">
+      <div slot="content" style="margin-top: -24px;" class="mail-info">
         <div class="task-basic-box">
           <div class="label">
             <div class="title">提单号</div>
@@ -26,9 +26,15 @@
         </div>
       </div>
     </x-card>
+
+    <a-collapse class="collapse-box" :bordered="false" expandIconPosition="right" v-model="showKey">
+      <a-collapse-panel key="1">
+        <template slot="header">
+          <div class="base-tit"><i class="iconfont icon-a-fahuodaifahuo"></i>收发通信息</div>
+        </template>
         <div class="mailing-info">
           <x-card>
-        <div slot="content" style="margin-top: -5px;" class="mail-info">
+            <div slot="content" style="margin-top: -24px;" class="mail-info">
               <a-form-model :selfUpdate="true" ref="mailingFrom" :model="taskDetail">
                 <a-row :gutter="10">
                   <a-col :xs="24" :sm="24" :md="24" :lg="10" :xl="12">
@@ -306,6 +312,17 @@
             </div>
           </x-card>
         </div>
+      </a-collapse-panel>
+    </a-collapse>
+
+    <a-collapse class="collapse-box" :bordered="false" expandIconPosition="right" v-model="showKey">
+      <a-collapse-panel key="1">
+        <template slot="header">
+          <div class="base-tit"><i class="iconfont icon-goods"></i>货物信息</div>
+        </template>
+        <div></div>
+      </a-collapse-panel>
+    </a-collapse>
   </div>
 </template>
 <script>
@@ -357,7 +374,8 @@ export default {
       kindpkgsData: [],
       showShipper: '',
       showConsignee: '',
-      showNotifier: ''
+      showNotifier: '',
+      showKey: ['1']
     }
   },
   computed: {
@@ -584,7 +602,7 @@ export default {
   display: flex;
   width: 500px;
   margin-top: 10px;
-  padding: 10px;
+  padding: 0 10px;
   background: #fff;
   margin-bottom: 10px;
   .label{
@@ -618,13 +636,15 @@ export default {
     padding-left: 5px;
   }
 }
-
+.sender-label{
+  margin-bottom: 0;
+}
 .sender,
 .consignee,
 .notifier {
-  margin-bottom: 20px;
+  // margin-bottom: 20px;
   .top {
-    margin-bottom: 15px;
+    // margin-bottom: 15px;
     min-height: 32px;
     line-height: 32px;
     overflow: hidden;
@@ -745,4 +765,41 @@ export default {
     }
   }
 }
+
+.collapse-box {
+  margin-bottom: 10px;
+  background: #fff;
+}
+
+.base-tit {
+  font-size: 14px;
+  font-weight: 600;
+  color: #666;
+  position: relative;
+  height: 34px;
+  line-height: 40px;
+  margin-top: -5px;
+  &::before {
+    content: '';
+    position: absolute;
+    width: 4px;
+    height: 30px;
+    background: @primary-color;
+    top: 6px;
+    left: 0px;
+  }
+  i {
+    margin-right: 7px;
+    font-weight: 500;
+    font-size: 18px;
+    color: @primary-color;
+    margin-left: 10px;
+  }
+}
+.nav-btn-box{
+  margin-bottom: 20px;
+  .nav-btn{
+    margin-right: 10px;
+  }
+}
 </style>

src/views/main/Taskmanage/TaskmanageList/index.vue

@@ -368,7 +368,8 @@ import {
   PrintBatch,
   DownloadAttach,
   DownloadOriginalTask,
-  LaraPaperRegist
+  LaraPaperRegist,
+  LaraPaperRegistPost
 } from '@/api/modular/main/TaskmanageList'
 export default {
   name: 'TaskmanageList',
@@ -988,7 +989,26 @@ export default {
     },
     // LARA记录
     laraRecordFun () {
-
+      const select = this.$refs.xGrid.getCheckboxRecords()
+      const pkIdArr = select.map((item, index) => {
+        return item.pkId
+      })
+      if (pkIdArr.length === 0) {
+        this.$message.error('请选择数据')
+        return false
+      }
+      console.log('已选择数据', pkIdArr)
+      LaraPaperRegistPost({
+        taskPKId: pkIdArr[0]
+      }).then((res) => {
+        debugger
+        if (res.success) {
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch((err) => {
+        console.log(err)
+      })
     },
   },
 }