Merge remote-tracking branch 'origin/master'

ant-design-vue-jeecg/src/views/fieldx/FieldxList.vue

@@ -1,109 +1,60 @@
 <template>
-  <a-card :bordered="false">
+  <a-modal
-    <!-- 查询区域 -->
+    width="96%"
-    <div class="table-page-search-wrapper">
+    title="评分项管理"
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
+    :visible="visible"
-        <a-row :gutter="24">
+    :confirm-loading="confirmLoading"
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+    @ok="handleOk"
-            <a-form-item label="中文名称">
+    @cancel="handleCancel"
-              <a-input placeholder="中文名称" v-model="queryParam.fieldName"></a-input>
+  >
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="英文名称">
-              <a-input placeholder="英文名称" v-model="queryParam.fieldEnName"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="实体状态">
-              <j-dict-select-tag type="list" v-model="queryParam.status" dictCode="a_status" placeholder="请选择实体状态" />
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('字段管理')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
 
-    <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+      <j-vxe-table
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
         :columns="columns"
         :dataSource="dataSource"
-        :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        height='auto'
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
 
-        <template slot="htmlSlot" slot-scope="text">
+        toolbar
-          <div v-html="text"></div>
+        :toolbarConfig="toolbarConfig"
-        </template>
-        <template slot="imgSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
 
-        <span slot="action" slot-scope="text, record">
+        row-number
-          <a @click="handleEdit(record)">编辑</a>
+        row-selection
+        keep-source
+        async-remove
 
+        :pagination="pagination"
+        style="margin-top: 8px;"
+        @pageChange="handlePageChange"
+        @valueChange="valueChange"
+        @added="added">
+        <template v-slot:toolbarSuffix>
+          <a style="
+            background: #e6f7ff;
+            color: red;
+            position: relative;
+            border: 1px solid #91d5ff;
+            padding: 6px 300px 8px 31px;
+            border-radius: 5px;">
+            注意: 编辑后请点击保存按钮保存数据</a>
+          <!-- <a-button type="primary" icon="rollback" @click="fanHui()">返回</a-button>-->
+          <!-- <p style="color: red;font-size: 16px"></p>-->
+        </template>
+
+        <template v-slot:action="props">
+          <a @click="submitForm(props)">保存</a>
           <a-divider type="vertical"/>
-          <a @click="handleDetail(record)">详情</a>
+          <!-- <a @click="viewDetail(props.rowId)">详情</a>-->
-          <a-divider type="vertical" />
+          <!-- <a-divider type="vertical"/>-->
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm title="确定删除吗？" @confirm="handleDelete(props.rowId)">
             <a>删除</a>
           </a-popconfirm>
-        </span>
+        </template>
+      </j-vxe-table>
 
-      </a-table>
     </div>
 
-    <fieldx-modal ref="modalForm" @ok="modalFormOk"></fieldx-modal>
+  </a-modal>
-  </a-card>
 </template>
 
 <script>
