修改库存调整，选择产品会修改列表所有产品的bug，新建出库单添加表单校验

zuozhengqing

2023-12-01 52c492586cc33a909e8192ef6d83ac609ce8126c

 src/components/makepager/CommonFormTableView.vue

@@ -151,6 +151,7 @@
                    v-model="scope.row[item.prop]"
                    placeholder="请选择"
                    size="mini"
                    filterable
                    style="width: 80%"
                    @change="
                      (val) => {
@@ -162,14 +163,47 @@
                      v-for="(item, index) in selLocationOptions"
                      :key="index"
                      :label="item.jointName"
                      :value="{ value: item.id, label: item.jointName}"
                      :value="{ value: item.id, label: item.jointName }"
                    >
                    </el-option>
                  </el-select>
                </div>
              </el-form-item>
              <!-- 产品到达位置 -->
              <el-form-item v-else-if="item.toLocation" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
                <div class="custom-name">
                  <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]"
                    placeholder="请选择"
                    size="mini"
                    filterable
                    style="width: 80%"
                    @change="
                      (val) => {
                        selLocationClick(val, item.prop)
                      }
                    "
                  >
                    <el-option
                      v-for="(item, index) in selToLocationOptions"
                      :key="index"
                      :label="item.jointName"
                      :value="{ value: item.id, label: item.jointName }"
                    >
                    </el-option>
                  </el-select>
                </div>
              </el-form-item>
              <!-- 子位置 -->
              <el-form-item v-else-if="item.sonLocation" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
              <el-form-item
                v-else-if="item.sonLocation"
                label=" "
                :prop="'tableData.' + scope.$index + '.' + item.prop"
              >
                <div class="custom-name">
                  <span v-if="scope.row.isEdit || scope.row.editable">{{
                    scope.row[item.prop]?.label ?? scope.row[item.prop]
@@ -190,7 +224,7 @@
                      v-for="(item, index) in selSonLocationOptions"
                      :key="index"
                      :label="item.jointName"
                      :value="{ value: item.id, label: item.jointName}"
                      :value="{ value: item.id, label: item.jointName }"
                    >
                    </el-option>
                  </el-select>
@@ -208,6 +242,7 @@
                    v-model="locacionName"
                    placeholder="请选择"
                    size="mini"
                    filterable
                    style="width: 80%"
                    @change="
                      (val) => {
@@ -231,48 +266,22 @@
              <!-- 产品 -->
              <el-form-item v-else-if="item.product" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
                <div class="custom-name">
                  <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row.productName}}</span>
                  <!-- <el-select
                    v-else
                    v-model="scope.row[item.prop]"
                    placeholder="请选择"
                    size="mini"
                    style="width: 80%"
                    clearable
                    @clear="setValueNull(scope.row[item.prop])"
                    @change="
                      (val) => {
                        selProductClick(val)
                      }
                    "
                  >
                    <el-option
                      v-for="(item, index) in productNameOptions"
                      :key="index"
                      :label="item.name"
                      :value="{
                        value: item.id,
                        label: item.name,
                        amount: item.amount,
                        unit: item.unit,
                        categoryId: item.categoryId,
                        categoryName: item.categoryName
                      }"
                  <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row.productName }}</span>
                  <template v-else>
                    <SimpleSearchInput
                      v-model="scope.row[item.prop]"
                      :echoValue="scope.row[item.prop]"
                      :echoName="scope.row[item.prop]"
                      checkedNum="1"
                      :clearable="true"
                      @select-user="
                        (val) => {
                          selProductClick(val, scope.row)
                        }
                      "
                    >
                    </el-option>
                  </el-select> -->
                  <el-autocomplete
                    v-else
                    style="width: 100%"
                    v-model="scope.row.productName"
                    :fetch-suggestions="
                      (queryString, callback) => {
                        querySearchAsync(queryString, callback, 'product')
                      }
                    "
                    value-key="name"
                    @select="handleSelectClient('product', $event)"
                  ></el-autocomplete>
                    </SimpleSearchInput>
                  </template>
                </div>
              </el-form-item>
              <!-- 产品类别 -->
