冲突

Your Name

2022-08-17 2475c65a3c091cee4fe48f49e0f53697403750df

 src/views/goalManagement/IncentiveRecording/index.vue

@@ -4,7 +4,7 @@
         <el-row>
            <el-col :span="4">
               <el-form-item size="default">
                  <el-input v-model="ruleForm.searchParams.personId" placeholder="请选择被奖惩者">
                  <el-input v-model="personName" placeholder="请选择被奖惩者">
                     <template #append>
                        <el-button :icon="Search" @click="openSearch" />
                     </template>
@@ -28,8 +28,8 @@
         <div class="btns">
            <div>
               <el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>
               <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button>
               <el-button size="default" :disabled="danger" type="danger" :icon="Delete" plain @click="handleSelectionChange">删除 </el-button>
               <!-- <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button> -->
               <el-button size="default" :disabled="danger" type="danger" :icon="Delete" plain @click="onDeleteAll">删除 </el-button>
            </div>
            <div>
               <!-- <el-button size="default" :icon="Download"></el-button>
@@ -45,13 +45,13 @@
                  <span v-if="scope.row.standardType == 2">惩罚</span>
               </template>
            </el-table-column>
            <el-table-column property="personId" align="center" label="被奖惩者" sortable />
            <el-table-column property="personName" align="center" label="被奖惩者" sortable />
            <el-table-column property="content" label="奖惩内容" align="center" sortable show-overflow-tooltip />
            <el-table-column property="reason" label="奖惩依据" align="center" sortable show-overflow-tooltip />
            <el-table-column label="操作" align="center" sortable show-overflow-tooltip>
               <template #default="scope">
                  <el-button link type="primary" size="default" :icon="View" @click="openD('查看', scope.row.id)">查看 </el-button>
                  <el-button link type="primary" size="default" :icon="EditPen" @click="openD('修改', scope.row.id)">修改</el-button>
                  <el-button link type="primary" size="default" :icon="View" @click="openD('查看', scope.row)">查看 </el-button>
                  <el-button link type="primary" size="default" :icon="EditPen" @click="openD('修改', scope.row)">修改</el-button>
                  <el-button link type="primary" size="default" :icon="Delete" @click="onDelete(scope.row.id)">删除 </el-button>
               </template>
            </el-table-column>
@@ -92,8 +92,10 @@
         },
      });
      // 重置
      const personName=ref()
      const resetForm = () => {
         ruleForm.searchParams.personId = '';
           personName.value = '';
         listApi();
      };
      const listApi = () => {
@@ -229,9 +231,11 @@
      };
      const userId = (val: any) => {
         ruleForm.searchParams.personId = val.uid;
         personName.value = val.realName;
      };
      return {
         timeDate,
         personName,
         ruleForm,
         userId,
         resetForm,
@@ -291,4 +295,4 @@
   display: flex;
   justify-content: right;
}
</style>
</style>