linwenxin 1 年間 前
コミット
ac9d579f79
1 ファイル変更32 行追加31 行削除
  1. 32 31
      src/views/engineerFeeSettlement/monthlyPayrollSummary/index.vue

+ 32 - 31
src/views/engineerFeeSettlement/monthlyPayrollSummary/index.vue

@@ -16,7 +16,7 @@
           <div>
             <div style="box-sizing: border-box; padding: 10px">
               <el-button size="mini" @click="handleClose">取 消</el-button>
-              <el-button v-if="!formEdit" size="mini" @click="formConfirm" type="primary">确 定</el-button>
+              <el-button size="mini" @click="formConfirm" type="primary">确 定</el-button>
             </div>
           </div>
         </zj-page-container>
@@ -41,6 +41,7 @@ import {
   settleMonthWagesBatchSend,
   settleMonthWagesWorkerBatchSend
 } from "@/api/costPerDimension";
+import { tableDataParsing } from "@/utils/common.js"
 export default {
   components: { TemplatePage, ImageUpload },
   mixins: [import_mixin, operation_mixin],
@@ -68,8 +69,8 @@ export default {
         remark: ""
       },
       formBool: false,
-      formEdit: false,
-      workerList: []
+      evaluationColumns: [],
+      evaluationData: []
     }
   },
   computed: {
@@ -83,6 +84,7 @@ export default {
                   this.$message.warning('请勾选工单')
                   return
                 }
+                this.getTableJieGou()
                 this.formBool = true
               }
             })
@@ -135,6 +137,7 @@ export default {
                   this.$message.warning('请勾选工单')
                   return
                 }
+                this.getTableJieGou()
                 this.formBool = true
               }
             })
@@ -166,7 +169,6 @@ export default {
         md: 6,
         attributes: {
           type: "date",
-          disabled: this.formEdit,
           'value-format': 'yyyy-MM-dd HH:mm:ss',
         },
         formItemAttributes: {
@@ -190,9 +192,6 @@ export default {
       }, {
         name: 'el-input',
         md: 24,
-        attributes: {
-          disabled: this.formEdit,
-        },
         formItemAttributes: {
           label: '备注',
           prop: 'remark',
@@ -239,29 +238,8 @@ export default {
         },
         render: (h, { props, onInput }) => {
           return <zj-table
-            columns={[
-              {
-                columnAttributes: {
-                  label: '操作类别',
-                  prop: 'type',
-                  width: 140
-                }
-              },
-              {
-                columnAttributes: {
-                  label: '操作类别',
-                  prop: 'type',
-                  width: 140
-                }
-              },
-              {
-                columnAttributes: {
-                  label: '操作类别',
-                  prop: 'type',
-                }
-              },
-            ]}
-            table-data={this.recordSelected}
+            columns={this.evaluationColumns}
+            table-data={this.evaluationData}
           />
         }
       }]
@@ -290,7 +268,10 @@ export default {
     getList2(p, cb) {
       var pam = JSON.parse(JSON.stringify(p))
       try {
-        pam.params.push({ "param": "month_settle_worker_id", "compare": "=", "value": this.workerItem.workerId })
+        pam.params.push(
+          { "param": "a.settle_month_wages_id", "compare": "=", "value": this.monthItem.id },
+          { "param": "month_settle_worker_id", "compare": "=", "value": this.workerItem.workerId }
+        )
         cb && cb(pam)
         return settleExpenseList(pam)
       } catch (err) {
@@ -308,6 +289,7 @@ export default {
           },
           click: ({ row, index, column }) => {
             this.recordSelected = [{ ...row }]
+            this.getTableJieGou()
             this.formBool = true
           }
         },
@@ -342,6 +324,7 @@ export default {
           },
           click: ({ row, index, column }) => {
             this.recordSelected = [{ ...row }]
+            this.getTableJieGou()
             this.formBool = true
           }
         },
@@ -366,6 +349,8 @@ export default {
     },
     handleClose() {
       this.recordSelected = []
+      this.evaluationColumns = []
+      this.evaluationColumns = []
       this.$refs?.pageRef?.refreshList()
       this.$data.formData = this.$options.data().formData
       this.formBool = false
@@ -388,6 +373,22 @@ export default {
         }
       })
     },
+    getTableJieGou() {
+      ; (([settleMonthWagesGatherList, settleMonthWagesList])[this.pageLevel])({ "pageNum": 1, "pageSize": 1, "params": [] }).then(res => {
+        this.evaluationColumns = tableDataParsing(res.fieldBeans.filter(item => !~["aaa"].indexOf(item.jname))).map(item => {
+          return item
+        })
+        this.$nextTick(() => {
+          this.evaluationData = this.recordSelected.map(item => {
+            Object.keys(item).map(key => {
+              var val = JSON.parse(res?.fieldBeans?.find(val => val.jname == key)?.enumMap || "{}")[item[key]];
+              if (val) item[key] = val;
+            })
+            return item
+          })
+        })
+      })
+    }
   }
 }
 </script>