Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs

kimi

2020-02-11 89ba01e8e0bec7fdadc5278c95850cfe68b9e62a

 src/views/DataEdit(1).vue

@@ -273,7 +273,6 @@
       // let url = "/api/master/" + this.menuObj.tableName + "/all/1"
        let url = "/api/field/" + this.menuObj.tableName;
          this.$axios.get(url).then(data_ => {
            console.log(data_);
            me.tableFields = data_.data.data;
           /* var fields_ = [];
            var result = data_.data.data;
@@ -287,7 +286,6 @@
            me.getData_edit();
          })
          .catch(error =>{
              console.log(error);
          })
      },

@@ -330,7 +328,6 @@
          }
        }
        ).then(data_ => {
          console.log(data_);
          let header_height = me.$refs.dataEdit_table.$el.getElementsByClassName('el-table__header-wrapper')[0].offsetHeight;
          me.$refs.dataEdit_table.$el.getElementsByClassName('el-table__body-wrapper')[0].style['height'] = me.tableHeight - header_height + "px";
          me.$refs.dataEdit_table.$el.getElementsByClassName('el-table__body-wrapper')[0].style['min-height'] = me.tableHeight - header_height + "px";
@@ -342,7 +339,6 @@
          me.loading_edit = false;
        })
        .catch(error =>{
            console.log(error);
        })
      },

@@ -375,11 +371,9 @@
            desp: this.desp
          }
        }).then(data_ => {
          console.log(data_);
          this.alert2_("当前流程正在审批");
        })
        .catch(error =>{
            console.log(error);
        });
      },

@@ -402,7 +396,6 @@
            },
          }
        ).then(data_ => {
            console.log(data_);
            if (!data_.data.data.grid || !data_.data.data) {
              this.tableData_edit = [];
              this.currentPage_edit = 1;
@@ -416,7 +409,6 @@
            this.loading_edit = false;
          })
          .catch(error =>{
              console.log(error);
              this.loading_edit = false;
              this.tableData_edit = [];
              this.currentPage_edit = 1;
@@ -454,12 +446,10 @@
        let datas = "?datas=" + encodeURI(table_data.id);
        this.$axios.post(url + datas
        ).then(data_ => {
          console.log(data_);

          this.query_edit();
        })
        .catch(error =>{
            console.log(error);
        });

      },
@@ -506,14 +496,12 @@
        let datas = "?datas=" + encodeURI(JSON.stringify(table_data)) + "&fields=" + fields_;
        this.$axios.post(url + datas
        ).then(data_ => {
          console.log(data_);

          this.loading_button_add = false;
          this.dialog_4_1_1 = false;
          this.query_edit();
        })
        .catch(error =>{
            console.log(error);
        });
      },

@@ -560,13 +548,11 @@

       this.$axios.post(url + datas
        ).then(data_ => {
          console.log(data_);
          me.loading_button_update = false;
          me.dialog_4_2 = false;
          me.query_edit();
        })
        .catch(error =>{
            console.log(error);
        });
      },