shj
2022-08-09 3b54a522b60cc50f9867deb3046f55b84aec1b7f
对接
已修改8个文件
189 ■■■■ 文件已修改
src/components/checkTemplate/index.vue 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/equipmentDailog/Dailog.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/contingencyManagement/contingency/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/goalManagement/IncentiveRecording/component/DailogAdd.vue 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/goalManagement/IncentiveRecording/component/DailogSearch.vue 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/goalManagement/IncentiveRecording/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/goalManagement/Incentivestandard/component/DailogAdd.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/goalManagement/performanceAppraisal/component/DailogAq.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/checkTemplate/index.vue
@@ -7,10 +7,7 @@
          <el-col :span="24">
            <el-form ref="ruleFormRef" :inline="true" status-icon>
              <el-form-item>
                <el-input size="default" v-model="listQuery.searchParams.id" placeholder="id"  style="max-width: 215px;"/>
              </el-form-item>
              <el-form-item>
                <el-input size="default" v-model="listQuery.searchParams.teamName" placeholder="队伍名称"  style="max-width: 215px;padding: 0 12px;"/>
                                <el-input size="default" v-model="listQuery.searchParams.teamName" placeholder="队伍名称" style="max-width: 215px; padding: 0 12px" />
              </el-form-item>
              <el-form-item>
                <el-button size="default" type="primary" @click="onSubmit">查询</el-button>
@@ -19,15 +16,10 @@
            </el-form>
          </el-col>
          <el-col :span="24">
            <el-button size="default" :icon="Delete" style="margin-top: 15px;" @click="submitReset">清除选择</el-button>
                        <el-button size="default" :icon="Delete" style="margin-top: 15px" @click="submitReset">清除选择</el-button>
          </el-col>
        </el-row>
        <el-table
            :data="tableData"
            ref="multipleTableRef"
            style="width: 100%;margin-top:20px"
            @selection-change="handleSelectionChange"
        >
                <el-table :data="tableData" ref="multipleTableRef" style="width: 100%; margin-top: 20px" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="55" v-if="types==0">
            <template #default="scope" v-if="types!=0">
              <el-radio-group v-model="radio1">
@@ -75,27 +67,17 @@
  </el-dialog>
</template>
<script lang="ts">
import {
  defineComponent,
  reactive,
  ref,
  onMounted,
} from 'vue';
import {
  Delete,
  FullScreen
} from '@element-plus/icons-vue';
import {
  ElMessage,
} from 'element-plus';
import {contingencyApi} from "/@/api/contingencyManagement/contingency";
import { defineComponent, reactive, ref, onMounted } from 'vue';
import { Delete, FullScreen } from '@element-plus/icons-vue';
import { ElMessage } from 'element-plus';
import { contingencyApi } from '/@/api/contingencyManagement/contingency';
export default defineComponent({
  setup(props, { emit }) {
    const types=ref()
        const types = ref();
    const dialogVisible = ref<boolean>(false);
    const openDailog = (type:any) => {
      types.value=type
            types.value = type;
      dialogVisible.value = true;
      // onSubmit();
    };
@@ -104,13 +86,12 @@
      pageIndex: 1,
      pageSize: 10,
      searchParams: {
        teamName: "",
        id: "",
      }
                teamName: '',
            },
    });
    // 列表数据请求
    const onSubmit = async () => {
      let res = await contingencyApi().getTeamManagementList(listQuery)
            let res = await contingencyApi().getTeamManagementList(listQuery);
      if(res.data.code === '200'){
        tableData.value = res.data.data;
        pageIndex.value = res.data.pageIndex;
@@ -120,28 +101,27 @@
        ElMessage({
          showClose: true,
          type:'error',
          message:res.data.msg
        })
                    message: res.data.msg,
                });
      }
    }
        };
    const submitForm = () => {
      if(types.value==0){
        emit('SearchUser',dynamicTags.value,types.value);
      }
      else {
            } else {
        emit('SearchUser',dynamicTags.value[0],types.value);
      }
      dialogVisible.value = false;
    };
    const handleSelectionChange = (val:any) => {
      dynamicTags.value=val
    }
            dynamicTags.value = val;
        };
    // 重置
    const submitReset = () => {
      listQuery.searchParams.teamName = '';
      listQuery.searchParams.id = '';
      radio1.value=""
      dynamicTags.value[0]=""
            radio1.value = '';
            dynamicTags.value[0] = '';
      onSubmit();
    };
    // 表格
