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

src/components/Table/index.vue

@@ -318,6 +318,8 @@
                         v-model="tableForm[item.columnName]"
                         @change="changeSelect(item.columnName, item)"
                         placeholder="请选择"
+                        clearable
+                        @clear="tableForm[item.columnName] = ''"
                       >
                         <el-option
                           v-for="item in tableOptions[item.columnName]"
@@ -741,6 +743,9 @@ export default {
     this.$refs["table"]?.doLayout();
   },
   methods: {
+    clearup(item) {
+      item = "";
+    },
     eledite() {
       this.flag = false;
       const arrbegin = _.cloneDeep(this.tableOptionscp);
@@ -774,7 +779,7 @@ export default {
         arrbegin.beginPosition.forEach((element) => {
           if (element.v === this.tableForm.beginPosition) {
             if (element.nodeCode !== this.tableForm.beginNode) {
-              this.tableForm.beginPosition = null;
+              this.tableForm.beginPosition = "";
             }
           }
         });
@@ -805,7 +810,7 @@ export default {
         arrbegin.endPosition.forEach((element) => {
           if (element.v === this.tableForm.endPosition) {
             if (element.nodeCode !== this.tableForm.endNode) {
-              this.tableForm.endPosition = null;
+              this.tableForm.endPosition = "";
             }
           }
         });