Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut

shj

2022-08-09 c64c8f43ec1a3d88feb1f915fd488040b6358e7d

 src/views/goalManagement/targetDecompositionYear/index.vue

@@ -36,7 +36,7 @@
                  <div class="tableC">
                     <el-tabs v-model="activeNames">
                        <el-tab-pane label="目标指标分解" name="1">
                           <el-table :data="targetDivideDetailList" style="width: 100%">
                           <el-table :data="tableData.targetDivideDetailList" style="width: 100%">
                              <el-table-column align="center" prop="dutyDepartmentId" label="责任部门" />
                              <el-table-column align="center" prop="value" label="考核指标" />
                              <el-table-column align="center" prop="makerDepartmentId" label="制定人部门" />
@@ -66,13 +66,13 @@
               v-model:page-size="pageSize4"
               :page-sizes="[10, 20, 30, 40]"
               layout="total, sizes, prev, pager, next, jumper"
               :total="400"
               :total="total"
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
            />
         </div>
      </div>
      <Dailog ref="Show"></Dailog>
      <Dailog ref="Show" @addList="add"></Dailog>
   </div>
</template>
<script lang="ts">
@@ -140,6 +140,8 @@
      };
      // 删除
      const onDelete = (id: number) => {
         let arr=[]
         arr.push(id)
         ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
            confirmButtonText: '确定',
            cancelButtonText: '取消',
@@ -147,7 +149,7 @@
         })
            .then(() => {
               goalManagementApi()
                  .getTargetMngDelete(id)
                  .getTargetMngDelete(arr)
                  .then((res) => {
                     if (res.data.code == 200) {
                        ElMessage({
@@ -177,7 +179,7 @@
         for (let i = 0; i < valId.length; i++) {
            arr.push(valId[i].id);
         }
         deletAll.value = arr.toString();
         deletAll.value = arr
         if (val.length == 1) {
            warning.value = false;
            danger.value = false;
@@ -217,8 +219,12 @@
               });
            });
      };
      const add=()=>{
         listApi()
      }
      return {
         listApi,
         add,
         resetForm,
         tableData,
         currentPage4,