Merge remote-tracking branch 'origin/master'

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

@@ -100,16 +100,7 @@
         </span>
 
 
-        <span slot="action" slot-scope="text, record" v-if="role==2">
+
-        <a @click="fabu(record)" v-if="record.workStatus==0">发布</a>
-           <a  v-else="">已发布</a>
-          <a-divider type="vertical" />
-            <a @click="kaishi(record)">开始</a>
-          <a-divider type="vertical" />
-            <a @click="tijiao(record)">提交</a>
-          <a-divider type="vertical" />
-                <a @click="handleDetail(record)">详情</a>
-        </span>
 
 
 
@@ -137,6 +128,16 @@
                   <a>删除</a>
                 </a-popconfirm>
         </span>
+        <span slot="action" slot-scope="text, record" v-else="">
+        <a @click="fabu(record)" v-if="record.workStatus==0">发布</a>
+           <a  v-else="">已发布</a>
+          <a-divider type="vertical" />
+            <a @click="kaishi(record)">开始</a>
+          <a-divider type="vertical" />
+            <a @click="tijiao(record)">提交</a>
+          <a-divider type="vertical" />
+                <a @click="handleDetail(record)">详情</a>
+        </span>
 
       </a-table>
     </div>
@@ -390,11 +391,11 @@
             })
         },
         loginrole(id){
+            let that = this
             getAction(this.url.loginrole,{id:id}).then((res)=>{
                 if (res.success) {
                     //重新计算分页问题
-                    this.role=res.result;
+                    that.role=res.result;
-
                 }
             })
         },

ant-design-vue-jeecg/src/views/rulex/RulexList.vue

@@ -90,9 +90,7 @@
           </a-button>
         </template>
 
-        <span slot="action" slot-scope="text, record"v-if="role==2">
+
-            <a @click="handleDetail(record)">详情</a>
-        </span>
         <span slot="action" slot-scope="text, record"v-if="role==1">
             <a @click="fuzhi1(record)">复制</a>
             <a-divider type="vertical" />
@@ -109,6 +107,9 @@
                 </a-popconfirm>
 
         </span>
+        <span slot="action" slot-scope="text, record"v-else="">
+            <a @click="handleDetail(record)">详情</a>
+        </span>
 
       </a-table>
     </div>
@@ -263,7 +264,7 @@
     },
     methods: {
         ziduan(){
-            this.field="fieldx,field_name,id,table_id="+this.model.tableId;
+            this.field="fieldx,field_name,id,table_id="+this.queryParam.tableId;
         },
         loginrole(id){
             getAction(this.url.loginrole,{id:id}).then((res)=>{