@@ -157,7 +137,7 @@
    const handleCurrentChange = (val: number) => {
      listQuery.pageIndex = val;
      onSubmit();
    }
        };
    // 右方点击添加后显示标签
    const dynamicTags = ref(['']);
    const handleClose = (tag: string) => {
@@ -166,7 +146,7 @@
    };
    const radio1 = ref('');
    const radio = (event: any) => {
      console.log(event)
            console.log(event);
      dynamicTags.value[0] = event;
    };
    onMounted(() => {
src/components/equipmentDailog/Dailog.vue
@@ -461,7 +461,6 @@
      repaireDetailList: [],
      equipmentTypeId: 1,
      equipmentTypeId: "",
      equipmentTypeName:"",
src/views/contingencyManagement/contingency/index.vue
@@ -7,7 +7,7 @@
            <el-input size="default" v-model="listQuery.searchParams.teamName" placeholder="队伍名称"> </el-input>
          </el-form-item>
          <el-form-item>
            <el-select size="default" v-model="listQuery.searchParams.teamType" placeholder="请选择队伍级别">
            <el-select size="default" v-model="listQuery.searchParams.teamLevel" placeholder="请选择队伍级别">
              <el-option label="公司" value="1"></el-option>
              <el-option label="分厂-车间" value="2"></el-option>
              <el-option label="工序-班组等" value="3"></el-option>
@@ -170,7 +170,7 @@
      pageSize: 10,
      searchParams: {
        teamName: "",
        teamType: "",
        teamLevel: "",
      }
    })
    // 定义表格数据
@@ -194,7 +194,7 @@
    // 重置
    const submitReset = () => {
      listQuery.searchParams.teamName = '';
      listQuery.searchParams.teamType = '';
      listQuery.searchParams.teamLevel = '';
      onSubmit();
    };
    const warning = ref(true);
src/views/goalManagement/IncentiveRecording/component/DailogAdd.vue
@@ -5,8 +5,8 @@
            <el-row>
                <el-col :span="24">
                    <el-form-item label="员工姓名" size="default">
                        <el-input v-model="form.personId" placeholder="请选择">
                            <template #append> <el-button :icon="Search" @click="daiInpts" /> </template
                        <el-input v-model="form.personName" placeholder="请选择">
                            <template #append> <el-button :icon="Search" @click="daiInpts(0)" /> </template
                        ></el-input>
                    </el-form-item>
                </el-col>
@@ -14,31 +14,34 @@
            <el-row>
                <el-col :span="11">
                    <el-form-item label="奖惩名称" size="default">
                        <el-input v-model="form.rewardPunishmentStandardId" placeholder="请选择">
                        <el-input v-model="form.rewardPunishmentStandardName" placeholder="请选择">
                            <template #append> <el-button :icon="Search" @click="daiInpt" /> </template
                        ></el-input>
                    </el-form-item>
                </el-col>
                <!-- <el-col :span="11" :offset="2">
                <el-col :span="11" :offset="2" >
                    <el-form-item label="奖惩类型" size="default">
                        <el-input disabled v-model="form.personId" />
                        <el-select v-model="form.standardType" disabled size="default" style="width: 100%" placeholder="请选择">
                            <el-option label="奖励" :value="1" />
                            <el-option label="惩罚" :value="2" />
                        </el-select>
                    </el-form-item>
                </el-col> -->
                </el-col>
            </el-row>
            <!-- <el-row>
            <el-row>
                <el-col :span="24">
                    <el-form-item label="奖惩内容" size="default">
                        <el-input disabled v-model="form.personId" placeholder="请填写奖惩内容" />
                        <el-input disabled v-model="form.content" placeholder="请填写奖惩内容" />
                    </el-form-item>
                </el-col>
            </el-row>
            <el-row>
                <el-col :span="24">
                    <el-form-item label="依据" size="default">
                        <el-input disabled v-model="form.personId" placeholder="请填写奖惩依据" />
                        <el-input disabled v-model="form.reason" placeholder="请填写奖惩依据" />
                    </el-form-item>
                </el-col>
            </el-row> -->
            </el-row>
            <el-row>
                <el-col :span="24">
                    <el-form-item label="备注信息">