@@ -113,141 +64,188 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import FieldxModal from './modules/FieldxModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import {JVXETypes} from '@/components/jeecg/JVxeTable'
+  import {filterObj} from '@/utils/util'
+  import moment from "dayjs";
+  import { httpAction, getAction } from '@/api/manage'
 
   export default {
     name: 'FieldxList',
     mixins: [JeecgListMixin, mixinDevice],
-    components: {
+    components: {},
-      FieldxModal
-    },
     data() {
       return {
         description: '字段管理管理页面',
-        loadRouteType:false,
+        tableid:'',
-        tableId:'',
+        tablename:'',
-        // 表头
+        visible: false,
-        columns: [
+        confirmLoading: false,
-          {
+        // 工具栏的按钮配置
-            title: '#',
+        toolbarConfig: {
-            dataIndex: '',
+          // add 新增按钮；remove 删除按钮；clearSelection 清空选择按钮
-            key:'rowIndex',
+          btn: ['add'],
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'对应实体',
-            align:"center",
-            dataIndex: 'tableId_dictText'
         },
-          {
+        // 是否正在加载
-            title:'中文名称',
+        loading: false,
-            align:"center",
+        // 分页器参数
-            dataIndex: 'fieldName'
+        pagination: {
+          // 当前页码
+          current: 1,
+          // 每页的条数
+          pageSize: 10,
+          // 可切换的条数
+          pageSizeOptions: ['10', '20', '30', '100', '200'],
+          // 数据总数（目前并不知道真实的总数，所以先填写0，在后台查出来后再赋值）
+          total: 0,
+          showQuickJumper: true,
+          showSizeChanger: true,
+          id: null
         },
+        // 开启 reload 数据效果
+        reloadEffect:true,
+        // 表头
+        columns: [
+          /*关于样式宽度布局
+          如果留行号和可选择行的话 宽度得留给它12% 也就是还省88%的宽度
+          关于插槽 每个按钮留10%的宽度 如果有两个按钮 宽度就设为20% 按钮一般就两个字
+           */
+          // {
+          //   title: '', width: '100px', fixed: 'left', key: '',
+          //   type: JVXETypes.normal,
+          //   placeholder: '请输入${title}',
+          //   disabled: true,
+          // },
           {
-            title:'英文名称',
+            key: 'tableId_dictText', title: '对应实体', width: '6%',
-            align:"center",
+            type: JVXETypes.normal,
-            dataIndex: 'fieldEnName'
+            disabled: true,
+            defaultValue:this.tablename,
           },
           {
-            title:'数据类型',
+            key: 'fieldName', title: '中文名称', width: '6%',
-            align:"center",
+            type: JVXETypes.input,
-            dataIndex: 'type_dictText'
+            validateRules: [{required: true, message: '${title}不能为空'}]
           },
           {
-            title:'数据长度',
+            key: 'fieldEnName', title: '英文名称', width: '6%',
-            align:"center",
+            type: JVXETypes.input,
-            dataIndex: 'length'
+            validateRules: [{required: true, message: '${title}不能为空'}]
           },
           {
-            title:'浮点精度',
+            key: 'type', title: '数据类型', width: '6%',
-            align:"center",
+            type: JVXETypes.selectSearch,
-            dataIndex: 'accuracy'
+            dictCode:'date_type',
+            validateRules: [{required: true, message: '${title}不能为空'}]
           },
           {
-            title:'显示形式',
+            key: 'accuracy', title: '浮点精度', width: '6%',
-            align:"center",
+            type: JVXETypes.inputNumber,
-            dataIndex: 'format'
           },
           {
-            title:'是否主键',
+            key: 'format', title: '显示形式', width: '6%',
-            align:"center",
+            type: JVXETypes.textarea,
-            dataIndex: 'isPk_dictText'
           },
           {
-            title:'是否外键',
+            key: 'isPk', title: '是否主键', width: '6%',
-            align:"center",
+            type: JVXETypes.select,
-            dataIndex: 'isFk_dictText'
+            dictCode:'yn',
+            defaultValue:0,
+            validateRules: [{required: true, message: '${title}不能为空'}]
           },
           {
-            title:'关联实体',
+            key: 'isFk', title: '是否外键', width: '6%',
-            align:"center",
+            type: JVXETypes.select,
-            dataIndex: 'associateTable'
+            dictCode:'yn',
+            defaultValue:0,
+            validateRules: [{required: true, message: '${title}不能为空'}]
           },
           {
-            title:'关联字段',
+            key: 'associateTable', title: '关联实体', width: '6%',
-            align:"center",
+            type: JVXETypes.select,
-            dataIndex: 'associateField'
+            dictCode:'tablex,table_name,id',
           },
           {
-            title:'是否为空',
+            key: 'associateField', title: '关联字段', width: '6%',
-            align:"center",
+            type: JVXETypes.select,
-            dataIndex: 'isNull_dictText'
+            options: [],
+            placeholder: '请选择${title}',
           },
           {
-            title:'是否重复',
+            key: 'isNull', title: '是否为空', width: '6%',
-            align:"center",
+            type: JVXETypes.select,
-            dataIndex: 'isUniqueness_dictText'
+            dictCode:'yn',
+            defaultValue:0,
+            validateRules: [{required: true, message: '${title}不能为空'}]
           },
           {
-            title:'字段规则',
+            key: 'isUniqueness', title: '是否重复', width: '6%',
-            align:"center",
+            type: JVXETypes.select,
-            dataIndex: 'rule',
+            dictCode:'yn',
-            scopedSlots: {customRender: 'htmlSlot'}
+            defaultValue:0,
+            validateRules: [{required: true, message: '${title}不能为空'}]
           },
           {
-            title:'字段状态',
+            key: 'rule', title: '字段规则', width: '6%',
-            align:"center",
+            type: JVXETypes.textarea,
-            dataIndex: 'status_dictText'
           },
           {
-            title:'版本状态',
+            key: 'status', title: '字段状态', width: '6%',
-            align:"center",
+            type: JVXETypes.select,
-            dataIndex: 'verisonStatus_dictText'
+            dictCode:'a_status',
+            defaultValue:1,
+            validateRules: [{required: true, message: '${title}不能为空'}]
           },
           {
-            title:'版本号',
+            key: 'verisonStatus', title: '版本状态', width: '6%',
-            align:"center",
+            type: JVXETypes.select,
-            dataIndex: 'verison'
+            dictCode:'verison_status',
+            defaultValue:1,
+            validateRules: [{required: true, message: '${title}不能为空'}]
           },
+          // {
+          //   key: 'verison', title: '版本号', width: '18%',
+          //   type: JVXETypes.input,
+          //   dictCode:'yn',
+          // },
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align: "center",
+          //   fixed: "right",
+          //   width: 147,
+          //   scopedSlots: {customRender: 'action'}
+          // }
           {
             title: '操作',
-            dataIndex: 'action',
+            key: 'action',
-            align:"center",
+            type: JVXETypes.slot,
-            fixed:"right",
+            fixed: 'right',
-            width:147,
+            // 对齐方式为居中
-            scopedSlots: { customRender: 'action' }
+            align: 'center',
+            minWidth: '6%',
+            slotName: 'action',
           }
         ],
         url: {
+          add: "/fieldx/fieldx/add",
+          edit: "/fieldx/fieldx/edit",
           list: "/fieldx/fieldx/list",
           delete: "/fieldx/fieldx/delete",
           deleteBatch: "/fieldx/fieldx/deleteBatch",
           exportXlsUrl: "/fieldx/fieldx/exportXls",
           importExcelUrl: "fieldx/fieldx/importExcel",
+          getFieldByTableId:"/fieldx/fieldx/getFieldByTableId",
 
         },
         dictOptions: {},
         superFieldList: [],
+        //参数
+        loadRouteType: false,
+
       }
     },
     created() {
-      this.loadParameter();
       this.getSuperFieldList();
-      this.searchQuery();
     },
     computed: {
       importExcelUrl: function () {
@@ -255,29 +253,173 @@
       },
     },
     methods: {
-      initDictConfig(){
+      submitForm(props) {
+        this.model = Object.assign({}, props);
+        var str = props.rowId;
+        let httpurl = '';
+        let method = '';
+        if (str.search("row") !== -1) {
+          props.row.id ='';
+          httpurl += this.url.add;
+          method = 'post';
+        } else {
+          httpurl += this.url.edit;
+          method = 'put';
+        }
+        props.row.tableId = this.tableid
+        httpAction(httpurl, props.row, method).then((res) => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$emit('ok');
+          } else {
+            this.$message.warning(res.message);
+          }
+        })
+      },
+      //新增触发事件
+      added(event) {
+        const {type, row, column, value, target} = event
+        this.tableid = this.model.id
+        target.setValues([{
+          rowKey: row.id,
+          values: {tableId_dictText: this.model.tableName}
+        }])
+      },
+      //数据发生变化时事件 即 编辑 时同步保存
+      async handleValueChange(event) {
+        //this.submitForm(event)
+        // console.log("//数据发生变化时事件", event);
+        //const str = event.row.id;
+        let httpUrl = this.url.edit;
+        let method = 'put';
+        await httpAction(httpUrl, event.row, method).then((res) => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$emit('ok');
+          } else {
+            this.$message.warning(res.message);
+          }
+        })
+      },
+      // 数据发生变化时
+      valueChange(event){
+        const {type, row, column, value, target} = event
+        if (column.key == "associateTable"){
+          let tableId = row.associateTable
+          // 清空关联字段数据
+          target.setValues([{
+            rowKey: row.id,
+            values: {associateField: ''}
+          }])
+          target.$refs.vxe.columns[11].options = []
+
+          // 调用接口，向选项中传值
+          getAction(this.url.getFieldByTableId, {"tableId": tableId}).then((res) => {
+            if (res.success) {
+              this.fieldxList = res.result.records || res.result;
+              // 从2开始
+              target.$refs.vxe.columns[11].options = this.fieldxList;
+            } else {
+              this.$message.warning(res.message)
+            }
+          });
+        }
+      },
+      edit(record) {
+        this.model = Object.assign({}, record);
+        console.log(this.model)
+        //console.log(topicid);
+        this.queryParam.tableId = this.model.id;
+        this.tableid = this.model.id
+        //console.log(this.queryParam.topicid);
+        this.loadData();
+      },
+      showModal() {
+        this.visible = true;
       },
-      searchReset() {
+      // handleOk(e) {
-        this.tableId = this.$route.query.tableId;
+      //   this.ModalText = 'The modal will be closed after two seconds';
-        this.queryParam ={};
+      //   this.confirmLoading = true;
-        this.queryParam.tableId = this.tableId;
+      //   setTimeout(() => {
-        this.loadData(1);
+      //     this.visible = false;
+      //     this.confirmLoading = false;
+      //   }, 2000);
+      // },
+      handleOk(e) {
+        this.visible = false;
       },
-      searchQuery(){
+      handleCancel(e) {
-        this.tableId = this.$route.query.tableId;
+        console.log('Clicked cancel button');
-        this.queryParam.tableId = this.$route.query.tableId;
+        this.visible = false;
-        this.loadData(1);
+      },
+      initDictConfig() {
       },
       //加载传递参数
       loadParameter() {
-        if (this.loadRouteType == false) {
+        if (this.loadRouteType === false) {
-          this.queryParam.tableId = this.$route.query.tableId;
+          // this.id = this.$route.query.id;
-          this.tableId = this.$route.query.tableId;
+          console.log('this.id -----------------', this.id)
-          console.log(this.queryParam.tableId)
+          //this.styleId = this.id;
+          //this.biaoTi = this.$route.query.styleNames + "款式型号管理";
+          //console.log("**********传递到此层的id：" + this.id);
           this.loadRouteType = true;
-          this.loadData(1);
         }
       },
+      // 加载数据
+      loadData(arg) {
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.pagination.current = 1;
+        }
+        // 调用查询数据接口
+        this.loadParameter();
+        var params = this.getQueryParams1();//查询条件
+        this.loading = true;
+        getAction(this.url.list, params).then(res => {
+          if (res.success) {
+            /*// 后台查询回来的 total，数据总数量
+            this.pagination.total = res.result.total*/
+            // 将查询的数据赋值给 dataSource
+            this.dataSource = res.result.records || res.result;
+            console.log(this.dataSource, 'abc')
+            if (res.result.total) {
+              this.pagination.total = res.result.total;
+            } else {
+              this.pagination.total = 0;
+            }
+            //this.dataSource = res.result.records
+
+          } else {
+            this.$error({title: '主表查询失败', content: res.message})
+          }
+        }).finally(() => {
+          // 这里是无论成功或失败都会执行的方法，在这里关闭loading
+          this.loading = false
+        })
+      },
+      // 当分页参数变化时触发的事件
+      handlePageChange(event) {
+        // 重新赋值
+        this.pagination.current = event.current
+        this.pagination.pageSize = event.pageSize
+        // 查询数据
+        this.loadData()
+      },
+
+      getQueryParams1() {
+        //获取查询条件
+        let sqp = {}
+        if (this.superQueryParams) {
+          sqp['superQueryParams'] = encodeURI(this.superQueryParams)
+          sqp['superQueryMatchType'] = this.superQueryMatchType
+        }
+        var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
+        param.field = this.getQueryField();
+        param.pageNo = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        //param.id = this.id
+        return filterObj(param);
+      },
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'tableId',text:'对应实体',dictCode:'tablex,table_name,id'})

ant-design-vue-jeecg/src/views/fieldx/modules/FieldxForm.vue

@@ -5,7 +5,7 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="对应实体" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tableId">
-              <j-search-select-tag v-model="model.tableId"  dict="tablex,table_name,id" />
+              <j-search-select-tag v-model="model.tableId" placeholder="请选择对应实体" disabled dict="tablex,table_name,id" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -120,6 +120,7 @@
           isUniqueness:'0',
           status:'1',
           verisonStatus:'1',
+          tableId:'',
          },
         labelCol: {
           xs: { span: 24 },
@@ -173,6 +174,7 @@
       },
     },
     created () {
+      this.model.tableId = this.$route.query.tableId;
        //备份model原始值
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },

