Merge branch 'master' of http://120.26.64.82:10880/BFFE/SMAirports

src/views/newBagDetails/components/baggageMessage.vue

@@ -9,7 +9,7 @@
                 <div class="message-date">{{ message.readTime }}</div>
                 <div class="message-content">
                   <el-scrollbar style="height: 100%">
-                    <div>{{ message.sourceData.replaceAll(/[\r\n]{2,}/g, '\n').replaceAll('\\', '') }}</div>
+                    <div>{{ message.sourceData.replaceAll(/[\\r\\n]{2,}/g, '\n').replaceAll('\\', '') }}</div>
                   </el-scrollbar>
                 </div>
               </div>
@@ -89,7 +89,7 @@ export default {
       xlsxDatas.push(
         ...this.messageList.map(message => [
           message.flightDate,
-          message.sourceData.replaceAll(/[\r\n]{2,}/g, '\n').replaceAll('\\', '')
+          message.sourceData.replaceAll(/[\\r\\n]{2,}/g, '\n').replaceAll('\\', '')
         ])
       )
       const columnWidths = []

src/views/newBagDetails/components/baggageView.vue

@@ -186,7 +186,7 @@ export default {
             this.loading = false;
           }
           returnData.forEach(item => {
-            item.bagStatus = this.stepNodes
+            item.bagStatus = _.cloneDeep(this.stepNodes)
           })
           this.tableData.push(...returnData);
           this.tableData = _.uniqBy(this.tableData, 'carrierFlights')

src/views/newBagDetails/index.vue

@@ -185,18 +185,26 @@ export default {
         }
         const { code, returnData } = await this.getQueryList(SERVICE_ID.bagTableId, parmObj)
         if (code == 0 && returnData && returnData.length) {
-          this.detailsArr = _.uniq([...returnData])
+          this.detailsArr = _.uniqBy([...returnData], 'luggageNum')
         }
       } catch (error) {
         console.log(error)
       }
     },
     tagClick (item, index) {
-      const { luggageNum, carrierFlights, carrierFlightsDate } = item
-      this.tagObj = {
-        luggageNum,
-        carrierFlights,
-        carrierFlightsDate
+      const { luggageNum, carrierFlights, carrierFlightsDate, PNRNO, passengerName } = item
+      if (PNRNO) {
+        this.tagObj = {
+          PNRNO,
+          passengerName,
+          luggageNum
+        }
+      } else {
+        this.tagObj = {
+          luggageNum,
+          carrierFlights,
+          carrierFlightsDate
+        }
       }
       this.query = this.tagObj
       this.activeIndex = index
@@ -258,8 +266,8 @@ export default {
       }
       .tags-view-wrapper {
         width: calc(100%);
-        ::v-deep .el-scrollbar__wrap {
-          // margin-top: 8.5px;
+        ::v-deep .is-vertical {
+          display: none;
         }
         .tags-view-item {
           display: inline-block;

src/views/newFlightView/index.vue

@@ -98,14 +98,7 @@ export default {
   },
   async created () {
     const query = this.$route.query
-    const { flightNo, flightDate, depStation_iataCd, arrStation_iataCd } = query
-    const showObj = {
-      carrierFlights: flightNo,
-      carrierFlightsDate: flightDate,
-      outAirport: depStation_iataCd,
-      landAirport: arrStation_iataCd
-    }
-    this.showObj = showObj
+    const { flightNo, flightDate } = query
     this.flightObj = query
     this.dataContent = query
     const res = await this.getViewInfo(query)
@@ -135,7 +128,7 @@ export default {
   },
   mounted () {
     this.table1 = this.dataContent
-    this.table2 = this.showObj
+    this.table2 = this.dataContent
   },
   methods: {
     // 获取基本信息
@@ -180,7 +173,15 @@ export default {
         const caps = datas.sort((a, b) => a.index - b.index)
         const c4 = caps[0].name //起飞
         const c5 = caps[caps.length - 1].name //降落
-        console.log(c4, c5)
+        const newPrams = _.cloneDeep(this.dataContent)
+        newPrams.depStation_iataCd = c4
+        newPrams.arrStation_iataCd = c5
+        this.table1 = newPrams
+        this.table2 = newPrams
+        const res = await this.getViewInfo(newPrams)
+        if (res && res.length) {
+          this.infoObj = res[0]
+        }
       }
     }
   }

src/views/newUserManagement/index.vue

@@ -45,7 +45,7 @@
                     <div class="flex">
                       <span class="customTxt">{{ node.label }}</span>
                       <span v-show="treeCheckId == data.user_group_id" class="customBtn">
-                        <span v-if="data.user_group_id != 0" @click.stop="handleRemove(data)">删除</span>
+                        <span v-if="data.user_group_id" @click.stop="handleRemove(data)">删除</span>
                       </span>
                     </div>
                   </span>
@@ -126,7 +126,7 @@
           </el-form>
         </div>
         <div class="foot right">
-          <el-button size="small" @click="handleOk('ruleForms')" class="r24" type="primary">确定</el-button>
+          <el-button size="small" @click="handleOkSk('ruleForms')" class="r24" type="primary">确定</el-button>
           <el-button @click="eledite" size="small">取消</el-button>
         </div>
       </div>
@@ -320,7 +320,7 @@ export default {
       if (datas && datas.length) {
         return
       }
-      this.arrs.push({ user_group_name: '新建账号组' })
+      this.arrs.push({ user_group_name: '新建账号组', user_group_id: 'test' })
       this.type = 'add'
       this.treeCheckId = null
       this.tableData = []
@@ -331,17 +331,23 @@ export default {
     },
     async handleNodeClick (data) {
       if (data.user_group_id) {
+        const datas = this.arrTree.filter(item => item.user_group_id == data.up_user_group_id)
         this.treeCheckId = data.user_group_id
         this.treeCheckObj = _.cloneDeep(data)
         this.formInline = _.cloneDeep(data)
-        this.type = 'edit'
-        const { code, returnData } = await this.getQueryList(SERVICE_ID.getUserTableId, {
-          up_user_group_id: data.user_group_id
-        })
-        if (code == 0 && returnData && returnData.length) {
-          this.tableData = returnData
-        } else {
-          this.tableData = []
+        if (data.user_group_id != 'test') {
+          if (!data.up_user_group_id || datas.length < 1) {
+            this.formInline.up_user_group_id = ''
+          }
+          this.type = 'edit'
+          const { code, returnData } = await this.getQueryList(SERVICE_ID.getUserTableId, {
+            up_user_group_id: data.user_group_id
+          })
+          if (code == 0 && returnData && returnData.length) {
+            this.tableData = returnData
+          } else {
+            this.tableData = []
+          }
         }
       }
     },
@@ -378,11 +384,17 @@ export default {
     },
     async tableRemove () {
       if (this.rmType == '1') {
-        const { code } = await this.getChangeList(this.queryId, this.rmObj, 3)
-        if (code == 0) {
-          this.getTreeData()
-          this.rmObj = {}
-          this.clearForm()
+        const { user_group_id } = this.treeCheckObj
+        if (user_group_id == 'test') {
+          this.arrs.pop()
+        } else {
+          const { code } = await this.getChangeList(this.queryId, this.rmObj, 3)
+          if (code == 0) {
+            this.getTreeData()
+            this.rmObj = {}
+            this.clearForm()
+            this.tipMsg(code)
+          }
         }
       } else {
         const { user_name } = this.dataObj
@@ -404,16 +416,22 @@ export default {
         if (valid) {
           let code = null
           this.formInline.user_group_id = this.treeCheckId
-          const data = this.formInline
+          const data = _.cloneDeep(this.formInline)
           // console.log(this.type)
           if (this.type = 'edit') {
             const id = this.formInline.user_group_id
-            if (id) {
+            if (id && id != 'test') {
               const res = await this.getChangeList(this.queryId, data, 2, 'user_group_id')
               code = res.code
             } else {
-              const res = await this.getChangeList(this.queryId, data, 1)
-              code = res.code
+              let result = null
+              if (id == 'test') {
+                data.user_group_id = null
+                result = await this.getChangeList(this.queryId, data, 1)
+              } else {
+                result = await this.getChangeList(this.queryId, data, 1)
+              }
+              code = result.code
             }
           }
           if (code == 0) {
@@ -507,6 +525,33 @@ export default {
     hide () {
       this.dialogFlag = false
     },
+    async handleOkSk () {
+      const id = this.ruleForm.user_group_id || this.ruleForm.user_id
+      if (id) {
+        const r = PLATFROM_CONFIG.editRule
+        const b = r.test(this.ruleForm.user_pwd)
+        if (b) {
+          this.ruleForm.user_pwd = MD5(this.ruleForm.user_pwd)
+          const data = _.cloneDeep(this.ruleForm)
+          const { user_id, user_pwd } = data
+          const newData = {
+            user_id,
+            user_pwd
+          }
+          const { code } = await this.getChangeList(SERVICE_ID.getUserTableId, newData, 2, 'user_id')
+          this.tipMsg(code)
+          const result = await this.getQueryList(SERVICE_ID.getUserTableId, {
+            up_user_group_id: this.treeCheckObj.user_group_id
+          })
+          this.tableData = result.returnData
+          // this.clearTableForm()
+          this.tableFlag = false
+          this.paswordFlag = false
+        } else {
+          this.$message.error('请根据密码规则设置密码')
+        }
+      }
+    },
     async handleOk (data) {
       this.$refs[data].validate(async (valid) => {
         if (valid) {
@@ -520,26 +565,20 @@ export default {
           } else {
             const id = this.ruleForm.user_group_id || this.ruleForm.user_id
             if (id) {
-              const r = PLATFROM_CONFIG.editRule
-              const b = r.test(this.ruleForm.user_pwd)
-              if (b) {
-                this.ruleForm.user_pwd = MD5(this.ruleForm.user_pwd)
-                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)
-                const result = await this.getQueryList(SERVICE_ID.getUserTableId, {
-                  up_user_group_id: this.treeCheckObj.user_group_id
-                })
-                this.tableData = result.returnData
-                this.clearTableForm()
-                this.tableFlag = false
-                this.paswordFlag = false
-              } else {
-                this.$message.error('请根据密码规则设置密码')
-              }
+              this.ruleForm.user_pwd = MD5(this.ruleForm.user_pwd)
+              this.ruleForm.up_user_group_id = this.ruleForm.user_group_id
+              const data = _.cloneDeep(this.ruleForm)
+              delete data.user_group_id
+              delete data.user_pwd
+              const { code } = await this.getChangeList(SERVICE_ID.getUserTableId, data, 2, 'user_id')
+              this.tipMsg(code)
+              const result = await this.getQueryList(SERVICE_ID.getUserTableId, {
+                up_user_group_id: this.treeCheckObj.user_group_id
+              })
+              this.tableData = result.returnData
+              this.clearTableForm()
+              this.tableFlag = false
+              this.paswordFlag = false
             }
           }
         }

src/views/systemSettings/views/newAuth/components/button.vue

@@ -32,7 +32,7 @@
           </el-select>
         </el-form-item>
         <el-form-item class="flex1" label="关联数据项">
-          <el-select size="small" clearable v-model="form.relation_data" placeholder="请选择关联数据项">
+          <el-select size="small" clearable filterable v-model="form.relation_data" placeholder="请选择关联数据项">
             <el-option v-for="(item,index) in relationData" :key="index" :label="item.columnLabel" :value="item.columnName"></el-option>
           </el-select>
         </el-form-item>
@@ -46,7 +46,7 @@
       </div>
       <div class="flex-wrap fr-list">
         <el-form-item class="flex1" label="传递参数">
-          <el-select size="small" multiple collapse-tags clearable v-model="form.pass_parameters" placeholder="请选择传递参数">
+          <el-select size="small" multiple filterable collapse-tags clearable v-model="form.pass_parameters" placeholder="请选择传递参数">
             <el-option v-for="(item,index) in passData" :key="index" :label="item.columnLabel" :value="item.columnName">
             </el-option>
           </el-select>

src/views/systemSettings/views/newAuth/components/table.vue

@@ -15,7 +15,7 @@
         </div>
         <div class="flex-wrap fr-list">
           <el-form-item label="服务ID">
-            <el-select @change="serviceChange" style="width: 264px;" size="small" clearable v-model="form.serviceID" placeholder="请选择服务ID">
+            <el-select @change="serviceChange" filterable style="width: 264px;" size="small" clearable v-model="form.serviceID" placeholder="请选择服务ID">
               <el-option v-for="(item,index) in authArrs" :key="index" :label="item.serviceName" :value="item.serviceID"></el-option>
             </el-select>
           </el-form-item>

src/views/systemSettings/views/newAuth/index.vue

@@ -41,12 +41,12 @@
                 <el-input size="small" clearable placeholder="请输入权限项名称" v-model="form.auth_name"></el-input>
               </el-form-item>
               <el-form-item class="flex1" label="上级权限项">
-                <el-select @change="authChange" size="small" clearable v-model="form.up_auth_id" placeholder="请选择上级权限项">
+                <el-select @change="authChange" filterable size="small" clearable v-model="form.up_auth_id" placeholder="请选择上级权限项">
                   <el-option v-for="(item,index) in authDataArr" :key="index" :label="item.auth_name" :value="item.auth_id"></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item class="flex1" prop="auth_type" label="权限类型">
-                <el-select size="small" @change="typeChange" clearable v-model="form.auth_type" placeholder="请选择权限类型">
+                <el-select size="small" filterable @change="typeChange" clearable v-model="form.auth_type" placeholder="请选择权限类型">
                   <el-option label="目录" :value="1"></el-option>
                   <el-option label="菜单" :value="2"></el-option>
                   <el-option label="按钮" :value="3"></el-option>
@@ -57,7 +57,7 @@
             </div>
             <div class="flex-wrap fr-list">
               <el-form-item class="flex1" label="所属应用">
-                <el-select size="small" style="width: 265px;" clearable v-model="form.app_id" placeholder="请选择所属应用">
+                <el-select size="small" style="width: 265px;" filterable clearable v-model="form.app_id" placeholder="请选择所属应用">
                   <el-option v-for="(item,index) in apps" :key="index" :label="item.app_name" :value="item.app_id"></el-option>
                 </el-select>
               </el-form-item>