@@ -50,7 +53,7 @@
        <template #footer>
            <span class="dialog-footer">
                <el-button @click="resetForm" size="default">关闭</el-button>
                <el-button type="primary" @click="submitForm" size="default">确定</el-button>
                <el-button type="primary" @click="submitForm" size="default" :disabled="disabled">确定</el-button>
            </span>
        </template>
    </el-dialog>
@@ -70,22 +73,27 @@
        const dialogVisible = ref<boolean>(false);
        const form = ref({
            rewardPunishmentStandardId: '', //奖惩标准/外键
            rewardPunishmentStandardName: '',
            memo: '', ////备注信息
            personId: "", ////员工(多个用逗号隔开)
            personId: '', ////员工(多个用逗号隔开)
            personName: '',
        });
        const titles = ref();
        const disabled = ref(false);
        // 打开弹窗
        const openDailog = (title: string, value: any, id: number) => {
        const openDailog = (title: string, value: any, data: any) => {
            dialogVisible.value = true;
            titles.value = `${title}奖惩标准设定`;
            disabled.value = title == '查看' ? true : false;
            if (title == '查看' || title == '修改')
                goalManagementApi()
                    .getrewardPunishmentDetail(id)
                    .getrewardPunishmentDetail(data.id)
                    .then((res) => {
                        if (res.data.code == 200) {
                            form.value = res.data.data;
                            form.value.standardType = data.standardType;
                            form.value.content = data.content;
                            form.value.reason = data.reason;
                        } else {
                            ElMessage.error(res.data.msg);
                        }
@@ -109,8 +117,10 @@
                });
            form.value = {
                rewardPunishmentStandardId: '', //奖惩标准/外键
                rewardPunishmentStandardName: '',
                memo: '', ////备注信息
                personId: "", ////员工(多个用逗号隔开)
                personId: '', ////员工(多个用逗号隔开)
                personName: '',
            };
        };
        //   取消
@@ -118,8 +128,10 @@
            dialogVisible.value = false;
            form.value = {
                rewardPunishmentStandardId: '', //奖惩标准/外键
                rewardPunishmentStandardName: '',
                memo: '', ////备注信息
                personId: "", ////员工(多个用逗号隔开)
                personId: '', ////员工(多个用逗号隔开)
                personName: '',
            };
        };
@@ -129,16 +141,27 @@
            Shows.value.openDailog();
        };
        const Show = ref();
        const daiInpts = () => {
            Show.value.openDailog();
        const daiInpts = (type: any) => {
            Show.value.openDailog(type);
        };
        const numberId=(val:any)=>{
            console.log(val)
            form.value.rewardPunishmentStandardId=val.id
        }
            console.log(val);
            form.value.rewardPunishmentStandardId = val.id;
            form.value.rewardPunishmentStandardName = val.qname;
            form.value.standardType = val.standardType;
            form.value.content = val.content;
            form.value.reason = val.reason;
        };
        const UserId=(val:any)=>{
            form.value.personId=val.id
            let arr = [];
            let arrId = [];
            for (let i = 0; i < val.length; i++) {
                arr.push(val[i].realName);
                arrId.push(val[i].uid);
        }
            form.value.personName = arr.toString();
            form.value.personId = arrId.toString();
        };
        //全屏
        const full = ref(false);
        const toggleFullscreen = () => {
src/views/goalManagement/IncentiveRecording/component/DailogSearch.vue
@@ -24,11 +24,11 @@
                    </el-row>
                </el-form>
                <el-button size="default" :icon="Delete" @click="clear">清除选择</el-button>
                <el-table :data="tableData" style="width: 100%; margin-top: 20px" @cell-click="radio">
                <el-table :data="tableData" style="width: 100%; margin-top: 20px">
                        <el-table-column align="center">
                        <template #default="scope">
                            <el-radio-group v-model="radio1">
                                <el-radio :label="scope.row.id" size="large">{{ null }}</el-radio>
                                <el-radio :label="scope.row.id" @click="radio(scope.row)" size="large">{{ null }}</el-radio>
                            </el-radio-group>
                        </template>
                    </el-table-column>
@@ -117,9 +117,7 @@
            ruleForm.searchParams.standardType = targetType.paneName;
            listApi();
        };
        onMounted(() => {
        });
        onMounted(() => {});
        // const onAddorUpdata = () => {
        //     listApi();
        // };