@@ -282,31 +291,7 @@
                :prop="'tableData.' + scope.$index + '.' + item.prop"
              >
                <div class="custom-name">
                  <span v-if="scope.row.isEdit || scope.row.editable">{{scope.row.productCategory }}</span>
                  
                  <!-- <el-select
                    v-else
                    v-model="scope.row[item.prop]"
                    placeholder="请选择"
                    size="mini"
                    style="width: 80%"
                    @change="
                      (val) => {
                        selProductTypeClick(val)
                      }
                    "
                  >
                    <el-option
                      v-for="item in productTypeNameOptions"
                      :key="item.id"
                      :label="item.name"
                      :value="{
                        value: item.id,
                        label: item.name
                      }"
                    >
                    </el-option>
                  </el-select> -->
                  <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row.productCategory }}</span>
                  <el-autocomplete
                    v-else
                    style="width: 100%"
@@ -464,14 +449,15 @@
        { id: 2, name: "打" }
      ],
      selLocationOptions: [], // 位置
      selSonLocationOptions:[], //子位置
      selSonLocationOptions: [], //子位置
      selToLocationOptions: [], // 产品到达位置
      companyOptions: [], // 公司
      selRouteOptions: [{ id: 1, name: "制造" }], // 路线
      locacionName: "",
      locacionId: 0,
      productName: "",
      productId: "",
      initialPosition:""
      initialPosition: ""
    }
  },
  created() {
@@ -485,7 +471,7 @@
      this.getProductCategoryList()
    }
    if (this.islistingrules) {
      this.getLocationList()
      this.getToLocationList()
      // this.getCompanyList()
    }
    this.tableList = this.productTableList
