11131455

src/components/OP/OpInvitationOfficialActivities.vue

@@ -838,7 +838,10 @@ export default {
             })
         },
         //点击保存事件
-        addBtn() {
+        addBtn() { 
+            if (this.uploadFiles.length === 0) {
+                return this.$message.warning('请选取文件后再上传');
+            }
             if(this.InvitationOfficialActivities.payDId!=72){
                 this.InvitationOfficialActivities.ctdId=0;
                 this.InvitationOfficialActivities.bankNo="";

src/components/Resource/OpOfficialActivities.vue

@@ -385,6 +385,14 @@
 </template>
 <script>
 import { pinyin } from 'pinyin-pro';
+var validateBudget = (rule, value, callback) => {
+
+    if (value.split('@')[0].includes('info')) { //不输入或输0.0或0.00时，都进入
+        callback(new Error('请输正确格式！'));
+    }else {
+        callback();
+    }
+}
 export default {
     data() {
         return {
@@ -504,6 +512,7 @@ export default {
                 emailOrWeChat: [
                     { required: true, message: '该信息为必填信息', trigger: 'blur' },
                     { required: true, message: '该信息为必填信息', trigger: 'change' },
+                    {validator: validateBudget, trigger: 'blur'},
                 ],
                 website: [
                     { required: true, message: '该信息为必填信息', trigger: 'blur' },
@@ -766,7 +775,7 @@ export default {
         reqSampleArrli(val){
             console.log(val);
             this.OpOfficialActivitiesDto.reqSample=val.reqSample;
-            this.reqSampleArrpd=false;
+            this.reqSampleArrpd=false; 
         },
         QueryOfficialActivitiesById() {
             var url = "/api/Resource/QueryOfficialActivitiesById"

src/components/Resource/PerformanceT.vue

@@ -1,23 +1,37 @@
 <template>
     <div class="PerformanceT-all">
-        <el-dialog title="设置" :visible.sync="dialogTableVisible">
+        <el-dialog width="830px" class="settings-dialog" title="设置" :visible.sync="dialogTableVisible">
             <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
-                <el-form-item label="活动名称" prop="name">
-                    <el-input v-model="ruleForm.name"></el-input>
-                </el-form-item>
-                <el-form-item label="活动区域" prop="region">
-                    <el-select v-model="ruleForm.region" placeholder="请选择活动区域">
-                        <el-option label="区域一" value="shanghai"></el-option>
-                        <el-option label="区域二" value="beijing"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="活动区域" prop="region">
-                    <el-select v-model="ruleForm.region" placeholder="请选择活动区域">
-                        <el-option label="区域一" value="shanghai"></el-option>
-                        <el-option label="区域二" value="beijing"></el-option>
+                <div class="settings-form">
+                    <el-form-item label="考核项目">
+                        <el-select value-key="id" @change="itemchange" v-model="ruleForm.id" placeholder="请选择活动区域">
+                            <el-option v-for="(item,index) in tablelist" :key="index" :label="item.name" :value="item.id"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="考核细则">
+                        <el-select v-model="ruleForm.parentId" placeholder="请选择活动区域">
+                            <el-option v-for="(item,index) in Assessmentrules" :key="index" :label="item.name" :value="item.id"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="名称" prop="name">
+                        <el-input v-model="ruleForm.name"></el-input>
+                    </el-form-item>
+                    <el-form-item label="评估比例" prop="name">
+                        <el-input v-model="ruleForm.assessmentProportion"></el-input>
+                    </el-form-item>
+                    <el-form-item style="width:100%;" label="评估标准">
+                        <el-input type="textarea" :rows="2" v-model="ruleForm.assessmentStandard"></el-input>
+                    </el-form-item>
+                    <el-form-item style="width:100%;" label="备注">
+                        <el-input type="textarea" :rows="2" v-model="ruleForm.remark"></el-input>
+                    </el-form-item>
+                </div>
+                <!-- <el-form-item label="关键绩效指标(KPI)">
+                    <el-select v-model="ruleForm.parentId" placeholder="请选择活动区域">
+                        <el-option v-for="(item,index) in Assessmentrules" :key="index" :label="item.name" :value="item.id"></el-option>
                     </el-select>
-                </el-form-item>
-                <el-form-item>
+                </el-form-item> -->
+                <el-form-item style="text-align: right;width:100%;">
                     <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
                     <el-button @click="resetForm('ruleForm')">重置</el-button>
                 </el-form-item>
@@ -127,7 +141,7 @@ export default {
             tboxheight:0,
             immobilizationarr:[
                 {
-                    id: 1,
+                    id: 788,
                     name: "行为管理",
                     assessmentProportion: 0.4,
                     assessmentStandard: "",
@@ -297,7 +311,7 @@ export default {
                     higherUpUserId: 0
                 },
                 {
-                    id: 1,
+                    id: 666,
                     name: "工作态度",
                     assessmentProportion: 0.4,
                     assessmentStandard: "",
@@ -396,17 +410,23 @@ export default {
             options: [],
             value: '',
             dialogTableVisible:true,
+            Assessmentrules:[],
             ruleForm: {
                 name: '',
-                region: '',
+                assessmentProportion: '',
+                assessmentStandard: '',
+                parentId: '',
+                id:'',
+                createId: '',
+                remark: '',
             },
             rules: {
-          name: [
-                    { required: true, message: '请输入活动名称', trigger: 'blur' },
+                name: [
+                    { required: true, message: '请输入', trigger: 'blur' },
                     { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
                 ],
-                region: [
-                    { required: true, message: '请选择活动区域', trigger: 'change' }
+                assessmentProportion: [
+                    { required: true, message: '请输入', trigger: 'blur' }
                 ],
             }
         }
@@ -490,6 +510,43 @@ export default {
             console.log(ref);
             
         },
+        //考核项目值改变
+        itemchange(val){
+            for(let i=0;i<this.tablelist.length;i++){
+                if (this.tablelist[i].id==val) {
+                    this.Assessmentrules=this.tablelist[i].children;
+                }
+            }
+        },
+        //新增项
+        AssessmentSettingOperation(){
+            var url = "/api/PersonnelModule/AssessmentSettingOperation"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer '
+                },
+                data:{
+                    name:that.ruleForm.name,
+                    assessmentProportion:that.ruleForm.assessmentProportion,
+                    assessmentStandard:that.ruleForm.assessmentStandard,
+                    parentId:that.ruleForm.parentId==''?0:that.ruleForm.parentId,
+                    id:that.ruleForm.id==''?0:that.ruleForm.id,
+                    createId:that.value,
+                    remark:that.ruleForm.remark,
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    
+                } else {
+                    that.$message.error(res.data.msg);
+                }
+            }).catch(function (error) {
+                that.$message.error("出错！，请联系信息部。");
+            });
+        },
         //打开对话框
         ondialog(){
             this.dialogTableVisible=true
@@ -497,7 +554,7 @@ export default {
         submitForm(formName) {
             this.$refs[formName].validate((valid) => {
             if (valid) {
-                alert('submit!');
+                this.AssessmentSettingOperation();
             } else {
                 console.log('error submit!!');
                 return false;
@@ -593,6 +650,17 @@ export default {
     justify-content: space-between;
     margin-bottom: 10px;
 }
+.settings-dialog .el-form-item{
+    width: 395px;
+}
+.settings-dialog .el-select,.el-input{
+    width: 100%;
+}
+.settings-form{
+    display: flex;
+    flex-wrap:wrap ;
+    
+}
 </style>