Merge remote-tracking branch 'origin/V0.0.5' into V0.0.5

src/views/core/message/index.vue

@@ -21,7 +21,7 @@
                   @defaultKey="getDefaultKey"
                   @checkChange="checkChange"
                   @click="clickTreeNode"
-                  hangsheTree
+                  hangshe
                   ref="orgTree"
                 ></org-tree>
               </el-form-item>
@@ -400,11 +400,10 @@ import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 import KFileUpload from "@/components/K-FileUpload/index.vue";
 import OrgTreeSelect from "@/components/orgTreeSelect";
 import {mapGetters} from "vuex";
-
 export default {
-  components: {OrgTree, KFileUpload, OrgTreeSelect},
-  name: "Notification",
   dicts: ["messag_type", "message_status", "sys_org_type"],
+  name: "Notification",
+  components: {OrgTree, KFileUpload, OrgTreeSelect},
   data() {
     return {
       // 遮罩层
@@ -722,6 +721,7 @@ export default {
   },
 };
 </script>
+
 <style lang="scss" scoped>
 .line-style {
   display: -webkit-box;
@@ -730,4 +730,4 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
 }
-</style>
+</style>

src/views/evaluateTable/index.vue

@@ -48,11 +48,30 @@
                     :key="item.id"
                     :label="item.evaluateName"
                     :value="item.id"
+                 
                   >
                   </el-option>
                 </el-select>
               </el-form-item>
 
+              <el-form-item v-if="this.cycle=='0'" label="月份" prop="searchTime">
+        <el-date-picker v-model="queryParams.searchTime" align="right"
+                        placeholder="请选择查询月份" type="month" value-format='yyyy-MM'>
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item  v-if="this.cycle=='1'"label="统计季度" prop="searchTime">
+                <QuarterPicker format="yyyy年q季度" value-format="yyyy-MM" placeholder="请选择查询季度" v-model="queryParams.searchTime" />
+              </el-form-item>
+
+              <el-form-item v-if="this.cycle=='2'" label="年份" prop="searchTime">
+          <el-date-picker
+            value-format='yyyy'
+            v-model="queryParams.searchTime"
+            type="year"
+            placeholder="选择查询年份">
+          </el-date-picker>
+        </el-form-item>
             </el-form>
             <!-- 按纽    -->
         <el-row :gutter="10" >
@@ -113,10 +132,11 @@ import { list, getPlanList } from "@/api/evaluateTable/evaluateTable.js";
 import { newDateMonth } from "@/utils/index.js";
 import { deptTreeSelect } from "@/api/system/public";
     import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
+    import QuarterPicker from '@/views/components/QuarterPicker/index.vue'
 export default {
   name: "SocWebIndex",
 
-  components: {OrgTree
+  components: {OrgTree,QuarterPicker
   },
 
   data() {
@@ -131,10 +151,12 @@ export default {
       planRoles: [],
       options: [],
       fullTableTitle: "对押运公司月度评价",
+      cycle:"0",
       orgName:null,
       queryParams: {
         orgId: null,
-        planId: "",
+        planId: null,
+        searchTime:new Date,
         // date: newDateMonth("", "1"),
       },
       // 显示搜索条件
@@ -187,7 +209,13 @@ export default {
       this.getList();
     },
 
-    changeHandler() {
+    changeHandler(id) {
+    this.  options.forEach(element => {
+        if(element.id==id){
+          this.cycle=element.evaluateCycle;
+        }
+      });
+      console.log(this.cycle+"efijewioo")
       this.getList();
     },
     changeSelect() {
@@ -204,7 +232,9 @@ export default {
     getevlauteList() {
       getPlanList().then((res) => {
         this.queryParams.planId = res[0].id;
+        
         this.options = res;
+        this.cycle=res[0].evaluateCycle;
         console.log(res,'res');
         if (this.queryParams.orgId && this.queryParams.planId) {
           this.getList();
@@ -263,8 +293,9 @@ this.orgName=res.orgName;
       this.queryParams = {
         orgId: this.orgId,
         planId: this.options[0].id,
+        searchTime:new Date(),
       };
-
+      this.cycle=this.options[0].evaluateCycle;
       this.getList();
     },
     //导出

src/views/safetycheck/ruleManager/index.vue

@@ -372,7 +372,7 @@ export default {
     },
     deldata(val) {
       this.$modal
-        .confirm("确定删除检查手册？")
+        .confirm("确定删除检查项？")
         .then(() => {
           return del(val);
         })

src/views/system/dept/index.vue

@@ -272,11 +272,11 @@
     <DialogCom
       :title="title"
       :visible.sync="open"
-      width="700px"
+      width="1000px"
       @close="closeHandler"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
             <el-form-item
@@ -297,7 +297,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="12">
             <el-form-item label="机构名称" prop="name">
               <el-input
                 :maxlength="50"
@@ -308,7 +308,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="12">
             <el-form-item label="机构简称" prop="shortName">
               <el-input
                 v-model="form.shortName"
@@ -394,6 +394,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item v-if="isEdit" label="机构缩略词" prop="breviary">
+              <el-input
+                :maxlength="5"
+                style="width: 200px;" 
+                v-model="form.breviary"
+                placeholder="请输入机构缩略词"
+              
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="机构状态" prop="isLock">
               <el-radio-group v-model="form.isLock">
                 <el-radio
@@ -407,17 +418,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="24">
-            <el-form-item v-if="isEdit" label="机构缩略词" prop="breviary" label-width="240">
-              <el-input
-                :maxlength="5"
-                style="width: 270px;" 
-                v-model="form.breviary"
-                placeholder="请输入机构缩略词"
-              
-              />
-            </el-form-item>
-          </el-col>
+        
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">