Merge branch 'master' of http://120.26.64.82:10880/BFFE/CA3.0

public/config.js

@@ -23,6 +23,7 @@ window.SERVICE_ID = {
   changePwd: 20045, // 修改密码
   userColAuthId: 200227, //用户授权-列设置
   containerId: 200238, //容器历史记录-容器历史
+  transferReamkesId: 2003114, //中转管理-备注
 
   /***-----高级查询------***/
   baggageTypeId: 86, //高级查询-特殊行李类型下拉选项查询-id

src/views/newQuery/components/table.vue

@@ -51,6 +51,22 @@
         </div>
       </Dialog>
     </template>
+    <Dialog :flag="reamkeFlag" width="600px" class="dialog-check-group">
+      <div class="dialog-wrapper">
+        <div class="title">备注</div>
+        <div style="height: 250px" class="content">
+          <el-form ref="form" :model="form" label-width="70px">
+            <el-form-item label="输入备注">
+              <el-input type="textarea" clearable rows="10" v-model="form.desc"></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="foot right t30">
+          <el-button size="medium" class="r24" type="primary" @click="onReamkeCheck">确定</el-button>
+          <el-button size="medium" @click="reamkeFlag = false">取消</el-button>
+        </div>
+      </div>
+    </Dialog>
   </div>
 </template>
 
@@ -59,6 +75,7 @@ import pf from '@/layout/mixin/publicFunc'
 import { getToken } from '@/utils/auth'
 import { getAuthData, formatOrder } from '@/utils/validate'
 import { exportToExcel } from '@/utils/table'
+import { modifyData } from '@/api/webApi'
 import tableColsMixin from '../mix/tableCols'
 import Dialog from '@/layout/components/Dialog/index.vue'
 import TableHeaderCell from '@/components/TableHeaderCell/index.vue'
@@ -146,6 +163,11 @@ export default {
       arriveCount: 0,
       checkPath: ['/newDeparture', '/newTransfer/in', '/newTransfer/out', '/newArrival'],
       hasSetTableScroll: false,
+      reamkeFlag: false,
+      reamkeMap: {},
+      form: {
+        desc: ''
+      }
     }
   },
   computed: {
@@ -690,8 +712,45 @@ export default {
               })
             }
           }
+        } else {
+          this.headerClick(row, column)
         }
       }
+      else {
+        this.headerClick(row, column)
+      }
+    },
+    // 表格-备注-单元格点击
+    headerClick (row, column) {
+      const { property } = column
+      const path = this.$route.path
+      const newPath = (path.endsWith('/in') || path.endsWith('/out')) ? true : false
+      if (!newPath && property != 'remarks') return
+      this.form.desc = row.remarks || ''
+      this.reamkeFlag = true
+      this.reamkeMap = row
+    },
+    // 表格-备注-单元格点击-弹框确定
+    onReamkeCheck () {
+      this.sendReamkesHttp()
+    },
+    //发送备注请求
+    async sendReamkesHttp () {
+      const parmas = {
+        "serviceId": SERVICE_ID.transferReamkesId,
+        "page": 1,
+        "pageSize": 10,
+        "dataContent": {
+          "ID": this.reamkeMap.ID,
+          "remarks": this.form.desc
+        },
+        "event": "2"
+      }
+      const { code } = await modifyData(parmas)
+      if (code == 0) this.$message.success('操作成功')
+      this.restTable()
+      this.load()
+      this.reamkeFlag = false
     },
     // 导出
     exportHandler () {