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

src/api/audit/dataInduction.js

@@ -0,0 +1,47 @@
+import request from '@/utils/request'
+
+const url = window.context.form
+
+// 资料归纳列表
+export function getDataInductionList(data) {
+  return request({
+    url: url + '/api/materialSummary/v1/listByTaskId',
+    method: 'get',
+    params: data,
+  })
+}
+
+// 添加资料列表（查询用）
+export function addDataInductionList(data) {
+  return request({
+    url: url + '/api/materialSummary/v1/getDetail',
+    method: 'post',
+    data: data,
+  })
+}
+
+// 新增/编辑资料归纳接口
+export function saveDataInductionWithDetails(data) {
+  return request({
+    url: url + '/api/materialSummary/v1/saveWithDetails',
+    method: 'post',
+    data: data,
+  })
+}
+
+// 删除资料归纳接口
+export function deleteDataInductionWithDetails(data) {
+  return request({
+    url: url + '/api/materialSummary/v1/delete',
+    method: 'delete',
+    params: data,
+  })
+}
+// 上移下移
+export function moveDataInductionWithDetails(data) {
+  return request({
+    url: url + '/api/materialSummary/v1/sort',
+    method: 'post',
+    data: data,
+  })
+}

src/components/costAudit/CostAuditDialog.vue

@@ -25,7 +25,7 @@
     </div>
 
     <!-- 弹窗底部按钮 -->
-    <div slot="footer" class="dialog-footer">
+    <div v-if="showFooter" slot="footer" class="dialog-footer">
       <slot name="footer">
         <el-button
           v-if="showConfirmBtn"
@@ -148,6 +148,11 @@
         type: Number,
         default: 2000,
       },
+      // 是否显示底部按钮
+      showFooter: {
+        type: Boolean,
+        default: true,
+      },
     },
     computed: {
       mergedDialogProps() {

src/views/costAudit/baseInfo/financeSheetManage/infoMaintain.vue

@@ -1477,8 +1477,8 @@
   import {
     listByTemplateIdAndVersion,
     getCellCodesByTemplateId,
-    listByCurrentTemplateId,
   } from '@/api/costSurveyFdTemplateItems'
+  import { listByCurrentTemplateId } from '@/api/catalogManage'
   import {
     addSurveyFdTemplateVersion,
     delSurveyFdTemplateVersionById,