暂存一下

liangzhen
Commit 54a52706 authored Sep 20, 2024 by liangzhen
Showing with 91 additions and 54 deletions
src/views/compliance/addConfigure.vue
src/views/compliance/checkRules.vue
src/views/compliance/taskConfigure.vue
src/views/projectCheck/checkResault.vue
src/views/projectCheck/problemRectify.vue
src/views/projectCheck/verificationRectify.vue
--- a/src/views/compliance/addConfigure.vue
+++ b/src/views/compliance/addConfigure.vue
@@ -229,7 +229,7 @@
          <el-table
            @select="handleSelectionChangeXM"
            @select-all="selectAll"
-            @row-click="handleRowClickSelf"
+            @row-click="(row, column, event) => handleRowClick(row, column, event, 'multipleTableXM')"
            ref="multipleTableXM"
            :data="zjtableData"
            tooltip-effect="dark myTooltips"
@@ -429,7 +429,10 @@ import {
 } from "@/api/index";
 import { generateYearOptions, constructionFormText } from "@/utils/cache";
 import { getCurrentDate } from "@/utils/format";
+import tableMixin from '@/mixins/table.mixin.js'
 export default {
+  mixins: [tableMixin],
  data() {
    return {
      yearsList: generateYearOptions(),

--- a/src/views/compliance/checkRules.vue
+++ b/src/views/compliance/checkRules.vue
@@ -69,6 +69,7 @@
      <el-table
        @selection-change="handleSelectionChange"
        ref="multipleTable"
+        @row-click="(row, column, event) => handleRowClick(row, column, event, 'multipleTable')"
        :data="tableData"
        tooltip-effect="dark myTooltips"
        style="width: 100%"
@@ -197,21 +198,22 @@
          >
          </el-table-column>
          <el-table-column label="详细列表" prop="checkDesc">
+            <!-- v-if="scope.row.configValue == 1" -->
            <template slot-scope="scope">
              <el-button
                size="small"
-                v-if="scope.row.configValue == 1"
+                v-if="scope.row.questionId == 1"
                type="primary"
                class="btn-search"
-                @click="edit(scope.row,scope.$index, '详情')"
+                @click="editxq(scope.row,scope.$index, '详情')"
              >
-                编制
+              查看
              </el-button>
            </template>
          </el-table-column>
        </el-table>
      </div>
-      <el-pagination
+      <!-- <el-pagination
        @size-change="handleSizeChangeXQ"
        @current-change="handleCurrentChangeXQ"
        :current-page="XQcurrentPage"
@@ -221,7 +223,7 @@
        :total="totalXQ"
        class="elpagination"
      >
-      </el-pagination>
+      </el-pagination> -->
      <p class="close"><span @click="cancel()">关闭</span></p>
    </el-dialog>
    <!-- 新增弹窗 -->
@@ -336,7 +338,7 @@
      :append-to-body="false"
    >
      <div class="bjrule">
-        <el-checkbox-group v-model="checkList">
+        <el-checkbox-group v-model="checkList" :disabled="xqedit">
          <el-checkbox label="1">应有可研报告或项目说明书</el-checkbox>
          <el-checkbox label="2">可研评审意见</el-checkbox>
          <el-checkbox label="3">可研批复</el-checkbox>
@@ -351,7 +353,7 @@
  </div>
 </template>
-      <script>
+<script>
 import { MaterialsList } from "@/utils/cache";
 import {
  ruleFormulation,
@@ -361,10 +363,13 @@ import {
  addiPageRorm,
 } from "@/api/index";
 import { getCurrentDate } from "@/utils/format";
+import tableMixin from '@/mixins/table.mixin.js'
 export default {
+  mixins: [tableMixin],
  data() {
    return {
+      xqedit:false,
      editIndex:99999999,
      checkList: [],
      tableDataQR: [],
@@ -487,14 +492,23 @@ export default {
    },
    //点击编辑
    async edit(info,index) {
-      console.log(info, index,"2222");
+      this.xqedit=false
      this.editIndex=index
      this.dialogedit = true;
-      if (info.questionId == 1 && info.configValue) {
+      // if (info.questionId == 1 && info.configValue) {
-        this.checkList = info.configValue.split(",");
+      //   this.checkList = info.configValue.split(",");
-      }
+      // }
      console.log(this.checkList, "3333");
    },
+    //详情里的编制
+    editxq(info,index){
+      console.log(info, index,"2222");
+      if ( info.configValue) {
+        this.checkList =  info.configValue.split(",")
+      }
+      this.xqedit=true
+      this.dialogedit = true;
+    },
    timeChange(time) {
      if (time) {
        //给后端的参数
@@ -559,9 +573,10 @@ export default {
      this.dialog = true;
      this.ruleFormdialog = this.checkedList[0];
      let params = {
-        current: this.XQcurrentPage,
+        id:this.checkedList[0].id
-        pageSize: this.pageSizeXQ,
+        // current: this.XQcurrentPage,
-        projectStage: this.checkedList[0].questionId,
+        // pageSize: this.pageSizeXQ,
+        // projectStage: this.checkedList[0].questionId,
      };
      let res = await iPageRorm(params);
      this.tableDataXQ = res.data.records;

--- a/src/views/compliance/taskConfigure.vue
+++ b/src/views/compliance/taskConfigure.vue
@@ -82,6 +82,7 @@
      <el-table
        @selection-change="handleSelectionChange"
        ref="multipleTable"
+        @row-click="(row, column, event) => handleRowClick(row, column, event, 'multipleTable')"
        :data="tableData"
        tooltip-effect="dark myTooltips"
        style="width: 100%"
@@ -324,8 +325,9 @@
          <el-table
            @select="handleSelectionChangeXM"
            @select-all="selectAll"
-            @row-click="handleRowClickSelf"
+            @row-click="(row, column, event) => handleRowClick(row, column, event, 'multipleTableXM')"
            ref="multipleTableXM"
            :data="zjtableData"
            tooltip-effect="dark myTooltips"
            style="width: 100%"
@@ -722,7 +724,10 @@ import {
  qidongTasks,
 } from "@/api/index";
 import { generateYearOptions,  constructionFormText } from "@/utils/cache";
+import tableMixin from '@/mixins/table.mixin.js'
 export default {
+  mixins: [tableMixin],
  data() {
    return {
      showDate: false,
@@ -995,15 +1000,15 @@ export default {
      }
      return "";
    },
-    handleRowClickSelf(row, column, event) {
+    // handleRowClickSelf(row, column, event) {
-      console.log(row,'2222')
+    //   console.log(row,'2222')
-      if (row.contractNumber && row.projectCode) {
+    //   if (row.contractNumber && row.projectCode) {
-        this.$refs['multipleTableZJ'].toggleRowSelection(row)
+    //     this.$refs['multipleTableZJ'].toggleRowSelection(row)
-        this.addZJList = this.$refs.multipleTableZJ.selection
+    //     this.addZJList = this.$refs.multipleTableZJ.selection
-      } else {
+    //   } else {
-        this.$message.warning('项目编码或合同编码为空')
+    //     this.$message.warning('项目编码或合同编码为空')
-      }
+    //   }
-    },
+    // },
    async handleClick() {
      if (this.activeName == "second") {
        let params = {
@@ -1100,6 +1105,7 @@ export default {
      let res = await qidongTasks(this.checkedList[0]);
      if (res.code == 200) {
        this.$message("运行成功");
+        this.resetForm()
      } else {
        this.$message("运行失败");
      }
@@ -1269,13 +1275,13 @@ export default {
      Promise.all([
        selRuleProject(params),
        selProject(params2),
-        // selProjectList(params2),
+        selProjectList({ auditId: this.checkedList[0].auditId}),
      ]).then((res) => {
        this.addtableData = res[0].data.records;
        this.addtableDataXM = res[1].data.records;
        this.addtotal = res[0].data.total;
        this.addtotalXM = res[1].data.total;
-        // let allList = res[2].data.records;
+        let allList = res[2].data.records;
        this.addtableDataXM.forEach((item) => {
          this.oldid = this.oldid.concat(item.projectCode + ",");
        });

--- a/src/views/projectCheck/checkResault.vue
+++ b/src/views/projectCheck/checkResault.vue
@@ -75,6 +75,7 @@
      <el-table
        @selection-change="handleSelectionChange"
        ref="multipleTable"
+          @row-click="(row, column, event) => handleRowClick(row, column, event, 'multipleTable')"
        :data="tableData"
         tooltip-effect="dark myTooltips"
        style="width: 100%"
@@ -90,7 +91,7 @@
        <el-table-column prop="auditTime" label="稽核时间" width="250">
        </el-table-column>
        <el-table-column
-          prop="fullName"
+          prop="projectName"
          label="项目名称"
          show-overflow-tooltip
        >
@@ -136,15 +137,9 @@
          <!-- <el-form-item label="项目编码:" class="fromItem" prop="projectId">
            <el-input v-model="ruleFormdialogXQ.projectId" disabled></el-input>
          </el-form-item> -->
-          <el-form-item label="项目名称:" class="fromItem" prop="fullName">
+          <el-form-item label="项目名称:" class="fromItem" prop="projectName">
-            <el-input v-model="ruleFormdialogXQ.fullName" type="textarea" disabled></el-input>
+            <el-input v-model="ruleFormdialogXQ.projectName" type="textarea" disabled></el-input>
          </el-form-item>
-          <!-- <el-form-item label="项目年度:" class="fromItem" prop="projectYear">
-            <el-input v-model="ruleFormdialogXQ.projectYear" disabled></el-input>
-          </el-form-item>
-          <el-form-item label="建设形式:" class="fromItem" prop="projectCategory">
-            <el-input v-model="ruleFormdialogXQ.projectCategory" disabled></el-input>
-          </el-form-item> -->
        </el-form>
        <p class="zjBtn">稽核异常项目清单</p>
        <div class="setscroll">
@@ -160,8 +155,14 @@
          <el-table-column label="序号" width="55" type="index">
          </el-table-column>
          <el-table-column
-            prop="projectName"
+            label="问题检查项"
-            label="稽核异常项目清单"
+            prop="quesCheckItem"
+            show-overflow-tooltip
+          >
+        </el-table-column>
+          <el-table-column
+            prop="questionValue"
+            label="问题描述"
            width="auto"
            show-overflow-tooltip
          >
@@ -196,7 +197,9 @@
 <script>
 import { auditTasksResults, xqauditTasksResults } from "@/api/index";
 import { generateYearOptions, projectCategoryText } from "@/utils/cache";
+import tableMixin from '@/mixins/table.mixin.js'
 export default {
+  mixins: [tableMixin],
  data() {
    return {
      yearsList: generateYearOptions(),
@@ -288,6 +291,8 @@ export default {
        current: this.currentPageXQ,
        pageSize: this.pageSizeXQ,
        auditId: this.checkedList[0].auditId,
+        contractNumber: this.checkedList[0].contractNumber,
+        projectId:this.checkedList[0].projectId
      };
      let res = await xqauditTasksResults(params);
      if (res.code == 200) {

--- a/src/views/projectCheck/problemRectify.vue
+++ b/src/views/projectCheck/problemRectify.vue
@@ -94,6 +94,7 @@
    <div class="setscroll">
      <el-table
        @selection-change="handleSelectionChange"
+          @row-click="(row, column, event) => handleRowClick(row, column, event, 'multipleTable')"
        ref="multipleTable"
        :data="tableData"
         tooltip-effect="dark myTooltips"
@@ -118,12 +119,12 @@
          show-overflow-tooltip
        >
        </el-table-column>
-        <el-table-column prop="projectYear" label="项目年度" width="200">
+        <el-table-column prop="issueYear" label="项目年度" width="200">
          <template slot-scope="scope">
-            {{ scope.row.projectYear }}年
+            {{ scope.row.issueYear }}年
          </template>
        </el-table-column>
-        <el-table-column prop="projectCategory" label="建设形式" width="200">
+        <el-table-column prop="constructionForm" label="建设形式" width="200">
        </el-table-column>
        <el-table-column prop="rectificationStatusText" label="问题整改状态">
        </el-table-column>
@@ -378,8 +379,11 @@ import {
  ossupload,
  downloadObject
 } from "@/api/index";
-import { generateYearOptions, projectCategoryText,ruleType } from "@/utils/cache";
+import { generateYearOptions,constructionFormText,ruleType } from "@/utils/cache";
+import tableMixin from '@/mixins/table.mixin.js'
 export default {
+  mixins: [tableMixin],
  data() {
    return {
      yearsList: generateYearOptions(),
@@ -454,10 +458,10 @@ export default {
            this.$set(item, "rectificationStatusText", "整改完成");
          }
          this.$set(
-            item,
+          item,
-            "projectCategory",
+          "constructionForm",
-            projectCategoryText(item.projectCategory)
+          constructionFormText(item.constructionForm)
-          );
+        );
        });
        this.total = res.data.total * 1;
      }

--- a/src/views/projectCheck/verificationRectify.vue
+++ b/src/views/projectCheck/verificationRectify.vue
@@ -101,6 +101,7 @@
      <el-table
        @selection-change="handleSelectionChange"
        ref="multipleTable"
+        @row-click="(row, column, event) => handleRowClick(row, column, event, 'multipleTable')"
        :data="tableData"
         tooltip-effect="dark myTooltips"
        style="width: 100%"
@@ -124,12 +125,12 @@
          show-overflow-tooltip
        >
        </el-table-column>
-        <el-table-column prop="projectYear" label="项目年度" width="200">
+        <el-table-column prop="issueYear" label="项目年度" width="200">
          <template slot-scope="scope">
-            {{ scope.row.projectYear }}年
+            {{ scope.row.issueYear }}年
          </template>
        </el-table-column>
-        <el-table-column prop="projectCategory" label="建设形式" width="200">
+        <el-table-column prop="constructionForm" label="建设形式" width="200">
        </el-table-column>
        <el-table-column
          prop="rectificationStatusText"
@@ -423,8 +424,11 @@ import {
  downloadObject,
  wtxfResults
 } from "@/api/index";
-import { generateYearOptions, projectCategoryText } from "@/utils/cache";
+import { generateYearOptions, constructionFormText } from "@/utils/cache";
+import tableMixin from '@/mixins/table.mixin.js'
 export default {
+  mixins: [tableMixin],
  data() {
    return {
      yearsList: generateYearOptions(),
@@ -493,10 +497,10 @@ export default {
            this.$set(item, "rectificationStatusText", "整改完成");
          }
          this.$set(
-            item,
+          item,
-            "projectCategory",
+          "constructionForm",
-            projectCategoryText(item.projectCategory)
+          constructionFormText(item.constructionForm)
-          );
+        );
        });
        this.total = res.data.total * 1;