Commit 963fa298 by li.jian

修改bug

parent 477de5aa
......@@ -74,7 +74,7 @@ export default {
registerButton: '注册',
rememberMe: '记住我',
forgetPassword: '忘记密码?',
otherSignIn: '其他登录方式',
// otherSignIn: '其他登录方式',
// notify
loginSuccessTitle: '登录成功',
......
......@@ -135,4 +135,3 @@
</script>
\ No newline at end of file
......@@ -21,10 +21,10 @@
{{ button.name }}
</a-button>
<CustomButtonModal v-else-if="button.buttonType == 'modal'" :info="button" />
<a-button v-else :type="button.buttonType === 'danger' ? 'default' : button.buttonType || 'primary'" :danger="button.buttonType === 'danger'" >
<template #icon><Icon :icon="button.icon" /></template>
{{ button.name }}
</a-button>
<!-- <a-button v-else :type="button.buttonType === 'danger' ? 'default' : button.buttonType || 'primary'" :danger="button.buttonType === 'danger'" >-->
<!-- <template #icon><Icon :icon="button.icon" /></template>-->
<!-- {{ button.name }}-->
<!-- </a-button>-->
</template>
</template>
<template #bodyCell="{ column, record }">
......@@ -137,11 +137,6 @@
const filterColumns = filterColumnAuth(columns);
const tableRef = ref();
//展示在列表内的按钮
const actionButtons = ref<string[]>(["view","edit","delete"]);
const buttonConfigs = computed(()=>{
......
......@@ -267,7 +267,7 @@ export const formProps: FormProps = {
popupType: 'associate',
width: '100%',
span: 7,
placeholder: '请产品名称选择',
placeholder: '请选择产品名称',
showLabel: true,
disabled: false,
datasourceType: 'api',
......@@ -927,7 +927,8 @@ export const formProps: FormProps = {
{ key: '3', title: 'Body' },
],
script:
"if(keyword!=null && keyword!=''){\r\n var sql = \"select *,id as value,cpmc as label from mes_base_product_info where delete_mark=0 and cpmc like '%${keyword}%' \";\r\n return db.select(sql)\r\n}\r\nvar sql = 'select *,id as value,cpmc as label from mes_base_product_info where delete_mark=0';\r\nreturn db.select(sql)",
"if(keyword!=null && keyword!=''){\r\n var sql " +
"= \"select *,id as value,cpmc as label from mes_base_product_info where delete_mark=0 and cpmc like '%${keyword}%' \";\r\n return db.select(sql)\r\n}\r\nvar sql = 'select *,id as value,cpmc as label from mes_base_product_info where delete_mark=0';\r\nreturn db.select(sql)",
outputParams: [
{ name: 'cpbh', tableTitle: '编号' },
{ name: 'cpmc', tableTitle: '名称' },
......
......@@ -35,23 +35,23 @@
</template>
</InputPassword>
</FormItem>
<FormItem name="code" class="enter-x" v-if="formData.showCaptcha">
<label class="form-title"> {{ t('验证码') }}</label>
<div style="display: flex">
<Input
size="large"
v-model:value="formData.code"
:placeholder="t('验证码')"
class="fix-auto-fill"
style="height: 58px"
/>
<img
:src="formData.captchaImg"
style="width: 100%; height: 60px; margin-left: 10px"
@click="getImg"
/>
</div>
</FormItem>
<!-- <FormItem name="code" class="enter-x" v-if="formData.showCaptcha">-->
<!-- <label class="form-title"> {{ t('验证码') }}</label>-->
<!-- <div style="display: flex">-->
<!-- <Input-->
<!-- size="large"-->
<!-- v-model:value="formData.code"-->
<!-- :placeholder="t('验证码')"-->
<!-- class="fix-auto-fill"-->
<!-- style="height: 58px"-->
<!-- />-->
<!-- <img-->
<!-- :src="formData.captchaImg"-->
<!-- style="width: 100%; height: 60px; margin-left: 10px"-->
<!-- @click="getImg"-->
<!-- />-->
<!-- </div>-->
<!-- </FormItem>-->
<ARow class="enter-x">
<ACol :span="12">
<FormItem>
......@@ -97,16 +97,16 @@
</ACol>
</ARow> -->
<a-divider class="enter-x">{{ t('其他登录方式') }}</a-divider>
<!-- <a-divider class="enter-x">{{ t('其他登录方式') }}</a-divider>-->
</div>
<!-- <div style="height: 1000px; width: 800px" v-else>
<iframe id="iframeId" style="height: 100%; width: 100%" :src="authorizeUrl"></iframe>
</div> -->
<div class="text-center" :class="`${prefixCls}-sign-in-way`">
<WechatOutlined @click="oauthLogin('wechat_enterprise')" class="methods-icon mr-5" />
<DingdingOutlined @click="oauthLogin('dingtalk')" class="methods-icon" />
</div>
<!-- <div class="text-center" :class="`${prefixCls}-sign-in-way`">-->
<!-- <WechatOutlined @click="oauthLogin('wechat_enterprise')" class="methods-icon mr-5" />-->
<!-- <DingdingOutlined @click="oauthLogin('dingtalk')" class="methods-icon" />-->
<!-- </div>-->
</Form>
<Modal
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment