Merge branch 'master' of http://116.204.116.5:3000/zzw/cbjsxt-front-master

src/components/task/taskInfo.vue

@@ -2,8 +2,8 @@
   <el-dialog
     :visible.sync="dialogVisible"
     title="任务详情"
-    width="100%"
-    height="100%"
+    width="80%"
+    top="5vh"
     :close-on-click-modal="false"
     :before-close="handleClose"
     class="task-info-dialog"
@@ -137,7 +137,7 @@
               </el-form-item>
               <el-form-item label="监审期间：">
                 <div class="cost-period-container">
-                  <el-button
+                  <!-- <el-button
                     type="primary"
                     size="small"
                     class="add-cost-year-btn"
@@ -145,7 +145,7 @@
                     @click="addCostYear"
                   >
                     +
-                  </el-button>
+                  </el-button> -->
                   <div class="cost-years-wrapper">
                     <div
                       v-for="(year, index) in formData.basicInfo
@@ -163,7 +163,7 @@
                         clearable
                         :disabled="isViewMode"
                       ></el-date-picker>
-                      <el-button
+                      <!-- <el-button
                         type="danger"
                         size="small"
                         class="delete-cost-year-btn"
@@ -171,7 +171,7 @@
                         @click="deleteCostYear(index)"
                       >
                         删除
-                      </el-button>
+                      </el-button> -->
                     </div>
                   </div>
                 </div>
@@ -259,7 +259,16 @@
         </el-tab-pane>
 
         <!-- 监审文书 -->
-        <el-tab-pane label="监审文书" name="auditDocument">
+        <el-tab-pane
+          v-if="
+            currentNode !== 'clcs' &&
+            currentNode !== 'jtsy' &&
+            currentNode !== 'yjfk' &&
+            currentNode === 'tjcl'
+          "
+          label="监审文书"
+          name="auditDocument"
+        >
           <div v-loading="loading" element-loading-text="加载中...">
             <div style="font-size: 14px; margin-bottom: 15px; color: #606266">
               <strong>说明：</strong>
@@ -309,7 +318,11 @@
         </el-tab-pane>
 
         <!-- 报送资料 -->
-        <el-tab-pane label="报送资料" name="dataRequirements">
+        <el-tab-pane
+          v-if="currentNode === 'clcs' || currentNode === 'tjcl'"
+          label="报送资料"
+          name="dataRequirements"
+        >
           <div v-loading="loading" element-loading-text="加载中...">
             <el-table
               border
@@ -397,12 +410,41 @@
                   </span>
                 </template>
               </el-table-column>
+              <el-table-column
+                prop="isRequired"
+                label="是否通过"
+                width="110"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <span v-if="!scope.row.isCategoryHeader">
+                    <span
+                      v-if="
+                        scope.row.auditedStatus !== null &&
+                        scope.row.auditedStatus !== undefined
+                      "
+                    >
+                      {{
+                        getDictName(
+                          'clshzt',
+                          String(scope.row.auditedStatus)
+                        ) || scope.row.auditedStatus
+                      }}
+                    </span>
+                    <span v-else>-</span>
+                  </span>
+                </template>
+              </el-table-column>
             </el-table>
           </div>
         </el-tab-pane>
 
         <!-- 成本调查表 -->
-        <el-tab-pane label="成本调查表" name="costSurvey">
+        <el-tab-pane
+          v-if="currentNode === 'clcs' || currentNode === 'tjcl'"
+          label="成本调查表"
+          name="costSurvey"
+        >
           <div v-loading="loading" element-loading-text="加载中...">
             <el-table
               style="width: 100%"
@@ -468,7 +510,7 @@
 
         <!-- 监审意见 -->
         <el-tab-pane
-          v-if="showAuditOpinion"
+          v-if="currentNode === 'yjfk'"
           label="监审意见"
           name="auditOpinion"
         >
@@ -555,7 +597,16 @@
         </el-tab-pane>
 
         <!-- 消息通知 -->
-        <el-tab-pane label="消息通知" name="messageNotice">
+        <el-tab-pane
+          v-if="
+            currentNode !== 'clcs' &&
+            currentNode === 'tjcl' &&
+            currentNode !== 'jtsy' &&
+            currentNode !== 'yjfk'
+          "
+          label="消息通知"
+          name="messageNotice"
+        >
           <div v-loading="loading" element-loading-text="加载中...">
             <el-table
               style="width: 100%"
@@ -683,6 +734,7 @@
           materialType: [], // 资料类别
           materialCategory: [], // 资料类别
           formatAsk: [], // 资料类型
+          clshzt: [], // 是否通过
         },
         formData: {
           basicInfo: {
@@ -725,6 +777,7 @@
           messageNotice: [],
         },
         showAuditOpinion: true,
+        currentNode: '',
       }
     },
     computed: {
@@ -871,7 +924,8 @@
           }
 
           // 根据状态决定是否显示监审意见标签页
-          this.showAuditOpinion = data.currentNode !== 'jtsy'
+          // this.showAuditOpinion = data.currentNode !== 'jtsy'
+          this.currentNode = data.currentNode
 
           // 立即加载立项信息
           this.loadProjectInfo()

src/views/EntDeclaration/auditTaskManagement/components/DataRequirementsTab.vue

@@ -78,6 +78,29 @@
           </span>
         </template>
       </el-table-column>
+      <el-table-column
+        prop="isRequired"
+        label="是否通过"
+        width="110"
+        align="center"
+      >
+        <template slot-scope="scope">
+          <span v-if="!scope.row.isCategoryHeader">
+            <span
+              v-if="
+                scope.row.auditedStatus !== null &&
+                scope.row.auditedStatus !== undefined
+              "
+            >
+              {{
+                getDictName('clshzt', String(scope.row.auditedStatus)) ||
+                scope.row.auditedStatus
+              }}
+            </span>
+            <span v-else>-</span>
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column prop="operation" label="操作" width="220" align="center">
         <template slot-scope="scope">
           <template v-if="!scope.row.isCategoryHeader">

