修改

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

@@ -11,6 +11,14 @@ export const getProjectDetailApi = (projectId) => request({
   params: {}
 });
 
+//项目名称模糊查询
+export function queryProjectNameListProjectName(data) {
+  return request({
+    url: '/cbProjectRecord/queryProjectNameList/projectName',
+    method: 'get',
+    params: data,
+  });
+}
 //校验项目名称是否有相同
 export function checkProjectNameExistProjectName(data) {
   return request({

dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue

@@ -100,6 +100,7 @@ export default {
             {
               title: '企业概要', pathName: '', children: [
                 { title: '企业速览', pathName: 'overview' },
+                { title: '资质资格', pathName: 'qualification' },
                 { title: '工商信息', pathName: 'businfo' },
                 { title: '股东信息', pathName: 'holderinfo' },
                 { title: '高管信息', pathName: 'execuinfo' },
@@ -144,7 +145,8 @@ export default {
             //   ]
             // },
             {
-              title: '风险信息', pathName: '', children: [
+              title: '信用行为', pathName: '', children: [
+                { title: '信用中国', pathName: 'credit' },
                 { title: '行政处罚', pathName: 'punish' },
                 { title: '经营异常', pathName: 'businessAnomaly' },
                 { title: '被执行人', pathName: 'ifThePerson' },
@@ -200,6 +202,7 @@ export default {
             {
               title: '企业概要', pathName: '', children: [
                 { title: '企业速览', pathName: 'overview' },
+                { title: '资质资格', pathName: 'qualification' },
                 { title: '工商信息', pathName: 'businfo' },
                 { title: '股东信息', pathName: 'holderinfo' },
                 { title: '高管信息', pathName: 'execuinfo' },
@@ -244,7 +247,8 @@ export default {
             //   ]
             // },
             {
-              title: '风险信息', pathName: '', children: [
+              title: '信用行为', pathName: '', children: [
+                { title: '信用中国', pathName: 'credit' },
                 { title: '行政处罚', pathName: 'punish' },
                 { title: '经营异常', pathName: 'businessAnomaly' },
                 { title: '被执行人', pathName: 'ifThePerson' },

dsk-operate-ui/src/views/detail/party-a/credit/credit.vue

+<template>
+    <div>
+      信用中国
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "credit"
+    }
+</script>
+
+<style scoped>
+
+</style>

dsk-operate-ui/src/views/detail/party-a/index.vue

@@ -14,6 +14,7 @@
           <template v-if="isCompany">
             <!-- 企业概览 -->
             <Overview v-if="currentPath.pathName=='overview'" :company-id="companyId" :isSkeleton="isSkeleton" :companyInfo="companyInfo" />
+            <Qualification v-if="currentPath.pathName=='qualification'" :company-id="companyId" />
             <Businfo v-if="currentPath.pathName=='businfo'" :company-id="companyId" />
             <Holderinfo v-if="currentPath.pathName=='holderinfo'" :company-id="companyId" />
             <Execuinfo v-if="currentPath.pathName=='execuinfo'" :company-id="companyId" />
@@ -48,6 +49,7 @@
             <LandAcquisition v-if="currentPath.pathName=='landAcquisition'" :company-id="companyId" />
             <SameRegion v-if="currentPath.pathName=='sameRegion'" :company-id="companyId" :companyInfo="companyInfo" />
             <!-- 风险信息 -->
+            <Credit v-if="currentPath.pathName=='credit'" :company-id="companyId" />
             <Punish v-if="currentPath.pathName=='punish'" :company-id="companyId" />
             <BusinessAnomaly v-if="currentPath.pathName=='businessAnomaly'" :company-id="companyId" />
             <IfThePerson v-if="currentPath.pathName=='ifThePerson'" :company-id="companyId" />
@@ -118,6 +120,7 @@ import elementResizeDetectorMaker from "element-resize-detector";
 import Header from "./component/Header";
 import SideBar from "./component/Sidebar";
 import Overview from "./overview/overview";  //企业概览-企业速览
+import Qualification from "./qualification/qualification";  //企业概览-资质资格
 import Businfo from "./overview/businfo";   //企业概览-工商信息
 import Holderinfo from "./overview/holderinfo";   //企业概览-股东信息
 import Execuinfo from "./overview/execuinfo";   //企业概览-高管信息
@@ -145,6 +148,7 @@ import LandAcquisition from "./urbanLnvestment/landAcquisition"; //投诚分析-
 import RegionalEconomies from "./urbanLnvestment/regionalEconomies"; //投诚分析-区域经济
 import SameRegion from "./urbanLnvestment/sameRegion"; //投诚分析-同地区城投
 import Punish from "./riskInformation/punish"; //风险信息-行政处罚
+import Credit from "./credit/credit"; //风险信息-信用中国
 import BusinessAnomaly from "./riskInformation/businessAnomaly"; //风险信息-经营异常
 import IfThePerson from "./riskInformation/ifThePerson"; //风险信息-被执行人
 import Dishonesty from "./riskInformation/dishonesty"; //风险信息-失信被执行
@@ -189,6 +193,7 @@ export default {
     Header,
     SideBar,
     Overview,
+    Qualification,
     Businfo,
     Holderinfo,
     Execuinfo,
@@ -212,6 +217,7 @@ export default {
     LandAcquisition,
     RegionalEconomies,
     SameRegion,
+    Credit,
     Punish,
     BusinessAnomaly,
     IfThePerson,

dsk-operate-ui/src/views/detail/party-a/qualification/qualification.vue

+<template>
+    <div>
+      资质资格
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "qualification"
+    }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -75,6 +75,9 @@
               </el-table-column>
               <el-table-column label="盈亏率" width="100" prop="profitLossRatio"></el-table-column>
               <el-table-column label="标准费用项" width="100" prop="standardCbItem"></el-table-column>
+              <el-table-column label="规格型号" width="100" prop="specificationModel"></el-table-column>
+              <el-table-column label="计算规则" width="100" prop="calculateRule"></el-table-column>
+              <el-table-column label="甲供材料" width="150" prop="supplierMaterial"></el-table-column>
               <el-table-column label="备注" width="120" prop="remark"></el-table-column>
               <el-table-column label="操作" min-width="120" fixed="right">
                 <template slot-scope="scope">
@@ -110,7 +113,16 @@
         <el-form-item label="含税成本单价" prop="includeTaxCbUnitPrice">
           <el-input v-model="ruleForm.includeTaxCbUnitPrice" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入含税成本单价"></el-input>
         </el-form-item>
-        <el-form-item label="特征描述">
+        <el-form-item label="规格型号" prop="specificationModel">
+          <el-input v-model="ruleForm.specificationModel" placeholder="请输入规格型号"></el-input>
+        </el-form-item>
+        <el-form-item label="计算规则" prop="calculateRule">
+          <el-input v-model="ruleForm.calculateRule" placeholder="请输入计算规则"></el-input>
+        </el-form-item>
+        <el-form-item label="甲供材料" prop="supplierMaterial">
+          <el-input v-model="ruleForm.supplierMaterial" placeholder="请输入甲供材料"></el-input>
+        </el-form-item>
+        <el-form-item label="特征描述" prop="projectFeature">
           <el-input type="textarea" v-model="ruleForm.projectFeature" placeholder="请输入特征描述"></el-input>
         </el-form-item>
       </el-form>
@@ -172,10 +184,13 @@ export default {
         expenseName:{ required: true, message: '项目名称不能为空', trigger: 'blur' }, // 限制必填
         // jsgz:{ required: true, message: '计算规则不能为空', trigger: 'blur' }, // 限制必填
         unit:{ required: true, message: '单位不能为空', trigger: 'blur' }, // 限制必填
-        tenderControlUnitPrice:{ required: true, message: '招标控制价单价', trigger: 'blur' }, // 限制必填
-        excludeTaxCbUnitPrice:{ required: true, message: '不含税成本单价', trigger: 'blur' }, // 限制必填
-        includeTaxCbUnitPrice:{ required: true, message: '含税成本单价', trigger: 'blur' }, // 限制必填
-        // projectFeature:{ required: true, message: '特征描述', trigger: 'blur' }, // 限制必填
+        tenderControlUnitPrice:{ required: true, message: '招标控制价单价不能为空', trigger: 'blur' }, // 限制必填
+        excludeTaxCbUnitPrice:{ required: true, message: '不含税成本单价不能为空', trigger: 'blur' }, // 限制必填
+        includeTaxCbUnitPrice:{ required: true, message: '含税成本单价不能为空', trigger: 'blur' }, // 限制必填
+        specificationModel:{ required: true, message: '规格型号不能为空', trigger: 'blur' }, // 限制必填
+        calculateRule:{ required: true, message: '计算规则不能为空', trigger: 'blur' }, // 限制必填
+        supplierMaterial:{ required: true, message: '甲供材料不能为空', trigger: 'blur' }, // 限制必填
+        projectFeature:{ required: true, message: '特征描述不能为空', trigger: 'blur' }, // 限制必填
       },
       dialogVisible:false,
       defaultActive: "",

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

@@ -45,7 +45,7 @@
                           :header-cell-class-name="headerCellClassName" :cell-class-name="cellClassName">
               <template slot="action-field-bar" slot-scope="scope">
                 <div class="project-action-field-bar">
-                  <span class="push-project-use" @click="pushProjectUse(scope.row)" :class="{'is-emty-quantities' : rowHasLastPush(scope.rowIndex)}">修改工程量</span>
+                  <span class="push-project-use" @click="pushProjectUse(scope.row)" :class="{'is-emty-quantities' : rowHasLastPush(scope.rowIndex)}">修改本月差值</span>
                 </div>
                 <!--<div class="project-action-field-bar" v-if="rowCanEditInput(scope.rowIndex,hasTarget)">-->
                   <!--<span class="push-project-use" :class="{'is-emty-quantities' : rowHasLastPush(scope.rowIndex)}"-->
@@ -303,7 +303,8 @@ export default {
             { label: '填写时间', prop: "createTime", minWidth: "160", uid: v4(), slot: true },
           ]
         },
-        { label: '修改后工程量', prop: "pushQuantities", width: "110", uid: v4(), slot: true },
+        { label: '本月差值', prop: "pushQuantities", width: "110", uid: v4(), slot: true },
+        { label: '累计差值', prop: "cumulativeDifference", width: "110", uid: v4(), slot: true },
         { label: '备注', prop: "remark", width: "115", uid: v4(), slot: true },
         { label: '操作', prop: "action-field-bar", width: "99", uid: v4(), fixed: "right" },
       ],
@@ -372,9 +373,9 @@ export default {
       lastScrollTop: 0,
       // 推送工程量弹窗
       pushProjectUseDialog: false,
-      //修改工程量弹窗
+      //修改本月差值弹窗
       editDialog: false,
-      // 修改工程量数据缓存
+      // 修改本月差值数据缓存
       pushProjectUseTemp: {
         id: "",
         pushQuantities: "",
@@ -786,7 +787,6 @@ export default {
     },
     // 修改工程用量
     pushProjectUse(row) {
-      console.log(row)
       if (!row.actualId) return;
       // 打开推送推送弹窗
       const _temp = {
@@ -824,9 +824,9 @@ export default {
     async submitEditData(pushForm) {
       try {
         const result = await editEngineeringQuantityApi(pushForm);
-        console.log(result)
         if(result.code === 200){
-          this.editDialog=false
+          this.editDialog=false;
+          this.init(this.comProjectDetailInfo);
         }
       } catch (error) {
 

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

@@ -176,14 +176,23 @@
           <span>{{protitle}}</span>
         </div>
         <el-form class="popform" label-width="97px" :model="queryParam" :rules="rules" ref="ruleForm">
-          <el-form-item label="项目名称" class="row" prop="projectName">
-            <el-input type="text" v-model="queryParam.projectName" @blur="blurProjectName" placeholder="请输入完整的项目名称"></el-input>
-          </el-form-item>
           <el-form-item label="IPM项目编码" class="row">
             <el-input type="text" placeholder="请输入IPM项目编码" v-model="queryParam.ipmProjectNo">
               <template slot="append"><div class="pro-getbtn" @click="getipmProjectNo">获取数据</div></template>
             </el-input>
           </el-form-item>
+          <el-form-item label="项目名称" class="row" prop="projectName">
+            <el-input type="text" v-model="queryParam.projectName" @input="inputProjectName" placeholder="请输入完整的项目名称"></el-input>
+            <div class="projectNameList" v-if="projectNameList.length > 0">
+              <p @click="blurProjectName(item)" v-for="item in projectNameList">
+                <el-tooltip placement="top" v-if="item.projectName.length>26">
+                  <div slot="content"  v-html="item.projectName"></div>
+                  <span v-html="item.projectName"></span>
+                </el-tooltip>
+                <span v-else v-html="item.projectName"></span>
+              </p>
+            </div>
+          </el-form-item>
           <el-form-item label="文件名称" class="row">
             <el-input type="text" placeholder="请输入文件名称" v-model="queryParam.projectFileName"></el-input>
           </el-form-item>
@@ -261,6 +270,7 @@
   import {
     addNewStageProject,
     addProject,
+    queryProjectNameListProjectName,
     checkProjectNameExistProjectName,
     checkProjectCodeExist,
     deleteDraft,
@@ -318,9 +328,19 @@
         checkAll:false,
         checkds:[],
         allchecks:[],//可以用的项目阶段
+        projectNameList:[],
         repeatState:false, //当新增项目名称重复的时候下一步按钮状态
       };
     },
+    watch: {
+      dialogVisible: {
+        handler(newValue) {
+          if(!newValue){
+            this.projectNameList=[]
+          }
+        }
+      },
+    },
   //可访问data属性
   created() {
     //成本阶段
@@ -473,7 +493,7 @@
       this.getlist()
     },
     //验证项目名称是否有相同的
-    blurProjectName(){
+    blurProjectName(item){
       let pram = {
         projectName:this.queryParam.projectName
       }
@@ -489,11 +509,26 @@
             this.repeatState = true
           });
         }else{
-          this.repeatState = false
+          this.repeatState = false;
         }
       })
+      this.queryParam.projectName=item.projectName.replace(/<[^>]+>/g,'');
+      this.projectNameList=[]
 
     },
+    //模糊查询
+    inputProjectName(){
+      let pram = {
+        projectName:this.queryParam.projectName
+      }
+      queryProjectNameListProjectName(pram).then(res=>{
+        if(res.code == 200){
+          this.projectNameList=res.data;
+        }else{
+
+        }
+      })
+    },
     getipmProjectNo(){
       //点击且校验了当前编码有数据才获取
       let pram = {
@@ -501,9 +536,10 @@
         projectCode:this.queryParam.ipmProjectNo
       }
       checkProjectCodeExist(pram).then(res=>{
-        if(res.code == 200 && res.data == true){
+        if(res.code == 200){
           this.queryParam.isGetProjectDetail = 1
-          this.$message.success(res.msg)
+          this.queryParam.projectName =res.msg;
+          // this.$message.success(res.msg)
         }else{
           this.queryParam.isGetProjectDetail = 0
           this.$message.error(res.msg)
@@ -732,6 +768,34 @@
       .popform {
         padding: 24px 20px 0;
 
+        .projectNameList{
+          width: 342px;
+          height: 176px;
+          border-radius: 4px;
+          background: #ffffff;
+          position: absolute;
+          box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.12);
+          border: 1px solid #E4E7ED;
+          z-index: 9;
+          top:40px;
+          padding-top: 8px;
+          overflow: auto;
+          cursor: pointer;
+          p{
+            height: 32px;
+            line-height: 32px;
+            color:#232323;
+            font-size: 14px;
+            padding-left: 20px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
+          p:hover{
+            background: #F5F7FA;
+          }
+        }
+
         .row {
           margin-bottom: 16px;
           position: relative;