kubbo/dvcp_v2_wxcp_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
aixianling
2021-12-24 17:35:28 +08:00
parent f4fcd97297 15e60c3175
commit 310ed2e392
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/apps/AppWorkonline/Detail.vue
View File

@@ -162,10 +162,10 @@
</div> </div>
</div> </div>
<!-- <div v-if="item.candidateFieldInfos" v-for="(item2, inde2) in item.candidateFieldInfos" :key="inde2"> <div v-for="(item2, inde2) in item.candidateFieldInfos" :key="inde2" v-if="item.candidateFieldInfos">
<span>{{ item2.fieldName }}&nbsp;:&nbsp;</span> <span>{{ item2.fieldName }}&nbsp;:&nbsp;</span>
<span>{{ item2.fieldValue }}</span> <span>{{ item2.fieldValue }}</span>
</div> --> </div>
<!-- <div v-for="(item4, indexsss) in stepList" :key="indexsss"> <!-- <div v-for="(item4, indexsss) in stepList" :key="indexsss">
<span>{{ item4.fieldName }}&nbsp;:&nbsp;</span> <span>{{ item4.fieldName }}&nbsp;:&nbsp;</span>

6
src/apps/AppWorkonline/Opinion.vue
View File

@@ -21,7 +21,7 @@
<!-- 同意意见 --> <!-- 同意意见 -->
<div v-if="type == 1"> <div v-if="type == 1">
<div class="list" v-for="(item, index) in list" :key="index"> <div class="list" v-for="(item, index) in list" :key="index">
<div class="textarea_msgfont" v-if="item.fieldDataType == 1"> <div class="textarea_msgfont" v-if="item.fieldType == 3">
<span class="msgfont"> <span class="msgfont">
<span class="icon" v-if="item.mustFill == 1">*</span> <span class="icon" v-if="item.mustFill == 1">*</span>
<span> {{ item.fieldName }}:</span> <span> {{ item.fieldName }}:</span>
@@ -29,14 +29,14 @@
<textarea :maxlength="150" placeholder="请输入审批意见" v-model="item.fieldValue" class="textarea" clearable="false"> </textarea> <textarea :maxlength="150" placeholder="请输入审批意见" v-model="item.fieldValue" class="textarea" clearable="false"> </textarea>
<div class="clearns" @click="clearn">清空内容</div> <div class="clearns" @click="clearn">清空内容</div>
<div class="msg_length"> <div class="msg_length">
<span class="font">{{ item.fieldValue.length }}</span> <span class="font">{{ item.fieldValue && item.fieldValue.length }}</span>
<span>/{{ item.fieldLength }}</span> <span>/{{ item.fieldLength }}</span>
</div> </div>
</div> </div>
<!-- 入户调查时间 --> <!-- 入户调查时间 -->
<!-- v-if="item.fieldType == 3 && item.fieldDataType == 8" .--> <!-- v-if="item.fieldType == 3 && item.fieldDataType == 8" .-->
<div class="calendar" v-if="item.fieldDataType == 8"> <div class="calendar" v-if="item.fieldType == 5">
<div class="left"> <div class="left">
<span class="icon" v-if="item.mustFill == 1">*</span> <span class="icon" v-if="item.mustFill == 1">*</span>
<span> {{ item.fieldName }}:</span> <span> {{ item.fieldName }}:</span>

4
src/apps/AppWorkonline/detail.vue
View File

@@ -162,10 +162,10 @@
</div> </div>
</div> </div>
<!-- <div v-if="item.candidateFieldInfos" v-for="(item2, inde2) in item.candidateFieldInfos" :key="inde2"> <div v-for="(item2, inde2) in item.candidateFieldInfos" :key="inde2" v-if="item.candidateFieldInfos">
<span>{{ item2.fieldName }}&nbsp;:&nbsp;</span> <span>{{ item2.fieldName }}&nbsp;:&nbsp;</span>
<span>{{ item2.fieldValue }}</span> <span>{{ item2.fieldValue }}</span>
</div> --> </div>
<!-- <div v-for="(item4, indexsss) in stepList" :key="indexsss"> <!-- <div v-for="(item4, indexsss) in stepList" :key="indexsss">
<span>{{ item4.fieldName }}&nbsp;:&nbsp;</span> <span>{{ item4.fieldName }}&nbsp;:&nbsp;</span>