src/views/EntDeclaration/auditTaskManagement/components/ProjectInfoTab.vue

@@ -110,7 +110,7 @@
     </el-form-item>
     <el-form-item label="监审期间：">
       <div class="cost-period-container">
-        <el-button
+        <!-- <el-button
           type="primary"
           size="small"
           class="add-cost-year-btn"
@@ -118,7 +118,7 @@
           @click="$emit('add-cost-year')"
         >
           +
-        </el-button>
+        </el-button> -->
         <div class="cost-years-wrapper">
           <div
             v-for="(year, index) in localFormData.auditPeriodArray"
@@ -135,7 +135,7 @@
               clearable
               :disabled="isViewMode"
             ></el-date-picker>
-            <el-button
+            <!-- <el-button
               type="danger"
               size="small"
               class="delete-cost-year-btn"
@@ -143,7 +143,7 @@
               @click="$emit('delete-cost-year', index)"
             >
               删除
-            </el-button>
+            </el-button> -->
           </div>
         </div>
       </div>

src/views/EntDeclaration/auditTaskManagement/taskFillIn.vue

@@ -65,7 +65,8 @@
             v-if="
               currentNode !== 'clcs' &&
               currentNode !== 'jtsy' &&
-              currentNode !== 'yjfk'
+              currentNode !== 'yjfk' &&
+              currentNode === 'tjcl'
             "
             label="监审文书"
             name="auditDocument"
@@ -81,7 +82,7 @@
 
           <!-- 报送资料 -->
           <el-tab-pane
-            v-if="currentNode === 'clcs'"
+            v-if="currentNode === 'clcs' || currentNode === 'tjcl'"
             label="报送资料"
             name="dataRequirements"
           >
@@ -99,7 +100,7 @@
           </el-tab-pane>
           <!-- 成本调查表 -->
           <el-tab-pane
-            v-if="currentNode === 'clcs'"
+            v-if="currentNode === 'clcs' || currentNode === 'tjcl'"
             label="成本调查表"
             name="costSurvey"
           >
@@ -135,6 +136,7 @@
           <el-tab-pane
             v-if="
               currentNode !== 'clcs' &&
+              currentNode === 'tjcl' &&
               currentNode !== 'jtsy' &&
               currentNode !== 'yjfk'
             "
@@ -344,6 +346,7 @@
           materialType: [], // 资料类别
           materialCategory: [], // 资料类别
           formatAsk: [], // 资料类型
+          clshzt: [], // 是否通过
         },
         // 立项依据文件列表
         accordingFileList: [],

src/views/EntDeclaration/auditTaskProcessing/index.vue

@@ -131,9 +131,9 @@
         align="center"
         show-overflow-tooltip
       >
-        <!-- <template slot-scope="scope">
-            {{ getDictName('projectProposal', scope.row.sourceType) }}
-          </template> -->
+        <template slot-scope="scope">
+          {{ getDictName('projectProposal', scope.row.sourceType) }}
+        </template>
       </el-table-column>
       <el-table-column
         prop="auditType"
@@ -141,9 +141,9 @@
         width="120"
         align="center"
       >
-        <!-- <template slot-scope="scope">
-            {{ getDictName('auditType', scope.row.auditType) }}
-          </template> -->
+        <template slot-scope="scope">
+          {{ getDictName('auditType', scope.row.auditType) }}
+        </template>
       </el-table-column>
       <el-table-column
         prop="orgName"
@@ -179,7 +179,8 @@
           <!-- 文字按钮样式 -->
           <el-button
             v-if="
-              scope.row.currentNode === 'clcs' &&
+              (scope.row.currentNode === 'clcs' ||
+                scope.row.currentNode === 'tjcl') &&
               (scope.row.status === '100' || scope.row.status === '500')
             "
             size="mini"

src/views/costAudit/auditInfo/auditManage/extractMaterial.vue

@@ -24,7 +24,11 @@
         width="55"
         align="center"
       ></el-table-column> -->
-      <el-table-column prop="id" label="编号" width="80"></el-table-column>
+      <el-table-column prop="id" label="编号" width="80">
+        <template slot-scope="scope">
+          {{ scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column
         prop="materialName"
         label="材料名称"

src/views/costAudit/auditInfo/auditManage/workDraft.vue

@@ -20,8 +20,12 @@
       style="width: 100%; margin-top: 20px"
       border
     >
-      <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="id" label="序号" width="80"></el-table-column>
+      <!-- <el-table-column type="selection" width="55"></el-table-column> -->
+      <el-table-column prop="id" label="序号" width="80">
+        <template slot-scope="scope">
+          {{ scope.$index + 1 }}
+        </template>
+      </el-table-column>
       <el-table-column
         prop="auditSubject"
         label="核增核减科目"

src/views/costAudit/projectInfo/auditTaskManage/taskProgressManage/conclusionTab.vue

@@ -102,7 +102,7 @@
 <script>
   import { getConclusionDetail } from '@/api/taskProgressManage'
   export default {
-    name: 'Conclusion',
+    name: 'ConclusionTab',
     props: {
       project: {
         type: Object,
@@ -128,10 +128,10 @@
       }
     },
     mounted() {
-      this.getConclusionDetail()
+      this.getConclusionDetails()
     },
     methods: {
-      getConclusionDetail() {
+      getConclusionDetails() {
         getConclusionDetail({
           projectId: this.project.projectId,
         }).then((res) => {