checkTime

src/views/components/AddDialog/tab2.vue

@@ -81,7 +81,7 @@
         </el-form-item>
       </el-form>
     </div>
-    <div class="tables" v-loading="loading">
+    <div class="tables">
       <el-table v-loading="loading" :data="newList" height="350">
         <el-table-column
           label="企业名称"
@@ -294,9 +294,10 @@ export default {
       let userInfo = JSON.parse(sessionStorage.getItem("USER_INFO"));
       if (userInfo.lawLevel == "县级" || userInfo.lawLevel == "镇级") {
         this.queryParams.district = userInfo.permissionCode;
+      }
+
       this.queryPlanEnterpriseParams.district = userInfo.permissionCode;
       this.queryPlanEnterpriseParams.lawHierarchy = userInfo.nickName;
-      }
       this.queryParams.riskLevel = "C,D";
       this.getList();
       this.getPlanEnterpriseList();
@@ -336,10 +337,11 @@ export default {
       );
       this.formPlanEnterprise.plannedMonth = "";
       this.formPlanEnterprise.enterpriseId = row.enterpriseId;
+      this.formPlanEnterprise.uuto = row.id;
       this.formPlanEnterprise.enterpriseName = row.enterpriseName;
       this.formPlanEnterprise.district = row.district;
       this.formPlanEnterprise.status = 0;
-      // console.log("2", this.formPlanEnterprise);
+      // console.log(row);
       addEnterprise(this.formPlanEnterprise).then((response) => {
         this.$modal.msgSuccess("加入成功");
         this.getList(); //对应草稿箱的消失需要后台写
@@ -588,7 +590,7 @@ export default {
           }
         }
         .el-table__body-wrapper {
-          height: 448px !important;
+          // height: 448px !important;
           overflow-y: auto;
         }
       }

src/views/components/AddDialog/tab3.vue

@@ -1,7 +1,8 @@
 <template>
   <div>
-    <div class="tables" v-loading="loading">
-      <el-table v-loading="loading" :data="enterpriseList" height="350">
+    <div class="filtrate"></div>
+    <div class="tables">
+      <el-table v-loading="loading" :data="enterpriseList" height="400">
         <el-table-column label="计划年份" align="center" prop="plannedYear" />
 
         <el-table-column label="计划月份" align="center" prop="plannedMonth">
@@ -215,6 +216,7 @@ export default {
       this.$nextTick(() => {
         let userInfo = JSON.parse(sessionStorage.getItem("USER_INFO"));
         this.queryParams.district = userInfo.permissionCode;
+        this.queryParams.lawHierarchy = userInfo.nickName;
         this.getList();
       });
     },
@@ -429,7 +431,7 @@ export default {
           }
         }
         .el-table__body-wrapper {
-          height: 448px !important;
+          // height: 448px !important;
           overflow-y: auto;
         }
       }

src/views/system/userc/profile/resetPwd.vue

@@ -26,7 +26,7 @@
     </el-form-item>
     <el-form-item>
       <el-button type="primary" size="mini" @click="submit">保存</el-button>
-      <el-button type="danger" size="mini" @click="close">关闭</el-button>
+      <!-- <el-button type="danger" size="mini" @click="close">关闭</el-button> -->
     </el-form-item>
   </el-form>
 </template>
@@ -89,6 +89,8 @@ export default {
                 let isGovernmentAffairsNetwork = localStorage.getItem(
                   "isGovernmentAffairsNetwork"
                 );
+                sessionStorage.removeItem("SET_IS_ORG_PWD");
+
                 // console.log("进入跳转政务网的登录页");
                 if (isGovernmentAffairsNetwork == "1") {
                   localStorage.removeItem("isGovernmentAffairsNetwork");

src/views/yingji/enforcing.vue

@@ -138,7 +138,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="examineEndTime"
+          prop="checkTime"
           label="检查结束时间"
           header-align="center"
         />

src/views/yingji/home.vue

@@ -216,12 +216,24 @@
         </el-table>
       </div>
     </el-dialog>
+
+    <!-- 重置密码 -->
+    <el-dialog
+      title="需要修改原始密码"
+      :visible.sync="isResetPwdDialog"
+      :show-close="false"
+      width="30%"
+      center
+    >
+      <resetPwd />
+    </el-dialog>
   </div>
 </template>
 <script>
 import completePlan from "./echarts/completePlan";
 import finishRate from "./echarts/finishRate";
 import executionPlan from "./echarts/executionPlan";
+import resetPwd from "../system/userc/profile/resetPwd.vue";
 import {
   listEnterprise,
   getEnterprise,
@@ -235,6 +247,7 @@ import {
 export default {
   data() {
     return {
+      isResetPwdDialog:false,
       queryParams: {
         plannedYear: null,
         plannedMonth: null,
@@ -324,13 +337,23 @@ export default {
     completePlan,
     finishRate,
     executionPlan,
+    resetPwd,
   },
   created() {
     this.queryParams.plannedYear = this.$moment(new Date()).format("yyyy");
     this.getList();
+
+    let SET_IS_ORG_PWD = JSON.parse(sessionStorage.getItem("SET_IS_ORG_PWD"));
+    if (SET_IS_ORG_PWD) {
+      // 原始密码修改
+      this.resetPwd();
+    }
   },
   mounted() {},
   methods: {
+    resetPwd() {
+      this.isResetPwdDialog = true;
+    },
     // 导出
     handelExport() {
       this.download(

src/views/yingji/planManage.vue

@@ -188,6 +188,17 @@
 
     <!-- 编辑对话框 -->
     <edit-dialog ref="editDialog" />
+
+    <!-- 重置密码 -->
+    <el-dialog
+      title="需要修改原始密码"
+      :visible.sync="isResetPwdDialog"
+      :show-close="false"
+      width="30%"
+      center
+    >
+      <resetPwd />
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -202,12 +213,14 @@ import AddDialog from "@/views/components/AddDialog/index.vue";
 import InfoDialog from "./planmanage/components/infoDialog.vue";
 import EditDialog from "./planmanage/components/editDialog.vue";
 import executive from "./echarts/executive.vue";
+import resetPwd from "../system/userc/profile/resetPwd.vue";
 
 export default {
-  components: { AddDialog, InfoDialog, executive, EditDialog },
+  components: { AddDialog, InfoDialog, executive, EditDialog, resetPwd },
   dicts: ["dict_law_hierarchy"],
   data() {
     return {
+      isResetPwdDialog: false,
       islawHierarchy: false,
       lawHierarchys: [
         {
@@ -318,6 +331,9 @@ export default {
     };
   },
   methods: {
+    resetPwd() {
+      this.isResetPwdDialog = true;
+    },
     // 行政区划
     onChange(e) {
       console.log(1, e);
@@ -487,6 +503,12 @@ export default {
       this.queryParams.lawHierarchy = this.$route.query.lawHierarchy;
     }
 
+    let SET_IS_ORG_PWD = JSON.parse(sessionStorage.getItem("SET_IS_ORG_PWD"));
+    if (SET_IS_ORG_PWD) {
+      // 原始密码修改
+      this.resetPwd();
+    }
+
     // 初始化
     this.getList();
   },