样式和bug

itdmWeb/src/views/module-iTDM/itdmYeWu/itdmGcShishi.vue

@@ -40,7 +40,7 @@
                 <!-- <td><div class="delBtn" @click="delRow(index)" v-show="stepEdit.cleanPrice.length >= 2">删除</div></td> -->
               </table>
             </div>
-            <div v-if="index === stepEdit.assessmentLog.length - 1" class="addRow" @click="addRow">添加</div>
+            <div v-if="index === stepEdit.assessmentLog.length - 1" class="addRow" @click="addRow" :style="{'pointer-events':stepParameter.disabled?'none':'auto'}">添加</div>
           </div>
         </td>
         <!-- <td class="content" style="width: 100px">量化积分</td> -->

itdmWeb/src/views/module-iTDM/itdmYeWu/itdmXmShuru.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="u-OA-jixiao">
     <div class="head">第一部分　试验项目输入</div>
     <table class="main-table">
       <tr>
@@ -9,67 +9,69 @@
         </td>
         <td class="title white" style="width: 100px">输入类型</td>
         <td class="content" style="width: 450px">
-          <input v-model="stepEdit.shuruLeixing" style="text-align: center" />
+          详见委托管理
+          <!-- <input v-model="stepEdit.shuruLeixing" style="text-align: center" /> -->
         </td>
       </tr>
-      <tr style="height: 150px">
+      <tr>
         <td class="title">实验信息</td>
         <td class="content">
-          <input v-model="stepEdit.shiyanXinxi" :disabled="step1Parameter.disabled" style="text-align: center" />
+          <!-- <input v-model="stepEdit.shiyanXinxi" :disabled="stepParameter.disabled" style="text-align: center" /> -->
+          详见委托管理
         </td>
         <td class="title">定制需求</td>
         <td class="content">
           <div style="display: flex; align-items: center; justify-content: center">
             方案设计：
-            <input type="radio" name="fangan" value="需要" v-model="stepEdit.fanganSheji" :disabled="step1Parameter.disabled" />需要&nbsp;<input
+            <input type="radio" name="fangan" value="需要" v-model="stepEdit.fanganSheji" :disabled="stepParameter.disabled" />需要&nbsp;<input
               type="radio"
               name="fangan"
               value="不需要"
               v-model="stepEdit.fanganSheji"
-              :disabled="step1Parameter.disabled"
+              :disabled="stepParameter.disabled"
             />不需要&nbsp;&nbsp; 工装设计：
-            <input type="radio" name="gongzhuang" value="需要" v-model="stepEdit.gongzhuangSheji" :disabled="step1Parameter.disabled" />需要 &nbsp;<input
+            <input type="radio" name="gongzhuang" value="需要" v-model="stepEdit.gongzhuangSheji" :disabled="stepParameter.disabled" />需要 &nbsp;<input
               type="radio"
               name="gongzhuang"
               value="不需要"
               v-model="stepEdit.gongzhuangSheji"
-              :disabled="step1Parameter.disabled"
+              :disabled="stepParameter.disabled"
             />不需要
           </div>
 
           <div style="display: flex; align-items: center; justify-content: center">
             试验评审：
-            <input type="radio" name="shiyan" value="需要" v-model="stepEdit.shiyanPingshen" :disabled="step1Parameter.disabled"/>需要 &nbsp;<input
+            <input type="radio" name="shiyan" value="需要" v-model="stepEdit.shiyanPingshen" :disabled="stepParameter.disabled"/>需要 &nbsp;<input
               type="radio"
               name="shiyan"
               value="不需要"
               v-model="stepEdit.shiyanPingshen"
-              :disabled="step1Parameter.disabled"
+              :disabled="stepParameter.disabled"
             />不需要&nbsp;&nbsp; 用餐安排：
-            <input type="radio" name="yongcan" value="需要" v-model="stepEdit.yongcanAnpai" :disabled="step1Parameter.disabled"/>需要 &nbsp;<input
+            <input type="radio" name="yongcan" value="需要" v-model="stepEdit.yongcanAnpai" :disabled="stepParameter.disabled"/>需要 &nbsp;<input
               type="radio"
               name="yongcan"
               value="不需要"
               v-model="stepEdit.yongcanAnpai"
-              :disabled="step1Parameter.disabled"
+              :disabled="stepParameter.disabled"
             />不需要
           </div>
 
           <div style="display: flex; align-items: center; justify-content: center">
-            用车安排： <input type="radio" name="yongche" value="需要" v-model="stepEdit.yongcheAnpai" :disabled="step1Parameter.disabled"/>需要
+            用车安排： <input type="radio" name="yongche" value="需要" v-model="stepEdit.yongcheAnpai" :disabled="stepParameter.disabled"/>需要
             &nbsp;<input
               type="radio"
               name="yongche"
               value="不需要"
               v-model="stepEdit.yongcheAnpai"
