Compare commits

..

No commits in common. '97a6cc2ff533542e3985d639f83808dda260a725' and '654e8a910fb9ceb79abac219f72a22f4cd6b4166' have entirely different histories.

  1. 25
      ant-design-vue-jeecg/src/views/functionx/FunctionxList.vue
  2. 7
      ant-design-vue-jeecg/src/views/rulex/RulexList.vue

@ -100,7 +100,16 @@
</span> </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>
@ -128,16 +137,6 @@
<a>删除</a> <a>删除</a>
</a-popconfirm> </a-popconfirm>
</span> </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> </a-table>
</div> </div>
@ -391,11 +390,11 @@
}) })
}, },
loginrole(id){ loginrole(id){
let that = this
getAction(this.url.loginrole,{id:id}).then((res)=>{ getAction(this.url.loginrole,{id:id}).then((res)=>{
if (res.success) { if (res.success) {
// //
that.role=res.result; this.role=res.result;
} }
}) })
}, },

@ -90,7 +90,9 @@
</a-button> </a-button>
</template> </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"> <span slot="action" slot-scope="text, record"v-if="role==1">
<a @click="fuzhi1(record)">复制</a> <a @click="fuzhi1(record)">复制</a>
<a-divider type="vertical" /> <a-divider type="vertical" />
@ -107,9 +109,6 @@
</a-popconfirm> </a-popconfirm>
</span> </span>
<span slot="action" slot-scope="text, record"v-else="">
<a @click="handleDetail(record)">详情</a>
</span>
</a-table> </a-table>
</div> </div>

Loading…
Cancel
Save