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/views/projectCostLedger/detail/components/MeasureItems/index.vue

@@ -22,7 +22,6 @@
           <el-table
             element-loading-text="Loading"
             :data="tableData"
-            :row-class-name="tableRowClassName"
             row-key="id"
             v-horizontal-scroll="'hover'"
             default-expand-all
@@ -30,7 +29,7 @@
             border
             highlight-current-row
           >
-            <el-table-column label="序号" width="60" align="left" prop="index" fixed="left"></el-table-column>
+            <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">
               <template slot-scope="scope">{{scope.row.itemContent || '--'}}</template>
             </el-table-column>
@@ -49,6 +48,58 @@
             <el-table-column label="使用时间" width="130" prop="usageTime">
               <template slot-scope="scope">{{scope.row.usageTime || '--'}}</template>
             </el-table-column>
+            <el-table-column label="不含税合价" width="130" prop="amountExcludingTax">
+              <template slot-scope="scope">{{scope.row.amountExcludingTax || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="税率（%）" width="130" prop="taxRate">
+              <template slot-scope="scope">{{scope.row.taxRate || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="含税合价" width="130" prop="amountIncludingTax">
+              <template slot-scope="scope">{{scope.row.amountIncludingTax || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="摊销比例（%）" width="130" prop="amortizationRatio">
+              <template slot-scope="scope">{{scope.row.amortizationRatio || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="摊销后不含税合价" width="130" prop="amountExcludeTaxAmortized">
+              <template slot-scope="scope">{{scope.row.amountExcludeTaxAmortized || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="摊销后含税合价" width="130" prop="amountIncludeTaxAmortized">
+              <template slot-scope="scope">{{scope.row.amountIncludeTaxAmortized || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="税金（元）" width="130" prop="taxAmount">
+              <template slot-scope="scope">{{scope.row.taxAmount || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="成本科目" width="130" prop="costSubject">
+              <template slot-scope="scope">{{scope.row.costSubject || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="税金类型" width="130" prop="taxType">
+              <template slot-scope="scope">{{scope.row.taxType || '--'}}</template>
+            </el-table-column>
+
+
+            <el-table-column label="本月发生成本比例" width="130" prop="monthCostRate">
+              <template slot-scope="scope">{{scope.row.monthCostRate || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="成本合价" width="130" prop="costEffective">
+              <template slot-scope="scope">{{scope.row.costEffective || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="截止本月工程量" width="130" prop="currentProjectVolume">
+              <template slot-scope="scope">{{scope.row.currentProjectVolume || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="推送工作量" width="130" prop="submitProjectVolume">
+              <template slot-scope="scope">{{scope.row.submitProjectVolume || '--'}}</template>
+            </el-table-column>
+
+
+            <el-table-column label="备注" width="130" prop="remarks">
+              <template slot-scope="scope">{{scope.row.remarks || '--'}}</template>
+            </el-table-column>
+            <el-table-column label="是否推送" width="130">
+              <template slot-scope="scope">{{scope.row.pushTime?"是":"否"}}</template>
+            </el-table-column>
+            <el-table-column label="操作" width="130" fixed="right">
+              <span class="wordprimary">推送工程量</span>
+            </el-table-column>
           </el-table>
         </div>
 
@@ -134,7 +185,7 @@
     methods: {
       select(menuPath){
         this.id = menuPath
-        let month = this.expenseDate.replace(/-/ig, "");
+        let month = this.expenseDate.replace('-', "");
         let param = {
           projectId:this.projectId,
           id:this.id,

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

@@ -22,7 +22,6 @@
           <el-table
             element-loading-text="Loading"
             :data="tableData"
-            :row-class-name="tableRowClassName"
             row-key="id"
             v-horizontal-scroll="'hover'"
             default-expand-all
@@ -30,7 +29,7 @@
             border
             highlight-current-row
           >
-            <el-table-column label="序号" width="60" align="left" prop="index"></el-table-column>
+            <el-table-column label="序号" width="60" align="left" type="index"></el-table-column>
             <el-table-column label="名称" width="300" prop="cbName">
               <template slot-scope="scope">{{scope.row.cbName || '--'}}</template>
             </el-table-column>

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

@@ -425,6 +425,7 @@
     //返回列表
     colsepro(){
       this.isupload = false
+      this.dialogVisible = false
       this.getCGXlist()
       this.getlist()
     },