15179599649
2024-01-18 a9ff6eff705ba4d25f5e453c78b694a334d62fed
'增加评优理由可为空'
5 files modified
84 ■■■■ changed files
src/views/toAppraising/index.vue 4 ●●● patch | view | raw | blame | history
src/views/toAppraising/toAppraisingfirst.vue 4 ●●●● patch | view | raw | blame | history
src/views/toAppraising/toAppraisingthree.vue 10 ●●●●● patch | view | raw | blame | history
src/views/toAppraising/toAppraisingtwo.vue 64 ●●●● patch | view | raw | blame | history
src/views/toexamine/index.vue 2 ●●●●● patch | view | raw | blame | history
src/views/toAppraising/index.vue
@@ -176,7 +176,7 @@
    onConfirmAwards(select) {
      this.currentValueAwards = select.categoryName;
      this.submitdata.evaluateTaskCategoryName = this.currentValueAwards;
      this.submitdata.evaluateTaskCategoryId=select.id;
      this.submitdata.evaluateTaskCategoryId = select.id;
      this.showPickerAwards = false;
    },
    onConfirm(select) {
@@ -211,8 +211,6 @@
        this.$toast.fail(
          this.poepleinfo.type == 1 ? "请选择推荐部门" : "请选择推荐人员"
        );
      } else if (this.remark == "") {
        this.$toast.fail("请输入推荐理由");
      } else {
        this.disabledsubmit = true;
        if (this.exitindex == null) {
src/views/toAppraising/toAppraisingfirst.vue
@@ -57,7 +57,7 @@
              <tr v-for="(item,index) of this.poepleinfo.jsonArr" :key="index">
                <td width="45px">{{item.userName}}</td>
                <td  width="45px" >{{item.evaluateTaskCategoryName}}</td>
                <td>{{item.remark}}</td>
                <td>{{item.remark==""?'---':item.remark}}</td>
                <td  width="80px"><van-button type="danger" size="mini" @click="editRecommend(item,index)">修改</van-button><van-button type="danger" size="mini" @click="deleteRecommend(index)">删除</van-button></td>
              </tr>
              <tr v-show="this.poepleinfo.jsonArr.length==0">
@@ -68,7 +68,7 @@
              <tr v-for="(item,index) of this.poepleinfo.jsonArr" :key="index">
                <td width="70px">{{item.userName}}</td>
                <td>{{item.evaluateTaskCategoryName}}</td>
                <td>{{item.remark}}</td>
                <td>{{item.remark==""?'---':item.remark}}</td>
              </tr>
            </tbody>
        </table>
src/views/toAppraising/toAppraisingthree.vue
@@ -47,7 +47,7 @@
                <tr  v-for="(item,index) in this.infoData.evaluateCandidateResultVOS" :key="index">
                  <td width="80px">{{item.categoryName}}</td>
                  <td>{{item.userName}}</td>
                  <td>{{item.remark}}</td>
                  <td>{{item.remark==""?"----":item.remark}}</td>
                </tr>
              </tbody>
          </table>
@@ -56,7 +56,7 @@
      </div>
      <van-dialog v-model="show" title="推荐理由" show-cancel-button :beforeClose="chargeBtn">
        <p class="tuiianpeople">推荐人:{{this.temporaryData.userName}}</p>
        <van-field  class="tuiianrematk" v-model="Recommendedreason" rows="3" size='20' autosize type="textarea" placeholder="请输入推荐理由"/>
        <van-field  class="tuiianrematk" v-model="Recommendedreason" rows="3" size='20' autosize type="textarea" placeholder="可在此输入推荐理由"/>
       </van-dialog>
       <van-dialog v-model="cancelshow" title="是否要取消对该人员的投选" show-cancel-button :beforeClose="cancelchargeBtn">
        <p class="tuiianpeople">推荐人:{{this.canceltemporaryData.userName}}</p>
@@ -183,10 +183,7 @@
      // 输入理由关闭之前操作
      chargeBtn(action,done){
        if(action=='confirm'){
          if( this.Recommendedreason==''){
            this.$toast.fail("推荐理由不能为空");
          }else{
            this.Categorylist.forEach((item,index)=>{
          this.Categorylist.forEach((item,index)=>{
            let liiyouDatasub=item;
            if(this.temporaryData.evaluateTaskCategoryId==item.id){
               liiyouDatasub.Voters.forEach((itemin,indexin)=>{
@@ -198,7 +195,6 @@
            }
            this.$set(this.Categorylist,index,liiyouDatasub)
            })
          }
        }
        this.Recommendedreason='';
        this.show=false;
src/views/toAppraising/toAppraisingtwo.vue
@@ -23,12 +23,23 @@
          </van-radio-group>
        </span>
      </p>
      <p class="info" v-show="this.poepleinfo.isVote==false">
        <span>推荐理由:</span>
        <van-field v-model="remark" rows="5" type="textarea" placeholder="请输入推荐理由..." />
      </p>
      <p class="info" v-show="this.poepleinfo.isVote==true">
        <span>推荐部门:</span>
        <span
          v-for="item_resu in this.poepleinfo.evaluateCandidateResultVOS"
          :key="item_resu"
        >{{item_resu.deptName}}</span>
      </p>
      <p class="info" v-show="this.poepleinfo.isVote==true">
        <span>推荐理由:</span>
        <span
          v-for="item_resu in this.poepleinfo.evaluateCandidateResultVOS"
          :key="item_resu"
        >{{item_resu.remark==""?'无':item_resu.remark}}</span>
      </p>
      <div>
        <van-button
@@ -53,6 +64,7 @@
export default {
  data() {
    return {
      remark: "",
      checked: {},
      deptData: [],
      infoData: JSON.parse(this.$route.query.info),
@@ -75,7 +87,6 @@
  methods: {
    //提交
    SubmitTo() {
      console.log(this.checked.deptName);
      if (this.checked.deptName == undefined) {
        this.$toast.success("投选部门不能为空");
      } else {
@@ -83,7 +94,8 @@
        submitData.push({
          evaluateTaskId: this.infoData.id,
          deptId: this.checked.id,
          deptName: this.checked.deptName
          deptName: this.checked.deptName,
          remark: this.remark
        });
        saveBatchCandidateResult(submitData).then(res => {
          setTimeout(() => {
@@ -120,6 +132,10 @@
    .info {
      font-size: 16px;
      line-height: 30px;
      .van-field {
        border-radius: 5px;
        border: 1px solid #dee1e7;
      }
      span:nth-child(1) {
        color: #8894a8;
      }
@@ -179,29 +195,6 @@
        }
      }
    }
    .toin {
      margin-top: 20px;
      [class*="van-hairline"]::after {
        border: none;
      }
      .van-field {
        font-size: 16px;
        font-weight: bold;
        padding: 10px 0px;
      }
      .Reasons {
        font-size: 16px;
        font-weight: bold;
        color: #646566;
        margin-bottom: 10px;
      }
      .van-borderline {
        border: 1px solid #dee1e7;
        font-weight: 100;
        border-radius: 8px;
        padding: 5px;
      }
    }
    .van-button {
      margin: 30px 0px 0px auto;
      width: 120px;
@@ -212,27 +205,6 @@
      justify-content: center;
      background: linear-gradient(163deg, #01bdfc 0%, #017bfc 100%);
      border-radius: 8px;
    }
    .showdetails {
      margin-top: 20px;
      p {
        display: flex;
        align-items: center;
      }
      .title {
        font-size: 16px;
        color: #8894a8;
      }
      .fraction {
        font-size: 18px;
        text-align: center;
        line-height: 30px;
      }
      .instruct {
        font-size: 18px;
        text-align: center;
        line-height: 30px;
      }
    }
  }
}
src/views/toexamine/index.vue
@@ -105,8 +105,6 @@
        };
        if (Data.scoreVal == "") {
          this.$toast.fail("请输入评分");
        } else if (Data.remark == "") {
          this.$toast.fail("请输入评分说明");
        } else {
          this.disabledsubmit = true;
          assessmentScore(Data).then(res => {