Merge branch 'dev_2307' of http://182.92.169.222:3000/zhc077/projectManagement into dev_2307

ant-design-vue-jeecg/src/views/modulex/ModulexList.vue

@@ -101,8 +101,8 @@
           <a @click="bugfankui(record)">BUG反馈</a>
           <a-divider type="vertical"/>
 
-<!--          <a @click="shenhe(record)">审核</a>-->
+          <!--          <a @click="shenhe(record)">审核</a>-->
-<!--          <a-divider type="vertical"/>-->
+          <!--          <a-divider type="vertical"/>-->
 
            <a @click="fabu(record)">发布</a>
           <a-divider type="vertical"/>
@@ -116,17 +116,17 @@
 
         <!--功能 开发者-->
         <!--这里只能用v-else-if / v-else 不能用v-if 用了没效果 原因不清楚-->
-<!--        <span v-else slot="actionManage" slot-scope="text, record">-->
+        <!--        <span v-else slot="actionManage" slot-scope="text, record">-->
 
-<!--          <a @click="fabu(record)">发布</a>-->
+        <!--          <a @click="fabu(record)">发布</a>-->
 
-<!--          <a-divider type="vertical"/>-->
+        <!--          <a-divider type="vertical"/>-->
 
-<!--          <a @click="kaishi(record)">开始</a>-->
+        <!--          <a @click="kaishi(record)">开始</a>-->
-<!--          <a-divider type="vertical"/>-->
+        <!--          <a-divider type="vertical"/>-->
 
-<!--          <a @click="tijiao(record)">提交</a>-->
+        <!--          <a @click="tijiao(record)">提交</a>-->
-<!--        </span>-->
+        <!--        </span>-->
 
 
 
@@ -399,14 +399,14 @@ export default {
       // console.log(record)
       let s = null;
       getAction('/tablex/tablex/list', {moduleId: record.id}).then((res) =>{
-         s=res.result.records
+        s=res.result.records
         console.log(s)
         if (s[0]==null){
           this.$message.error("该模块无实体");
         }else{
-        this.$refs.FieldxList.showModal();
+          this.$refs.FieldxList.showModal();
-        this.$refs.FieldxList.edit(s[0]);
+          this.$refs.FieldxList.edit(s[0]);
-        this.$refs.FieldxList.disableSubmit = false;
+          this.$refs.FieldxList.disableSubmit = false;
         }
       })
 

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

@@ -109,11 +109,11 @@ export default {
         sm: { span: 20 },
       },
       labelCol: {
-        xs: { span: 24 },
+        xs: { span: 20 },
         sm: { span: 6 },
       },
       wrapperCol: {
-        xs: { span: 24 },
+        xs: { span: 20 },
         sm: { span: 16 },
       },
 
@@ -253,7 +253,7 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-/deep/.ant-col-24 .ant-form-item .ant-col-xs-24 {
+// /deep/.ant-col-24 .ant-form-item .ant-col-xs-24 {
-  text-align: center;
+//   text-align: center;
-}
+// }
 </style>