修改

src/layout/mixin/publicFunc.js

@@ -5,13 +5,21 @@ export default {
     return {
       AauthId: null,
       AqueryId: null,
-      AauthTable: []
+      AauthTable: [],
+      TauthId: null,
+      TqueryId: null,
     }
   },
   created () {
     const { auth_id } = this.$route.meta
     const { arrs } = getAuthData(auth_id)
     const table = arrs.filter(item => item.auth_type == 4)
+    const table2 = arrs.filter(item => item.auth_type == 5)
+    if (table2 && table2.length) {
+      const obj = table2[0]
+      this.TqueryId = obj.queryTemplateID
+      this.TauthId = obj.auth_id
+    }
     if (table && table.length) {
       if (table.length == 1) {
         const obj = table[0]

src/views/newArrival/index.vue

@@ -127,11 +127,12 @@ export default {
     },
     async getAirPortData (type = 1) {
       try {
-        const res = await this.getQueryList(SERVICE_ID.getAirpotId)
+        let res = null
+        res = this.TauthId ? await this.getQueryListAuth(this.TqueryId || SERVICE_ID.getAirpotId, {}, 1, 999, this.TauthId) : await this.getQueryList(SERVICE_ID.getAirpotId)
         if (Number(res.code) === 0) {
           this.AirportList = res.returnData;
           if (type) {
-            this.formData.currentAirport = "PEK";
+            this.formData.currentAirport = this.TauthId ? res.returnData[0].IATACode : "PEK";
           }
           this.tableTag = {
             filter: this.formatParams()

src/views/newContainer/index.vue

@@ -0,0 +1,110 @@
+<template>
+  <div class="newContainer">
+    <div class="newContainer-top">
+      <div class="newContainer-top-title flex">
+        <div class="manageTitle">容器基本信息</div>
+        <el-button size="small" type="primary">历史记录</el-button>
+      </div>
+      <div class="newContainer-top-table">
+        <scroll-pane ref="scrollPane" class="tags-view-wrapper">
+          <div v-for="(item,index) in detailsArr" class="tags-view-item" :key="index">{{ item.luggageNum }}</div>
+        </scroll-pane>
+      </div>
+    </div>
+    <div class="newContainer-bootom">
+      <div class="newContainer-bootom-title flex">
+        <div class="manageTitle">容器基本信息</div>
+        <div>2</div>
+      </div>
+      <div class="newContainer-bootom-table">
+        <Table :tableTag="tabObj" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import pf from '@/layout/mixin/publicFunc'
+import Table from '@/views/newQuery/components/table.vue'
+import ScrollPane from "@/layout/components/TagsView/ScrollPane.vue"
+export default {
+  name: 'NewContainer',
+  mixins: [pf],
+  components: {
+    ScrollPane,
+    Table
+  },
+  data () {
+    return {
+      detailsArr: [],
+      query: '',
+      tabObj: ''
+    }
+  },
+  created () {
+    const { query } = this.$route
+    this.query = query
+  },
+  mounted () {
+    this.tabObj = this.query
+    this.getTableInfo()
+  },
+  methods: {
+    async getTableInfo () {
+      const { code, returnData } = await this.getQueryListAuth(this.TqueryId, this.query, 1, 999, this.TauthId)
+      console.log(returnData)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.newContainer {
+  height: calc(100vh - 80px);
+  padding: 24px;
+  .tags-view-wrapper {
+    width: calc(100%);
+    ::v-deep .el-scrollbar__wrap {
+      // margin-top: 8.5px;
+    }
+    .tags-view-item {
+      display: inline-block;
+      position: relative;
+      cursor: pointer;
+      height: 32px;
+      line-height: 32px;
+      // border: 1px solid #767eba;
+      // border-radius: 4px;
+      font-size: 14px;
+      font-family: Microsoft YaHei;
+      font-weight: 400;
+      color: #aaacb2;
+      margin-right: 100px;
+      &:last-child {
+        margin-right: 0;
+      }
+      &.active {
+        color: #fff;
+        position: relative;
+        &::after {
+          position: absolute;
+          content: "";
+          width: 100%;
+          left: 0;
+          bottom: 0;
+          height: 3px;
+          background: #2d67e3;
+        }
+      }
+    }
+  }
+  &-bootom {
+    margin-top: 24px;
+    height: calc(100% - 150px);
+    &-table {
+      margin-top: 24px;
+      height: 100%;
+    }
+  }
+}
+</style>

src/views/newDeparture/index.vue

@@ -127,11 +127,12 @@ export default {
     },
     async getAirPortData (type = 1) {
       try {
-        const res = await this.getQueryList(SERVICE_ID.getAirpotId)
+        let res = null
+        res = this.TauthId ? await this.getQueryListAuth(this.TqueryId || SERVICE_ID.getAirpotId, {}, 1, 999, this.TauthId) : await this.getQueryList(SERVICE_ID.getAirpotId)
         if (Number(res.code) === 0) {
           this.AirportList = res.returnData;
           if (type) {
-            this.formData.currentAirport = "PEK";
+            this.formData.currentAirport = this.TauthId ? res.returnData[0].IATACode : "PEK";
           }
           this.tableTag = {
             filter: this.formatParams()

src/views/newQuery/components/table.vue

@@ -322,9 +322,14 @@ export default {
       }
     },
     setCellClick () {
+      let table = null
       const { auth_id } = this.$route.meta
       const { arrs } = getAuthData(auth_id)
-      const table = arrs.filter(item => item.auth_type == 4)
+      if (this.tableName) {
+        table = this.AauthTable.filter(item => item.auth_name == this.tableName)
+      } else {
+        table = arrs.filter(item => item.auth_type == 4)
+      }
       if (table && table.length) {
         const obj = table[0]
         const { arrs } = getAuthData(obj.auth_id)

src/views/newTransfer/index.vue

@@ -135,11 +135,12 @@ export default {
     },
     async getAirPortData (type = 1) {
       try {
-        const res = await this.getQueryList(SERVICE_ID.getAirpotId)
+        let res = null
+        res = this.TauthId ? await this.getQueryListAuth(this.TqueryId || SERVICE_ID.getAirpotId, {}, 1, 999, this.TauthId) : await this.getQueryList(SERVICE_ID.getAirpotId)
         if (Number(res.code) === 0) {
           this.AirportList = res.returnData;
           if (type) {
-            this.formData.currentAirport = "PEK";
+            this.formData.currentAirport = this.TauthId ? res.returnData[0].IATACode : "PEK";
           }
           this.tableTag = {
             filter: this.formatParams()

src/views/newUserManagement/index.vue

@@ -521,7 +521,10 @@ export default {
             const id = this.ruleForm.user_group_id || this.ruleForm.user_id
             if (id) {
               this.ruleForm.user_pwd = MD5(this.ruleForm.user_pwd)
-              const data = this.ruleForm
+              const data = _.cloneDeep(this.ruleForm)
+              if (data.user_group_id) {
+                delete data.user_group_id
+              }
               const { code } = await this.getChangeList(SERVICE_ID.getUserTableId, data, 2, 'user_id')
               this.tipMsg(code)
             }
@@ -530,17 +533,6 @@ export default {
             up_user_group_id: this.treeCheckObj.user_group_id
           })
           this.tableData = result.returnData
-          this.tipMsg(result.code)
-          // if (code) {
-          //   // if (this.dataType == 'add') {
-          //   //   this.clearTableForm()
-          //   // }
-          //   this.clearTableForm()
-          //   const result = await this.getQueryList(SERVICE_ID.getUserTableId, {
-          //     user_group_id: this.formInline.user_group_id
-          //   }, 'user_group_id')
-          //   this.tableData = result
-          // }
           this.clearTableForm()
           this.tableFlag = false
           this.paswordFlag = false