-              :disabled="step1Parameter.disabled"
+              :disabled="stepParameter.disabled"
             />不需要&nbsp;&nbsp; 住宿安排：
-            <input type="radio" name="zhusu" value="需要" v-model="stepEdit.zhusuAnpai" :disabled="step1Parameter.disabled"/>需要 &nbsp;<input
+            <input type="radio" name="zhusu" value="需要" v-model="stepEdit.zhusuAnpai" :disabled="stepParameter.disabled"/>需要 &nbsp;<input
               type="radio"
               name="zhusu"
               value="不需要"
               v-model="stepEdit.zhusuAnpai"
-              :disabled="step1Parameter.disabled"
+              :disabled="stepParameter.disabled"
             />不需要
           </div>
         </td>
@@ -81,35 +83,33 @@
         </td>
         <td class="title">合同编号</td>
         <td class="content">
-          <input style="width: 100%; text-align: center" v-model="stepEdit.hetongBianhao" :disabled="step1Parameter.disabled"/>
+          <input style="width: 100%; text-align: center" v-model="stepEdit.hetongBianhao" :disabled="stepParameter.disabled"/>
         </td>
       </tr>
       <tr>
         <td class="title">试验要求</td>
         <td class="content" colspan="3">
-          <input style="width: 100%; text-align: center" v-model="stepEdit.shiyanYaoqiu" :disabled="step1Parameter.disabled"/>
+          <input style="width: 100%; text-align: center" v-model="stepEdit.shiyanYaoqiu" :disabled="stepParameter.disabled"/>
         </td>
       </tr>
       <tr>
         <td class="title">报告体系</td>
-        <td class="content" style="display: flex; align-items: center; justify-content: center">
-          <input type="radio" name="baogao" value="海检版" v-model="stepEdit.baogaoTixi" :disabled="step1Parameter.disabled"/> 海检版&nbsp;
-          <input type="radio" name="baogao" value="瑞莱版" v-model="stepEdit.baogaoTixi" :disabled="step1Parameter.disabled"/> 瑞莱版&nbsp;
-          <input type="radio" name="baogao" value="瑞莱海检版" v-model="stepEdit.baogaoTixi" :disabled="step1Parameter.disabled"/> 瑞莱海检版
+        <td class="content">
+          <el-radio-group v-model="stepEdit.baogaoTixi" :disabled="stepParameter.disabled">
+            <el-radio :label="0">海检版</el-radio>
+            <el-radio :label="1">瑞莱版</el-radio>
+            <el-radio :label="2">瑞莱海检版</el-radio>
+          </el-radio-group>
         </td>
         <td class="title">资质要求</td>
-        <td class="content" style="display: flex; align-items: center; justify-content: center">
-          <input type="checkbox" v-model="stepEdit.zizhiYaoqiu_dictText1" :disabled="step1Parameter.disabled"/> CNAS&nbsp;<input
-            type="checkbox"
-            v-model="stepEdit.zizhiYaoqiu_dictText2"
-            :disabled="step1Parameter.disabled"
-          />
-          CMA&nbsp; <input type="checkbox" v-model="stepEdit.zizhiYaoqiu_dictText3" :disabled="step1Parameter.disabled"/> ISTA &nbsp;<input
-            type="checkbox"
-            v-model="stepEdit.zizhiYaoqiu_dictText4"
-            :disabled="step1Parameter.disabled"
-          />
-          船级社&nbsp; <input type="checkbox" v-model="stepEdit.zizhiYaoqiu_dictText5" :disabled="step1Parameter.disabled"/> 无
+        <td class="content">
+          <el-checkbox-group v-model="stepEdit.zizhiYaoqiu" :disabled="stepParameter.disabled">
+            <el-checkbox label="CNAS"></el-checkbox>
+            <el-checkbox label="CMA"></el-checkbox>
+            <el-checkbox label="ISTA"></el-checkbox>
+            <el-checkbox label="船级社"></el-checkbox>
+            <el-checkbox label="无"></el-checkbox>
+          </el-checkbox-group>
         </td>
       </tr>
       <tr>
@@ -117,10 +117,10 @@
         <td class="content" colspan="3">
           <div style="display: flex;align-items: flex-end;">
             <el-table :data="stepEdit.xnJiesuanPrice" class="u-dynamic-table"  show-summary :summary-method="getSummaries" border ref="table" style="width: 800px;">
-              <el-table-column type="index" label="序号" align="center" width="60"></el-table-column>
+              <el-table-column type="index" label="序号" align="center" min-width="60"></el-table-column>
               <el-table-column prop="eqName" label="试验设备" align="center" min-width="100">
                 <template slot-scope="scope">
