Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-10 5d0120d2e8a6e5cd2e1e95d4c5ffeecf5fc1c4a6

 src/components/makepager/CommonFormTableView.vue

@@ -63,8 +63,12 @@
                  <div class="common-select-btn" @click="selClientClick(scope.row, item.prop)">
                    <i class="el-icon-circle-plus-outline" title="选择"></i>
                  </div>
                  <div class="common-select-btn" @click="clearupClient(scope.row)">
                    <i class="el-icon-edit-outline" title="清除"></i>
                  <div
                    v-if="scope.row[item.prop] && scope.row[item.prop].length > 0"
                    class="common-select-btn"
                    @click="clearupClient(scope.row)"
                  >
                    <i class="el-icon-remove-outline" title="清除"></i>
                  </div>
                </div>
              </el-form-item>
@@ -121,7 +125,7 @@
              </el-form-item>
              <span v-else>{{ scope.row[item.prop] }}</span>
            </template>
            <span v-else>{{ scope.row[item.prop] }}</span>
            <span v-else style="text-align: right">{{ scope.row[item.prop] }}</span>
          </template>
        </el-table-column>
      </el-table>
@@ -328,6 +332,13 @@
    commonInputChange(val, prop, row) {
      console.log(val, prop)
      console.log(row)
      if (prop === "amount") {
        this.tableList.tableData.map((ite) => {
          if (ite.name === row.name) {
            ite.total = row.amount * row.price
          }
        })
      }
      this.$emit("inputContent", val, prop, row)
    },
    // 清空
@@ -434,7 +445,7 @@
  }
  .el-table__footer-wrapper tbody td.el-table__cell {
    background-color: #fff;
    text-align: right;
    // text-align: right;
    font-weight: bold;
  }
  .el-input--suffix .el-input__inner {
@@ -445,7 +456,8 @@
    padding: 0 5px;
  }
  .el-input__inner {
    text-align: left;
    // text-align: left;
    text-align: center !important;
  }
}
</style>