2/22

src/api/modular/main/BookingLedger.js

@@ -703,3 +703,11 @@ export function DjyCustomerContacts(parameter) {
     params: parameter
   })
 }
+// 删除备注
+export function BookingOrderDeleteRemark(parameter) {
+  return axios({
+    url: '/BookingOrder/DeleteRemark',
+    method: 'post',
+    params: parameter
+  })
+}

src/views/main/BookingLedger/detail/modules/operationArea.vue

@@ -390,7 +390,7 @@
                   </a-form-item>
                 </a-col>
               </div>
-              <div class="item-box vgm-remarks" style="padding-top:0px;padding-bottom:0px;">
+              <div class="item-box vgm-remarks" style="padding-top:0px;padding-bottom:0px;height:85px;">
                 <a-col :span="24">
                   <a-form-item
                     label="备注"
@@ -399,10 +399,10 @@
                     has-feedback
                   >
                     <div class="box-flex">
-                      <a-input
-                        class="remark-input"
+                      <a-textarea
                         style="width:1000px !important; text-align: left;"
                         :allowClear="true"
+                        :auto-size="{ minRows: 3, maxRows: 5 }"
                         v-model="initCabinFrom.remark"
                       />
                     </div>
@@ -544,7 +544,7 @@
                   </a-form-item>
                 </a-col>
               </div>
-              <div class="item-box vgm-remarks" style="padding-top:0px;padding-bottom:0px;">
+              <div class="item-box vgm-remarks" style="padding-top:0px;padding-bottom:0px;height:85px">
                 <a-col :span="24">
                   <a-form-item
                     label="备注"
@@ -553,9 +553,10 @@
                     has-feedback
                   >
                     <div class="box-flex">
-                      <a-input
-                        style="width:1000px !important; text-align: left;"
+                      <a-textarea
+                        style="width:1000px !important; text-align: left;background: #13c2c2;"
                         :allowClear="true"
+                        :auto-size="{ minRows: 3, maxRows: 5 }"
                         v-model="initCabinFrom.remark"
                       />
                     </div>
