Merge remote-tracking branch 'origin/master'

itdmWeb/src/api/api.js

@@ -112,6 +112,8 @@ const listSj = (params)=>getAction("/itdmgomgongdanshuju/ItdmGongdanshuju/list",
 const upload = (params)=>postAction("/itdmgomgongdanshuju/ItdmGongdanshuju/upload",params);
 // 获取当前附件
 const getUpload = (params)=>getAction("/itdmgomgongdanshuju/ItdmGongdanshuju/getUpdate",params);
+// 根据流程id查询业务内容
+const getYeWU = (params)=>getAction("flowpath/itdmRunFlowPath/queryById",params);
 
 
 //日志管理
@@ -296,6 +298,7 @@ export {
   runFlowPathRejectDQ,
   runFlowPathyrunList,
   runFlowPathrejectzd,
+  getYeWU,
 }
 
 

itdmWeb/src/components/GenerateFormItem.vue

@@ -311,7 +311,7 @@ export default {
     padding: 0;
     .cell{
       padding-left: 0 !important;
-      padding-right: 0;
+      padding-right: 0 !important;
     }
   }
   // 当加入校验时需要判断设置

itdmWeb/src/views/module-iTDM/flowpath/ItdmRunFlowPathList.vue

@@ -100,7 +100,8 @@
           <a-divider type='vertical' />
           <a @click='bohui1(record)'>驳回指定节点</a>
           <a-divider type='vertical' />
-          <a @click='handleEdit(record)'>编辑</a>
+          <!-- <a @click='handleEdit(record)'>编辑</a> -->
+          <a @click='handleEdit2(record)'>流程编辑</a>
 
           <a-divider type='vertical' />
           <a-dropdown>
@@ -252,6 +253,10 @@ export default {
       this.$refs.bohuiForm1.bohui(record);
 
     },
+    handleEdit2(record){
+      console.log(record)
+      this.$router.push({path: '/itdmYeWu/index',query:{id: record.id,flowPathId: record.flowPathId,weituoNo:record.weituoNo}})
+    },
 
     initDictConfig() {
     },

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

@@ -1,10 +1,10 @@
 <template>
     <a-card :bordered="false">
-        <itdm-xm-shuru></itdm-xm-shuru>
-        <itdm-xq-pingshen></itdm-xq-pingshen>
-        <itdm-gc-shishi></itdm-gc-shishi>
-        <itdm-bg-jiaofu></itdm-bg-jiaofu>
-        <itdm-xn-jiesuan></itdm-xn-jiesuan>
+        <itdm-xm-shuru :tableData1="tableData1"></itdm-xm-shuru>
+        <itdm-xq-pingshen :tableData2="tableData2"></itdm-xq-pingshen>
+        <itdm-gc-shishi :tableData3="tableData3"></itdm-gc-shishi>
+        <itdm-bg-jiaofu :tableData4="tableData4"></itdm-bg-jiaofu>
+        <itdm-xn-jiesuan :tableData5="tableData5"></itdm-xn-jiesuan>
     </a-card>
 </template>
 
@@ -14,9 +14,49 @@ import ItdmXqPingshen from './itdmXqPingshen.vue'
 import ItdmGcShishi from './itdmGcShishi.vue'
 import ItdmBgJiaofu from './itdmBgJiaofu.vue'
 import ItdmXnJiesuan from './itdmXnJiesuan.vue'
+import { getYeWU } from '@/api/api'
 export default {
   components: { ItdmXmShuru, ItdmXqPingshen, ItdmGcShishi, ItdmBgJiaofu, ItdmXnJiesuan },
-    
+    data() {
+      return {
+        querys:{
+          id: this.$route.query.id
+        },
+        // 接收后端传的json
+        tableData1:[],
+        tableData2:[],
+        tableData3:[],
+        tableData4:[],
+        tableData5:[],
+      }
+    },
+    created(){
+      // this.querys.id = this.$route.query.id
+      console.log(this.querys.id)
+      this.getList()
+    },
+    methods: {
+      getList(){
+        getYeWU(this.querys).then((res) => {
+          console.log(11111,res)
+          // this.tableData = res.result.stepList
+          // console.log(this.tableData)
+          this.tableData1.push(res.result.stepList[0])
+          this.tableData1.push(res.result.stepList[1])
+          this.tableData2.push(res.result.stepList[2])
+          this.tableData2.push(res.result.stepList[3])
+          this.tableData3.push(res.result.stepList[4])
+          this.tableData4.push(res.result.stepList[5])
+          this.tableData4.push(res.result.stepList[6])
+          this.tableData5.push(res.result.stepList[7])
+          this.tableData5.push(res.result.stepList[8])
+          this.tableData5.push(res.result.stepList[9])
+          this.tableData5.push(res.result.stepList[10])
+          this.tableData5.push(res.result.stepList[11])
+          // console.log(this.tableData1)
+        })
+      }
+    }
 }
 </script>
 

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

@@ -74,6 +74,14 @@ import JUpload from '@/components/jeecg/JUpload'
 export default {
     name: 'itdmBgJiaofu',
     components: { JUpload },
+    props: {
+      // json
+      tableData4: {
+        type: Array,
+        default: false,
+        required: false
+      }
+    },
     data() {
         return {
             tableData: {
@@ -95,6 +103,9 @@ export default {
             excel: '',
         }
     },
+    created(){
+      console.log(44444,this.tableData4)
+    },
     methods: {
       // 点击导入excel
       daoruButton() {

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

@@ -16,10 +16,10 @@
               <td style="width: 80px;">工时</td>
               <td style="width: 80px;">强度</td>
               <td style="width: 80px;">工作量</td>
-              <td style="width: 80px;">告知数</td>
+              <!-- <td style="width: 80px;">告知数</td>
               <td style="width: 80px;">差错数</td>
               <td style="width: 80px;">催促数</td>
-              <td style="width: 80px;">警告数</td>
+              <td style="width: 80px;">警告数</td> -->
               <!-- <td style="width: 60px">操作</td> -->
             </thead>
             <tr>
@@ -28,15 +28,15 @@
               <td><input style="width: 80px;" v-model="item.resultData.gongshi" /></td>
               <td><input style="width: 80px;" v-model="item.resultData.qiangdu" /></td>
               <td><input style="width: 80px;" v-model="item.resultData.gongzuoliang" /></td>
-              <td><input style="width: 80px;" v-model="item.resultData.gaozhiNum" /></td>
+              <!-- <td><input style="width: 80px;" v-model="item.resultData.gaozhiNum" /></td>
               <td><input style="width: 80px;" v-model="item.resultData.chacuoNum" /></td>
               <td><input style="width: 80px;" v-model="item.resultData.cuicuNum" /></td>
-              <td><input style="width: 80px;" v-model="item.resultData.jinggaoNum" /></td>
+              <td><input style="width: 80px;" v-model="item.resultData.jinggaoNum" /></td> -->
               <!-- <td><div class="delBtn" @click="delRow(index)" v-show="tableData.cleanPrice.length >= 2">删除</div></td> -->
             </tr>
           </table>
         </td>
-        <td class="content" style="width: 100px">量化积分</td>
+        <!-- <td class="content" style="width: 100px">量化积分</td> -->
       </tr>
       <tr>
         <td class="title" style="width: 80px">非考核<br/>支持人员</td>
@@ -61,6 +61,14 @@
 <script>
 export default {
   name: 'itdmGcShishi',
+  props: {
+    // json
+    tableData3: {
+      type: Array,
+      default: false,
+      required: false
+    }
+  },
   data() {
     return {
       tableData: {
@@ -70,6 +78,9 @@ export default {
       },
     }
   },
+  created(){
+    console.log(33333,this.tableData3)
+  },
 }
 </script>
 

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

@@ -8,20 +8,17 @@
           <table>
             <tr>
               <td>序号</td>
-              <td>新客户</td>
-              <td>客户行业</td>
+              <!-- <td>客户行业</td> -->
               <td>客户名称</td>
             </tr>
             <tr>
               <td style="min-width: 50px">1</td>
-              <td style="max-width: 130px">
-                <input v-model="tableData.newkehu" style="text-align: center; max-width: 130px" />
-              </td>
-              <td style="max-width: 130px">
+              <!-- <td style="max-width: 130px">
                 <input v-model="tableData.kehuHangye" style="text-align: center; max-width: 130px" />
-              </td>
+              </td> -->
               <td style="max-width: 130px">
-                <input v-model="tableData.kehuMingcheng" style="text-align: center; max-width: 130px" />
+                {{ tableData.weituoClient }}
+                <!-- <input v-model="tableData.weituoClient" style="text-align: center; max-width: 130px" /> -->
               </td>
             </tr>
           </table>
@@ -88,10 +85,11 @@
       <tr>
         <td class="title">客户<br />联系信息</td>
         <td class="content">
-          姓名：<input style="width: 110px" v-model="tableData.kehuName" /> 电话：<input
+          <!-- 姓名：<input style="width: 110px" v-model="tableData.kehuName" /> 电话：<input
             style="width: 150px"
             v-model="tableData.kehuPhone"
-          />
+          /> -->
+          姓名：{{ tableData.weituoLxr }}　　电话：{{ tableData.weituoPhone }}
         </td>
         <td class="title">合同编号</td>
         <td class="content">
@@ -127,34 +125,36 @@
       <tr>
         <td class="title">项目<br />虚拟结算额</td>
         <td class="content" colspan="3">
-          <div style="display: flex; align-items: flex-end">
-            <table>
-              <thead>
-                <td>序号</td>
-                <td>试验设备</td>
-                <td>试验时间（h）</td>
-                <td>试验单价（rmb/h）</td>
-                <td>试验费用</td>
-                <td style="width: 60px">操作</td>
-              </thead>
-              <tr v-for="(item, index) in tableData.cleanPrice" :key="index">
-                <td>{{ index + 1 }}</td>
-                <td><input style="max-width: 150px; text-align: center" v-model="item.shebei" /></td>
-                <td><input style="max-width: 150px; text-align: center" v-model="item.time" /></td>
-                <td><input style="max-width: 150px; text-align: center" v-model="item.price" /></td>
-                <td>{{ item.time * item.price }}</td>
-                <td><div class="delBtn" @click="delRow(index)" v-show="tableData.cleanPrice.length >= 2">删除</div></td>
-              </tr>
-              <tr>
-                <td style="font-weight: bold;">合计</td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td style="font-weight: bold;">{{ totalCleanPrice }}</td>
-              </tr>
-            </table>
-            <div class="addRow" style="margin-right:1.1%" @click="addRow">添加</div>
-            <!-- <div class="addRow" @click="addSubTable">提交</div> -->
+          <div style="display: flex;align-items: flex-end;">
+            <el-table :data="tableData.xnJiesuanPrice" class="u-dynamic-table" stripe  show-summary :summary-method="getSummaries" border ref="table" style="width: 740px;">
+              <el-table-column type="index" label="序号" align="center" width="60"></el-table-column>
+              <el-table-column prop="eqName" label="试验设备" align="center" 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%;">
+                    <el-option
+                      v-for="item in equipmentOptions"
+                      :key="item.id"
+                      :label="item.deviceName"
+                      :value="item">
+                    </el-option>
+                  </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">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.time" placeholder="请输入" @input="handleCheng(scope.row, scope.$index)"/>
+                </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">
+                <template slot-scope="scope">
+                  <el-button type="text" size="small" @click="handleDelete(scope.row, scope.$index)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div class="addRow" @click="addRow">添加</div>
           </div>
         </td>
       </tr>
@@ -183,7 +183,7 @@
         </td>
       </tr>
     </table>
-    
+
   </div>
 </template>
 
@@ -191,183 +191,120 @@
 import '@/assets/less/TableExpand.less'
 import { mixinDevice } from '@/utils/mixin'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import { getDeviceList } from '@/api/api'
 
 export default {
   name: 'itdmXmShuru',
-  mixins: [JeecgListMixin, mixinDevice],
+  // mixins: [JeecgListMixin, mixinDevice],
+  props: {
+    // json
+    tableData1: {
+      type: Array,
+      default: false,
+      required: false
+    }
+  },
   data() {
     return {
-      description: '试验项目输入管理页面',
       tableData: {
-        cleanPrice: [
-          {
-            total: 0,
-          },
-        ],
-      },
-      // 表头
-      columns: [
-        {
-          title: '#',
-          dataIndex: '',
-          key: 'rowIndex',
-          width: 60,
-          align: 'center',
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1
-          },
-        },
-        {
-          title: '是否新客户',
-          align: 'center',
-          dataIndex: 'newkehu',
-        },
-        {
-          title: '客户行业',
-          align: 'center',
-          dataIndex: 'kehuHangye',
-        },
-        {
-          title: '客户名称',
-          align: 'center',
-          dataIndex: 'kehuMingcheng',
-        },
-        {
-          title: '输入类型',
-          align: 'center',
-          dataIndex: 'shuruLeixing',
-        },
-        {
-          title: '试验信息',
-          align: 'center',
-          dataIndex: 'shiyanXinxi',
-        },
-        {
-          title: '方案设计',
-          align: 'center',
-          dataIndex: 'fanganSheji_dictText',
-        },
-        {
-          title: '试验评审',
-          align: 'center',
-          dataIndex: 'shiyanPingshen_dictText',
-        },
-        {
-          title: '用车安排',
-          align: 'center',
-          dataIndex: 'yongcheAnpai_dictText',
-        },
-        {
-          title: '工装设计',
-          align: 'center',
-          dataIndex: 'gongzhuangSheji_dictText',
-        },
-        {
-          title: '用餐安排',
-          align: 'center',
-          dataIndex: 'yongcanAnpai_dictText',
-        },
-        {
-          title: '住宿安排',
-          align: 'center',
-          dataIndex: 'zhusuAnpai_dictText',
-        },
-        {
-          title: '报告确认',
-          align: 'center',
-          dataIndex: 'baogaoQueren_dictText',
-        },
-        {
-          title: '客户姓名',
-          align: 'center',
-          dataIndex: 'kehuName',
-        },
-        {
-          title: '客户电话',
-          align: 'center',
-          dataIndex: 'kehuPhone',
-        },
-        {
-          title: '合同编号',
-          align: 'center',
-          dataIndex: 'hetongBianhao',
-        },
-        {
-          title: '试验要求',
-          align: 'center',
-          dataIndex: 'shiyanYaoqiu',
-        },
-        {
-          title: '报告体系',
-          align: 'center',
-          dataIndex: 'baogaoTixi_dictText',
-        },
-        {
-          title: '资质要求',
-          align: 'center',
-          dataIndex: 'zizhiYaoqiu_dictText',
-        },
-        {
-          title: '预计报价',
-          align: 'center',
-          dataIndex: 'yujiBaojia',
-        },
-        {
-          title: '评审结论',
-          align: 'center',
-          dataIndex: 'pingshenJielun',
-        },
-        {
-          title: '主审人',
-          align: 'center',
-          dataIndex: 'zhushenRen',
-        },
-        {
-          title: '主审时间',
-          align: 'center',
-          dataIndex: 'zhushenShijian',
-        },
-        {
-          title: '操作',
-          dataIndex: 'action',
-          align: 'center',
-          fixed: 'right',
-          width: 147,
-          scopedSlots: { customRender: 'action' },
-        },
-      ],
-      url: {
-        list: '/itdmShiYanXiangMu/itdmShiyanxiangmu/list',
-        delete: '/itdmShiYanXiangMu/itdmShiyanxiangmu/delete',
-        deleteBatch: '/itdmShiYanXiangMu/itdmShiyanxiangmu/deleteBatch',
-        exportXlsUrl: '/itdmShiYanXiangMu/itdmShiyanxiangmu/exportXls',
-        importExcelUrl: 'itdmShiYanXiangMu/itdmShiyanxiangmu/importExcel',
+        weituoClient: undefined,
+        weituoLxr: undefined,
+        weituoPhone: undefined,
+        xnJiesuanPrice: [{}],
       },
-      dictOptions: {},
-      superFieldList: [],
+      equipmentOptions: [],
     }
   },
   created() {
-    this.getSuperFieldList()
+    // console.log(11111,this.tableData1)
+    // const a = JSON.parse(JSON.stringify(this.tableData1))
+    // console.log(a)
+    // this.tableData.weituoClient =JSON.parse(JSON.stringify(this.tableData1[0].itdmWeituoInfo.weituoClient))
+    // this.tableData.weituoClient =this.tableData1[0].itdmWeituoInfo.weituoClient
+    this.getDevicePrice()
   },
   computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
-    },
-    totalCleanPrice() {
-      let total = 0
-      this.tableData.cleanPrice.forEach((item) => {
-        var row = item.time * item.price
-        if (!isNaN(row)) {
-          total += Number(row)
+    // importExcelUrl: function () {
+    //   return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    // },
+  },
+  watch: {
+    tableData1: {
+      handler(newV, oldV){
+        if(newV){
+          console.log(newV[0].itdmWeituoInfo, oldV)
+          this.tableData.weituoClient =newV[0].itdmWeituoInfo.weituoClient
+          this.tableData.weituoLxr =newV[0].itdmWeituoInfo.weituoLxr
+          this.tableData.weituoPhone =newV[0].itdmWeituoInfo.weituoPhone
         }
-      })
-      return total.toFixed(2)
-    },
+      },
+      deep: true,
+      immediate: true
+    }
   },
   methods: {
+    getDevicePrice(){
+      getDeviceList().then(response => {
+        // console.log(response)
+        this.equipmentOptions = response
+      })
+    },
+    chooseEquipment(value, index){
+      var row = this.tableData.xnJiesuanPrice[index]
+      this.tableData.xnJiesuanPrice[index].type = value.zyxbz
+      this.tableData.xnJiesuanPrice[index].typeName = value.zyxbzText
+      this.tableData.xnJiesuanPrice[index].unitPrice = value.danjia
+      this.tableData.xnJiesuanPrice[index].costPrice = row.unitPrice * row.time || 0
+    },
+    handleCheng(value, index){
+      console.log(value)
+      // console.log(this.$refs.table.summaryMethod())
+      this.tableData.xnJiesuanPrice[index].costPrice = value.unitPrice * value.time || 0
+    },
+    getSummaries(param){
+      const { columns, data } = param;
+      // console.log(columns, data)
+      const len = columns.length;
+      const sums = [];
+      columns.forEach((column, index) => {
+        // 第一列显示合计
+        if (index === 0) {
+          sums[index] = '合计';
+          return;
+        }else if(index === len - 2){ // 返回数据长度的最后一个
+          const times = data.map(item => Number(item['time']));
+          const prices = data.map(item=>Number(item['unitPrice']))
+          const eqName = data.map(item => item['eqName']); // 谁改变也要写在这，要不不能触发
+          // if (!times.every(value => isNaN(value))) {
+            //通过reduce求和,curr为每一列的每个元素的值,return prev返回值给到sums[index]
+            sums[index] = times.reduce((prev, curr, index) => {
+              const value = Number(curr);
+              //确定数据是否为空,不为空进行计算,为空返回原值
+              if (!isNaN(value) && !isNaN(prices[index])) {
+                //curr为工时,prices为单价,求得每行的金额,再通过reduce累加求和
+                console.log(curr*prices[index], prev + curr*prices[index])
+                return prev + curr*prices[index];
+              } else {
+                return prev;
+              }
+            }, 0);
+          // } else {
+          //   sums[index] = 0;
+          // }
+        }
+      });
+      return sums;
+    },
+    handleDelete(row, index){
+      this.tableData.xnJiesuanPrice.splice(index, 1)
+    },
+    addRow() {
+      this.tableData.xnJiesuanPrice.push({})
+    },
+
+
     submit() {
-    
+
       let zizhiYaoqiu = []
       if (this.tableData.zizhiYaoqiu_dictText1) {
         zizhiYaoqiu.push('CNAS')
@@ -391,39 +328,6 @@ export default {
       console.log(this.tableData.cleanPrice)
       console.log(this.tableData)
     },
-    addRow() {
-      this.tableData.cleanPrice.push({})
-    },
-    delRow(index) {
-      this.tableData.cleanPrice.splice(index, 1)
-    },
-    initDictConfig() {},
-    getSuperFieldList() {
-      let fieldList = []
-      fieldList.push({ type: 'string', value: 'newkehu', text: '是否新客户', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'kehuHangye', text: '客户行业', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'kehuMingcheng', text: '客户名称', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'shuruLeixing', text: '输入类型', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'shiyanXinxi', text: '试验信息', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fanganSheji', text: '方案设计', dictCode: 'fangan_sheji' })
-      fieldList.push({ type: 'string', value: 'shiyanPingshen', text: '试验评审', dictCode: 'shiyan_pingshen' })
-      fieldList.push({ type: 'string', value: 'yongcheAnpai', text: '用车安排', dictCode: 'yongche_anpai' })
-      fieldList.push({ type: 'string', value: 'gongzhuangSheji', text: '工装设计', dictCode: 'gongzhuang_sheji' })
-      fieldList.push({ type: 'string', value: 'yongcanAnpai', text: '用餐安排', dictCode: 'yongcan_anpai' })
-      fieldList.push({ type: 'string', value: 'zhusuAnpai', text: '住宿安排', dictCode: 'zhusu_anpai' })
-      fieldList.push({ type: 'string', value: 'baogaoQueren', text: '报告确认', dictCode: 'baogao_queren' })
-      fieldList.push({ type: 'string', value: 'kehuName', text: '客户姓名', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'kehuPhone', text: '客户电话', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'hetongBianhao', text: '合同编号', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'shiyanYaoqiu', text: '试验要求', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'baogaoTixi', text: '报告体系', dictCode: 'baogao_tixi' })
-      fieldList.push({ type: 'string', value: 'zizhiYaoqiu', text: '资质要求', dictCode: 'zizhi_yaoqiu' })
-      fieldList.push({ type: 'string', value: 'yujiBaojia', text: '预计报价', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'pingshenJielun', text: '评审结论', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'zhushenRen', text: '主审人', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'zhushenShijian', text: '主审时间', dictCode: '' })
-      this.superFieldList = fieldList
-    },
   },
 }
 </script>
@@ -491,9 +395,4 @@ tr {
   position: absolute;
   right: 3%;
 }
-.delBtn {
-  padding: 3px 10px;
-  text-align: center;
-  font-size: 12px;
-}
 </style>

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

@@ -7,14 +7,14 @@
         <td class="title" style="width: 100px">核准<br/>虚拟结算额</td>
         <td class="content" style="width: 360px">
           <div>
-            <div v-for="(item, index) in tableData.xnJiesuanE" :key="index">{{ item.name }}：{{ item.amount }}；</div>
+            <div v-for="(item, index) in tableData.xnJiesuanE" :key="index">{{ item.typeName }}：{{ item.price }}；</div>
           </div>
         </td>
         <td class="title white" style="width: 100px">核准<br/>虚拟结算毛利</td>
         <td class="content">
           <!-- <input v-model="tableData.xnMaoli" style="text-align: center" /> -->
           <div>
-            <div v-for="(item, index) in tableData.xnJiesuanE" :key="index">{{ item.name }}：{{ item.amount * 0.8 }}；</div>
+            <div v-for="(item, index) in tableData.xnJiesuanE" :key="index">{{ item.typeName }}：{{ item.price * 0.8 }}；</div>
           </div>
         </td>
       </tr>
@@ -31,11 +31,11 @@
       <tr>
         <td class="title" style="width: 100px">销售提成<br/>基数</td>
         <td class="content" style="width: 360px">
-          
+          <input v-model="tableData.tichengJishu" style="text-align: center" />
         </td>
         <td class="title white" style="width: 100px">项目满意度</td>
         <td class="content" style="width: 350px">
-          <input v-model="tableData.shuruLeixing" style="text-align: center" />
+          <input v-model="tableData.manyidu" style="text-align: center" />
         </td>
       </tr>
       <tr>
@@ -51,11 +51,11 @@
         </td>
         <td class="title white" style="width: 100px">项目绩效<br/>基数计算</td>
         <td class="content" style="width: 350px">
-          <el-table :data="jixiaoData" style="width: 100%">
+          <el-table :data="tableData.jixiaoData" style="width: 100%">
             <el-table-column type="index" label="序号"></el-table-column>
             <!-- <el-table-column prop="type" label="试验类型"></el-table-column> -->
-            <el-table-column prop="name" label="试验类型"></el-table-column>
-            <el-table-column prop="fenduan" label="合同分段"></el-table-column>
+            <el-table-column prop="typeName" label="试验类型"></el-table-column>
+            <!-- <el-table-column prop="fenduan" label="合同分段"></el-table-column> -->
             <el-table-column prop="bili" label="分段比例"></el-table-column>
             <el-table-column prop="ticheng" label="分段提成"></el-table-column>
             <el-table-column prop="yue" label="分段余额"></el-table-column>
@@ -65,12 +65,15 @@
       <tr>
         <td class="title" style="width: 100px">项目得分<br/>（百分制）</td>
         <td class="content" style="width: 360px">
-          <!-- <itdm-device-run-list></itdm-device-run-list> -->
+          <input v-model="tableData.fenshu" style="text-align: center" />
         </td>
         <!-- <td class="content" style="width: 100px" colspan="2"></td> -->
         <td class="title white" style="width: 100px">虚拟结算<br/>绩效总额</td>
         <td class="content" style="width: 350px">
-          <div v-for="(item, index) in jixiaoZonge" :key="index">{{ item }}</div>
+          <!-- 乘系数之后的数值数组 -->
+          <!-- <div v-for="(item, index) in tableData.xnJixiaoZongeArr" :key="index">{{ item.typeName }}：{{ item.price }}；</div> -->
+          <!-- 乘满意度之后的总额 -->
+          <div>{{ (tableData.xnJixiaoZonge * tableData.manyidu)/100 }}</div>
         </td>
       </tr>
       <tr>
@@ -141,30 +144,85 @@ export default {
   name: 'itdmXnJiesuan',
   data() {
     return {
+      defineXishu: [
+        { type: 0, xishu: 0.40 },
+        { type: 1, xishu: 0.70 },
+        { type: 2, xishu: 1 },
+      ],
       tableData: {
         xnJiesuanE: [
-          { type: 0, name: '气候试验', amount: 50000 },
-          { type: 1, name: '力学试验', amount: 510000 },
-          { type: 2, name: '重要/非标试验', amount: 100000 },
+          // { type: 0, typeName: '气候试验', price: 50000 },
+          // { type: 1, typeName: '力学试验', price: 510000 },
+          // { type: 2, typeName: '重要试验', price: 100000 },
         ],
+        tichengJishu: null,
+        manyidu: 100,
+        fenshu: null,
         jixiaoData: [],
-        jixiaoZonge: null
+        xnJixiaoZonge: null,
+        // hasMYDJixiaoZonge: null,
+        xnJixiaoZongeArr: []
       },
+      moniData: [
+        { type: 0, typeName: '气候试验', time: 1, unitPrice: 3, costPrice: 20000 },
+        { type: 0, typeName: '气候试验', time: 1, unitPrice: 3, costPrice: 30000 },
+        { type: 1, typeName: '力学试验', time: 1, unitPrice: 3, costPrice: 100000 },
+        { type: 1, typeName: '力学试验', time: 1, unitPrice: 3, costPrice: 200000 },
+        { type: 1, typeName: '力学试验', time: 1, unitPrice: 3, costPrice: 210000 },
+        { type: 2, typeName: '重要试验', time: 1, unitPrice: 3, costPrice: 100000 },
+      ]
     }
   },
-  computed: {
-    jixiaoData(){
+  computed: {    
+  },
+  created(){
+    this.getXnJiesuanE()
+  },
+  methods: {
+    // 获取第一部分设置的项目虚拟结算额并计算数据
+    getXnJiesuanE(){
+      // 计算核准虚拟结算额
+      this.tableData.xnJiesuanE = this.changeData(this.moniData, 'costPrice')
+      // 项目绩效基础计算
+      this.computeJixiaoData()
+      // 计算虚拟结算绩效总额
+      this.computeJXXishuZonge()
+      
+    },
+    // 将试验类型相同的金额相加，用于：核准虚拟结算额和虚拟结算绩效总额
+    changeData(array, key){
+      let totalArr = []
+      array.forEach(element => {
+        var itemObj = { type: element.type, typeName: element.typeName, price: element[key] }
+        if(totalArr.length === 0){
+          totalArr.push(itemObj)
+        } else {
+          var index = totalArr.findIndex(res => res.type === element.type)
+          if(index === -1){
+            // 原来没有  push
+            totalArr.push(itemObj)
+          } else {
+            // 原来有  相加
+            totalArr[index].price += itemObj.price
+          }
+        }
+      });
+      // console.log(totalArr)
+      return totalArr
+    },
+    // 项目绩效基础计算
+    computeJixiaoData(){
       var dataLists = []
       for (let i = 0; i < this.tableData.xnJiesuanE.length; i++) {
         const item = this.tableData.xnJiesuanE[i];
-        const money = item.amount * 0.8
+        const money = item.price * 0.8
         if(money > 500000){
           // 50万以上
           console.log(money+':50万以上')
           var arr = [
             {
               type: item.type,
-              name: item.name,
+              typeName: item.typeName,
               fenduan: item.fenduan,
               bili: 0.05,
               ticheng: 50000 * 0.05,
@@ -172,7 +230,7 @@ export default {
             },
             {
               type: item.type,
-              name: item.name,
+              typeName: item.typeName,
               fenduan: item.fenduan,
               bili: 0.04,
               ticheng: 50000 * 0.04,
@@ -180,7 +238,7 @@ export default {
             },
             {
               type: item.type,
-              name: item.name,
+              typeName: item.typeName,
               fenduan: item.fenduan,
               bili: 0.03,
               ticheng: 400000 * 0.03,
@@ -188,7 +246,7 @@ export default {
             },
             {
               type: item.type,
-              name: item.name,
+              typeName: item.typeName,
               fenduan: item.fenduan,
               bili: 0.02,
               ticheng: (money - 500000) * 0.02,
@@ -202,7 +260,7 @@ export default {
           var arr = [
             {
               type: item.type,
-              name: item.name,
+              typeName: item.typeName,
               fenduan: item.fenduan,
               bili: 0.05,
               ticheng: 50000 * 0.05,
@@ -210,7 +268,7 @@ export default {
             },
             {
               type: item.type,
-              name: item.name,
+              typeName: item.typeName,
               fenduan: item.fenduan,
               bili: 0.04,
               ticheng: 50000 * 0.04,
@@ -218,7 +276,7 @@ export default {
             },
             {
               type: item.type,
-              name: item.name,
+              typeName: item.typeName,
               fenduan: item.fenduan,
               bili: 0.03,
               ticheng: (money - 100000) * 0.03,
@@ -232,7 +290,7 @@ export default {
           var arr = [
             {
               type: item.type,
-              name: item.name,
+              typeName: item.typeName,
               fenduan: item.fenduan,
               bili: 0.05,
               ticheng: 50000 * 0.05,
@@ -240,7 +298,7 @@ export default {
             },
             {
               type: item.type,
-              name: item.name,
+              typeName: item.typeName,
               fenduan: item.fenduan,
               bili: 0.04,
               ticheng: (money - 50000) * 0.04,
@@ -254,7 +312,7 @@ export default {
           var arr = [
             {
               type: item.type,
-              name: item.name,
+              typeName: item.typeName,
               fenduan: item.fenduan,
               bili: 0.05,
               ticheng: money * 0.05,
@@ -264,56 +322,25 @@ export default {
           dataLists.push(...arr)
         }
       }
-      return dataLists
+      this.tableData.jixiaoData = dataLists
+    },
+    // 计算虚拟结算绩效总额
+    computeJXXishuZonge(){
+      // 将试验类型相同的金额相加
+      var noHasXishuZonge = this.changeData(this.tableData.jixiaoData, 'ticheng')
+      var total = 0
+      var arr = noHasXishuZonge.map(item => {
+        var obj = this.defineXishu.find(res => res.type === item.type)
+        // 根据试验类型*对应系数
+        item.price = item.price * obj.xishu
+        // 计算出总和
+        total += item.price
+        return item
+      })
+      this.tableData.xnJixiaoZongeArr = arr
+      console.log(total)
+      this.tableData.xnJixiaoZonge = total
     },
-    jixiaoZonge(){
-      console.log(this.jixiaoData)
-      
-      let totalArr = []
-      let total = 0
-
-      var arr0 = this.jixiaoData.filter(res => res.type === 0)
-      var arr1 = this.jixiaoData.filter(res => res.type === 1)
-      var arr2 = this.jixiaoData.filter(res => res.type === 2)
-      
-      // 默认传如一个参数0，prev的第一项就是0，每次加上下一次的价格即可
-      let total0 = 0
-      let total1 = 0
-      let total2 = 0
-      if(arr0.length > 0){
-        var d = arr0.reduce((prev, next) => {
-          console.log(prev, next)
-          return prev + next.ticheng
-        }, 0)
-        total0 = d * 0.4
-        totalArr.push(`气候试验：${total0}；`)
-        total = total + total0
-      }
-      if(arr1.length > 0){
-        var d = arr1.reduce((prev, next) => {
-          console.log(prev, next)
-          return prev + next.ticheng
-        }, 0)
-        total1 = d * 0.7
-        totalArr.push(`力学试验：${total1}；`)
-        total = total + total1
-      }
-      if(arr2.length > 0){
-        var d = arr2.reduce((prev, next) => {
-          console.log(prev, next)
-          return prev + next.ticheng
-        }, 0)
-        total2 = d * 1
-        totalArr.push(`重要/非标试验：${total2}；`)
-        total = total + total2
-      }
-      totalArr.push(`总计：${total}；`)
-      // console.log(total)
-      return totalArr
-    }
-  },
-  methods: {
-    
   },
 }
 </script>

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

@@ -138,6 +138,14 @@
 <script>
 export default {
     name: 'itdmXqPingshen',
+    props: {
+      // json
+      tableData2: {
+        type: Array,
+        default: false,
+        required: false
+      }
+    },
     data() {
         return {
             tableData: {
@@ -165,6 +173,9 @@ export default {
             },
         }
     },
+    created(){
+      console.log(22222,this.tableData2)
+    },
     computed: {
       totalCleanPrice() {
         let total = 0