Merge branch 'V0.0.3' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.3

src/views/resumptionEvaluate/evaluate/editDialog.vue

@@ -5,14 +5,13 @@
       :title="`${id ? '编辑' : '新增'}外包履职评价计划`"
       :visible.sync="isShow"
       width="1500px"
-     
     >
       <div class="page-body">
         <el-form
           :model="formData"
           :rules="formDataRules"
           size="small"
-          ref="form"
+          ref="formData"
           label-position="right"
           label-width="130px"
           label-prefix=":"
@@ -95,7 +94,12 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-button @click="openSelect" type="primary" style="margin-bottom: 10px;">新增评价内容</el-button>
+        <el-button
+          @click="openSelect"
+          type="primary"
+          style="margin-bottom: 10px"
+          >新增评价内容</el-button
+        >
 
         <el-table :data="tableData" style="width: 100%" height="400px">
           <el-table-column label="序号" type="index" width="100">
@@ -110,7 +114,12 @@
           </el-table-column>
           <el-table-column label="操作">
             <template v-slot="{ row }">
-              <el-button type="text" @click="removeRow(row)" v-if="row.code!==0">移除</el-button>
+              <el-button
+                type="text"
+                @click="removeRow(row)"
+                v-if="row.code !== 0"
+                >移除</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
@@ -121,12 +130,11 @@
         <el-button @click="onHide">取消</el-button>
       </div>
       <DialogSelect
-      ref="dialogEvaluate"
-      :orgType="formData.orgType"
-      @submitHandler="onSelect"
-    ></DialogSelect>
+        ref="dialogEvaluate"
+        :orgType="formData.orgType"
+        @submitHandler="onSelect"
+      ></DialogSelect>
     </DialogCom>
-    
   </div>
 </template>
 
@@ -165,7 +173,14 @@ export default {
       ],
       id: null,
       isShow: false,
-      formData: {},
+      formData: {
+        evaluateName: "",
+        roleIds: [],
+        orgType: "",
+        evaluateCycle: "",
+        planStatus: "",
+        buildTaskNow:'',
+      },
       formDataRules: {
         evaluateName: [{ required: true, message: "请输入评价名称" }],
         roleIds: [
@@ -286,9 +301,15 @@ export default {
     },
     // 事件
     onHide() {
-      this.$refs.form.resetFields();
+      this.$refs.formData.resetFields();
       this.isShow = false;
-      this.formData = {};
+      this.formData = {
+        evaluateName: "",
+        roleIds: [],
+        orgType: "",
+        evaluateCycle: "",
+        planStatus: "",
+      };
 
       this.tableData = [];
     },
@@ -297,28 +318,29 @@ export default {
       this.$refs.dialogEvaluate.show();
     },
     onSubmit() {
-      this.$refs.form.validate(async (isValidate) => {
+      this.$refs.formData.validate((isValidate) => {
         if (isValidate) {
           if (this.tableData.length == 0) {
             return this.$message.error("评价内容项,不能为空");
           }
-          if (falg) {
-            return this.$message.error(
-              "评价内容所有项,至少有一项评价类型为打分"
-            );
-          }
 
           let obj = {
             ...this.formData,
             coreEvaluateContentList: this.tableData,
           };
-          
+
           let falg = true;
+
           this.tableData.forEach((item) => {
             if (item.contentType == "2") {
               falg = false;
             }
           });
+          if (falg) {
+            return this.$message.error(
+              "评价内容所有项,至少有一项评价类型为打分"
+            );
+          }
           if (this.formData.id) {
             //编辑
 

src/views/resumptionEvaluate/evaluate/index.vue

@@ -21,7 +21,6 @@
               size="small"
               :inline="true"
               v-show="showSearch"
-
             >
               <el-form-item label="外包评价名称" prop="evaluateName">
                 <el-input
@@ -83,7 +82,6 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-
               </el-form-item>
             </el-form>
 
@@ -98,7 +96,7 @@
                   >搜索</el-button
                 >
                 <el-button
-                type="primary"
+                  type="primary"
                   icon="el-icon-refresh"
                   size="mini"
                   @click="resetQuery"
@@ -112,7 +110,6 @@
                   v-hasPermi="['system:user:add']"
                   >新增</el-button
                 >
-
               </el-col>
             </el-row>
           </div>
@@ -157,7 +154,6 @@
               label="操作"
               width="200"
               fixed="right"
-
               class-name="small-padding fixed-width"
             >
               <template slot-scope="{ row }">
@@ -166,7 +162,11 @@
                   size="mini"
                   @click="publishHandler(row)"
                   type="text"
-                  :class="row.isDistribute == 0? 'el-icon-arrow-down':'el-icon-top-left'"
+                  :class="
+                    row.isDistribute == 0
+                      ? 'el-icon-arrow-down'
+                      : 'el-icon-top-left'
+                  "
                   >{{ row.isDistribute == "0" ? "" : "取消" }}发布</el-button
                 >
                 <el-button
@@ -345,8 +345,12 @@ export default {
       this.getList();
     },
     getRolesByOrg() {
+      if(!this.queryParams.orgType){
+        this.planRoles=[]
+        this.queryParams.roleId=[]
+      }
       let params = {
-        orgType: null,
+        orgType:this.queryParams.orgType|| null,
       };
       findAllRole(params).then((res) => {
         this.planRoles = res.data;
@@ -355,6 +359,7 @@ export default {
     cleanExecOrgList() {
       this.execOrgIds = null;
       this.queryParams.execOrgList = [];
+      this.getRolesByOrg();
     },
     handleRolesChange(val) {
       this.selectedValues = val.toString().split(",");

src/views/resumptionEvaluate/evaluatePlan/index.vue

@@ -21,7 +21,7 @@
               size="small"
               :inline="true"
               v-show="showSearch" >
-              <el-form-item label="外包评价名称" prop="evaluateName">
+              <el-form-item label="外包评价名称" >
                 <el-input
                   :maxlength="20"
                   v-model="queryParams.evaluateName"
@@ -45,21 +45,22 @@
                 </el-select>
               </el-form-item>
 
-              <el-form-item>
-                <el-form-item prop="roleId" label="计划时间">
+            
+                <el-form-item  label="计划时间">
                   <el-date-picker
                     v-model="queryParams.dataTime"
                     type="daterange"
                     range-separator="至"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
-                    format="yyyy-MM-DD"
-                    value-format="yyyy-MM-DD"
+                    value-format="yyyy-MM-dd"
+                    
+                    @change="changeHandler"
                   >
                   </el-date-picker>
                 </el-form-item>
                 
-              </el-form-item>
+            
             </el-form>
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
@@ -208,6 +209,9 @@ export default {
           break;
       }
     },
+    changeHandler(time){
+      console.log(time);
+    },
     //获取列表
     getList() {
       this.loading = true;