思想政治

src/views/combatduty/RateOfTen/index.vue

@@ -1199,7 +1199,7 @@ export default {
                 name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
-                if (_this.form.cdrs == 0 || _this.form.bzrs) {
+                if (_this.form.cdrs == 0 || _this.form.bzrs==0) {
                   var s = `{value|${(0).toFixed()}%}` +
                     "\n" +
                     "\n" +
@@ -1397,7 +1397,7 @@ export default {
                 name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
-                if (_this.zhuangbei.zbky== 0 || _this.zhuangbei.zbsy) {
+                if (_this.zhuangbei.zbky== 0 || _this.zhuangbei.zbsy==0) {
                   var s = `{value|${(0).toFixed()}%}` +
                   "\n" +
                   "\n" +
@@ -1470,7 +1470,7 @@ export default {
               },
               formatter: function (params) {
                 // var n = data8[0].value / (data8[1].value + data8[0].value);
-                 if (_this.zhuangbei.sjpt== 0 || _this.zhuangbei.bzpt) {
+                 if (_this.zhuangbei.sjpt== 0 || _this.zhuangbei.bzpt==0) {
                   var s = `{value|${(0).toFixed()}%}` +
                   "\n" +
                   "\n" +
@@ -1630,7 +1630,7 @@ export default {
                 name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
-                   if (_this.zhuangbei.zbcd== 0 || _this.form.zbbz) {
+                   if (_this.zhuangbei.zbcd== 0 || _this.form.zbbz==0) {
                   var s = `{value|${(0).toFixed()}%}`+
                   "\n" +
                   "\n" +

src/views/thought/getready/index.vue

@@ -176,7 +176,7 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['thought:getready:edit']"
-          >查看</el-button
+          >修改</el-button
         >
       </el-col>
       <el-col :span="1.5">
@@ -314,6 +314,7 @@
           </el-form-item>
           <el-form-item label="开始时间" prop="startTime">
             <el-date-picker
+              editable
               clearable
               size="small"
               v-model="form.startTime"
@@ -330,6 +331,7 @@
          
           >
             <el-date-picker
+              editable
               clearable
               size="small"
               v-model="form.endTime"
@@ -450,6 +452,9 @@
            <el-form-item>
           <FileUpload v-model="form.fileName" />
            </el-form-item>
+           <el-input
+              v-model="form.fileName"
+            />
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -731,7 +736,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      console.log(row)
+      // console.log(row)
       this.reset();
       const id = row.id || this.ids;
       getGetready(id).then((response) => {
@@ -800,7 +805,32 @@ export default {
 };
 </script>
 <style scoped>
-
+::v-deep .el-pagination__sizes .el-input__suffix{
+  right: 6px;
+}
+::v-deep .ql-snow .ql-picker-options .ql-picker-item:focus{
+  outline: none !important;
+}
+::v-deep .ql-snow .ql-picker:focus{
+   outline: none !important;
+}
+::v-deep .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-label:focus{
+  outline: none !important;
+}
+::v-deep .ql-toolbar.ql-snow .ql-picker-label{
+  border: none !important;
+}
+::v-deep .ql-formats:focus{
+  outline: none !important;
+}
+::v-deep .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options{
+  border-color: none !important;
+  color: black !important;
+}
+/* normal */
+::v-deep .ql-active{
+ outline: none !important;
+}
 /* 输入框 */
 ::v-deep .el-dialog .el-input__inner {
   background-color: #004d86 !important;

src/views/thought/parliament/index.vue

@@ -261,6 +261,7 @@
         </el-form-item>
          <el-form-item label="开始时间" prop="startTime">
           <el-date-picker clearable size="small"
+          editable
             v-model="form.startTime"
             type="date"
             value-format="yyyy-MM-dd"
@@ -268,7 +269,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="结束时间" prop="endTime" label-width="115px">
-          <el-date-picker clearable size="small"
+          <el-date-picker editable clearable size="small"
             v-model="form.endTime"
             type="date"
             value-format="yyyy-MM-dd"
@@ -528,7 +529,7 @@ export default {
       this.recodeexecutor.map((item) => {
         // console.log(row.talkPeople)
           row.participants.split(",").forEach((items, index) => {
-            console.log(item.id,item.name)
+            // console.log(item.id,item.name)
             if (item.id == items) {
               deptName += item.name + "  ";
             }
@@ -565,7 +566,7 @@ export default {
       }
     },
     selectPeo(val){
-      console.log(val)
+      // console.log(val)
       this.queryParams.unitName = val.label;
       this.getList()
     },
@@ -677,7 +678,7 @@ export default {
       // console.log(this.form)
       this.form.participants = this.form.participants.join(",");
       this.form.participantsId = this.form.participants;
-      console.log(this.form)
+      // console.log(this.form)
       this.form.unitName=this.unitName
       this.$refs["form"].validate(valid => {
         if (valid) {
@@ -722,6 +723,32 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .el-pagination__sizes .el-input__suffix{
+  right: 6px;
+}
+::v-deep .ql-snow .ql-picker-options .ql-picker-item:focus{
+  outline: none !important;
+}
+::v-deep .ql-snow .ql-picker:focus{
+   outline: none !important;
+}
+::v-deep .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-label:focus{
+  outline: none !important;
+}
+::v-deep .ql-toolbar.ql-snow .ql-picker-label{
+  border: none !important;
+}
+::v-deep .ql-formats:focus{
+  outline: none !important;
+}
+::v-deep .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options{
+  border-color: none !important;
+  color: black !important;
+}
+/* normal */
+::v-deep .ql-active{
+ outline: none !important;
+}
 ::v-deep .canjiaren .el-input__inner{
   width: 560px !important;
 }

src/views/thought/talk/index.vue

@@ -640,11 +640,11 @@ export default {
     },
     peopleIds(item) {
       this.form.talkObjectId = item.id;
-      console.log(item);
+      // console.log(item);
     },
     // 选中单位
     selectPeo(val) {
-      console.log(val);
+      // console.log(val);
       this.form.talkObject = "";
       this.form.unitId = val.id;
       // this.unitName = val.label;
@@ -789,7 +789,7 @@ export default {
         this.form.fileName = this.form.fileName[0].name;
       }
       this.form.unitName = this.form.unitId;
-      console.log(this.form);
+      // console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
@@ -812,7 +812,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除谈心记录卡编号为"' + ids + '"的数据项？')
+        .confirm('是否确认删除？')
         .then(function () {
           return delTalk(ids);
         })
@@ -841,6 +841,9 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .el-pagination__sizes .el-input__suffix{
+  right: 6px;
+}
 /* 树形样式 */
 ::v-deep .vue-treeselect__control {
   background-color: #004d86;
@@ -906,6 +909,29 @@ export default {
   padding-bottom: 0px !important;
 }
 /* 富文本 */
+::v-deep .ql-snow .ql-picker:focus{
+   outline: none !important;
+}
+::v-deep .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-label:focus{
+  outline: none !important;
+}
+::v-deep .ql-toolbar.ql-snow .ql-picker-label{
+  border: none !important;
+}
+::v-deep .ql-formats:focus{
+  outline: none !important;
+}
+::v-deep .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options{
+  border-color: none !important;
+  color: black !important;
+}
+::v-deep .ql-snow .ql-picker-options .ql-picker-item:focus{
+  outline: none !important;
+}
+/* normal */
+::v-deep .ql-active{
+ outline: none !important;
+}
 ::v-deep .ql-snow .ql-fill,
 .ql-snow .ql-stroke.ql-fill {
   fill: #fff !important;

src/views/thought/weekjob/index.vue

@@ -477,6 +477,7 @@
 
             <el-form-item label="开始时间" prop="startTime">
               <el-date-picker
+                editable
                 clearable
                 size="small"
                 v-model="form.startTime"
@@ -488,6 +489,7 @@
             </el-form-item>
             <el-form-item label="结束时间" prop="endTime" label-width="115px">
               <el-date-picker
+                editable
                 clearable
                 size="small"
                 v-model="form.endTime"
@@ -776,10 +778,10 @@ export default {
     unit2Format(row){
       var deptName=""
       this.getdeptList.map((item) => {
-        console.log(item)
+        // console.log(item)
         // if(ite)
           if (item.deptId == row.unitId) {
-            console.log(item.deptName);
+            // console.log(item.deptName);
             deptName = item.deptName;
           }
         });
@@ -818,12 +820,12 @@ export default {
     },
     // 选中时间获取星期
     change_time(date, i) {
-      console.log(`data${date}${i}`);
+      // console.log(`data${date}${i}`);
       // console.log(this.getNowWeek(date));
       if (date) {
         this.tomList[i].week = this.getNowWeek(date);
-        console.log(this.tomList[i].week);
-        console.log(this.getNowWeek(date));
+        // console.log(this.tomList[i].week);
+        // console.log(this.getNowWeek(date));
       } else {
         this.tomList[i].week = "";
       }
@@ -853,7 +855,7 @@ export default {
     },
     // 选中单位
     selectPeo(val) {
-      console.log(val);
+      // console.log(val);
       this.form.dutyLeader = "";
       this.form.unitId = val.id;
       // this.unitName = val.label;
@@ -863,7 +865,7 @@ export default {
     // 获取电话
     peopleIds(item) {
       this.form.dutyLeaderId = item.id;
-      console.log(item);
+      // console.log(item);
       this.form.phone = item.phone;
     },
     // 获取执行人
@@ -881,7 +883,7 @@ export default {
     treeselect() {
       getWeiShu().then((res) => {
         this.deptOptions = res.data;
-        console.log(this.deptOptions);
+        // console.log(this.deptOptions);
       });
     },
     //外面树形选择搜索
@@ -894,6 +896,7 @@ export default {
       this.loading = true;
       listWeekjob(this.queryParams).then((response) => {
         this.weekjobList = response.rows;
+        console.log(this.weekjobList)
         this.total = response.total;
         this.loading = false;
       });
@@ -969,8 +972,10 @@ export default {
       const id = row.id || this.ids;
       getWeekjob(id).then((response) => {
         this.form = response.data;
-        this.form.unitName=this.form.unitName
         console.log(this.form)
+        this.form.unitName=this.form.unitName
+        this.tomList=this.form.thoughtWeekjobFuList
+        // console.log(this.form)
         this.open = true;
         this.title = "修改周工作";
       });
@@ -978,12 +983,10 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.form.unitName = this.form.unitId;
-
       // console.log(this.tomList)
       if (this.tomList) {
         this.form.thoughtWeekjobFuList = this.tomList;
       }
-
       console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
@@ -1036,6 +1039,9 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .el-pagination__sizes .el-input__suffix{
+  right: 6px;
+}
 /* 树形样式 */
 ::v-deep .vue-treeselect__control {
   background-color: #004d86;
@@ -1106,6 +1112,29 @@ export default {
   color: white;
 } */
 /* 富文本 */
+::v-deep .ql-snow .ql-picker:focus{
+   outline: none !important;
+}
+::v-deep .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-label:focus{
+  outline: none !important;
+}
+::v-deep .ql-toolbar.ql-snow .ql-picker-label{
+  border: none !important;
+}
+::v-deep .ql-formats:focus{
+  outline: none !important;
+}
+::v-deep .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options{
+  border-color: none !important;
+  color: black !important;
+}
+::v-deep .ql-snow .ql-picker-options .ql-picker-item:focus{
+  outline: none !important;
+}
+/* normal */
+::v-deep .ql-active{
+ outline: none !important;
+}
 ::v-deep .ql-snow .ql-fill,
 .ql-snow .ql-stroke.ql-fill {
   fill: #fff !important;