修改

src/views/manager/contractinfo/detail.vue

@@ -418,7 +418,7 @@
               <el-row v-if="contractForm.contractType===4">
                 <el-col :span="24">
                   <div class="head-font">计量信息</div>
-                  <table class="table-form" style="width: 100%;  border: 1px solid #DCDFE6;" border="1" cellspacing="5"
+                  <table class="table-form" style="width: 100%;  border: 1px solid #DCDFE6; font-size: 14px;" border="1" cellspacing="5"
 cellpadding="10">
                     <tbody>
                         <tr class=" bg bor">
@@ -432,25 +432,25 @@ cellpadding="10">
                             总额（元）
                           </td>
                           <td  >
-                           <el-input v-model="input" placeholder="请输入" ></el-input>
+                           <el-input-number v-model="meterContractInfo.dyTotalAmount" placeholder="请输入" :controls="false" :min="0"></el-input-number>
                           </td>
                           <td >
                             预付款限额(元)
                           </td>
                           <td >
-                           <el-input v-model="input" placeholder="请输入" ></el-input>
+                           <el-input-number v-model="meterContractInfo.clAdvancePaymentQuota" placeholder="请输入"  :controls="false" :min="0"></el-input-number>
                           </td>
                           <td  >
                             保留金比列 (%)
                           </td>
                           <td  >
-                           <el-input v-model="input" placeholder="请输入" ></el-input>
+                           <el-input-number v-model="meterContractInfo.blReserveFundsRatio" placeholder="请输入" :controls="false" :min="0"></el-input-number>
                           </td>
                           <td  >
                             保证金起扣点(元)
                           </td>
                           <td  >
-                           <el-input v-model="input" placeholder="请输入" ></el-input>
+                           <el-input-number  v-model="meterContractInfo.nmSdStartDeductPoint" placeholder="请输入" :controls="false" :min="0"></el-input-number>
                           </td>
                      
                         </tr>
@@ -459,25 +459,25 @@ cellpadding="10">
                             起扣点(元)
                           </td>
                           <td  >
-                           <el-input v-model="input" placeholder="请输入" ></el-input>
+                           <el-input-number v-model="meterContractInfo.dyStartDeductPoint" placeholder="请输入" :controls="false" :min="0"></el-input-number>
                           </td>
                           <td  >
                             隔几期扣回 (期)
                           </td>
                           <td  >
-                           <el-input v-model="input" placeholder="请输入" ></el-input>
+                           <el-input-number v-model="meterContractInfo.clIntervalDeduct" placeholder="请输入" :controls="false" :min="0"></el-input-number>
                           </td>
                           <td  >
                             起扣点(元)
                           </td>
                           <td  >
-                           <el-input v-model="input" placeholder="请输入" ></el-input>
+                           <el-input-number  v-model="meterContractInfo.blStartDeductPoint"  placeholder="请输入" :controls="false" :min="0"></el-input-number>
                           </td>
                           <td  >
                             保证金比列 (%)
                           </td>
                           <td >
-                           <el-input v-model="input" placeholder="请输入" ></el-input>
+                           <el-input-number  v-model="meterContractInfo.nmSdRatio" placeholder="请输入" :controls="false" :min="0"></el-input-number>
                           </td>
                      
                         </tr>
@@ -486,39 +486,39 @@ cellpadding="10">
                             全额扣回点(元)
                           </td>
                           <td  >
-                           <el-input v-model="input" placeholder="请输入" ></el-input>
+                           <el-input-number  v-model="meterContractInfo.dyFullDeductPoint" placeholder="请输入" :controls="false" :min="0"></el-input-number>
                           </td>
                           <td  >
                             从第几期起扣 (期)
                           </td>
                           <td  >
-                           <el-input v-model="input" placeholder="请输入" ></el-input>
+                           <el-input-number v-model="meterContractInfo.clFromIntervalDeduct" placeholder="请输入" :controls="false" :min="0"></el-input-number>
                           </td>
                           <td  >
                             累计扣回限额(元)
                           </td>
                           <td  >
-                           <el-input v-model="input" placeholder="请输入" ></el-input>
+                           <el-input-number v-model="meterContractInfo.blTotalDeductQuota" placeholder="请输入" :controls="false" :min="0"></el-input-number>
                           </td>
                           <td >
                             保证金扣回限额(元)
                           </td>
                           <td  >
-                           <el-input v-model="input" placeholder="请输入" ></el-input>
+                           <el-input-number  v-model="meterContractInfo.nmTotalDeductQuota" placeholder="请输入" :controls="false" :min="0"></el-input-number>
                           </td>
                      
                         </tr>
                         <tr>
                             <td rowspan="2">扣回比列(%)</td>
-                            <td rowspan="2">   <el-input v-model="input" placeholder="请输入" class="maxinp"></el-input></td>
+                            <td rowspan="2">   <el-input-number v-model="meterContractInfo.dyDeductRatio" placeholder="请输入" class="maxinp" :controls="false" :min="0"></el-input-number></td>
                             <td >预付款比列 (%)</td>
