Merge branch 'linwenxin_workOrder' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin into develop

src/views/valueAddedService/orderSettleManag/index.vue

@@ -1,7 +1,7 @@
 <template>
   <template-page ref="pageRef" :get-list="getList" :exportList="exportList" :table-attributes="tableAttributes"
     :table-events="tableEvents" :moreParameters="moreParameters" :column-parsing="columnParsing" :operation="operation"
-    :operationColumnWidth="200" :replaceOrNotMap="false" :optionsEvensGroup="optionsEvensGroup">
+    :operationColumnWidth="200" :optionsEvensGroup="optionsEvensGroup">
     <div class="cartographer">
       <el-dialog :title="formTypeName[formType]" width="100%" :modal="false" :visible.sync="formDialog"
         :before-close="formCancel">
@@ -62,7 +62,8 @@ export default {
       // 表格属性
       tableAttributes: {
         // 启用勾选列
-        selectColumn: true
+        selectColumn: true,
+        selectable: this.selectable
       },
       // 表格事件
       tableEvents: {
@@ -259,7 +260,13 @@ export default {
                   prop: 'websitAmount'
                 }
               }]}
-              tableData={[{ ...(this.formData.increItem || {}), ...(this.formData.incre || {}), commissionAmount: this.formData.commissionAmount }]}
+              tableData={[{
+                ...(this.formData.increItem || {}),
+                ...(this.formData.incre || {}),
+                workerAmount: this.formData.workerAmount,
+                websitAmount: this.formData.websitAmount,
+                commissionAmount: this.formData.commissionAmount
+              }]}
               tableAttributes={{
                 size: 'mini',
                 border: true,
@@ -295,6 +302,10 @@ export default {
     },
   },
   methods: {
+    selectable(row, index) {
+      return ["PAID"].includes(Object.entries(row.selectMapData.payStatus).find(([key, val]) => val == row.payStatus)?.[0]) &&
+        ["ING"].includes(Object.entries(row.selectMapData.settleStatus).find(([key, val]) => val == row.settleStatus)?.[0])
+    },
     // 列表请求函数
     getList: increOrderSettleList,
     // 列表导出函数
@@ -334,7 +345,7 @@ export default {
             this.formType = 0
             this.getDetail(row.id)
           }}>查看</el-button>
-          {!["REFUND", "EXPIRE", "CANCEL", "WAIT"].includes(row.payStatus) ? (
+          {["PAID", "REFUND"].includes(row.payStatus) ? (
             <el-button type="text" onClick={() => {
               this.$router.push({
                 name: "workOrderPool",
@@ -344,7 +355,7 @@ export default {
               })
             }}>服务单明细</el-button>
           ) : null}
-          {!["REFUND", "EXPIRE", "CANCEL", "WAIT"].includes(row.payStatus) ? (
+          {["PAID"].includes(row.payStatus) && ["ING"].includes(row.settleStatus) ? (
             <el-popconfirm
               title={`是否确定退款？`}
               onConfirm={() => {
@@ -357,7 +368,7 @@ export default {
               <el-button type="text" slot="reference">退款</el-button>
             </el-popconfirm>
           ) : null}
-          {!["REFUND", "EXPIRE", "CANCEL", "WAIT"].includes(row.payStatus) ? (
+          {["PAID"].includes(row.payStatus) && ["ING"].includes(row.settleStatus) ? (
             <el-button type="text" onClick={() => {
               this.formType = 1
               this.getDetail(row.id)