删除周工作附页面

src/views/thought/getready/index.vue

@@ -481,13 +481,10 @@ import {
   updateBdglShenPi
 } from "@/api/grassrootsregistration/bdgldiary";
 import {
-  deptUser,
   allUser,
-  getDept,
-  getDeptList,
 } from "@/api/workingArrangements/workTask";
-import { getDept2, getAll,getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
-// 富文本样式
+import {  getAll,getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
+// 富文本
 import "quill/dist/quill.core.css";
 import "quill/dist/quill.snow.css";
 import "quill/dist/quill.bubble.css";
@@ -750,22 +747,8 @@ export default {
       this.form.filePath=this.form.fileName[0].url
       this.form.fileName=this.form.fileName[0].name
       }
-     
-      // console.log(this.form)
       this.form.talkPeople = this.form.talkPeople.join(",");
       this.form.talkPeopleId = this.form.talkPeople;
-      // let deptName=""
-      // this.recodeexecutor.map((item) => {
-      //   // console.log(row.talkPeople)
-      //     this.form.talkPeopleId.split(",").forEach((items, index) => {
-      //       console.log(item.id,item.name)
-      //       if (item.id == items) {
-      //         deptName += item.name + ",";
-      //       }
-      //     });
-      //   });
-      //   this.form.talkPeople=deptName.slice(0,-1)
-      //   console.log(this.form)
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
@@ -884,6 +867,19 @@ export default {
 ::v-deep .ql-editor ql-blank {
   color: #fff !important;
 }
+::v-deep .ql-snow .ql-picker-label{
+  position: absolute;
+  bottom: 5px;
+}
+::v-deep .ql-snow .ql-picker:not(.ql-color-picker):not(.ql-icon-picker) svg{
+  margin-top: -2px;
+}
+::v-deep .ql-toolbar.ql-snow{
+  display: flex;
+  justify-content: space-around;
+}
+/* 富文本删除功能 */
+
 /* 富文本删除功能 */
 ::v-deep .ql-blockquote {
   display: none !important;
@@ -900,13 +896,10 @@ export default {
 ::v-deep .ql-direction {
   display: none !important;
 }
-::v-deep .ql-toolbar.ql-snow .ql-formats {
-  margin-right: 7px;
-}
-::v-deep .ql-toolbar {
-  display: flex;
-  justify-content: space-around;
+.ql-toolbar.ql-snow .ql-formats {
+  margin-right: 7px !important;
 }
+
 ::v-deep .el-input__inner {
   height: 36px !important;
   color: white;

src/views/thought/parliament/index.vue

@@ -794,6 +794,19 @@ export default {
 ::v-deep .ql-editor ql-blank {
   color: #fff !important;
 }
+::v-deep .ql-snow .ql-picker-label{
+  position: absolute;
+  bottom: 5px;
+}
+::v-deep .ql-snow .ql-picker:not(.ql-color-picker):not(.ql-icon-picker) svg{
+  margin-top: -2px;
+}
+::v-deep .ql-toolbar.ql-snow{
+  display: flex;
+  justify-content: space-around;
+}
+/* 富文本删除功能 */
+
 /* 富文本删除功能 */
 ::v-deep .ql-blockquote {
   display: none !important;
@@ -810,12 +823,8 @@ export default {
 ::v-deep .ql-direction {
   display: none !important;
 }
-::v-deep .ql-toolbar.ql-snow .ql-formats {
-  margin-right: 7px;
-}
-::v-deep .ql-toolbar{
-  display: flex;
-  justify-content: space-around;
+.ql-toolbar.ql-snow .ql-formats {
+  margin-right: 7px !important;
 }
 ::v-deep .el-input__inner {
   height: 36px !important;

src/views/thought/talk/index.vue

@@ -230,12 +230,22 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55" align="center" />
-         <el-table-column label="序号" type="index" width="50" align="center" />
+        <el-table-column label="序号" type="index" width="50" align="center" />
         <el-table-column label="谈心人名称" align="center" prop="talkPeople" />
-        <el-table-column label="谈心对象名称" align="center" prop="talkObject" />
-        <el-table-column label="谈心单位名称" align="center" prop="unitName" />
+        <el-table-column
+          label="谈心对象名称"
+          align="center"
+          prop="talkObject"
+        />
+        <el-table-column
+          label="谈心单位名称"
+          align="center"
+          prop="unitName"
+          show-overflow-tooltip
+          :formatter="unit2Format"
+        />
         <!-- <el-table-column label="单位id" align="center" prop="unitId" /> -->
-<!--         
+        <!--         
         <el-table-column
           label="谈心对象id"
           align="center"
@@ -261,11 +271,25 @@
             <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="创建人姓名" align="center" prop="createName" />
+        <!-- <el-table-column label="创建人姓名" align="center" prop="createName" /> -->
         <!-- <el-table-column label="创建人id" align="center" prop="createId" /> -->
         <!-- <el-table-column label="文件路径" align="center" prop="filePath" /> -->
-        <el-table-column label="文件名称" align="center" prop="fileName" />
-        <el-table-column label="谈话内容" align="center" prop="talkContent" />
+        <el-table-column
+          label="文件名称"
+          align="center"
+          prop="fileName"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="谈话内容"
+          align="center"
+          prop="talkContent"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ onEditor(scope.row.talkContent) }}</span>
+          </template>
+        </el-table-column>
         <!-- <el-table-column
           label="谈话时间"
           align="center"
@@ -344,10 +368,10 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="谈心对象单位" prop="unitName">
+          <el-form-item label="谈心对象单位" prop="unitId">
             <!-- <el-input v-model="form.unitName" placeholder="请输入单位名称" /> -->
             <treeselect
-              v-model="form.unitName"
+              v-model="form.unitId"
               :options="users"
               placeholder="请选择单位"
               class="threeselects"
@@ -356,20 +380,20 @@
           </el-form-item>
           <el-form-item label="谈心对象" prop="talkObject">
             <!-- <el-input v-model="form.talkObject" placeholder="请输入谈心对象" /> -->
-             <el-select
-                filterable
-                v-model="form.talkObject"
-                placeholder="请选择谈心对象"
-                ref="peoplenames"
-              >
-                <el-option
-                  v-for="item in tanxinexecutor"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.name"
-                  @click.native="peopleIds(item)"
-                />
-             </el-select>
+            <el-select
+              filterable
+              v-model="form.talkObject"
+              placeholder="请选择谈心对象"
+              ref="peoplenames"
+            >
+              <el-option
+                v-for="item in tanxinexecutor"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+                @click.native="peopleIds(item)"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="谈心开始时间" prop="startTime">
             <el-date-picker
@@ -486,6 +510,7 @@ import {
   getWeiShu,
 } from "@/api/grassrootsregistration/bdglmeeting";
 import { deptUser } from "@/api/doormanManage/bdglVisit";
+import { getDeptList } from "@/api/workingArrangements/workTask";
 export default {
   name: "Talk",
   components: { Treeselect },
@@ -571,10 +596,12 @@ export default {
       executors: [],
       recodeexecutor: [],
       // 获取单位列表
-      users:[],
+      users: [],
       // 谈心对象列表
-      tanxinexecutor:[],
-      unitName:""
+      tanxinexecutor: [],
+      unitName: "",
+      // 获取单位列表
+      getdeptList: [],
     };
   },
   created() {
@@ -583,26 +610,48 @@ export default {
     this.getSuoYou();
     // 获取执行单位列表
     getDept2().then((res) => {
-      // console.log(res,2)
       this.users = res.data;
-      // console.log(this.users);
+    });
+    // 获取部门列表
+    getDeptList().then((res) => {
+      this.getdeptList = res.data;
     });
   },
   methods: {
-    peopleIds(item){
-      this.form.talkObjectId=item.id
-      console.log(item)
+    unit2Format(row) {
+      var deptName = "";
+      this.getdeptList.map((item) => {
+        // console.log(item)
+        // if(ite)
+        if (item.deptId == row.unitId) {
+          deptName = item.deptName;
+        }
+      });
+      return deptName;
+    },
+    // 转义视图不加标签
+    onEditor(str) {
+      //可以在这里进行对应的操作 quill为富文本对象,html为富文本对象内内容由html标签组成,text为quill内容里面的所有文本内容
+      if (str) {
+        var str = str.replace(/<\/?[^>]*>/g, ""); //去除HTML tag
+        str = str.replace(/[ | ]*\n/g, "\n"); //去除行尾空白
+        return str;
+      }
+    },
+    peopleIds(item) {
+      this.form.talkObjectId = item.id;
+      console.log(item);
     },
     // 选中单位
     selectPeo(val) {
       console.log(val);
       this.form.talkObject = "";
       this.form.unitId = val.id;
-      this.unitName = val.label;
+      // this.unitName = val.label;
       // this.form.phone = "";
       this.getZhuChi(this.form.unitId);
     },
-     // 获取执行人
+    // 获取执行人
     getZhuChi(id) {
       // console.log(id)
       deptUser(id).then((res) => {
@@ -735,12 +784,12 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      if(this.form.fileName){
-      this.form.filePath=this.form.fileName[0].url
-      this.form.fileName=this.form.fileName[0].name
+      if (this.form.fileName) {
+        this.form.filePath = this.form.fileName[0].url;
+        this.form.fileName = this.form.fileName[0].name;
       }
-      this.form.unitName=this.unitName
-      console.log(this.form)
+      this.form.unitName = this.form.unitId;
+      console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
@@ -856,11 +905,6 @@ export default {
   padding-right: 0px !important;
   padding-bottom: 0px !important;
 }
-/* 富文本内容 */
-/* ::v-deep .editor{
-  width: 1010px;
-  color: white;
-} */
 /* 富文本 */
 ::v-deep .ql-snow .ql-fill,
 .ql-snow .ql-stroke.ql-fill {
@@ -875,6 +919,19 @@ export default {
 ::v-deep .ql-editor ql-blank {
   color: #fff !important;
 }
+::v-deep .ql-snow .ql-picker-label{
+  position: absolute;
+  bottom: 5px;
+}
+::v-deep .ql-snow .ql-picker:not(.ql-color-picker):not(.ql-icon-picker) svg{
+  margin-top: -2px;
+}
+::v-deep .ql-toolbar.ql-snow{
+  display: flex;
+  justify-content: space-around;
+}
+/* 富文本删除功能 */
+
 /* 富文本删除功能 */
 ::v-deep .ql-blockquote {
   display: none !important;
@@ -891,12 +948,8 @@ export default {
 ::v-deep .ql-direction {
   display: none !important;
 }
-::v-deep .ql-toolbar.ql-snow .ql-formats {
-  margin-right: 7px;
-}
-::v-deep .ql-toolbar {
-  display: flex;
-  justify-content: space-around;
+.ql-toolbar.ql-snow .ql-formats {
+  margin-right: 7px !important;
 }
 ::v-deep .el-input__inner {
   height: 36px !important;

src/views/thought/weekjob/index.vue

@@ -238,6 +238,7 @@
           align="center"
           prop="unitName"
           show-overflow-tooltip
+          :formatter="unit2Format"
         />
         <el-table-column
           label="工作标题"
@@ -365,10 +366,10 @@
             :inline="true"
           >
             <div class="jiben">基本信息</div>
-            <el-form-item label="单位" prop="unitName">
+            <el-form-item label="单位" prop="unitId">
               <!-- <el-input v-model="form.unitName" placeholder="请输入单位名称" /> -->
               <treeselect
-                v-model="form.unitName"
+                v-model="form.unitId"
                 :options="users"
                 placeholder="请选择单位"
                 class="threeselects"
@@ -610,6 +611,9 @@ import {
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { deptUser } from "@/api/doormanManage/bdglVisit";
+import {
+  getDeptList,
+} from "@/api/workingArrangements/workTask";
 export default {
   name: "Weekjob",
   components: {
@@ -750,6 +754,7 @@ export default {
           content: null,
         },
       ],
+      getdeptList:[]
     };
   },
   created() {
@@ -762,8 +767,24 @@ export default {
         this.users = res.data;
         // console.log(this.users);
       });
+      // 获取部门列表
+    getDeptList().then((res) => {
+      this.getdeptList = res.data;
+    });
   },
   methods: {
+    unit2Format(row){
+      var deptName=""
+      this.getdeptList.map((item) => {
+        console.log(item)
+        // if(ite)
+          if (item.deptId == row.unitId) {
+            console.log(item.deptName);
+            deptName = item.deptName;
+          }
+        });
+        return deptName
+    },
     // 搜索时间触发
     shiJian(data) {
       this.queryParams.diaryTime = data;
@@ -835,7 +856,7 @@ export default {
       console.log(val);
       this.form.dutyLeader = "";
       this.form.unitId = val.id;
-      this.unitName = val.label;
+      // this.unitName = val.label;
       this.form.phone = "";
       this.getZhuChi(this.form.unitId);
     },
@@ -940,14 +961,15 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      console.log(row)
+      // console.log(row)
+
       // this.unitName=row.unitName
       // console.log
       this.reset();
       const id = row.id || this.ids;
       getWeekjob(id).then((response) => {
         this.form = response.data;
-        // this.form.unitName=this.unitName
+        this.form.unitName=this.form.unitName
         console.log(this.form)
         this.open = true;
         this.title = "修改周工作";
@@ -955,7 +977,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.form.unitName = this.unitName;
+      this.form.unitName = this.form.unitId;
 
       // console.log(this.tomList)
       if (this.tomList) {
@@ -985,7 +1007,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除周工作编号为"' + ids + '"的数据项？')
+        .confirm('是否确认删除？')
         .then(function () {
           return delWeekjob(ids);
         })
@@ -1097,6 +1119,19 @@ export default {
 ::v-deep .ql-editor ql-blank {
   color: #fff !important;
 }
+::v-deep .ql-snow .ql-picker-label{
+  position: absolute;
+  bottom: 5px;
+}
+::v-deep .ql-snow .ql-picker:not(.ql-color-picker):not(.ql-icon-picker) svg{
+  margin-top: -2px;
+}
+::v-deep .ql-toolbar.ql-snow{
+  display: flex;
+  justify-content: space-around;
+}
+/* 富文本删除功能 */
+
 /* 富文本删除功能 */
 ::v-deep .ql-blockquote {
   display: none !important;
@@ -1113,12 +1148,8 @@ export default {
 ::v-deep .ql-direction {
   display: none !important;
 }
-::v-deep .ql-toolbar.ql-snow .ql-formats {
-  margin-right: 7px;
-}
-::v-deep .ql-toolbar {
-  display: flex;
-  justify-content: space-around;
+.ql-toolbar.ql-snow .ql-formats {
+  margin-right: 7px !important;
 }
 ::v-deep .el-input__inner {
   height: 36px !important;