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

src/views/check/dialog.edit.vue

@@ -802,17 +802,23 @@ export default {
     },
     onSubmit() {
       this.$refs.form.validate(async (isValidate) => {
+        if (!isValidate) return;
+        this.loading = true;
+        let status=0;
         // console.log(this.formData.hasEdit,"this.formData.hasEdit")
         this.formData.planCreateOrgId = this.orgId;
         this.formData.planCreateOrgName = this.orgName;
+        status=this.formData.planStatus;
         this.formData.planStatus = 0;
-        if (!isValidate) return;
+
         this.formData.rulePointList =
           this.tableData == null ? [] : this.tableData;
+          let rols=this.formData.roleList;
+          let rolis=this.formData.roleIds;
         this.formData.roleList = null;
         this.formData.roleIds =
           this.selectedValues.length == 0 ? null : this.selectedValues;
-        this.loading = true;
+        
         if (this.formData.planCycle == 6) {
           this.formData.buildTaskNow = true;
         }
@@ -824,6 +830,9 @@ export default {
             this.onHide();
           })
           .catch((err) => {
+            this.formData.roleList=rols;
+            this.formData.roleIds=rolis;
+            this.formData.planStatus=status;
             this.loading = false;
             // console.log(err,"err")
           });

src/views/core/reportForms/drill.vue

@@ -1,109 +1,93 @@
 <template>
   <div class="app-container">
-    <el-row slot="rightBar">
-      <!--用户数据-->
-      <el-col>
-        <div class="main-right-box">
-          <!--    搜索条件    -->
-          <div class="main-search-box">
-            <!--    搜索条件    -->
-            <el-form
-              :model="queryParams"
-              ref="queryForm"
-              size="small"
-              :inline="true"
-              v-show="showSearch"
+    <!--    搜索条件    -->
+    <div class="main-search-box">
+      <!--    搜索条件    -->
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
 
+      >
+        <el-form-item label="组织机构:" class="formTreeItem">
+          <tree-select
+            v-model="queryParams.orgId"
+            :options="deptOptions"
+            :show-count="true"
+            :normalizer="tenantIdnormalizer"
+            :props="{ checkStrictly: true, label: 'name' }"
+            placeholder="请选择归属机构"
+            clearValueText="清除"
+            :noChildrenText="''"
+            @select="changeSelect"
+            noOptionsText="没有数据"
+            noResultsText="没有搜索结果"
+          />
+        </el-form-item>
+        <el-form-item label="培训任务名称:" label-width="50">
+          <el-select v-model="queryParams.planId" @change="changeHandler">
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
             >
-              <el-form-item label="组织机构:" class="formTreeItem">
-                <tree-select
-                  v-model="queryParams.orgId"
-                  :options="deptOptions"
-                  :show-count="true"
-                  :normalizer="tenantIdnormalizer"
-                  :props="{ checkStrictly: true, label: 'name' }"
-                  placeholder="请选择归属机构"
-                  clearValueText="清除"
-                  :noChildrenText="''"
-                  @select="changeSelect"
-                  noOptionsText="没有数据"
-                  noResultsText="没有搜索结果"
-                />
-              </el-form-item>
-              <el-form-item label="培训任务名称:" label-width="50">
-                <el-select v-model="queryParams.planId" @change="changeHandler">
-                  <el-option
-                    v-for="item in options"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
+            </el-option>
+          </el-select>
+        </el-form-item>
 
-              <el-form-item class="searchTitle" label="任务时间">
-                <el-date-picker
-                  v-model="queryParams.range"
-                  key="monthrange"
-                  type="monthrange"
-                  :clearable="false"
-                />
-              </el-form-item>
+        <el-form-item class="searchTitle" label="任务时间">
+          <el-date-picker
+            v-model="queryParams.range"
+            key="monthrange"
+            type="monthrange"
+            :clearable="false"
+          />
+        </el-form-item>
 
-            </el-form>
-            <!-- 按纽    -->
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
-                <el-button
-                  type="primary"
-                  icon="el-icon-search"
-                  size="mini"
-                  @click="handleQuery"
-                >搜索
-                </el-button
-                >
-                <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
-                >重置
-                </el-button
-                >
-                <el-button
-                  type="primary"
-                  icon="el-icon-download"
-                  size="mini"
-                  @click="handleExport"
-                >导出数据
-                </el-button>
-              </el-col>
-            </el-row>
-          </div>
-        </div>
+      </el-form>
+      <!-- 按纽    -->
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+          >搜索
+          </el-button
+          >
+          <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置
+          </el-button
+          >
+          <el-button
+            type="primary"
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+          >导出数据
+          </el-button>
+        </el-col>
+      </el-row>
+    </div>
 
-
-        <div
-          class="securityEquipmentMonitoringtable ml-4 flex-1"
-        >
-          <div class="title">演练统计报表</div>
-          <table ref="tb11" class="table-scroll">
-            <tr>
-              <th colspan="1" rowspan="1">序号</th>
-              <th colspan="1" rowspan="1">单位名称</th>
-              <th colspan="1" rowspan="1">应完成数</th>
-              <th colspan="1" rowspan="1">已完成数</th>
-              <th colspan="1" rowspan="1">评分</th>
-            </tr>
-
-            <tr v-for="(item, index) in targetList" :key="index">
-              <td>{{ index + 1 }}</td>
-              <td>{{ item.orgName }}</td>
-              <td>{{ item.shouldFinish }}</td>
-              <td>{{ item.finish }}</td>
-              <td>{{ item.score }}</td>
-            </tr>
-          </table>
-        </div>
-      </el-col>
-    </el-row>
+    <div class="main-search-box" style="margin-bottom: 0;">
+      <h1 style="text-align:center;">演练统计报表</h1>
+    </div>
+    <el-table
+      v-loading="loading"
+      :data="targetList"
+      border
+      height="616" size="small">
+      <el-table-column type="index" align="center" label="序号" width="60"></el-table-column>
+      <el-table-column align="center" label="单位名称" prop="orgName"/>
+      <el-table-column align="center" label="应完成数" prop="shouldFinish" width="340"/>
+      <el-table-column align="center" label="已完成数" prop="finish"/>
+      <el-table-column align="center" label="评分" prop="score"/>
+    </el-table>
   </div>
 </template>
 <script>
@@ -154,6 +138,12 @@ export default {
     ...mapGetters(["orgId"]),
   },
   methods: {
+    getPageIndex($index) {
+      //表格序号
+      return (
+        (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+      );
+    },
     changeHandler() {
       // this.getList();
     },
@@ -198,11 +188,7 @@ export default {
       getDrillReportData(this.queryParams).then((res) => {
         let {code, data, msg} = res;
         if (code == 200) {
-          if (data.length > 0) {
-            this.targetList = data || [];
-          } else {
-            this.$message.error("暂无数据")
-          }
+          this.targetList = data || []
         }
         this.loading = false;
       });

src/views/core/reportForms/eduTraining.vue

@@ -1,113 +1,97 @@
 <template>
   <div class="app-container">
-    <el-row slot="rightBar">
-      <!--用户数据-->
-      <el-col>
-        <div class="main-right-box">
-          <!--    搜索条件    -->
-          <div class="main-search-box">
-            <!--    搜索条件    -->
-            <el-form
-              :model="queryParams"
-              ref="queryForm"
-              size="small"
-              :inline="true"
-              v-show="showSearch"
+    <!--    搜索条件    -->
+    <div class="main-search-box">
+      <!--    搜索条件    -->
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
 
+      >
+        <el-form-item label="组织机构:" class="formTreeItem">
+          <tree-select
+            v-model="queryParams.orgId"
+            :options="deptOptions"
+            :show-count="true"
+            :normalizer="tenantIdnormalizer"
+            :props="{ checkStrictly: true, label: 'name' }"
+            placeholder="请选择归属机构"
+            clearValueText="清除"
+            :noChildrenText="''"
+            @select="changeSelect"
+            noOptionsText="没有数据"
+            noResultsText="没有搜索结果"
+          />
+        </el-form-item>
+        <!--              <el-form-item label="受训机构">
+                        <org-tree
+                          v-model="queryParams.orgId"
+                          @defaultOrg="getDefaultOrg"
+                          @checkChange="checkChange"
+                          @click="clickTreeNode"
+                          :defaultCheckSub="false"
+                        ></org-tree>
+                      </el-form-item>-->
+        <el-form-item label="培训任务名称:" label-width="50">
+          <el-select v-model="queryParams.planId" @change="changeHandler">
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
             >
-              <el-form-item label="组织机构:" class="formTreeItem">
-                <tree-select
-                  v-model="queryParams.orgId"
-                  :options="deptOptions"
-                  :show-count="true"
-                  :normalizer="tenantIdnormalizer"
-                  :props="{ checkStrictly: true, label: 'name' }"
-                  placeholder="请选择归属机构"
-                  clearValueText="清除"
-                  :noChildrenText="''"
-                  @select="changeSelect"
-                  noOptionsText="没有数据"
-                  noResultsText="没有搜索结果"
-                />
-              </el-form-item>
-              <!--              <el-form-item label="受训机构">
-                              <org-tree
-                                v-model="queryParams.orgId"
-                                @defaultOrg="getDefaultOrg"
-                                @checkChange="checkChange"
-                                @click="clickTreeNode"
-                                :defaultCheckSub="false"
-                              ></org-tree>
-                            </el-form-item>-->
-              <el-form-item label="培训任务名称:" label-width="50">
-                <el-select v-model="queryParams.planId" @change="changeHandler">
-                  <el-option
-                    v-for="item in options"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
+            </el-option>
+          </el-select>
+        </el-form-item>
 
-              <el-form-item label="时间" prop="date">
-                <el-date-picker value-format='yyyy-MM-dd' v-model="queryParams.date"
-                                align="right" type="month" placeholder="请选择查询时间">
-                </el-date-picker>
-              </el-form-item>
+        <el-form-item label="时间" prop="date">
+          <el-date-picker value-format='yyyy-MM-dd' v-model="queryParams.date"
+                          align="right" type="month" placeholder="请选择查询时间">
+          </el-date-picker>
+        </el-form-item>
 
-            </el-form>
-            <!-- 按纽    -->
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
-                <el-button
-                  type="primary"
-                  icon="el-icon-search"
-                  size="mini"
-                  @click="handleQuery"
-                >搜索
-                </el-button>
-                <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
-                >重置
-                </el-button>
-                <el-button
-                  type="primary"
-                  icon="el-icon-download"
-                  size="mini"
-                  @click="handleExport"
-                >导出数据
-                </el-button>
-              </el-col>
-            </el-row>
-          </div>
-        </div>
+      </el-form>
+      <!-- 按纽    -->
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+          >搜索
+          </el-button>
+          <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+          >导出数据
+          </el-button>
+        </el-col>
+      </el-row>
+    </div>
 
-
-        <div
-          class="securityEquipmentMonitoringtable ml-4 flex-1"
-        >
-          <div class="title">教育统计报表</div>
-          <table ref="tb11" class="table-scroll">
-            <tr>
-              <th colspan="1" rowspan="1">序号</th>
-              <th colspan="1" rowspan="1">单位名称</th>
-              <th colspan="1" rowspan="1">应完成数</th>
-              <th colspan="1" rowspan="1">已完成数</th>
-              <th colspan="1" rowspan="1">完成率</th>
-            </tr>
-
-            <tr v-for="(item, index) in targetList" :key="index">
-              <td>{{ index + 1 }}</td>
-              <td>{{ item.orgName }}</td>
-              <td>{{ item.shouldFinish }}</td>
-              <td>{{ item.finish }}</td>
-              <td>{{ item.finishRate }}</td>
-            </tr>
-          </table>
-        </div>
-      </el-col>
-    </el-row>
+    <div class="main-search-box" style="margin-bottom: 0;">
+      <h1 style="text-align:center;">教育统计报表</h1>
+    </div>
+    <el-table
+      v-loading="loading"
+      :data="targetList"
+      border
+      height="616" size="small">
+      <el-table-column type="index" align="center" label="序号" width="60"></el-table-column>
+      <el-table-column align="center" label="单位名称" prop="orgName"/>
+      <el-table-column align="center" label="应完成数" prop="shouldFinish" width="340"/>
+      <el-table-column align="center" label="已完成数" prop="finish"/>
+      <el-table-column align="center" label="完成率" prop="finishRate"/>
+    </el-table>
   </div>
 </template>
 <script>
@@ -136,7 +120,7 @@ export default {
       // 显示搜索条件
       showSearch: true,
       deptOptions: [], //机构数组
-      selectedOrgName:null,
+      selectedOrgName: null,
     };
   },
   created() {
@@ -161,7 +145,7 @@ export default {
       //  this.getList();
     },
     changeSelect(org) {
-      this.selectedOrgName=org.shortName
+      this.selectedOrgName = org.shortName
       // this.getList();
     },
     /** 查询机构树数据 */
@@ -200,11 +184,7 @@ export default {
       getEduReportData(this.queryParams).then((res) => {
         let {code, data, msg} = res;
         if (code == 200) {
-          if (data.length > 0) {
-            this.targetList = data || [];
-          } else {
-            this.$message.error("暂无数据")
-          }
+          this.targetList = data || []
         }
         this.loading = false;
       });
@@ -234,10 +214,10 @@ export default {
 
     /** 导出按钮操作 */
     handleExport() {
-      let param={
+      let param = {
         ...this.queryParams,
       }
-      param.date=dayjs(param.date).format("YYYY-MM-DD HH:mm:s")
+      param.date = dayjs(param.date).format("YYYY-MM-DD HH:mm:s")
       this.download(
         "core/eduTask/exportReport",
         param,

src/views/resumption/plan/dialog.edit.vue

@@ -6,7 +6,7 @@
       :visible.sync="isShow"
       width="1500px"
     >
-      <div class="page-body">
+      <div class="page-body" v-loading="loading">
         <el-form
           :model="formData"
           :rules="formDataRules"
@@ -302,6 +302,7 @@ export default {
     // let o=statusOptions;
     // debugger
     return {
+      loading: false,
       parentCount: 1,
       buildTime: null,
       isSubmitting: false,
@@ -804,12 +805,14 @@ export default {
     },
     onSubmit() {
       this.$refs.form.validate(async (isValidate) => {
+        if (!isValidate) return;
+        this.loading = true;
         // this.formData.planStatus = 0;
         this.isSubmitting = true;
         // this.formData.note = this.formData.description;
         this.formData.planCreateOrgId = this.orgId;
         this.formData.planCreateOrgName = this.orgName;
-        if (!isValidate) return;
+      
         this.formData.itemList = this.tableData == null ? [] : this.tableData;
         //新需求,自动填充角色
         if (
@@ -823,10 +826,20 @@ export default {
         }
         this.formData.roleList =
           this.selectedValues.length == 0 ? null : this.selectedValues;
-        await api.update(this.formData);
-        this.isSubmitting = false;
-        this.$emit("success");
-        this.onHide();
+
+        await api.update(this.formData).then((data) => {
+          this.isSubmitting = false;
+            this.loading = false;
+            this.$emit("success");
+            this.onHide();
+          })
+          .catch((err) => {
+            this.loading = false;
+            // console.log(err,"err")
+          });
+        
+        // this.$emit("success");
+        // this.onHide();
       });
     },
     handleRolesChange(val) {

src/views/safetyBook/dialog.edit.vue

@@ -221,7 +221,16 @@ export default {
       };
     },
     removeRow(row) {
-      this.tableData = this.tableData.filter((item) => item !== row);
+      this.$modal
+        .confirm("是否确认删除？")
+        .then(function () {})
+        .then(() => {
+          this.tableData = this.tableData.filter((item) => item !== row);
+          this.$modal.msgSuccess("删除成功");
+        });
+
+      // this.tableData.splice(index, 1);
+    
     },
     reset() {
       return {

src/views/system/dept/index.vue

@@ -479,6 +479,7 @@ export default {
         checkSub: true,
         type: null,
         code: null,
+        isLock:null,
       },
       // 表单参数
       form: {},