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

src/views/core/edu/task/dialog.newTask.vue

@@ -27,17 +27,17 @@
             </el-col>
             <el-col :span="12">
               <el-form-item  prop="trainingStartDateTime" label="培训开始时间">
-                <el-date-picker required v-model="formData.trainingStartDateTime" :picker-options="startDatepickerOptions"
+                <el-date-picker style="width:100%" required v-model="formData.trainingStartDateTime" :picker-options="startDatepickerOptions"
                                 format="yyyy-MM-dd HH:mm"
-                                type="datetime" placeholder="选择日期"  @change="startDateChanged">
+                                type="datetime" placeholder="选择培训开始时间"  @change="startDateChanged">
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item prop="trainingEndDateTime" label="培训结束时间">
-                <el-date-picker required v-model="formData.trainingEndDateTime" :picker-options="endDatepickerOptions" @change="endDateChanged"
+                <el-date-picker style="width:100%" required v-model="formData.trainingEndDateTime" :picker-options="endDatepickerOptions" @change="endDateChanged"
                                 format="yyyy-MM-dd HH:mm"
-                                type="datetime" placeholder="选择日期">
+                                type="datetime" placeholder="选择培训结束时间">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -156,8 +156,8 @@ export default {
         type: [{required: true, message: "请输入培训类型"}],
         content: [{required: true, message: "请输入培训内容"}],
         absenceList: [{required: true, type: "array", message: "请选择参会人员"}],
-        startDate: [{required: true, message: "请输入培训开始时间"}],
-        endDate: [{required: true, message: "请输入培训结束时间"}],
+        trainingStartDateTime: [{required: true, message: "请选择培训开始时间"}],
+        trainingEndDateTime: [{required: true, message: "请选择培训结束时间"}],
         note: [{required: true, message: "请输入培训总结"}],
         imageList: [{required: true, message: "请上传培训图片"}],
         // fileList: [{required: true, message: "请上传培训文件"}],

src/views/core/outIn/approve/dialog.approve.letter.detail.vue

@@ -49,7 +49,7 @@
             <el-col :span="12">
               <!-- <el-form-item label="介绍信" prop="letterNo">               
               </el-form-item> -->
-              <el-form-item label="介绍信">
+              <el-form-item label="介绍信附件">
                 <K-file-upload ref="upload" :isShowUploadBtn="false"
                                 :defaultValue="formFileListDefualtValue"
                                 v-model="formData.letterFile"/>

src/views/core/outIn/approve/dialog.approve.letter.vue

@@ -48,7 +48,7 @@
             </el-col>
             
             <el-col :span="12">
-              <el-form-item label="介绍信">
+              <el-form-item label="介绍信附件">
                 <K-file-upload ref="upload" :isShowUploadBtn="false"
                                 :defaultValue="formFileListDefualtValue"
                                 v-model="formData.letterFile"/>

src/views/core/outIn/approve/index.vue

@@ -65,19 +65,15 @@
       </el-table-column>
       <el-table-column label="来访事由" header-align="center" align="left" prop="reasons"/>
     
-      <el-table-column label="介绍信" header-align="center" align="left" prop="letterNo" width="250">
+      <!-- <el-table-column label="介绍信" header-align="center" align="left" prop="letterNo" width="250">
         <template slot-scope="scope">
         <template v-if="scope.row.letterFile">
           <K-file-upload ref="upload" :isShowUploadBtn="false"
                                          :defaultValue="scope.row.letterFile"
                                          />
-              <!-- <el-tag style="cursor: pointer;margin-right: 5px;" v-for="(item, index) in scope.row.letterFile" size="mini" type="success" effect="plain" @click="downLoadFile(JSON.parse(item).url)"
-                      :key="index">
-                {{ JSON.parse(item).name }}
-              </el-tag> -->
             </template>
        </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="开具日期" align="center" width="150">
         <template slot-scope="scope">
           <span>{{ scope.row.startTime}}</span>

src/views/core/outIn/letter/dialog.addletter.vue

@@ -11,7 +11,7 @@
           ref="form"
           :model="formData"
           :rules="formDataRules"
-          label-width="120px"
+          label-width="140px"
         >
           <el-row>
             <el-col :span="12">
@@ -63,7 +63,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="上传介绍信" prop="letterFile">
+              <el-form-item label="上传介绍信附件" prop="letterFile">
                 <K-file-upload
                   ref="upload"
                   :limit=2
@@ -219,7 +219,7 @@ export default {
         startTime: [{ required: true, message: "请选择开具日期" }],      
         effectiveDays: [{ required: true, message: "请选择有效天数" }],   
         userInfos: [{ required: true, message: "请添加来访人员" }],
-        letterFile:[{ required: true, message: "请上传介绍信" }],
+        letterFile:[{ required: true, message: "请上传介绍信附件" }],
       },
       userInfoRules: {
         userName: [{ required: true, message: "请输入来访人员" }],

src/views/core/outIn/letter/dialog.letter.detail.vue

@@ -49,7 +49,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="介绍信">
+              <el-form-item label="介绍信附件">
                 <K-file-upload
                   ref="upload"
                   :isShowUploadBtn="false"

src/views/core/outIn/letter/index.vue

@@ -58,7 +58,7 @@
       <el-table-column label="接待机构" header-align="center" align="left"  prop="receptionOrgNames" />
 
       <el-table-column label="来访事由" header-align="center" align="left" prop="reasons"  width="300"/>
-      <el-table-column label="开具日期" header-align="center" align="left" prop="startTime"  width="150"/>
+      <el-table-column label="开具日期" header-align="center" align="center" prop="startTime"  width="150"/>
       <el-table-column label="有效天数" header-align="center" align="center" prop="effectiveDays" width="100"/>
       <!-- <el-table-column label="介绍信有效期" align="center" width="250">
         <template slot-scope="scope">

src/views/core/outIn/outInLog/dialog.outIn.detail.vue

@@ -85,7 +85,7 @@
               </el-form-item>
             </el-col> -->
             <el-col :span="12">
-              <el-form-item label="介绍信">
+              <el-form-item label="介绍信附件">
                 <K-file-upload ref="upload" :isShowUploadBtn="false"
                                 :defaultValue="formData.letterFile"/>
               </el-form-item>

src/views/core/outIn/outInLog/index.vue

@@ -118,7 +118,7 @@
               width="120"
             >
             </el-table-column>
-            <el-table-column label="出入时间" align="center" width="300">
+            <el-table-column label="出入时间" header-align="center" align="left" width="360">
               <template slot-scope="scope">
                 <span>{{ dayjs(scope.row.arrivalTime).format("YYYY年MM月DD日HH时mm分") }} ~ </span>
                 <span v-if="scope.row.departureTime">{{ dayjs(scope.row.departureTime).format("YYYY年MM月DD日HH时mm分") }}</span>

src/views/resumptionEvaluate/evaluate/index.vue

@@ -345,15 +345,16 @@ export default {
       this.getList();
     },
     getRolesByOrg() {
-      if(!this.queryParams.orgType){
-        this.planRoles=[]
-        this.queryParams.roleId=[]
-      }
+      
       let params = {
         orgType:this.queryParams.orgType|| null,
       };
       findAllRole(params).then((res) => {
         this.planRoles = res.data;
+        if(!this.queryParams.orgType){
+        this.planRoles=[]
+        this.queryParams.roleId=[]
+      }
       });
     },
     cleanExecOrgList() {

src/views/safetyBook/hsggbsdj/dialog.des.vue

@@ -54,7 +54,7 @@
               labelClassName="gx_info_label"
               label="会议日期"
             >
-              {{ formData.date }}
+            {{ formData.date ? dayjs(formData.date).format("YYYY年-MM月-DD日") : "" }}
             </el-descriptions-item>
             <!-- <el-form-item prop="date" label="会议日期:">
             <el-date-picker
@@ -145,6 +145,7 @@ import { deptTreeSelect } from "@/api/system/public";
 import UserSelector from "@/components/userSelector/index.vue";
 import ImgsUpload from "@/components/ImgsUpload";
 import Editor from "@/components/Editor";
+import dayjs from "dayjs";
 export default {
   components: { UserSelector, ImgsUpload, Editor },
   data() {
@@ -195,7 +196,7 @@ export default {
   },
   methods: {
     ...mapMutations([]),
-
+    dayjs,
     /** 查询机构树数据 */
     getDeptTree() {
       deptTreeSelect().then((response) => {

src/views/safetyBook/hsggbsdj/index.vue

@@ -124,11 +124,13 @@
         />
         <el-table-column
           label="会议日期"
-          align="left"
-          header-align="center"
+          align="center"
           width="260"
           prop="date"
         >
+        <template slot-scope="r">
+            {{ r.row.date ? dayjs(r.row.date).format("YYYY年-MM月-DD日") : "" }}
+          </template>
         </el-table-column>
         <el-table-column label="参会人员" align="center" prop="joinNames">
         </el-table-column>
@@ -215,6 +217,7 @@ import kOrgTree from "@/components/k-orgTree/index.vue";
 import KFileUpload from "@/components/K-FileUpload/index.vue";
 import tableList from "@/mixins/tableList";
 import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
+import dayjs from "dayjs";
 export default {
   dicts: ["safety_book_type"],
   name: "hsggbsdj",
@@ -293,6 +296,7 @@ export default {
     this.getList();
   },
   methods: {
+    dayjs,
     resetQuery() {
       this.resetForm("queryForm");
       this.getList();

src/views/safetyBook/index.vue

@@ -140,7 +140,11 @@
           prop="userName"
         >
         </el-table-column>
-        <el-table-column label="签署时间" align="center" prop="createTime" />
+        <el-table-column label="签署时间" align="center" prop="createTime" >
+          <template slot-scope="r">
+            {{ r.row.createTime ? dayjs(r.row.createTime).format("YYYY年-MM月-DD日") : "" }}
+          </template>
+        </el-table-column>
 
         <el-table-column
           label="操作"
@@ -209,6 +213,7 @@ import kOrgTree from "@/components/k-orgTree/index.vue";
 import KFileUpload from "@/components/K-FileUpload/index.vue";
 import tableList from "@/mixins/tableList";
 import orgTree from "@/components/orgTree";
+import dayjs from "dayjs";
 export default {
   dicts: ["safety_book_type"],
   name: "safetyBook",
@@ -284,6 +289,7 @@ export default {
     this.getList();
   },
   methods: {
+    dayjs,
     resetQuery() {
       this.resetForm("queryForm");
       this.getList();

src/views/safetycheck/task/index.vue

@@ -55,14 +55,26 @@
               :maxlength="50" @input="inputRestriction"
             /> -->
                 <div style="width: 200px; height: 30px">
-                  <org-tree-select
+                  <!-- <org-tree-select
                     size="mini"
                     v-model="queryParams.checkOrgIds"
                     ref="checkorgTreeSelect"
                     :disable="true"
                     @change="getList"
                   >
-                  </org-tree-select>
+                  </org-tree-select> -->
+                  <tree-select
+                  v-model="queryParams.checkOrgIds"
+                  :options="deptOptions"
+                  :show-count="true"
+                  :normalizer="tenantIdnormalizer"
+                  :props="{ checkStrictly: true, label: 'name' }"
+                  placeholder="请选择组织机构"
+                  clearValueText="清除"
+                  :noChildrenText="''"
+                  noOptionsText="没有数据"
+                  noResultsText="没有搜索结果"
+                />
                 </div>
               </el-form-item>
               <el-form-item label="任务进度" prop="status">
@@ -400,6 +412,7 @@ import { getLabel } from "@/views/commonOption.js";
 import OrgTreeSelect from "@/components/orgTreeSelect";
 import { checkPermi } from "@/utils/permission.js";
 import dayjs from "dayjs";
+import { deptTreeSelect } from "@/api/system/public";
 import request from "@/utils/request";
 export default {
   name: "Saftask",
@@ -413,6 +426,8 @@ export default {
   },
   data() {
     return {
+       // 机构树选项
+       deptOptions: [],
       loading: false,
       showSearch: true,
       total: 0,
@@ -473,10 +488,27 @@ export default {
     ...mapGetters(["orgName", "userId", "roleList", "orgId"]),
   },
   activated (){
-    console.log("刷新");
+    // console.log("刷新");
     this.getList();
   },
   methods: {
+    getDeptTree() {
+      deptTreeSelect().then((response) => {
+        // console.log(response,"sss")
+        this.deptOptions = response.data;
+      });
+    },
+        /** treeSelect组件自定义数据*/
+        tenantIdnormalizer(node, instanceId) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.shortName,
+        children: node.children,
+      };
+    },
     async onDown(pdfUrl) {
       window.open(pdfUrl);
     },
@@ -503,7 +535,7 @@ export default {
     getLabel,
     showDetail(row) {
       let path = "/core/safetycheck/detail/" + row.id;
-      console.log(path,"path")
+      // console.log(path,"path")
       this.$router.push(path);
     },
     showscanRecord(row) {
@@ -560,7 +592,7 @@ export default {
       this.getList();
     },
     resetQuery() {
-      this.queryParams.checkOrgIds = [];
+      this.queryParams.checkOrgIds = null;
       this.queryParams.range = [];
       this.resetForm("queryParams");
       this.getList();
@@ -585,7 +617,7 @@ export default {
         });
     },
     async getList() {
-      console.log(this.queryParams, "this.queryParams2222");
+      // console.log(this.queryParams, "this.queryParams2222");
       this.loading = true;
       api
         .page(this.queryParams)
@@ -660,7 +692,9 @@ export default {
   },
   async mounted() {
     this.selectLoadRoles();
+   
   },
+  created(){ this.getDeptTree();},
 };
 </script>