-                  <el-select v-model="scope.row.eqName" placeholder="请选择"   value-key="id" @change="chooseEquipment($event, scope.$index)" style="width: 100%;" :disabled="step1Parameter.disabled">
+                  <el-select v-model="scope.row.eqName" placeholder="请选择"   value-key="id" @change="chooseEquipment($event, scope.$index)" style="width: 100%;" :disabled="stepParameter.disabled">
                     <el-option
                       v-for="item in equipmentOptions"
                       :key="item.id"
@@ -130,29 +130,29 @@
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column prop="typeName" label="试验类型" align="center" width="120"></el-table-column>
-              <el-table-column prop="time" label="试验时间(h)" align="center" width="120">
+              <el-table-column prop="typeName" label="试验类型" align="center" min-width="120"></el-table-column>
+              <el-table-column prop="time" label="试验时间(h)" align="center" min-width="120">
                 <template slot-scope="scope">
-                  <el-input v-model="scope.row.time" placeholder="请输入" @input="handleCheng(scope.row, scope.$index)" :readonly="step1Parameter.disabled"/>
+                  <el-input v-model="scope.row.time" placeholder="请输入" @input="handleCheng(scope.row, scope.$index)" :readonly="stepParameter.disabled"/>
                 </template>
               </el-table-column>
-              <el-table-column prop="unitPrice" label="试验单价(rmb/h)" align="center" width="140"></el-table-column>
-              <el-table-column prop="costPrice" label="试验费用" align="center" width="100"></el-table-column>
-              <el-table-column label="操作" width="100">
+              <el-table-column prop="unitPrice" label="试验单价(rmb/h)" align="center" min-width="140"></el-table-column>
+              <el-table-column prop="costPrice" label="试验费用" align="center" min-width="100"></el-table-column>
+              <el-table-column label="操作" min-width="100">
                 <template slot-scope="scope">
-                  <el-button type="text" size="small" @click="handleDelete(scope.row, scope.$index)" :style="{'pointer-events':step1Parameter.disabled?'none':'auto'}">删除</el-button>
+                  <el-button type="text" size="small" @click="handleDelete(scope.row, scope.$index)" :style="{'pointer-events':stepParameter.disabled?'none':'auto'}">删除</el-button>
                 </template>
               </el-table-column>
             </el-table>
-            <div class="addRow" @click="addRow" :style="{'pointer-events':step1Parameter.disabled?'none':'auto'}">添加</div>
+            <div class="addRow" @click="addRow" :style="{'pointer-events':stepParameter.disabled?'none':'auto'}">添加</div>
           </div>
         </td>
       </tr>
       <tr>
         <td class="title">预计报价</td>
         <td class="content" colspan="3">
-          <input style="width: 100%; text-align: center" v-model="stepEdit.yujiBaojia" :disabled="step1Parameter.disabled"/>
-          <div class="btn" style="margin-top:1%" @click="submitData" :style="{'pointer-events':step1Parameter.disabled?'none':'auto'}">保存</div>
+          <input style="width: 100%; text-align: center" v-model="stepEdit.yujiBaojia" :disabled="stepParameter.disabled"/>
+          <div class="btn" style="margin-top:1%" @click="submitData" :style="{'pointer-events':stepParameter.disabled?'none':'auto'}">保存</div>
         </td>
       </tr>
       <tr>
