1

src/views/PrintsLog/printlog/index.vue

@@ -109,8 +109,7 @@
         <template slot-scope="scope">
           <el-tooltip :content="scope.row.printName" placement="top">
             <div
-              style="
-                overflow: hidden;
+              style=" overflow: hidden;
                 display: -webkit-box;
                 text-overflow: ellipsis;
                 -webkit-line-clamp: 2;
@@ -157,10 +156,10 @@
       <el-table-column label="归还状态" align="center" prop="statusG">
         <template slot-scope="scope">
           <!-- <dict-tag :options="dict.type.sys_statusG" :value="scope.row.statusG" /> -->
-          <div style="color: #00ff00" v-if="scope.row.statusG == '0'">
-            无需归还
+          <div style="color: #00ff00" v-if="scope.row.statusG == '1'">
+           已归还
           </div>
-          <div style="color: #90da90" v-if="scope.row.statusG == '1'">
+          <div style="color: #90da90" v-if="scope.row.statusG == '0'">
             未归还
           </div>
         </template>
@@ -322,6 +321,7 @@
       width="680px"
       append-to-body
       :close-on-click-modal="false"
+      @close="remoer"
     >
       <el-form
         ref="form"
@@ -498,6 +498,12 @@ export default {
     this.danWeis()
   },
   methods: {
+    remoer(){
+      this.queryParams.levelM = "";
+      this.queryParams.unitIds = null;
+      this.queryParams.startt = null;
+      this.queryParams.endt = null;
+    },
     unitFn(row){
       var name =""
       this.danWeisList.map(item=>{

src/views/PrintsManage/manage/index.vue

@@ -284,6 +284,14 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="归还时间" prop="returnTime"  class="box1">
+            <el-date-picker
+            v-model="form.returnTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+          </el-form-item>
           <div class="jiben">打印说明</div>
           <el-form-item label prop="explainInfo">
             <el-input
@@ -610,6 +618,14 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="归还时间" prop="returnTime"  class="box1">
+          <el-date-picker
+          v-model="form1.returnTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期">
+        </el-date-picker>
+        </el-form-item>
         <div class="jiben">打印说明</div>
         <el-form-item label prop="explainInfo">
           <el-input
@@ -784,14 +800,7 @@
             placeholder="请输入打印份数"
           />
         </el-form-item>
-        <el-form-item label="归还时间" prop="returnTime">
-          <el-date-picker
-          v-model="dyform.returnTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择日期">
-        </el-date-picker>
-        </el-form-item>
+        
         <!-- <el-form-item label="是否需要归还" prop="isReturn">
           <el-radio-group
             v-model="dyform.isReturn"
@@ -923,8 +932,7 @@
             上一页</el-button
           >
           <div
-            style="
-              width: 50px;
+            style="width: 50px;
               height: 28px;
               background: #f4f4f4;
               text-align: center;
@@ -1119,7 +1127,11 @@ export default {
           { required: true, message: "归还时间不能为空", trigger: "change" },
         ]
       },
-      ruless: {},
+      ruless: {
+        returnTime:[
+          { required: true, message: "归还时间不能为空", trigger: "change" },
+        ]
+      },
       //级别
       levelMs: [],
       //文印室
@@ -1651,10 +1663,10 @@ export default {
         if (valid) {
           // 
           console.log(this.dyform);
-          if (this.dyform.isReturn == 0) {
-            this.dyform.statusG = 1;
-          } else {
+          if (this.dyform.isReturn == 1) {
             this.dyform.statusG = 0;
+          } else {
+            this.dyform.statusG = 1;
           }
           printCode(this.dyform).then((res) => {
             if (res.code == 200) {
@@ -2075,6 +2087,6 @@ export default {
   left: -280px;
 }
 ::v-deep .box1 .el-form-item__label {
-  width: 93px !important;
+  width: 91px !important;
 }
 </style>

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -178,7 +178,7 @@
               size="btk"
               type="text"
               @click="handleChakan(scope.row)"
-              v-hasPermi="['grassrootsregistration:bdgldiary:edit']"
+              v-hasPermi="['grassrootsregistration:bdgldiary:query']"
               ><span class="chakan">查看</span></el-button
             >
             <el-button

src/views/grassrootsregistration/bdgldrills/index.vue

@@ -38,7 +38,9 @@
       <li v-for="(item, i) in lieList" :key="i">
         <div class="names">{{ item.deptName }}</div>
         <div class="btn">
-          <el-button size="btJS" @click="chaKan(item.deptId)">查看</el-button>
+          <el-button size="btJS" @click="chaKan(item.deptId)"
+          v-hasPermi="['grassrootsregistration:bdgldrills:query']"
+          >查看</el-button>
         </div>
       </li>
     </ul>

src/views/grassrootsregistration/bdglequips/index.vue

@@ -29,6 +29,7 @@
           <div class="names">{{ item1.deptName }}</div>
           <div class="btn">
             <el-button size="btJS" @click="chaKan(item1.deptId)"
+            v-hasPermi="['grassrootsregistration:bdglequips:query']"
               >查看</el-button
             >
           </div>

src/views/grassrootsregistration/bdglevens/index.vue

@@ -41,7 +41,12 @@
         <li v-for="(item, i) in lieList" :key="i">
           <div class="names">{{ item.deptName }}</div>
           <div class="btn">
-            <el-button size="btJS" @click="chaKan(item.deptId)">查看</el-button>
+            <el-button
+              size="btJS"
+              @click="chaKan(item.deptId)"
+              v-hasPermi="['grassrootsregistration:bdglevens:query']"
+              >查看</el-button
+            >
           </div>
         </li>
       </ul>
@@ -132,8 +137,7 @@
       :before-close="closes"
     >
       <div
-        style="
-          margin-bottom: 20px;
+        style=" margin-bottom: 20px;
           margin-left: 28%;
           font-size: 16px;
           font-weight: 700;

src/views/grassrootsregistration/bdglfilemanagements/index.vue

@@ -38,7 +38,9 @@
         <li v-for="(item, i) in lieList" :key="i">
           <div class="names">{{ item.deptName }}</div>
           <div class="btn">
-            <el-button size="btJS" @click="chaKan(item.deptId)">查看</el-button>
+            <el-button size="btJS" @click="chaKan(item.deptId)"
+            v-hasPermi="['grassrootsregistration:bdglfilemanagements:query']"
+            >查看</el-button>
           </div>
         </li>
       </ul>

src/views/grassrootsregistration/bdglmeetings/index.vue

@@ -115,7 +115,7 @@
               size="btk"
               type="text"
               @click="handleChakan(scope.row)"
-              v-hasPermi="['grassrootsregistration:bdgldiary:edit']"
+              v-hasPermi="['grassrootsregistration:bdglmeetings:query']"
               ><span class="chakan">查看</span></el-button
             >
           </template>

src/views/grassrootsregistration/bdglpartys/index.vue

@@ -38,7 +38,12 @@
         <li v-for="(item, i) in lieList" :key="i">
           <div class="names">{{ item.deptName }}</div>
           <div class="btn">
-            <el-button size="btJS" @click="chaKan(item)">查看</el-button>
+            <el-button
+              size="btJS"
+              @click="chaKan(item)"
+              v-hasPermi="['grassrootsregistration:bdglpartys:query']"
+              >查看</el-button
+            >
           </div>
         </li>
       </ul>
@@ -92,7 +97,7 @@
               size="btk"
               type="text"
               @click="handleChakan(scope.row)"
-              v-hasPermi="['grassrootsregistration:bdgldiary:edit']"
+              v-hasPermi="['grassrootsregistration:bdglpartys:query']"
               ><span class="chakan">查看</span></el-button
             >
           </template>
@@ -133,8 +138,7 @@
       :before-close="closes"
     >
       <div
-        style="
-          margin-bottom: 20px;
+        style="  margin-bottom: 20px;
           margin-left: 28%;
           font-size: 16px;
           font-weight: 700;

src/views/grassrootsregistration/bdglpublicpropertys/index.vue

@@ -38,7 +38,9 @@
         <li v-for="(item, i) in lieList" :key="i">
           <div class="names">{{ item.deptName }}</div>
           <div class="btn">
-            <el-button size="btJS" @click="chaKan(item.deptId)">查看</el-button>
+            <el-button size="btJS" @click="chaKan(item.deptId)"
+            v-hasPermi="['grassrootsregistration:bdglpublicpropertys:query']"
+            >查看</el-button>
           </div>
         </li>
       </ul>

src/views/grassrootsregistration/bdglsecrecys/index.vue

@@ -29,6 +29,7 @@
           <div class="names">{{ item1.deptName }}</div>
           <div class="btn">
             <el-button size="btJS" @click="chaKan(item1.deptId, item1.startTime)"
+            v-hasPermi="['grassrootsregistration:bdglsecrecys:query']"
               >查看</el-button
             >
           </div>

src/views/grassrootsregistration/bdglsoldiers/index.vue

@@ -107,7 +107,7 @@
               size="btk"
               type="text"
               @click="handleChakan(scope.row)"
-              v-hasPermi="['grassrootsregistration:bdgldiary:edit']"
+              v-hasPermi="['grassrootsregistration:bdglsoldiers:query']"
               ><span class="chakan">查看</span></el-button
             >
           </template>

src/views/pt.vue

@@ -842,10 +842,15 @@ export default {
         console.log(res);
         this.opentitel = res.msg;
         if (res.num == 0) {
+          this.open6 = false;
+        } else {
+          var ti = Cookies.get("tixing")||false;
+          if (ti) {
             this.open6 = false;
-        }else{
-          this.open6 = true;
+          } else {
+            this.open6 = true;
             Cookies.set("tixing", "true");
+          }
         }
       });
     },

src/views/regulations/fileinfo/index.vue

@@ -39,13 +39,13 @@
                   alt=""
                 />
                 <img
-                v-else-if="
-                  scope.row.parentDirId == '.ppt' ||
-                  scope.row.parentDirId == '.pptx'
-                "
-                src="../../../images/ppt.png"
-                alt=""
-              />
+                  v-else-if="
+                    scope.row.parentDirId == '.ppt' ||
+                    scope.row.parentDirId == '.pptx'
+                  "
+                  src="../../../images/ppt.png"
+                  alt=""
+                />
               </div>
               <!-- 文件名称 fileName -->
               <div>
@@ -156,7 +156,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
+      <!-- <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="queryParams.pageNum"
@@ -165,15 +165,25 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       >
-      </el-pagination>
-      <!-- <pagination
+      </el-pagination> -->
+      <pagination
+        v-if="nunms == 0"
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="handleCurrentChange()"
+      />
+      <pagination
+        v-if="nunms == 1"
         v-show="total > 0"
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      /> -->
+        @pagination="handleCurrentChanges"
+      />
     </div>
+
     <!-- 右边 -->
     <div class="rights">
       <!-- 目录 -->
@@ -732,6 +742,9 @@ export default {
       gopage: true,
       // 多文件上传列表
       moreFile: [],
+      nunms: 0,
+      // 点击右侧一级分类进去
+      Ids: null,
     };
   },
 
@@ -810,25 +823,45 @@ export default {
     },
     handleSizeChange(val) {},
     handleCurrentChange(val) {
-      this.queryParams.pageNum = val;
-      listFileinfo({
-        pageNum: this.queryParams.pageNum,
-        pageSize: this.queryParams.pageSize,
-      }).then((res) => {
+      // 1
+      this.nunms = 0;
+      listFileinfo(this.queryParams).then((res) => {
+        this.fileinfoList = res.rows;
+        this.total = res.total;
+      });
+      // if(this.nunms==0){
+      //   this.queryParams.pageNum = val;
+      // listFileinfo({
+      //   pageNum: this.queryParams.pageNum,
+      //   pageSize: this.queryParams.pageSize,
+      // }).then((res) => {
+      //   this.fileinfoList = res.rows;
+      //   this.total = res.total;
+      // });
+      // if(this.nunms==1){
+      //   listParents({
+      //     parentid: row.id,
+      //     pageNum: this.queryParams.pageNum,
+      //     pageSize: this.queryParams.pageSize,
+      //   }).then(res=>{
+      //     console.log(res,1);
+      //     this.fileinfoList = res.rows;
+      //     this.total = res.total;
+      //   })
+      // }
+      // }
+      console.log(val);
+    },
+    handleCurrentChanges() {
+      this.queryParams.parentid=this.Ids;
+      listParents(this.queryParams).then((res) => {
         this.fileinfoList = res.rows;
-        // this.fileinfoList.map(item=>{
-        //   item.parentDirName='http://localhost:8089'+item.parentDirName;
-
-        // })
-
         this.total = res.total;
       });
     },
     handleCurrentChange1(val) {
       this.queryParams1.pageNum = val;
-
       // this.queryParams.common = "1";
-
       if (this.parentId) {
         this.queryParams1.common = null;
       } else {
@@ -886,22 +919,24 @@ export default {
     },
     // 点击目录根据子目录的数量控制他是否可以点进去进行渲染
     mulus(row) {
+      console.log(row, 1);
+      this.nunms = 1;
       if (row.parentId == 0) {
         this.parentId = row.id;
+        this.Ids = row.id;
       } else {
         this.parentId = row.parentId;
       }
-      console.log(row.parentId );
       if (row.parentId == 0) {
         listParents({
           parentid: row.id,
           pageNum: this.queryParams.pageNum,
           pageSize: this.queryParams.pageSize,
-        }).then(res=>{
-          console.log(res,1);
+        }).then((res) => {
+          console.log(res, 1);
           this.fileinfoList = res.rows;
           this.total = res.total;
-        })
+        });
       } else {
         // if(this.parentId)
         this.form.directoryId = row.id;
@@ -911,7 +946,7 @@ export default {
           pageNum: this.queryParams.pageNum,
           pageSize: this.queryParams.pageSize,
         }).then((res) => {
-          console.log(res,2);
+          console.log(res, 2);
           this.fileinfoList = res.rows;
           // this.fileinfoList.map(item=>{
           //   item.parentDirName='http://localhost:8089'+item.parentDirName;
@@ -1207,8 +1242,8 @@ export default {
         this.previewDialog = true;
         this.pdfurl = process.env.VUE_APP_BASE_API + row.parentDirName;
         this.pageNum = 1;
-      }else{
-        this.$message.error('只能阅读Word跟pdf文件')
+      } else {
+        this.$message.error("只能阅读Word跟pdf文件");
       }
       row.common = "1";
       updateFileinfo(row).then((res) => {
@@ -1725,4 +1760,8 @@ body,
   background: #1d96ff;
   color: white;
 }
+
+::v-deep .el-pagination__sizes  .el-select--mini{
+  display: none;
+}
 </style>

src/views/system/cookcategory/index.vue

@@ -346,9 +346,11 @@ export default {
   background: #004d86 !important;
   margin: 200px auto !important;
 }
-::v-deep .el-input__inner {
-  width: 200px !important;
+::v-deep .el-dialog .el-input__inner {
   height: 36px;
+}
+::v-deep .el-input__inner {
+  height: 28px;
   background: transparent;
   color: #fff !important;
 }

src/views/thought/getready/index.vue

@@ -1406,9 +1406,9 @@ export default {
   width: 100% !important;
 }
 
-::v-deep .yuedu .el-dialog__body {
+/*  ::v-deep .yuedu .el-dialog__body {
   padding-left: 126px !important;
-}
+} */
 
 /* 上一页样式 */
 .gopage {

src/views/thought/parliament/index.vue

@@ -1123,9 +1123,9 @@ export default {
   padding-right: 0px !important;
   padding-bottom: 0px !important;
 }
-::v-deep .yuedu .el-dialog__body{
+/*  ::v-deep .yuedu .el-dialog__body{
   padding-left: 126px !important;
-}
+}*/
 /* 富文本内容 */
 /* ::v-deep .editor{
   width: 1010px;