Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-operate-ui/src/api/projectCostLedger/index.js

@@ -61,7 +61,7 @@ export function getProjectFileUploadDetail(projectId) {
 export function importData(projectId) {
   return request({
     url: '/cbProjectRecord/importData/'+projectId,
-    method: 'get',
+    method: 'post',
   });
 }
 

dsk-operate-ui/src/views/projectCostLedger/detail/components/MeasureItems/index.vue

@@ -40,7 +40,7 @@
         </div>
         <!--单条-->
         <div class="table-item" v-else>
-          <el-table element-loading-text="Loading" :data="tableData" row-key="id" v-horizontal-scroll="'hover'" default-expand-all
+          <el-table element-loading-text="Loading" ref="edittable" :data="tableData" row-key="id" v-horizontal-scroll="'hover'" default-expand-all
             :tree-props="{children: 'children', hasChildren: 'hasChildren'}" border highlight-current-row :cell-class-name="tored1" :header-cell-class-name="tored1">
             <el-table-column label="序号" width="60" align="left" type="index" fixed="left"></el-table-column>
             <el-table-column label="清单内容" width="130" prop="itemContent" fixed="left">
@@ -448,6 +448,7 @@ export default {
     inputnum(){
       this.cbVisible = false
       this.isinput = true
+      this.$refs.edittable.bodyWrapper.scrollLeft=Number(2220)
     }
   },
 }

dsk-operate-ui/src/views/projectCostLedger/index.vue

@@ -503,6 +503,7 @@
       this.uploadData = data
       this.isupload = true
       this.cgxVisible = false
+      this.prodetail = false
     },
     handleCurrentChange(val){
       this.formdata.pageNum = val

dsk-operate-ui/src/views/projectCostLedger/upload/index.vue

@@ -220,7 +220,7 @@
       </div>
       <el-divider></el-divider>
       <div class="pro-btns">
-        <el-button type="primary" size="small" @click="importdata">导入数据</el-button>
+        <el-button type="primary" size="small" @click="importdata" v-if="!prodetail">导入数据</el-button>
         <el-button size="small" @click="goback">返回</el-button>
       </div>
 
@@ -295,11 +295,16 @@
     methods:{
       importdata(){
         this.visible = true
-        this.$refs['ruleForm'].validate((valid) => {
+        let valid = true
+        if(this.directExpense.length>0&&this.quantitySummary.length>0
+          &&this.measureProject.length>0&&this.otherProject.length>0
+          &&this.sceneExpense.length>0&&this.cbSummary.length>0){
+          valid = true
+          importData(this.formdata.id).then(res=>{})
+         }else{
+          valid = false
+        }
         if (valid) {
-            importData(this.formdata.id).then(res=>{
-
-            })
           this.issub = true
           this.directExpense.forEach(item=>{
             item.fileParseStatus = 1
@@ -322,7 +327,6 @@
         } else {
           this.issub = false
         }
-        });
       },
       goback(){
         this.visible = false