@@ -192,7 +192,7 @@ export default {
   data() {
     return {
       // 获取的流程数据
-      step1Parameter: {
+      stepParameter: {
         disabled: true
       },
       // 数据编辑信息
@@ -203,11 +203,16 @@ export default {
           weituoPhone: undefined,
         },
         xnJiesuanPrice: [{}],
+        baogaoTixi: null,
+        zizhiYaoqiu: [],
       },
       // 评审信息
       stepReview: {
+        id: null,
         disabled: true,
-        reviewResult: null
+        reviewResult: null,
+        fqUser: null,
+        shenheTime: null
       },
       // 试验设备数据
       equipmentOptions: [],
@@ -227,13 +232,14 @@ export default {
         if(newV && newV[0]){
           console.log(newV)
           var arrData = newV
-          this.step1Parameter = arrData[0]
-          this.step1Parameter.disabled = !(arrData[0].dangqian && arrData[0].isUpdate)
+          this.stepParameter = arrData[0]
+          this.stepParameter.disabled = !(arrData[0].dangqian && arrData[0].isUpdate)
           this.stepEdit = arrData[0].saveData ? JSON.parse(arrData[0].saveData) : this.stepEdit
           this.stepReview = arrData[1]
           this.stepReview.disabled = !(arrData[1].dangqian && arrData[1].isUpdate)
           this.stepReview.reviewResult = arrData[1].saveData ? JSON.parse(arrData[1].saveData).reviewResult : ''
-
+          console.log(this.stepReview)
+          
           if(!arrData[0].saveData){
             this.stepEdit.itdmWeituoInfo = arrData[0].itdmWeituoInfo
           }
@@ -317,7 +323,7 @@ export default {
     },
     submitData() {
       var saveData = {
-        runFlowPathStep: this.step1Parameter.id,
+        runFlowPathStep: this.stepParameter.id,
         saveData: JSON.stringify(this.stepEdit),
       }
       this.$emit('save', saveData)
@@ -326,37 +332,55 @@ export default {
 }
 </script>
 
-<style lang="less" scoped>
-@import '~@assets/less/common.less';
-
-.el-input__inner{
-  background: transparent;
-}
-.el-select{
-  /deep/.el-input.is-disabled .el-input__inner{
-    color: #606266 !important;
-    background-color: transparent !important;
-    cursor: auto;
+<style lang="less">
+.u-OA-jixiao{
+  .el-radio-group{
+    .el-radio__input.is-disabled+span.el-radio__label{
+      color: rgba(0, 0, 0, 0.65) !important;
+      cursor: auto !important;
+    }
   }
-}
-.el-table{
-  background-color: transparent;
-  border: solid 1px #808080;
-  /deep/ tr{
-    background-color: transparent !important;
+  .el-checkbox-group{
+    .el-checkbox__input.is-disabled+span.el-checkbox__label{
+      color: rgba(0, 0, 0, 0.65) !important;
+      cursor: auto !important;
+    }
   }
-  /deep/ th.el-table__cell{
-    background-color: transparent !important;
-    border-color: #808080;
+  .el-input__inner{
+    background: transparent !important;
   }
-  /deep/ td.el-table__cell{
-    border-color: #808080;
+  .el-select{
+    .el-input.is-disabled .el-input__inner{
+      color: #606266 !important;
+      background-color: transparent !important;
+      cursor: auto !important;
+    }
   }
-  /deep/ .el-input__inner{
-    background: transparent;
+  .el-table{
+    background-color: transparent !important;
+    border: solid 1px #808080 !important;
+    thead{
+      color: #3d3d3d !important;
+    }
+    tr{
+      background-color: transparent !important;
+    }
+    th.el-table__cell{
+      background-color: transparent !important;
+      border-color: #808080 !important;
+    }
+    td.el-table__cell{
+      border-color: #808080 !important;
+    }
+    .el-input__inner{
+      background: transparent !important;
+    }
   }
 }
+</style>
 
+<style scoped>
+@import '~@assets/less/common.less';
 
 table * {
   box-sizing: border-box;
@@ -365,6 +389,7 @@ table * {
 table {
   border: 1px solid rgb(30, 53, 65);
   width: 100%;
+  table-layout:fixed;
 }
 input {
   padding: 0 20px;
@@ -375,7 +400,7 @@ input {
 }
 td {
   text-align: center;
-  border: 1px solid rgb(30, 53, 65);
+  border: 1px solid #1e3541;
 }
 
 tr {
@@ -396,6 +421,7 @@ tr {
 }
 .title {
   background-color: #fff;
+  font-weight: bold;
 }
 .addRow {
   width: 60px;

itdmWeb/src/views/module-iTDM/itdmYeWu/itdmXnJiesuan.vue

@@ -203,16 +203,18 @@ export default {
   watch: {
     tableData5: {
       handler(newV, oldV){
-        if(newV.length>0){
+        if(newV && newV[0]){
           console.log(newV)
           var arrData = newV
-          // 计算核准虚拟结算额
-          var xnJiesuanPrice = JSON.parse(arrData[0].saveData).xnJiesuanPrice
-          this.stepEdit.xnJiesuanE = this.changeData(xnJiesuanPrice, 'costPrice')
-          // 项目绩效基础计算
-          this.computeJixiaoData()
-          // 计算虚拟结算绩效总额
-          this.computeJXXishuZonge()
+          if(arrData[0].saveData){
+            // 计算核准虚拟结算额
+            var xnJiesuanPrice = JSON.parse(arrData[0].saveData).xnJiesuanPrice
+            this.stepEdit.xnJiesuanE = this.changeData(xnJiesuanPrice, 'costPrice')
+            // 项目绩效基础计算
+            this.computeJixiaoData()
+            // 计算虚拟结算绩效总额
+            this.computeJXXishuZonge()
+          }
 
           var obj = arrData.find(res => res.sort === '8')
           this.stepParameter = obj

itdmWeb/src/views/module-iTDM/itdmYeWu/itdmXqPingshen.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="u-OA-jixiao">
     <div class="head">第二部分　试验需求评审</div>
     <table class="main-table">
       <tr>
@@ -306,6 +306,7 @@ table * {
 table {
   border: 1px solid rgb(30, 53, 65);
   width: 100%;
+  table-layout:fixed;
 }
 td {
   text-align: center;