修改

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

@@ -192,11 +192,19 @@ export default {
       }
     },
     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

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

@@ -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>
@@ -507,6 +507,31 @@ 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)
+          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('请根据密码规则设置密码')
+        }
+      }
+    },
     async handleOk (data) {
       this.$refs[data].validate(async (valid) => {
         if (valid) {
@@ -520,26 +545,19 @@ 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
+              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
             }
           }
         }