linwenxin il y a 4 mois
Parent
commit
00b801f3b7

+ 4 - 4
src/views/mallManagement/settleManagElecpay/index.vue

@@ -114,8 +114,8 @@
                 <el-table-column prop="num" label="数量"> </el-table-column>
                 <el-table-column prop="normAmount" label="收费标准"> </el-table-column>
                 <el-table-column prop="totalAmount" label="订单金额"> </el-table-column>
-                <el-table-column prop="workerProceAmount" label="手续费"> </el-table-column>
-                <el-table-column prop="workerAmount" label="师傅分账金额"> </el-table-column>
+                <!-- <el-table-column prop="workerProceAmount" label="手续费"> </el-table-column> -->
+                <!-- <el-table-column prop="workerAmount" label="师傅分账金额"> </el-table-column> -->
               </el-table>
             </el-card>
             <br />
@@ -162,8 +162,8 @@
               >
                 <el-table-column prop="amountName" label="费用名称"> </el-table-column>
                 <el-table-column prop="normAmount" label="费用金额"> </el-table-column>
-                <el-table-column prop="sffzje" label="师傅分账金额"> </el-table-column>
-                <el-table-column prop="sfsxf" label="师傅手续费"> </el-table-column>
+                <!-- <el-table-column prop="sffzje" label="师傅分账金额"> </el-table-column> -->
+                <!-- <el-table-column prop="sfsxf" label="师傅手续费"> </el-table-column> -->
               </el-table>
             </el-card>
           </div>

+ 62 - 62
src/views/workOrder/workOrderPool/detailModule/Payment/index.vue

@@ -153,50 +153,50 @@ export default {
                     render: (h, { row, column }) => {
                       return <div>{this.toFixed(row[column.columnAttributes.prop])}</div>
                     }
-                  },
-                  ...(() => {
-                    if (!!~[1, 2, 3].indexOf(this?.workOrderType)) {
-                      return [
-                        {
-                          columnAttributes: {
-                            label: '师傅分账金额',
-                            prop: 'workerAmount'
-                          },
-                          render: (h, { row, column }) => {
-                            return <div>{this.toFixed(row[column.columnAttributes.prop])}</div>
-                          }
-                        },
-                        {
-                          columnAttributes: {
-                            label: '师傅手续费',
-                            prop: 'workerProceAmount'
-                          },
-                          render: (h, { row, column }) => {
-                            return <div>{this.toFixed(row[column.columnAttributes.prop])}</div>
-                          }
-                        },
-                        {
-                          columnAttributes: {
-                            label: '网点分账金额',
-                            prop: 'websitAmount'
-                          },
-                          render: (h, { row, column }) => {
-                            return <div>{this.toFixed(row[column.columnAttributes.prop])}</div>
-                          }
-                        },
-                        {
-                          columnAttributes: {
-                            label: '网点手续费',
-                            prop: 'websitProceAmount'
-                          },
-                          render: (h, { row, column }) => {
-                            return <div>{this.toFixed(row[column.columnAttributes.prop])}</div>
-                          }
-                        }
-                      ]
-                    }
-                    return []
-                  })()
+                  }
+                  // ...(() => {
+                  //   if (!!~[1, 2, 3].indexOf(this?.workOrderType)) {
+                  //     return [
+                  //       {
+                  //         columnAttributes: {
+                  //           label: '师傅分账金额',
+                  //           prop: 'workerAmount'
+                  //         },
+                  //         render: (h, { row, column }) => {
+                  //           return <div>{this.toFixed(row[column.columnAttributes.prop])}</div>
+                  //         }
+                  //       },
+                  //       {
+                  //         columnAttributes: {
+                  //           label: '师傅手续费',
+                  //           prop: 'workerProceAmount'
+                  //         },
+                  //         render: (h, { row, column }) => {
+                  //           return <div>{this.toFixed(row[column.columnAttributes.prop])}</div>
+                  //         }
+                  //       },
+                  //       {
+                  //         columnAttributes: {
+                  //           label: '网点分账金额',
+                  //           prop: 'websitAmount'
+                  //         },
+                  //         render: (h, { row, column }) => {
+                  //           return <div>{this.toFixed(row[column.columnAttributes.prop])}</div>
+                  //         }
+                  //       },
+                  //       {
+                  //         columnAttributes: {
+                  //           label: '网点手续费',
+                  //           prop: 'websitProceAmount'
+                  //         },
+                  //         render: (h, { row, column }) => {
+                  //           return <div>{this.toFixed(row[column.columnAttributes.prop])}</div>
+                  //         }
+                  //       }
+                  //     ]
+                  //   }
+                  //   return []
+                  // })()
                 ]}
                 table-data={
                   [formData.workerOrderItems, formData.rpMaterialOrderItems][
@@ -355,25 +355,25 @@ export default {
                     render: (h, { row, column }) => {
                       return <div>{this.toFixed(row[column.columnAttributes.prop])}</div>
                     }
-                  },
-                  {
-                    columnAttributes: {
-                      label: '师傅分账金额',
-                      prop: 'sffzje'
-                    },
-                    render: (h, { row, column }) => {
-                      return <div>{this.toFixed(row[column.columnAttributes.prop])}</div>
-                    }
-                  },
-                  {
-                    columnAttributes: {
-                      label: '师傅手续费',
-                      prop: 'sfsxf'
-                    },
-                    render: (h, { row, column }) => {
-                      return <div>{this.toFixed(row[column.columnAttributes.prop])}</div>
-                    }
                   }
+                  // {
+                  //   columnAttributes: {
+                  //     label: '师傅分账金额',
+                  //     prop: 'sffzje'
+                  //   },
+                  //   render: (h, { row, column }) => {
+                  //     return <div>{this.toFixed(row[column.columnAttributes.prop])}</div>
+                  //   }
+                  // },
+                  // {
+                  //   columnAttributes: {
+                  //     label: '师傅手续费',
+                  //     prop: 'sfsxf'
+                  //   },
+                  //   render: (h, { row, column }) => {
+                  //     return <div>{this.toFixed(row[column.columnAttributes.prop])}</div>
+                  //   }
+                  // }
                 ]}
                 table-data={formData.gengduofeiyong || []}
               />