ant-design-vue-jeecg/src/views/functionx/FunctionxList.vue

@@ -183,7 +183,7 @@
           {
             title:'对应模块',
             align:"center",
-            dataIndex: 'moduleId'
+            dataIndex: 'moduleId_dictText'
           },
           {
             title:'中文名称',

ant-design-vue-jeecg/src/views/rulex/modules/RulexForm.vue

@@ -27,7 +27,7 @@
 
           <a-col :span="24">
             <a-form-model-item label="对应实体" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tableId">
-              <j-dict-select-tag type="list" v-model="model.tableId" :dictCode=table  placeholder="请选择对应实体" @change="ziduan"/>
+              <j-dict-select-tag type="list" v-model="model.tableId" :dictCode=table  placeholder="请选择对应实体" disabled/>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -149,9 +149,10 @@
           add: "/rulex/rulex/add",
           edit: "/rulex/rulex/edit",
           queryById: "/rulex/rulex/queryById",
+            query:'modulex/modulex/queryById',
             sort:'/rulex/rulex/sort'
         },
-         table:'',
+         table:'tablex,table_name,id',
           field:'fieldx,field_name,id',
       }
     },
@@ -163,9 +164,10 @@
     created () {
        //备份model原始值
         this.model.moduleId=this.$route.query.moduleid
-        this.table="tablex,table_name,id,module_id="+this.model.moduleId
+        // this.table="tablex,table_name,id,module_id="+this.model.moduleId
         this.model.functionId=this.$route.query.functionid
         this.sort()
+        this.shiti()
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
     methods: {
@@ -177,6 +179,13 @@
                 console.log(this.model.ruleNo)
             })
         },