@@ -139,11 +137,11 @@
            listApi();
        };
        // 打开弹窗
        const dialogVisible=ref(false)
        const dialogVisible = ref(false);
        const openDailog=()=>{
            dialogVisible.value=true
            dialogVisible.value = true;
            listApi();
        }
        };
            // 右方点击添加后显示标签
        const dynamicTags = ref(['']);
        const handleClose = (tag: string) => {
@@ -155,14 +153,14 @@
            dynamicTags.value[0] = event;
        };
        const clear=()=>{
            dynamicTags.value=['']
            radio1.value=""
        }
            dynamicTags.value = [''];
            radio1.value = '';
        };
            const submitForm=()=>{
            let obj=JSON.parse(JSON.stringify(dynamicTags.value))
            emit("backNum",obj[0])
            dialogVisible.value = false
        }
            let obj = JSON.parse(JSON.stringify(dynamicTags.value));
            emit('backNum', obj[0]);
            dialogVisible.value = false;
        };
        //全屏
        const full = ref(false);
        const toggleFullscreen = () => {
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="ruleForm.searchParams.personName" placeholder="请选择被奖惩者">
                            <template #append>
                                <el-button :icon="Search" @click="openSearch" />
                            </template>
@@ -29,7 +29,7 @@
                <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="danger" type="danger" :icon="Delete" plain @click="onDeleteAll">删除 </el-button>
                </div>
                <div>
                    <!-- <el-button size="default" :icon="Download"></el-button>
@@ -50,8 +50,8 @@
                <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>
@@ -229,6 +229,7 @@
        };
        const userId = (val: any) => {
            ruleForm.searchParams.personId = val.uid;
            ruleForm.searchParams.personName = val.realName;
        };
        return {
            timeDate,
src/views/goalManagement/Incentivestandard/component/DailogAdd.vue
@@ -6,8 +6,8 @@
                <el-col :span="11">
                    <el-form-item label="奖惩类型" size="default">
                        <el-select v-model="form.standardType" style="width: 100%" placeholder="请选择">
                            <el-option label="奖励" value="1" />
                            <el-option label="惩罚" value="2" />
                            <el-option label="奖励" :value="1" />
                            <el-option label="惩罚" :value="2" />
                        </el-select>
                    </el-form-item>
                </el-col>
@@ -40,7 +40,7 @@
        <template #footer>
            <span class="dialog-footer">
                <el-button @click="resetForm" size="default">关闭</el-button>
                <el-button type="primary" @click="submitForm" size="default">确定</el-button>
                <el-button type="primary" @click="submitForm" size="default" :disabled="disabled">确定</el-button>
            </span>
        </template>
    </el-dialog>
src/views/goalManagement/performanceAppraisal/component/DailogAq.vue
@@ -115,7 +115,11 @@
        <el-table :data="tableData" style="width: 100%">
            <el-table-column align="center" prop="date" label="考核项目" />
            <el-table-column align="center" prop="name" label="考核内容" />
            <el-table-column align="center" prop="address" label="考核分数" />
            <el-table-column align="center" label="考核分数">
                <template #default="scope">
                <el-input v-model="scope.row.address" type="textarea"> </el-input>
                </template>
            </el-table-column>
            <!-- <el-table-column align="center" prop="address" label="制定日期" />
            <el-table-column align="center" prop="address" label="上报人" />
            <el-table-column align="center" label="操作">
@@ -279,7 +283,7 @@
            if (type == 1) {
                form.value.examinePersonId = val.uid;
                form.value.examinePersonName = val.realName;
            } else if (type == 2) {
            } else if (type == 0) {
                let uid=[]
                let realName=[]
                for(let i=0;i<val.length;i++){