Merge branch 'master' of http://192.168.20.39:8989/r/LFWEB_NEW

王旭

2023-05-10 7a0c7de021aebbef3ec137f2f94ff73ab41014d7

 src/views/datamanage/dictionaryManage.vue

@@ -18,19 +18,19 @@
          :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
          suffix-icon="el-icon-search"
        ></el-input>
        <el-tree
        <!-- <el-tree
          :data="domainData"
          :props="defaultProps"
        >

        </el-tree>
        <!-- <el-tree
        </el-tree> -->
        <el-tree
          :data="domainData"
          :props="defaultProps"
          @node-click="getTableDesc"
          :filter-node-method="filterNode"
          ref="tree"
        ></el-tree> -->
        ></el-tree>
        <!-- <ul>
          <li
            @click="getTableDesc(item)"
@@ -214,7 +214,7 @@
              @size-change="handleSizeChange"
              @current-change="handleCurrentChange"
              :current-page="listData.pageIndex"
              :page-sizes="[10, 20, 50, 100]"
              :page-sizes="[10, 50, 100, 200]"
              :page-size="listData.pageSize"
              layout="total, sizes, prev, pager, next, jumper"
              :total="count"
@@ -461,6 +461,7 @@
              v-model="insertform.orderNum"
              autocomplete="off"
              style="width:85%"
               :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuenumber')"
            ></el-input>
          </el-form-item>
          <el-form-item
@@ -471,6 +472,8 @@
              v-model="insertform.tab"
              autocomplete="off"
              style="width:85%"
              :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetableName')"
              disabled
            ></el-input>
          </el-form-item>
          <el-form-item
@@ -481,6 +484,7 @@
              v-model="insertform.tabDesc"
              autocomplete="off"
              style="width:85%"
              :placeholder="$t('shuJuGuanLi.shuJuJianSuo.tableDisplayName')"
            ></el-input>
          </el-form-item>

@@ -492,6 +496,7 @@
              v-model="insertform.field"
              autocomplete="off"
              style="width:85%"
                :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuefieldName')"
            ></el-input>
          </el-form-item>
          <el-form-item
@@ -502,6 +507,7 @@
              v-model="insertform.alias"
              autocomplete="off"
              style="width:85%"
                  :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuefieldDisplayName')"
            ></el-input>
          </el-form-item>
          <el-form-item
@@ -512,6 +518,7 @@
              v-model="insertform.type"
              autocomplete="off"
              style="width:85%"
               :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuefieldType')"
            ></el-input>
          </el-form-item>
          <el-form-item
@@ -522,6 +529,7 @@
              v-model="insertform.len"
              autocomplete="off"
              style="width:85%"
               :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuefieldLength')"
            ></el-input>
          </el-form-item>
          <el-form-item
@@ -532,6 +540,7 @@
              v-model="insertform.precision"
              autocomplete="off"
              style="width:85%"
                :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo')+$t('dataManage.dictionaryManageObj.FieldPrecision')"
            ></el-input>
          </el-form-item>

@@ -543,6 +552,7 @@
              v-model="insertform.bak"
              autocomplete="off"
              style="width:85%"
                :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo')+$t('dataManage.dictionaryManageObj.remark')"
            ></el-input>
          </el-form-item>
        </el-form>
@@ -661,6 +671,9 @@
    },
    //获取表格字段信息
    getTableDesc(res) {
      if (res.children) {
        return
      }
      this.insertform.tab = res.tab;
      this.insertform.tabDesc = res.tabDesc;
      this.insertform.ns = res.ns;
@@ -708,7 +721,8 @@
    //修改详情弹框
    handleEdit(index, row) {
      this.dialogFormVisible = true;
      this.upform = row;
      var val = JSON.parse(JSON.stringify(row))
      this.upform = val;
    },
    //删除列表
    DelFormData() {
@@ -728,7 +742,7 @@
            this.$message.error("删除失败");
          }
          this.listData.pageIndex = 1;
          this.listData.pageSize = 10;

          this.startQueryNameData();
          this.$message({
            type: "success",