|
|
@@ -11,11 +11,11 @@
|
|
|
</view>
|
|
|
</view> -->
|
|
|
|
|
|
- <!-- <picker range-key='label' :value="jcidx" :range="jcList" @change='bindDateChangea'>
|
|
|
+ <!-- <picker range-key='label' :value="jcidx" :range="jblist" @change='bindDateChangea'>
|
|
|
<uni-forms-item label="考核届次" name="boundary" required>
|
|
|
<view class="lbtabp">
|
|
|
<view class="lbtabp">
|
|
|
- <view v-if="datainfo.boundary&&!boundary">{{statusFormat(datainfo.boundary,jcList,'jc')}}</view>
|
|
|
+ <view v-if="datainfo.boundary&&!boundary">{{statusFormat(datainfo.boundary,jblist,'jc')}}</view>
|
|
|
<view v-else :class="boundary?'':'coa'">{{boundary||"请选择考核届次"}}</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -24,7 +24,7 @@
|
|
|
<!-- <uni-forms-item label="考核届次" name="boundary" required>
|
|
|
<view class="lbtabp" @click="getRecorddwFn">
|
|
|
<view class="lbtabp">
|
|
|
- <view v-if="datainfo.boundary&&!boundary">{{statusFormats(datainfo.boundary,jcList,'jc')}}</view>
|
|
|
+ <view v-if="datainfo.boundary&&!boundary">{{statusFormats(datainfo.boundary,jblist,'jc')}}</view>
|
|
|
<view v-else :class="boundary?'':'coa'">{{boundary||"请选择考核届次"}}</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -43,8 +43,8 @@
|
|
|
<picker range-key='label' :value="jflxbidx" :range="jflxList" @change='bindDateChangec'>
|
|
|
<uni-forms-item label="加分类型" name="bonusType" required>
|
|
|
<view class="lbtabp">
|
|
|
- <view v-if="datainfo.bonusType&&!bonusType">{{statusFormat(datainfo.bonusType,jflxList,'jflx')}}</view>
|
|
|
- <view v-else :class="bonusType?'':'coa'">{{bonusType||"请选择加分类型"}}</view>
|
|
|
+ <!-- <view v-if="datainfo.bonusType&&!bonusType">{{statusFormat(datainfo.bonusType,jflxList,'jflx')}}</view> -->
|
|
|
+ <view :class="datainfo.bonusType?'':'coa'">{{datainfo.bonusType||"请选择加分类型"}}</view>
|
|
|
<!-- <view :class="bonusType?'':'coa'">{{bonusType || "请选择加分类型"}}</view> -->
|
|
|
</view>
|
|
|
</uni-forms-item>
|
|
|
@@ -56,31 +56,29 @@
|
|
|
</view>
|
|
|
</uni-forms-item>
|
|
|
</picker> -->
|
|
|
- <uni-forms-item label="加分时间" name="bonusTime" required >
|
|
|
- <!-- <view class="lbtabp" >
|
|
|
- <uni-datetime-picker :border="false" placeholder="请选择加分时间" type="datetime" :clear-icon="false" v-model="datainfo.bonusTime" @maskClick="bindDateChanged" />
|
|
|
- </view> -->
|
|
|
+ <!-- <uni-forms-item label="加分时间" name="bonusTime" required >
|
|
|
<view class="lbtabp">
|
|
|
<uni-datetime-picker v-model="datainfo.bonusTime">
|
|
|
<view :class="datainfo.bonusTime?'':'coa'">{{datainfo.bonusTime || "请选择加分时间"}}</view>
|
|
|
</uni-datetime-picker>
|
|
|
</view>
|
|
|
- </uni-forms-item>
|
|
|
+ </uni-forms-item> -->
|
|
|
|
|
|
<uni-forms-item label="分值" name="score" required>
|
|
|
- <uni-easyinput :inputBorder="false" type="number" v-model="datainfo.score" placeholder="请输入分值" />
|
|
|
+ <view class='lbtabp'>{{datainfo.score}}</view>
|
|
|
+ <!-- <uni-easyinput :inputBorder="false" type="number" v-model="datainfo.score" placeholder="请输入分值" /> -->
|
|
|
</uni-forms-item>
|
|
|
<uni-forms-item label="备注" name="remark">
|
|
|
<uni-easyinput type="textarea" autoHeight :inputBorder="false" v-model="datainfo.remark" placeholder="请输入备注" />
|
|
|
</uni-forms-item>
|
|
|
</view>
|
|
|
- <view class="boxs pdboxa">
|
|
|
+ <view class="boxs pdboxa" style="padding-bottom:34rpx">
|
|
|
<view class="titbox mb20">
|
|
|
<view class="tit flexc">
|
|
|
<view>加分事由</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <textarea placeholder="请输入加分事由…" v-model="datainfo.bonusReason"></textarea>
|
|
|
+ <textarea placeholder="请输入加分事由…" style="min-height:120rpx" autoHeight v-model="datainfo.bonusReason"></textarea>
|
|
|
</view>
|
|
|
<view class="boxs pdbox">
|
|
|
<view class="titbox mb14">
|
|
|
@@ -184,19 +182,21 @@
|
|
|
},
|
|
|
titimg:require("@/work/static/images/titbg.png"),
|
|
|
rimg:require("@/work/static/images/rimg.png"),
|
|
|
+ fjimg:require("@/work/static/images/fjimg.png"),
|
|
|
+ delimg:require("@/work/static/images/delimg.png"),
|
|
|
datainfo:{
|
|
|
// "boundary":"",//考核界次
|
|
|
// "checkType":"",//考核类型
|
|
|
"bonusType":"",//加分类型
|
|
|
"bonusReason":"",//加分事由
|
|
|
- "bonusTime":"",//加分时间
|
|
|
+ // "bonusTime":"",//加分时间
|
|
|
"score":"",//分数
|
|
|
},
|
|
|
rules: {
|
|
|
// boundary: {rules: [{required: true,errorMessage: '请选择考核届次'} ]},
|
|
|
// checkType: {rules: [{required: true,errorMessage: '请选择考核类型'} ]},
|
|
|
bonusType: {rules: [{required: true,errorMessage: '请选择加分类型'} ]},
|
|
|
- bonusTime: {rules: [{required: true,errorMessage: '请选择加分时间'} ]},
|
|
|
+ // bonusTime: {rules: [{required: true,errorMessage: '请选择加分时间'} ]},
|
|
|
score: {rules: [{required: true,errorMessage: '请输入分值'} ]},
|
|
|
bonusReason: {rules: [{required: true,errorMessage: '请输入加分事由'} ]},
|
|
|
},
|
|
|
@@ -205,7 +205,7 @@
|
|
|
tzlbidx:'',
|
|
|
id:'',
|
|
|
editinfo:'',
|
|
|
- jcList:[],
|
|
|
+ jblist:[],
|
|
|
khlxList:[],
|
|
|
jflxList:[],
|
|
|
jcidx:'',
|
|
|
@@ -272,7 +272,7 @@
|
|
|
//界别
|
|
|
// getDictionaryFn('circles').then(res=>{
|
|
|
// if(res.code==200&&res.data.length){
|
|
|
- // this.jcList = res.data.map(v => {
|
|
|
+ // this.jblist = res.data.map(v => {
|
|
|
// return {
|
|
|
// label: v.dictLabel,
|
|
|
// value: v.dictValue
|
|
|
@@ -305,8 +305,8 @@
|
|
|
},
|
|
|
bindDateChangea(e){
|
|
|
var val=e.detail.value;
|
|
|
- this.boundary=this.jcList[val].label;
|
|
|
- this.datainfo.boundary=this.jcList[val].value;
|
|
|
+ this.boundary=this.jblist[val].label;
|
|
|
+ this.datainfo.boundary=this.jblist[val].value;
|
|
|
},
|
|
|
bindDateChangeb(e){
|
|
|
var val=e.detail.value;
|
|
|
@@ -315,8 +315,9 @@
|
|
|
},
|
|
|
bindDateChangec(e){
|
|
|
var val=e.detail.value;
|
|
|
- this.bonusType=this.jflxList[val].label;
|
|
|
- this.datainfo.bonusType=this.jflxList[val].value;
|
|
|
+ // this.bonusType=this.jflxList[val].label;
|
|
|
+ this.datainfo.bonusType=this.jflxList[val].label;
|
|
|
+ this.datainfo.score=this.jflxList[val].value;
|
|
|
},
|
|
|
bindDateChanged(e){
|
|
|
console.log(e,1)
|
|
|
@@ -336,12 +337,12 @@
|
|
|
this.$refs.form.validate().then(res => {
|
|
|
var params=that.datainfo;
|
|
|
params.userId=that.userId;
|
|
|
- var regex = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/;
|
|
|
- var s=regex.test(this.datainfo.bonusTime);
|
|
|
- if(!s){
|
|
|
- that.$toast("请选择完整的时间")
|
|
|
- return
|
|
|
- }
|
|
|
+ // var regex = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/;
|
|
|
+ // var s=regex.test(this.datainfo.bonusTime);
|
|
|
+ // if(!s){
|
|
|
+ // that.$toast("请选择完整的时间")
|
|
|
+ // return
|
|
|
+ // }
|
|
|
if(this.ptype=='add'){
|
|
|
getBonusAddFn(params).then(res=>{
|
|
|
if(res.code==200){
|
zouling