ZQ/laws-sinotruk-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/secondStage' into secondStage

Browse Source
This commit is contained in:
赵霄
2023-12-13 15:13:42 +08:00
parent 5a8055622c 4a285124d3
commit 1e05f4a155
3 changed files with 56 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/user/Login.vue
+18 -18
View File
@@ -37,7 +37,7 @@
</a-col>
<a-col :span="3"></a-col>
</a-row>
<a-row style="margin-bottom: 0;">
<a-row style="margin-bottom: 2%;">
<a-col :span="3"></a-col>
<a-col :span="12">
<a-form-item>
@@ -58,22 +58,22 @@
</a-col>
<a-col :span="3"></a-col>
</a-row>
<a-row style="margin-bottom: 2%;">
<a-col :span="3"></a-col>
<a-col :span="7">
<a-form-item>
<a-checkbox v-decorator="['rememberMe', {initialValue: true, valuePropName: 'checked'}]">自动登录</a-checkbox>
</a-form-item>
</a-col>
<a-col :span="6"></a-col>
<a-col :span="5" style="text-align: right;color: #1891FF;">
<a-form-item>
<router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">
忘记密码
</router-link>
</a-form-item>
</a-col>
</a-row>
<!--<a-row style="margin-bottom: 2%;">-->
<!-- <a-col :span="3"></a-col>-->
<!-- <a-col :span="7">-->
<!-- <a-form-item>-->
<!-- <a-checkbox v-decorator="['rememberMe', {initialValue: true, valuePropName: 'checked'}]">自动登录</a-checkbox>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :span="6"></a-col>-->
<!-- <a-col :span="5" style="text-align: right;color: #1891FF;">-->
<!-- <a-form-item>-->
<!-- <router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">-->
<!-- 忘记密码-->
<!-- </router-link>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!--</a-row>-->
<a-row class="login-btn">
<a-col :span="3"></a-col>
<a-col :span="18">
@@ -430,7 +430,7 @@ function isMobile () {
.user-layout-login{
z-index: 99;
width: 24%;
height: 59%;
height: 50%;
padding: 3% 0 3% 0;
min-width: 332px;
min-height: 460px;
src/views/workCenter/standardPromotionProcess/modules/BaseInfoForm.vue
+7 -5
View File
@@ -138,7 +138,7 @@
</div>
<a-form-model-item class="item-model" prop="initiator">
<user-selection :placeholder="$t('pleaseEnter')+$t('workCenter.standardPromotionProcess.contactPerson')"
type="checkbox" :nameStr="initiatorName" :disabled="disabledInitiator" :show-btn="!disabledInitiator"
type="checkbox" :nameStr="initiatorName"
v-model="formInline.initiator" />
</a-form-model-item>
</div>
@@ -297,11 +297,13 @@ export default {
changeParticipatingUnits (val) {
getLiaisonList({ deptIds: val }).then(res => {
if (res.success) {
const data = res.result || ''
const data = res.result || []
const ids = data.map(item => item.contactId).join(',')
const names = data.map(item => item.contactIdDictText).join(',')
// 如果是清空，设置禁用，否则根据返回内容设置禁用
this.disabledInitiator = val ? !!data : true
this.initiatorName = data
this.$set(this.formInline, 'initiator', data)
this.disabledInitiator = val ? !!ids : true
this.initiatorName = names
this.$set(this.formInline, 'initiator', ids)
}
})
}