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

src/views/valueAddedService/orderSettleManag/index.vue

@@ -51,9 +51,7 @@ export default {
                 this.$message.warning('请勾选订单')
                 return
               }
-              increOrderSettleConfirm({
-                ids: this.recordSelected.map(item => item.id)
-              }).then(res => {
+              increOrderSettleConfirm(this.recordSelected.map(item => item.id)).then(res => {
                 this.$message({ type: 'success', message: `成功!` })
                 this.$refs.pageRef.refreshList()
               })
@@ -236,10 +234,7 @@ export default {
               {
                 columnAttributes: {
                   label: '总手续费',
-                  prop: ''
-                },
-                render: (h, { row, column, index }) => {
-                  return <div style="padding-left:10px">{Number(row["amount"] || 0) / 1000 * 6}</div>
+                  prop: 'commissionAmount'
                 }
               },
               {
@@ -254,7 +249,7 @@ export default {
                   prop: 'websitAmount'
                 }
               }]}
-              tableData={[{ ...(this.formData.increItem || {}), ...(this.formData.incre || {}) }]}
+              tableData={[{ ...(this.formData.increItem || {}), ...(this.formData.incre || {}), commissionAmount: this.formData.commissionAmount }]}
               tableAttributes={{
                 size: 'mini',
                 border: true,
@@ -296,6 +291,15 @@ export default {
     exportList: increOrderSettleListExport,
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
+      if (item.jname === 'residuNum') {
+        defaultData.render = (h, { row, index, column }) => {
+          return (
+            <div style="padding:0 6px;cursor: pointer;">
+              {row["increType"] != 1 ? row["residuNum"] : ""}
+            </div>
+          )
+        }
+      }
       if (item.jname === 'serviceEndTime') {
         defaultData.render = (h, { row, index, column }) => {
           return (
@@ -363,9 +367,7 @@ export default {
     formConfirm() {
       this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
         if (valid) {
-          increOrderSettleConfirm({
-            ids: [this.formData.id]
-          }).then(res => {
+          increOrderSettleConfirm([this.formData.id]).then(res => {
             this.$message({ type: 'success', message: `操作成功!` })
             this.formCancel()
             this.$refs.pageRef.refreshList()