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

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>