@@ -503,7 +489,6 @@
        page: 1,
        pageSize: 100
      }).then((res) => {
        // console.log(res.data)
        if (res.code === 200) {
          if (res.data && res.data.length > 0) {
            this.productNameOptions = res.data
@@ -512,11 +497,12 @@
      })
    },
    async handleSelectClient(value, item) {
      this.$emit("selProductClick", value, item)
      if (value === "product") {
        if(item.categoryId===0||item.categoryName===""){
          this.productTypeNameOptions =[]
          this.tableList.tableData[this.tableList.rowClickIndex].productCategory=''
        }else{
        if (item.categoryId === 0 || item.categoryName === "") {
          this.productTypeNameOptions = []
          this.tableList.tableData[this.tableList.rowClickIndex].productCategory = ""
        } else {
          await getProductCategoryList({
            categoryId: item.categoryId,
            keyWord: item.categoryName,
@@ -526,38 +512,36 @@
            if (res.code === 200) {
              const list = res.data ? res.data : []
              this.productTypeNameOptions = list
              this.tableList.tableData[this.tableList.rowClickIndex].productCategory=list[0].name
              this.tableList.tableData[this.tableList.rowClickIndex].productCategory = list[0].name
            }
          })
        }
      }else if(value==="productType"){
      } else if (value === "productType") {
        console.log("产品类型选中")
      }
      this.$emit("selProductClick",value,item)
    },
    querySearchAsync(queryString, cb, value) {
      let restaurants=''
      if(value==="product"){
         restaurants = this.productNameOptions
      }else if(value==="productType"){
         restaurants = this.productTypeNameOptions
      let restaurants = ""
      if (value === "product") {
        restaurants = this.productNameOptions
      } else if (value === "productType") {
        restaurants = this.productTypeNameOptions
      }
      var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
      cb(results)
      if(results.length===0){
        this.productTypeNameOptions=[]
      if (results.length === 0) {
        this.productTypeNameOptions = []
      }
      console.log(results,"results",value)
      this.$emit("querySearchData",queryString,results,value)
      this.$emit("querySearchData", queryString, results, value)
    },
    createStateFilter(queryString) {
      return (state) => {
          return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
        return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
      }
    },
    // 清除选中产品
    setValueNull(val) {
      console.log(val,"看看val")
      console.log(val, "看看val")
    },

    // 库存调整获取位置和产品
@@ -566,11 +550,10 @@
        locationId: 0,
        productId: ""
      }).then((res) => {
        console.log(res)
        if (res.code === 200) {
          const list = res.data ? res.data : []
          this.selLocationOptions = list.locationList
          this.selSonLocationOptions=list.locationList
          this.selSonLocationOptions = list.locationList
          this.productNameOptions = list.productList
        }
      })
@@ -583,7 +566,6 @@
        page: 1,
        pageSize: 15
      }).then((res) => {
        console.log(res, "看看产品类型列表")
        if (res.code === 200) {
          const list = res.data ? res.data : []
          this.productTypeNameOptions = list
@@ -592,6 +574,7 @@
    },
    // 位置
    async getLocationList() {
      this.locacionName = ""
      await getLocationList({
        // keyword: "",
        jointName: this.initialPosition ? this.initialPosition : null,
@@ -600,12 +583,30 @@
        page: 1,
        pageSize: 100
      }).then((res) => {
        console.log(res,"newlocal")
        if (res.code === 200) {
          const list = res.data ? res.data : []
          this.selLocationOptions = list
          this.selSonLocationOptions=list
            console.log(list,"999")
          this.selSonLocationOptions = list
          if (this.isReorder) {
            this.locacionName = list[0]?.name
            this.locacionId = list[0]?.id
            this.$emit("selLocationClick", list[0], "locacionName")
          }
        }
      })
    },
    // 产品到达位置
    async getToLocationList() {
      await getLocationList({
        // keyword: "",
        type: 3,
        page: 1,
        pageSize: 100
      }).then((res) => {
        if (res.code === 200) {
          const list = res.data ? res.data : []
          this.selToLocationOptions = list
          this.selSonLocationOptions = list
          if (this.isReorder) {
            this.locacionName = list[0]?.name
            this.locacionId = list[0]?.id
@@ -615,17 +616,16 @@
      })
    },
    // 设置子位置
    async setLocationList(jointName){
    async setLocationList(jointName) {
      await getLocationList({
        // keyword: "",
        jointName: jointName,
        page: 1,
        pageSize: 100
      }).then((res) => {
        console.log(res,"newlocal")
        if (res.code === 200) {
          const list = res.data ? res.data : []
          this.selSonLocationOptions=list
          this.selSonLocationOptions = list
          // if (this.isReorder) {
          //   this.locacionName = list[0]?.name
          //   this.locacionId = list[0]?.id
@@ -637,7 +637,6 @@
    // 获取公司列表
    async getCompanyList() {
      await getCompanyList().then((res) => {
        console.log(res)
        if (res.code === 200) {
          this.companyOptions = res.data
        }
@@ -646,7 +645,6 @@
    selProductNameClick(item) {
      this.productIndex = this.tableList.tableData.length - 1
      this.tableList.tableData.map((ite, index) => {
        console.log(ite)
        if (index === this.productIndex) {
          ite.productId = item.id
          ite.productName = item.name
@@ -656,22 +654,34 @@
      })
    },
    // 选择产品
    selProductClick(item) {
    selProductClick(item, row) {
      if (this.isReorder) {
        this.productId = item.value
        this.productName = item.label
        this.getAmountAndPrediction(item, "product")
        this.productId = item.id
        this.productName = item.name
        this.getAmountAndPrediction(item, "product", row)
      } else {
        this.tableList.tableData.map((ite) => {
          if (ite.productName.label === item.label) {
            ite.productId = item.value
            ite.productName = item.label
        let selIndex = 0
        this.tableList.tableData.map((ite, index) => {
          // ite.id 是上架规则的, ite.productId是库存调整的
          if (ite.id === row.id&&ite.id!=undefined&&row.id!=undefined) {
            selIndex = index
            ite.productId = item.id
            ite.productName = item.name
            ite.categoryId = item.categoryId
            ite.productCategory = item.categoryName
            ite.amount = item.amount
            ite.unit = item.unit
          }else if(ite.productId===row.productId){
            selIndex = index
            ite.productId = item.id
            ite.productName = item.name
            ite.categoryId = item.categoryId
            ite.productCategory = item.categoryName
            ite.amount = item.amount
            ite.unit = item.unit
          }
        })
        this.$emit("selProductClick", "product", this.tableList.tableData[selIndex])
      }

      if (this.isinventory) {
@@ -679,15 +689,13 @@
          locationId: 0,
          productId: item.value
        }).then((res) => {
          console.log(res)
          if (res.code === 200) {
            const list = res.data ? res.data : []
            this.selLocationOptions = list.locationList
            this.selSonLocationOptions=list.locationList
            this.selSonLocationOptions = list.locationList
          }
        })
      }
      console.log(this.tableList.tableData)
      // this.$emit("selProductClick", item)
    },
    // 选择产品类型
@@ -704,10 +712,10 @@
      // this.$emit("selProductTypeClick", item)
    },
    // 产品类型获取焦点
    productTypeFocus(){
    productTypeFocus() {
      getProductCategoryList({
        categoryId: 0,
        keyWord:"",
        keyWord: "",
        page: 1,
        pageSize: 15
      }).then((res) => {
@@ -719,9 +727,7 @@
    },
    // 选择位置
    selLocationClick(item, prop, row) {
      console.log(item,prop,row,"起始位置")
      if(prop==="areaName"){
        // this.initialPosition=item.label
      if (prop === "areaName") {
        getLocationList({
          jointName: item.label,
          page: 1,
@@ -729,17 +735,14 @@
        }).then((res) => {
          if (res.code === 200) {
            const list = res.data ? res.data : []
            this.selSonLocationOptions=list
            if (this.isReorder) {
              this.locacionName = list[0]?.name
              this.locacionId = list[0]?.id
              this.$emit("selLocationClick", list[0], "locacionName")
            }
            this.selSonLocationOptions = list
          }
        })
      }
      if (this.isReorder) {
        if (this.productId !== 0) {
        this.locacionId = item.value
        this.productId = row.productId
        if (this.productId.length !== 0) {
          this.getAmountAndPrediction(row, "location", item)
        }
      }
@@ -748,7 +751,6 @@
          locationId: item.value,
          productId: ""
        }).then((res) => {
          console.log(res)
          if (res.code === 200) {
            const list = res.data ? res.data : []
            this.productNameOptions = list.productList
@@ -758,34 +760,41 @@
      this.$emit("selLocationClick", item, prop)
    },
    // 选择子位置
    selSonLocationClick(item){
      this.$emit("selSonLocationClick",item)
    selSonLocationClick(item) {
      this.$emit("selSonLocationClick", item)
    },
    // 获取在库与预测数量
    getAmountAndPrediction(item, val, ite) {
      console.log(item, val, ite)
      console.log(this.productName)
      console.log(this.tableList.tableData)
      if (this.productName.length > 0) {
        getAmountAndPrediction({
          locationId: val === "product" ? this.locacionId : ite.value,
          productId: val === "product" ? item.value : this.productId
        }).then((res) => {
          if (res.code === 200) {
            this.tableList.tableData.map((ite) => {
              if (ite.productName.label === this.productName) {
      let selIndex = 0
      getAmountAndPrediction({
        locationId: val === "product" ? this.locacionId : ite.value,
        productId: val === "product" ? item.id : this.productId
      }).then((res) => {
        if (res.code === 200) {
          this.tableList.tableData.map((ite, index) => {
            if (val === "product") {
              if (index === 0) {
                selIndex = index
                ite.amount = res.data.amount
                ite.prediction = res.data.prediction
                ite.productId = item.id
                ite.productName = item.name
                ite.unit = item.unit
              }
            })
          }
        })
      }
            } else {
              if (ite.id === item.id) {
                selIndex = index
                ite.amount = res.data.amount
                ite.prediction = res.data.prediction
              }
            }
          })
          this.$emit("selProductClick", this.tableList.tableData[selIndex])
        }
      })
    },
    // 选择路线
    selRouteClick(item, prop) {
      console.log("33333333333333")
      this.$emit("selRouteClick", item, prop)
    },
    // 选择单位/用户
@@ -832,8 +841,6 @@
      this.$emit("addProductClick")
    },
    commonInputChange(val, prop, row) {
      console.log(val, prop)
      console.log(row)
      this.$emit("inputContent", val, prop, row)
    },
    // 清空
@@ -844,7 +851,6 @@
    clearupClient(row, scope) {
      this.productIndex = scope.$index
      this.tableList.tableData.map((ite, index) => {
        console.log(scope.$index)
        if (scope.$index && scope.$index >= 0) {
          if (index === this.productIndex) {
            ite.name = ""
@@ -876,6 +882,9 @@
    },
    // 行点击
    tableRowClick(row) {
      if (this.isReorder) {
        this.locacionName = row.location.name
      }
      this.$emit("tableRowClick", row, row.index)
    },
    // 单选行相关
@@ -911,16 +920,15 @@
        font-size: 13px;
        cursor: pointer;
      }
      
    }
  }
}
::v-deep {
  .el-autocomplete{
      height:28px;
    .el-input{
      height:28px ;
      .el-input__inner{
  .el-autocomplete {
    height: 28px;
    .el-input {
      height: 28px;
      .el-input__inner {
        height: 28px;
      }
    }
@@ -962,7 +970,7 @@
  height: 35px;
  text-align: center;
}
::v-deep .el-table__body-wrapper{
::v-deep .el-table__body-wrapper {
  height: unset !important;
}
</style>