Merge branch 'zwf/style' into dev

yangfeng

2023-10-21 508f805bae4f74c9432d82c045d895a62ea1f099

 src/components/makepager/CommonFormTableView.vue

@@ -59,25 +59,14 @@
                :prop="'tableData.' + scope.$index + '.' + item.prop"
              >
                <div class="custom-name">
                  <el-select
                    v-model="scope.row[item.prop]"
                    placeholder="请选择"
                    size="mini"
                    style="width: 80%"
                    @change="
                      (val) => {
                        selProductNameClick(val)
                      }
                    "
                  <SimpleSearchInput
                    :echoValue="scope.row[item.prop]"
                    :echoName="scope.row[item.prop]"
                    checkedNum="1"
                    :clearable="true"
                    @select-user="selProductNameClick"
                  >
                    <el-option
                      v-for="item in productNameOptions"
                      :key="item.id"
                      :label="item.name"
                      :value="{ value: item.id, label: item.name, amount: item.amount, unit: item.unit }"
                    >
                    </el-option>
                  </el-select>
                  </SimpleSearchInput>
                </div>
              </el-form-item>
              <el-form-item
@@ -148,7 +137,9 @@
              <!-- 位置 -->
              <el-form-item v-else-if="item.location" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
                <div class="custom-name">
                  <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row[item.prop] }}</span>
                  <span v-if="scope.row.isEdit || scope.row.editable">{{
                    scope.row[item.prop]?.label ?? scope.row[item.prop]
                  }}</span>
                  <el-select
                    v-else
                    v-model="scope.row[item.prop]"
@@ -258,10 +249,11 @@
import { getLocationList } from "@/api/warehouseManage/warehouse"
import { getCompanyList } from "@/api/common/other"
import { getRuleList } from "@/api/operate/inventoryAdjustment"
import SimpleSearchInput from "@/components/makepager/SimpleSearchInput"
// import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
export default {
  name: "CommmonFormTableView",
  components: {},
  components: { SimpleSearchInput },
  props: {
    detailEnter: {
      type: Boolean,
@@ -385,13 +377,15 @@
      })
    },
    selProductNameClick(item) {
      console.log(item)
      this.tableList.tableData.map((ite) => {
        if (ite.productName.label === item.label) {
          ite.productId = item.value
          ite.productName = item.label
          ite.amount = item.amount
          ite.unit = item.unit
        }
        console.log(ite)
        // if (ite.productName === item.name) {
        ite.productId = item.id
        ite.productName = item.name
        ite.amount = item.amount
        ite.unit = item.unit
        // }
      })
      console.log(this.tableList.tableData)
    },
@@ -535,6 +529,9 @@
    // 单选行相关
    tableRowClassName({ row, rowIndex }) {
      row.index = rowIndex
    },
    setFormItem(val) {
      console.log(val)
    }
  }
}