@@ -1774,10 +1775,15 @@ export default {
     display: inline-block;
     width: 25px;
     text-align: right;
-    height: 32px;
-    line-height: 32px;
+    height: 100%;
+    // height: 32px;
+    // line-height: 32px;
     font-size: 13px;
     cursor: pointer;
+    > textarea {
+      background: #f6fdfd !important;
+    }
+
     i {
       color: @primary-color;
     }

src/views/main/BookingLedger/detail/modules/rightContent.vue

@@ -50,9 +50,12 @@
         <div class="remark" v-for="(remark, rindex) in remarkList" :key="rindex">
           <div class="remark-main">
             <div class="top"><i class="iconfont icon-yuandian"></i>{{ remark.remark }}</div>
-            <div class="bottom">{{ remark.updatedTime || remark.createdTime }} </div>
+            <div class="bottom">{{ remark.updatedTime || remark.createdTime }} {{ remark.UpdatedUserName }}</div>
           </div>
           <div class="remark-btn" @click="editRemark(remark)"><i class="iconfont icon-bianji1"></i></div>
+          <a-popconfirm title="你确定要删除这个备注吗?" ok-text="是" cancel-text="否" @confirm="deleteRemark(remark)">
+            <div class="remark-btn"><i class="iconfont icon-shanchu1"></i></div>
+          </a-popconfirm>
         </div>
         <div class="remark no-data" v-if="remarkList.length === 0">
           <i class="iconfont icon-wushuju"></i>
@@ -76,7 +79,9 @@
               <i class="iconfont icon-file-word" v-else></i>
               {{ file.fileName }}
             </span>
-            <span class="right"><i class="iconfont icon-yulan" @click="getFileFun(file)"></i><i class="iconfont icon-arrow-"></i></span>
+            <span class="right"
+              ><i class="iconfont icon-yulan" @click="getFileFun(file)"></i><i class="iconfont icon-arrow-"></i
+            ></span>
           </div>
           <div class="bottom">
             <span><i class="iconfont icon-leixing"></i>{{ file.typeName }}</span>
@@ -111,7 +116,9 @@
             <div class="child-log" v-for="(child, cindex) in bookingLog.detail" :key="cindex">
               <span class="log-time">{{ child.opTime }}</span>
               <i class="iconfont icon-yuanxuankuang2 icon"></i>
-              <span class="log-name">{{ child.status }} <span class="min-log" v-if="child.cntrno">箱号:{{ child.cntrno }}</span> </span>
+              <span class="log-name"
+                >{{ child.status }} <span class="min-log" v-if="child.cntrno">箱号:{{ child.cntrno }}</span>
+              </span>
             </div>
           </div>
         </div>
@@ -236,7 +243,8 @@ import {
   AddFile,
   BookingOrderGetFile,
   ExcuteRulesOceanBooking,
-  BookingOrderDownload
+  BookingOrderDownload,
+  BookingOrderDeleteRemark
 } from '@/api/modular/main/BookingLedger'
 
 export default {
@@ -395,6 +403,14 @@ export default {
       this.remarkVal = data.remark
       this.editRemarkVal = data
     },
+    deleteRemark(data) {
+      console.log(data)
+      BookingOrderDeleteRemark({ id: data.id }).then(res => {
+        // console.log(res)
+        this.$message.success('成功删除')
+        this.getRemark()
+      })
+    },
     handleModelCancel() {
       this.remarkModelvisible = false
       this.editRemarkVal = null

src/views/main/BookingLedger/list/index.vue

@@ -163,9 +163,9 @@
       </a-col>
     </a-row>
 
-    <a-modal :maskClosable="false" :width="950" :visible="addVisible" @ok="addSubmit" @cancel="addCancel">
+    <a-modal :maskClosable="false" :width="1700" :visible="addVisible" @ok="addSubmit" @cancel="addCancel">
       <a-radio-group class="group-label-box" v-model="carrierRadio">
-        <p v-if="RecentlyCarrierData.length">历史记录</p>
+        <p v-if="RecentlyCarrierData.length" class="ant-radio-wrapper">最近使用</p>
         <div class="group-label" v-if="RecentlyCarrierData.length">
           <a-radio :style="radioStyle" :value="item.code" v-for="item in RecentlyCarrierData" :key="item.code">
             <img class="radio-logo" :src="require(`@/assets/logo/${item.code}.png`)" />
@@ -175,7 +175,7 @@
         </div>
 
         <div v-for="e in Object.keys(RcarrierData)" :key="e">
-          <p>{{ e }}</p>
+          <p class="ant-radio-wrapper">{{ e }}</p>
           <div class="group-label">
             <a-radio :style="radioStyle" :value="item.code" v-for="item in RcarrierData[e]" :key="item.code">
               <img class="radio-logo" :src="require(`@/assets/logo/${item.code}.png`)" />
@@ -1540,7 +1540,7 @@ export default {
 }
 
 .radio-logo {
-  width: 60px;
+  width: 50px;
   // height: 40px;
   display: inline-block;
 }
@@ -1551,7 +1551,9 @@ export default {
     display: flex;
     flex-wrap: wrap;
     .ant-radio-wrapper {
-      width: 20%;
+      height: 45px !important;
+      line-height: 45px !important;
+      width: 10%;
       margin: 0;
     }
     // .label-flex {

src/views/main/CommondbYard/addForm.vue

@@ -26,6 +26,11 @@
               />
             </a-form-item>
           </a-col>
+          <a-col :span="12">
+            <a-form-item label="助记码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input placeholder="请输入助记码" v-decorator="['showCode']" />
+            </a-form-item>
+          </a-col>
           <a-col :span="12">
             <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input placeholder="请输入备注" v-decorator="['remark']" />

src/views/main/CommondbYard/editForm.vue

@@ -27,6 +27,11 @@
               />
             </a-form-item>
           </a-col>
+          <a-col :span="12">
+            <a-form-item label="助记码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input placeholder="请输入助记码" v-decorator="['showCode']" />
+            </a-form-item>
+          </a-col>
           <a-col :span="12">
             <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input placeholder="请输入备注" v-decorator="['remark']" />

src/views/main/CommondbYard/index.vue

@@ -98,6 +98,12 @@ export default {
           width: '100',
           dataIndex: 'name'
         },
+        {
+          title: '助记码',
+          align: 'center',
+          width: '80',
+          dataIndex: 'showCode'
+        },
         {
           title: '描述',
           align: 'center',