Merge branch 'master' of http://192.168.5.5:10010/r/web/WMS

zuozhengqing

2024-03-22 05b72b58002a8733b8b31825ea5edabe7e279283

 src/components/makepager/CommonFormTableView.vue

@@ -55,7 +55,7 @@
                  ></el-input>
                </div>
              </el-form-item>
              <el-form-item
              <!-- <el-form-item
                v-else-if="item.productName"
                label=" "
                :prop="'tableData.' + scope.$index + '.' + item.prop"
@@ -69,6 +69,44 @@
                    @select-user="selProductNameClick"
                  >
                  </SimpleSearchInput>
                </div>
              </el-form-item> -->
              <el-form-item
                v-else-if="item.productName"
                label=" "
                :prop="'tableData.' + scope.$index + '.' + item.prop"
              >
                <div class="custom-name">
                  <el-autocomplete
                    v-model="scope.row[item.prop]"
                    :fetch-suggestions="querySearchAsync"
                    value-key="name"
                    :disabled="!isOperate"
                    size="mini"
                    @select="
                      (val) => {
                        handleSelectClient(val, item.prop, scope.row)
                      }
                    "
                  ></el-autocomplete>

                  <div
                    v-if="scope.row[item.prop] && scope.row[item.prop].length > 0 && isOperate"
                    class="common-select-btn"
                    @click="handleEditClient(scope, item.prop)"
                  >
                    <i class="el-icon-edit" title="编辑"></i>
                  </div>
                  <div
                    v-if="scope.row[item.prop] && scope.row[item.prop].length > 0 && isOperate"
                    class="common-select-btn"
                    @click="clearupClient(scope)"
                  >
                    <i class="el-icon-remove-outline" title="清除"></i>
                  </div>
                  <div class="common-select-btn" v-else @click="selClientClick(scope, item.prop)">
                    <i class="el-icon-circle-plus-outline" title="选择"></i>
                  </div>
                </div>
              </el-form-item>
              <el-form-item
@@ -286,7 +324,11 @@
                </div>
              </el-form-item>
              <!-- 从 -->
              <el-form-item v-else-if="item.formLocation" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
              <el-form-item
                v-else-if="item.formLocation"
                label=" "
                :prop="'tableData.' + scope.$index + '.' + item.prop"
              >
                <div class="custom-name">
                  <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row.formLocation }}</span>
                  <el-autocomplete
@@ -389,16 +431,18 @@
      </el-table>
    </el-form>
    <div v-if="!detailEnter && !isinventory  && !isReorder" style="margin: 10px">
      <el-button size="small" type="primary" @click="add">添加明细行</el-button>
      <!-- <el-button size="small" type="primary" @click="empty">清空</el-button> -->
      <el-button size="small" type="primary" @click="add">新增</el-button>
      <el-button size="small" type="primary" @click="empty">清空</el-button>
    </div>
    <!-- 产品名称 -->
    <!-- <SelectCommonDialog
    <SelectCommonDialog
      v-if="editSelCommonConfig.editVisible"
      :edit-common-config="editSelCommonConfig"
      :sign="sign"
      :selectBoxList="tableList.tableData"
      :quotationNumber="quotationNumber"
      @selClient="selClient"
    /> -->
      @getSelectArray="getSelectArray"
    />
  </div>
</template>

@@ -410,10 +454,10 @@
import { getProductCategoryList } from "@/api/product/productCategory"
import SimpleSearchInput from "@/components/makepager/SimpleSearchInput"
import { getAmountAndPrediction } from "@/api/product/reorderRules"
// import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
export default {
  name: "CommmonFormTableView",
  components: { SimpleSearchInput },
  components: { SimpleSearchInput, SelectCommonDialog },
  props: {
    detailEnter: {
      type: Boolean,
@@ -448,6 +492,21 @@
    isReorder: {
      type: Boolean,
      default: false
    },
    // 根据报价单查询产品
    quotationNumber: {
      type: [String, Number],
      default: ""
    },
    // 列表新增是否多选
    addTypeIdMultiple: {
      type: Boolean,
      default: false
    },
    // 是否可以操作 添加等
    isOperate: {
      type: Boolean,
      default: true
    }
  },
  data() {
@@ -457,6 +516,7 @@
      tableList: [],
      editSelCommonConfig: {
        editVisible: false,
        isSelectBox: false,
        title: "",
        infomation: {}
      },
@@ -479,7 +539,7 @@
      productId: "",
      initialPosition: "",
      formLocationList:[],
      toLocationList:[],
      toLocationList: []
    }
  },
  created() {
@@ -563,6 +623,22 @@
      return (state) => {
        return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
      }
    },
    // 新增
    selClientClick(scope, prop) {
      console.log(scope, prop)
      this.productIndex = scope.$index
      this.editSelCommonConfig.title = "产品名称"
      this.editSelCommonConfig.isSelectBox = true
      this.editSelCommonConfig.editVisible = true
    },
    // 编辑
    handleEditClient(scope, prop) {
      console.log(scope, prop)
      this.productIndex = scope.$index
      this.editSelCommonConfig.title = "产品名称"
      this.editSelCommonConfig.isSelectBox = false
      this.editSelCommonConfig.editVisible = true
    },
    // 清除选中产品
    setValueNull(val) {
@@ -879,7 +955,14 @@
    },
    // 新增
    add() {
      if (this.addTypeIdMultiple) {
        this.productIndex = this.tableList.tableData.length
        this.editSelCommonConfig.title = "产品名称"
        this.editSelCommonConfig.isSelectBox = true
        this.editSelCommonConfig.editVisible = true
      } else {
      this.$emit("addProductClick")
      }
    },
    commonInputChange(val, prop, row) {
      this.$emit("inputContent", val, prop, row)
@@ -889,24 +972,17 @@
      this.$emit("emptyProductClick")
    },
    // 清除已选择用户
    clearupClient(row, scope) {
    clearupClient(scope) {
      this.productIndex = scope.$index
      this.tableList.tableData.map((ite, index) => {
        if (scope.$index && scope.$index >= 0) {
          if (index === this.productIndex) {
          ite.productName = ""
          ite.id = ""
            ite.name = ""
            ite.amount = 1
            ite.number = ""
            ite.purchasePrice = 0
            ite.unit = ""
            ite.deliveryTime = 0
            ite.shippingDuration = 0
          }
        } else {
          ite.name = ""
          ite.amount = 1
          ite.number = ""
          ite.purchasePrice = 0
          ite.model = ""
          ite.specs = ""
          ite.unit = ""
          ite.deliveryTime = 0
          ite.shippingDuration = 0
@@ -935,7 +1011,29 @@
    setFormItem(val) {
      console.log(val)
    },
    commoInput() {}
    commoInput() {},
    selClient(item) {
      let list = this.tableList.tableData.map((item) => item.number)
      if (list.findIndex((v) => v == item.number) == -1) {
        this.isRecalculate = true
        // this.editConfig.infomation.client_name = row.name
        this.tableList.tableData.map((ite, index) => {
          if (index === this.productIndex) {
            ite.name = item.name
            ite.amount = item.amount || 1
            ite.number = item.number
            ite.price = item.price
            ite.total = item.amount ? item.amount * item.price : 1 * item.price
            ite.unit = item.unit
          }
        })
      } else {
        this.$message.error("不能选择重复的产品， 请重新选择")
      }
    },
    getSelectArray(val) {
      this.$emit("getSelectArray", val, this.productIndex)
    }
  }
}
</script>