Merge branch 'master' of http://120.26.64.82:3000/BFFE/CABaggageData2.0

src/components/TableAirport/index.vue

@@ -566,7 +566,6 @@ export default {
       }
       this.tableForm[this.tableOptions[data][0].setvalue] =
         this.tableForm[data];
-      // console.log(this.tableForm)
     },
     inputChangeHandler(data) {
       if (this.tableForm[data] === "") {
@@ -580,7 +579,7 @@ export default {
         const { code, returnData } = await Query({
           id: this.dataId,
           needPage: ++this.page,
-          dataContent: Object.values(this.dataContent),
+          dataContent: [this.dataContent.companyID],
         });
         if (code == 0) {
           if (returnData.listValues.length === 0) {
@@ -617,6 +616,7 @@ export default {
       try {
         data = {
           ...data,
+          ...this.dataContent,
         };
         const { code, message } = await GeneralDataReception({
           serviceId: this.serviceId,
@@ -808,13 +808,13 @@ export default {
         this.tableType = "add";
         this.tableTitle = "新增";
         this.tableForm = {};
-        if (this.dataContent.companyID) {
-          this.tableForm.companyName = this.dataContent.companyID;
-        }
-        if (this.dataContent.nodeCode) {
-          this.tableForm.nodeCode = this.dataContent.nodeCode;
-        }
-        // this.tableForm.
+        this.tableForm = {
+          companyID: this.dataContent.companyID,
+          companyName: this.dataContent.companyName,
+          fullName: "",
+        };
+        // console.log(this.tableForm.companyName);
+        // this.tableForm.companyID = this.dataContent.companyID;
       } else {
         this.$emit("handleAdd");
       }
@@ -836,6 +836,7 @@ export default {
           // })
         } else {
           this.tableForm = JSON.parse(JSON.stringify(row));
+          console.log(this.tableForm);
         }
         this.flag = true;
         this.tableType = "edit";
@@ -867,6 +868,8 @@ export default {
     submitClickHandler() {
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
+          this.dataContent.companyID = this.tableForm.companyID;
+          this.dataContent.companyName = this.tableForm.companyName;
           if (this.tableType == "add") {
             this.tableForm.event = 1;
           } else {

src/views/BasicsData/views/airport/airportInfo.vue

@@ -45,7 +45,7 @@
             :minHeight="70"
             width="800px"
             :withlodSet="true"
-            :data-content="{ companyID }"
+            :data-content="{ companyID, companyName }"
             tableHeight="680"
           />
         </el-col>
@@ -286,6 +286,7 @@ export default {
         ],
       },
       companyID: "",
+      companyName: "",
       company: "所属公司",
     };
   },
@@ -300,7 +301,7 @@ export default {
     //点击树状图
     handleNodeClick(data) {
       this.companyID = data.companyID;
-      this.company = data.companyName;
+      this.companyName = data.companyName;
     },
     closeForm() {
       this.$refs.ruleForm.resetFields();