-                            <td colspan="3"> <el-input v-model="input" placeholder="请输入" ></el-input></td>
+                            <td colspan="3"> <el-input-number v-model="meterContractInfo.clPrepaymentRatio" placeholder="请输入" :controls="false" :min="0"></el-input-number></td>
                             <td>预扣农民工工资保证金(元)</td>
-                            <td > <el-input v-model="input" placeholder="请输入" ></el-input></td>
+                            <td > <el-input-number  v-model="meterContractInfo.nmPayDepositWithheld" placeholder="请输入" :controls="false" :min="0"></el-input-number></td>
                           </tr>
                           <tr>
                             <td >扣回比列 (%)</td>
-                            <td colspan="5"><el-input v-model="input" placeholder="请输入" ></el-input></td>
+                            <td colspan="5"><el-input-number v-model="meterContractInfo.clDeductRatio" placeholder="请输入" :controls="false" :min="0"></el-input-number></td>
                             
                         </tr>
                 
@@ -909,6 +909,7 @@ export default {
       leftTreeData: [],
       leftloading:false,
       rightloading:false,
+      meterContractInfo:{}//计量合同段管理相关信息
     }
   },
   computed: {
@@ -1004,10 +1005,11 @@ export default {
     async init() {
       this.pid = this.$route.query.pid;
       this.cid = this.$route.query.cid;
+      this.contractForm.contractType=this.$route.query.contractType
       if (!this.cid) {
         this.contractForm.pid = this.pid;
       } else {
-        if (this.$route.query.contractType == 1) {
+        if (this.$route.query.contractType == 1||this.$route.query.contractType == 4) {
           await this.getContractInfo();//获取合同段基本信息
         } else if (this.$route.query.contractType == 2 || this.$route.query.contractType == 3) {
           await this.getContractInfo2()
@@ -1118,6 +1120,10 @@ export default {
           if (Number(this.contractForm.storagePeriod) < 0) {
             this.contractForm.storagePeriod = 0;
           }
+          if(this.contractForm.contractType==4){
+            this.meterContractInfo=this.contractForm.meterContractInfo
+         
+          }
           this.$nextTick(() => {
             this.typeChang['1'] = false;
           })
@@ -1279,6 +1285,10 @@ export default {
               this.idList.forEach(val => {
                 das.idList.push({contractId: val})
               })
+              if(this.contractForm.contractType==4){
+                das.meterContractInfo=this.meterContractInfo
+              }
+            
               resolve(submitContractInfo(das))
               this.btnLoad = false
             } else {

src/views/measure/systemUnit.vue

@@ -65,7 +65,7 @@
                 </tr>
                 <tr>
                   <td class="tit" width="10%">工程类型：</td>
-                  <td id="workType">{{ nodeDetail.engineeringType||'' }}</td>
+                  <td id="workType">{{ nodeDetail.engineeringTypeName||'' }}</td>
                   <td class="tit" width="10%" >备注</td>
                   <td id="nodeType" colspan="4">{{nodeDetail.remarks||""}}</td>
                 </tr>
@@ -96,7 +96,7 @@
             </el-table-column>
             <el-table-column
             width="180"
-              prop="engineeringType"
+              prop="engineeringTypeName"
               label="工程类型">
             </el-table-column>
           </el-table>
@@ -127,8 +127,8 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="工程类型"  prop="engineeringType">
-            <el-input v-model="addForm.engineeringType" disabled></el-input>
+          <el-form-item label="工程类型"  prop="engineeringTypeName">
+            <el-input v-model="addForm.engineeringTypeName" disabled></el-input>
           </el-form-item>
       
           <el-form-item label="备注" prop="remarks">
@@ -163,7 +163,7 @@
 
 <script >
 import ManualSorting from '@/components/WbsTree/ManualSorting'
-import { getLazyTree,add,getDetail,getChildList,updateNode,removeNode,getSameList,sortNode } from "@/api/measure/template.js";
+import { getLazyTree,add,getDetail,getChildList,updateNode,removeNode,getSameList,sortNode,getEngineeringTypeName } from "@/api/measure/template.js";
 import { getDictionary } from "@/api/system/dict";
 
  export default {
@@ -308,6 +308,12 @@ import { getDictionary } from "@/api/system/dict";
     this.menuleft = x;
     this.menuvisible=true
 
+    },
+    getEngineeringTypeNameById(id){
+      getEngineeringTypeName({id}).then((res)=>{
+        console.log(res.data.data,'data');
+        this.addForm.engineeringTypeName=res.data.data||''
+      })
     },
     menuClick(e,item,data,node){
        this.menuKey=''
@@ -316,7 +322,8 @@ import { getDictionary } from "@/api/system/dict";
           console.log('新增');
           this.menuKey='add'
           this.adddialogVisible=true
-          this.addForm.engineeringType=node.parent.data.engineeringType
+          this.getEngineeringTypeNameById(data.id)
+          this.addForm.engineeringTypeName=node.parent.data.engineeringTypeName
           this.addNodeHandle()
         }
         
@@ -401,6 +408,7 @@ import { getDictionary } from "@/api/system/dict";
         });
         getDetail(subobj.id).then((res) => {
           this.nodeDetail = Object.assign({}, res.data.data);
+          this.getNodeTypeName(this.nodeDetail.nodeType)
         
         })
       })