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-31 17:23:53 +08:00
parent 9f12e9ba78 f67270ae45
commit 30c83de28c
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/apps/AppSpecialPeople/add.vue
View File

@@ -5,7 +5,7 @@
<span class="label"><span class="tips">*</span>类型</span> <span class="label"><span class="tips">*</span>类型</span>
<div class="value" @click="showType=true"> <div class="value" @click="showType=true">
<span :class="appId ? '' : 'color-999'">{{appName}}</span> <span :class="appId ? '' : 'color-999'">{{appName}}</span>
<u-icon name="arrow-right" color="#cccccc" :size="24"></u-icon> <u-icon name="arrow-right" color="#cccccc" ></u-icon>
</div> </div>
</div> </div>
<div class="info-content" v-for="(items, indexs) in formDataList" :key="indexs"> <div class="info-content" v-for="(items, indexs) in formDataList" :key="indexs">
@@ -43,7 +43,7 @@
<span class="label"><span class="tips">{{item.mustFill == 1 ? '*' : ''}}</span>{{item.fieldName}}</span> <span class="label"><span class="tips">{{item.mustFill == 1 ? '*' : ''}}</span>{{item.fieldName}}</span>
<div class="value" @click="selectClick(item.fieldDbName, item.dict)"> <div class="value" @click="selectClick(item.fieldDbName, item.dict)">
<span :class="formData[item.fieldDbName] ? '' : 'color-999'">{{$dict.getLabel(item.dict, formData[item.fieldDbName]) || '请选择'}}</span> <span :class="formData[item.fieldDbName] ? '' : 'color-999'">{{$dict.getLabel(item.dict, formData[item.fieldDbName]) || '请选择'}}</span>
<u-icon name="arrow-right area-icon" color="#cccccc" :size="24"></u-icon> <u-icon name="arrow-right area-icon" color="#cccccc" ></u-icon>
</div> </div>
</div> </div>
<!-- 单选radio --> <!-- 单选radio -->
@@ -91,7 +91,7 @@
<span class="label"><span class="tips">{{item.mustFill == 1 ? '*' : ''}}</span>{{item.fieldName}}</span> <span class="label"><span class="tips">{{item.mustFill == 1 ? '*' : ''}}</span>{{item.fieldName}}</span>
<div class="value"> <div class="value">
<AiAreaPicker v-model="formData[item.fieldDbName]" :areaId="user.areaId" :name.sync="formData[item.fieldDbName+'_name']"></AiAreaPicker> <AiAreaPicker v-model="formData[item.fieldDbName]" :areaId="user.areaId" :name.sync="formData[item.fieldDbName+'_name']"></AiAreaPicker>
<u-icon name="arrow-right area-icon" color="#cccccc" :size="24"></u-icon> <u-icon name="arrow-right area-icon" color="#cccccc" ></u-icon>
</div> </div>
</div> </div>
<!-- 人员选择 --> <!-- 人员选择 -->
@@ -106,7 +106,7 @@
formData[item.fieldDbName].length formData[item.fieldDbName].length
}}</em>人 }}</em>人
</template> </template>
<u-icon name="arrow-right" color="#cccccc" :size="24"></u-icon> <u-icon name="arrow-right" color="#cccccc" ></u-icon>
</div> </div>
</div> </div>
<!-- 日期选择 / 日期带时分秒选择 / 时间-时分秒选择 --> <!-- 日期选择 / 日期带时分秒选择 / 时间-时分秒选择 -->
@@ -114,7 +114,7 @@
<span class="label"><span class="tips">{{item.mustFill == 1 ? '*' : ''}}</span>{{item.fieldName}}</span> <span class="label"><span class="tips">{{item.mustFill == 1 ? '*' : ''}}</span>{{item.fieldName}}</span>
<div class="value" @click="dateClick(indexs, index)"> <div class="value" @click="dateClick(indexs, index)">
<span :class="formData[item.fieldDbName] ? '' : 'color-999'">{{formData[item.fieldDbName] || '请选择'}}</span> <span :class="formData[item.fieldDbName] ? '' : 'color-999'">{{formData[item.fieldDbName] || '请选择'}}</span>
<u-icon name="arrow-right area-icon" color="#cccccc" :size="24"></u-icon> <u-icon name="arrow-right area-icon" color="#cccccc" ></u-icon>
</div> </div>
</div> </div>
<u-picker mode="time" v-model="dateShow" :params="deteParams" start-year="2010" @confirm="dateConfirm" >请选择</u-picker> <u-picker mode="time" v-model="dateShow" :params="deteParams" start-year="2010" @confirm="dateConfirm" >请选择</u-picker>

1
src/apps/AppWalkask/selectType.vue
View File

@@ -119,6 +119,7 @@ export default {
res.data.records.map((item) => { res.data.records.map((item) => {
item.isChecked = false item.isChecked = false
}) })
uni.hideLoading()
this.userList = res.data.records this.userList = res.data.records
} }
}) })