+        shiti(){
+            getAction(this.url.query,{id:this.model.moduleId}).then((res)=>{
+                this.model.tableId=res.result.relatedBean
+                this.field="fieldx,field_name,id,table_id="+this.model.tableId;
+                console.log(this.model.tableId,"-----------")
+            })
+        },
         ziduan(){
             this.field="fieldx,field_name,id,table_id="+this.model.tableId;
         },

ant-design-vue-jeecg/src/views/tablex/TablexList.vue

@@ -38,7 +38,7 @@
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -89,7 +89,7 @@
         </template>
 
         <template slot="htmlSlot" slot-scope="text,record">
-          <a @click="tablemanage(record.id)">字段</a>
+          <a @click="viewVid(record)">字段</a>
         </template>
 
         <span slot="action" slot-scope="text, record">
@@ -108,6 +108,7 @@
     </div>
 
     <tablex-modal ref="modalForm" @ok="modalFormOk"></tablex-modal>
+    <FieldxList ref="FieldxList"></FieldxList>
   </a-card>
 </template>
 
@@ -119,6 +120,7 @@
   import TablexModal from './modules/TablexModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
   import JEllipsis from '@/components/jeecg/JEllipsis'
+  import FieldxList from "@/views/fieldx/FieldxList";
 
   export default {
     name: 'TablexList',
@@ -126,6 +128,7 @@
     components: {
       TablexModal,
       JEllipsis,
+      FieldxList,
     },
     data () {
       let ellipsis = (v, l = 20) => (<j-ellipsis value={v} length={l}/>)
@@ -243,11 +246,10 @@
       },
     },
     methods: {
-      tablemanage(tableId) {
+      viewVid(record) {
-        this.$router.push({
+        this.$refs.FieldxList.showModal();
-          path: '/fieldx/FieldxList',
+        this.$refs.FieldxList.edit(record);
-          query: {tableId: tableId}
+        this.$refs.FieldxList.disableSubmit = false;
-        })
       },
       initDictConfig(){
       },

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/functionx/controller/FunctionxController.java

@@ -23,6 +23,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.modulex.entity.Modulex;
+import org.jeecg.modules.modulex.service.IModulexService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -52,6 +54,8 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class FunctionxController extends JeecgController<Functionx, IFunctionxService> {
 	@Autowired
 	private IFunctionxService functionxService;
+	 @Autowired
+	 private IModulexService modulexService;
 
 	/**
 	 * 分页列表查询
@@ -108,6 +112,14 @@ public class FunctionxController extends JeecgController<Functionx, IFunctionxSe
 	@ApiOperation(value="功能管理-添加", notes="功能管理-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody Functionx functionx) {
+		QueryWrapper<Modulex> queryWrapper=new QueryWrapper<>();
+		queryWrapper.eq("id",functionx.getModuleId());
+		Modulex one = modulexService.getOne(queryWrapper);
+		if(one.getRelatedBean()==null){
+			return Result.error("请先为对应模块关联实体！！！");
+		}
+		//感觉不符合逻辑，上级模块如果是已发布，然后新增也是已发布状态，那样发布按钮还有什么用？？
+//		functionx.setWorkStatus(one.getWorkStatus());
 		functionxService.save(functionx);
 		return Result.OK("添加成功！");
 	}
@@ -198,9 +210,9 @@ public class FunctionxController extends JeecgController<Functionx, IFunctionxSe
 	@GetMapping(value = "/bianma")
 	public Result<?> moduleCode(@RequestParam(name="id",required=true) String id) {
 	String s=functionxService.findModuleCode(id);
-	//后期放入返回值中，当前为返回信息
+//	//后期放入返回值中，当前为返回信息
-		System.out.println(s);
+//		System.out.println(s);
-		return Result.OK("编码");
+		return Result.OK(s);
 	}
 	//在主界面判断一下登录角色，对操作栏进行替换
 	 @GetMapping(value = "/loginrole")

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/functionx/entity/Functionx.java

@@ -54,7 +54,7 @@ public class Functionx implements Serializable {
 	/**对应模块id*/
 	@Excel(name = "对应模块id", width = 15)
     @ApiModelProperty(value = "对应模块id")
-  //  @Dict(dictTable = "modulex",dicCode = "id",dicText = "module_name")
+  @Dict(dictTable = "modulex",dicCode = "id",dicText = "module_name")
     private java.lang.String moduleId;
 	/**中文名称*/
 	@Excel(name = "中文名称", width = 15)

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/rulex/controller/RulexController.java

@@ -103,6 +103,15 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
 			return Result.error("功能点错误！！！");
 		}
 		Functionx functionx = functionxMapper.selectById(rulex.getFunctionId());
+		if(functionx.getStartTime()!=null){
+        rulex.setStartTime(functionx.getStartTime());
+		}
+		if(functionx.getSubmitTime()!=null){
+			rulex.setSubmitTime(functionx.getSubmitTime());
+		}
+		if(functionx.getRealDuration()!=null){
+			rulex.setRealDuration(functionx.getRealDuration());
+		}
 		rulex.setManagerUsers(functionx.getManagerUsers());
 		rulex.setWorkStatus(functionx.getWorkStatus());
 		rulexService.save(rulex);

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/controller/FieldxController.java

@@ -1,14 +1,14 @@
 package org.jeecg.modules.fieldx.controller;
 
-import java.util.Arrays;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -76,6 +76,29 @@ public class FieldxController extends JeecgController<Fieldx, IFieldxService> {
 		return Result.OK(pageList);
 	}
 
+	 /**
+	  * 通过实体查询字段
+	  *
+	  */
+	 @AutoLog(value = "字段管理-通过实体查询字段")
+	 @ApiOperation(value="字段管理-通过实体查询字段", notes="字段管理-通过实体查询字段")
+	 @GetMapping(value = "/getFieldByTableId")
+	 public Result<?> getFieldByTableId(@RequestParam(name="tableId",required=true) String tableId) {
+	 	if (tableId != null){
+			List<Fieldx> fieldxList = fieldxService.list(new QueryWrapper<Fieldx>().eq("table_id", tableId));
+			ArrayList<HashMap> hashMaps = new ArrayList<>();
+			for (Fieldx fieldx:fieldxList){
+				HashMap<Object, Object> hashMap = new HashMap<>();
+				hashMap.put("text",fieldx.getFieldName());
+				hashMap.put("value",fieldx.getId());
+				hashMaps.add(hashMap);
+			}
+			return Result.OK(hashMaps);
+		}else return Result.error("未找到数据，请重试");
+
+	 }
+
+
 	/**
 	 *   添加
 	 *
@@ -86,6 +109,30 @@ public class FieldxController extends JeecgController<Fieldx, IFieldxService> {
 	@ApiOperation(value="字段管理-添加", notes="字段管理-添加")
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody Fieldx fieldx) {
+		if(fieldx.getTableId() ==null){
+			return Result.error("未选择相应实体，添加失败");
+		}
+		if(fieldx.getFieldName() ==null){
+			return Result.error("未输入中文名称，添加失败");
+		}
+		if (fieldx.getFieldEnName() == null){
+			return Result.error("未输入英文名称，添加失败");
+		}
+		if (fieldx.getType() == null){
+			return Result.error("未选择数据类型，添加失败");
+		}
+		if (fieldx.getIsNull() == null){
+			return Result.error("未选择是否为空，添加失败");
+		}
+		if (fieldx.getIsUniqueness() == null){
+			return Result.error("未选择是否重复，添加失败");
+		}
+		if (fieldx.getStatus() == null){
+			return Result.error("未选择字段状态，添加失败");
+		}
+		if (fieldx.getVerisonStatus() == null){
+			return Result.error("未选择版本状态，添加失败");
+		}
 		fieldx.setVerison(1);
 		if (fieldx.getAssociateTable() != null && fieldx.getAssociateTable().equals(fieldx.getTableId())){
 			return Result.error("实体不能关联自身，添加失败");
@@ -119,11 +166,32 @@ public class FieldxController extends JeecgController<Fieldx, IFieldxService> {
 	@ApiOperation(value="字段管理-编辑", notes="字段管理-编辑")
 	@PutMapping(value = "/edit")
 	public Result<?> edit(@RequestBody Fieldx fieldx) {
+		if(fieldx.getFieldName() ==null){
+			return Result.error("未输入中文名称，编辑失败");
+		}
+		if (fieldx.getFieldEnName() == null){
+			return Result.error("未输入英文名称，编辑失败");
+		}
+		if (fieldx.getType() == null){
+			return Result.error("未选择数据类型，编辑失败");
+		}
+		if (fieldx.getIsNull() == null){
+			return Result.error("未选择是否为空，编辑失败");
+		}
+		if (fieldx.getIsUniqueness() == null){
+			return Result.error("未选择是否重复，编辑失败");
+		}
+		if (fieldx.getStatus() == null){
+			return Result.error("未选择字段状态，编辑失败");
+		}
+		if (fieldx.getVerisonStatus() == null){
+			return Result.error("未选择版本状态，编辑失败");
+		}
 		if (fieldx.getAssociateTable() != null && fieldx.getAssociateTable().equals(fieldx.getTableId())){
 			return Result.error("实体不能关联自身，编辑失败");
 		}
 		if (fieldx.getTableId() != null){
-			List<Fieldx> fieldxList = fieldxService.list(new QueryWrapper<Fieldx>().eq("table_id", fieldx.getTableId()));
+			List<Fieldx> fieldxList = fieldxService.list(new QueryWrapper<Fieldx>().eq("table_id", fieldx.getTableId()).ne("id",fieldx.getId()));
 			for (Fieldx fieldx1 : fieldxList){
 				if (fieldx1.getFieldName().equals(fieldx.getFieldName())){
 					return Result.error("编辑失败，所属实体已有该中文名称");
@@ -151,8 +219,13 @@ public class FieldxController extends JeecgController<Fieldx, IFieldxService> {
 	@ApiOperation(value="字段管理-通过id删除", notes="字段管理-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		List<Fieldx> fieldxList = fieldxService.list(new QueryWrapper<Fieldx>().eq("associate_field", id));
+		if (!fieldxList.isEmpty()){
+			return Result.error("该字段已被关联，不能删除");
+		}
 		Fieldx fieldx = fieldxService.getById(id);
 		fieldxService.removeById(id);
+//		更新sql语句
 		tablexService.updateSql(fieldx.getTableId(),createSql(fieldx.getTableId()));
 		return Result.OK("删除成功!");
 	}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java

@@ -150,7 +150,15 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
 	@ApiOperation(value="实体表-通过id删除", notes="实体表-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		tablexService.removeById(id);
+		List<Fieldx> fieldxList = fieldxService.list(new QueryWrapper<Fieldx>().eq("table_id", id));
+		if (!fieldxList.isEmpty()){
+			return Result.error("该表内已有字段，不能删除");
+		}
+		List<Fieldx> fieldxList1 = fieldxService.list(new QueryWrapper<Fieldx>().eq("associate_table", id));
+		if (!fieldxList1.isEmpty()){
+			return Result.error("该表已被关联，不能删除");
+		}
+//		tablexService.removeById(id);
 		return Result.OK("删除成功!");
 	}