feat: bug修复 12564

石广澎

2023-12-12 9cf4b513cfc65d641d46be6ea424a9f45e4d48f7

 admin-web/src/views/stock/scrap/itemScrapping/edit.vue

@@ -1,6 +1,6 @@
<template>
  <win-md class="stock-edit" :title="`${setting.title}报废`" @close="close" :width="'800px'">
    <el-form class="form" ref="ruleForm" :model="formData" :rules="rules" label-width="120px">
    <el-form v-loading="loading" class="form" ref="ruleForm" :model="formData" :rules="rules" label-width="120px">
      <div class="main-w">
        <el-row :gutter="24" class="headerHeight">
          <el-col :span="12">
@@ -26,6 +26,7 @@
            <el-form-item label="报废时间" prop="dealTime">
              <el-date-picker
                v-model="formData.dealTime"
                clearable
                type="datetime"
                value="yyyy-MM-dd HH:mm:ss"
                value-format="yyyyMMddHHmmss"
@@ -48,17 +49,20 @@
            <el-col :span="12">
              <el-form-item
                label="物品分类"
                :prop="`scrappedGoodsInfo[${goodsIndex}].baseCategoryIds`"
                :prop="`scrappedGoodsInfo.${goodsIndex}.baseCategoryId`"
                :rules="{
                  required: true,
                  message: '请选择',
                  message: '请选择物品分类',
                  trigger: 'change',
                }"
              >
                <el-cascader
                  v-model="goodsItem.baseCategoryIds"
                  v-model="goodsItem.baseCategoryId"
                  :options="categoryOptions"
                  :props="{ value: 'id' }"
                  :props="{ value: 'id',emitPath: false }"
                  :show-all-levels="false"
                  filterable
                  clearable
                  @change="categoryChange($event, goodsIndex)"
                  style="width: 100%"
                ></el-cascader>
@@ -67,13 +71,14 @@
            <el-col :span="12">
              <el-form-item
                label="物品名称"
                :prop="`scrappedGoodsInfo[${goodsIndex}].baseGoodsTemplateId`"
                :prop="`scrappedGoodsInfo.${goodsIndex}.baseGoodsTemplateId`"
                :rules="rules.baseGoodsTemplateId"
              >
                <el-select
                  v-model="goodsItem.baseGoodsTemplateId"
                  placeholder="请先择物品分类"
                  :placeholder="goodsItem.baseCategoryId?'请选择物品':'请先选择物品分类'"
                  filterable
                  clearable
                  :disabled="!goodsItem.baseCategoryId"
                  style="width: 100%"
                  @change="goodsTemplateChange($event, goodsIndex)"
@@ -95,17 +100,19 @@
                :prop="`scrappedGoodsInfo[${goodsIndex}].modelsIds`"
                :rules="{
                  required: true,
                  message: '请选择',
                  message: '请选择规格型号',
                  trigger: 'change',
                }"
              >
                <el-select
                  v-model="goodsItem.modelsIds"
                  multiple
                  placeholder="请先择物品名称"
                  :disabled="!goodsItem.baseCategoryId"
                  clearable
                  :placeholder="goodsItem.baseGoodsTemplateId?'请选择规格型号':'请先选择物品名称'"
                  :disabled="!goodsItem.baseGoodsTemplateId"
                  @change="modelChange($event, goodsIndex)"
                  @remove-tag="modelRemoveTag($event, goodsIndex)"
                  @clear="modelRemoveTag(-1, goodsIndex)"
                  style="width: 100%"
                >
                  <el-option
@@ -186,6 +193,7 @@
import {getUploadUrl} from '@/utils/base';
import {mapGetters} from 'vuex';
import {getDicts} from '@/api/system/dict/data';
import * as DateFormatter from "@/utils/DateFormatter";

export default {
  components: { MyButton, winMd, upload },
@@ -209,7 +217,7 @@
      callback();
    };
    return {
      loading: false,
      loading: true,
      fileList: [],
      warehouses: [], // 报废仓库列表
      categoryOptions: [], // 物品分类列表
@@ -217,7 +225,7 @@
      formData: {
        uploadFiles: '',
        warehouseId: '', // 报废仓库id
        dealTime: '', // 报废时间
        dealTime: DateFormatter.formatDate(new Date(), 'yyyyMMddhhmmss'), // 报废时间
        scrappedGoodsInfo: [],
      },
      goodsItem: {
@@ -236,8 +244,8 @@
        dealTime: [{ required: true, message: '请选择', trigger: 'change' }],
        buyType: [{ required: true, message: '请选择', trigger: 'change' }],
        uploadFiles: [{ required: true, message: '请上传', trigger: 'change' }],
        baseCategoryIds: [{ required: true, message: '请选择', trigger: 'change' }],
        baseGoodsTemplateId: [{ validator: checkGoodsTemplateId, trigger: ['blur', 'change'] }],
        baseCategoryId: [{ required: true, message: '请选择', trigger: 'change' }],
        baseGoodsTemplateId: [{ required: true, message: '请选择', trigger: 'change' },{ validator: checkGoodsTemplateId, trigger: ['blur', 'change'] }],
        modelsIds: [{ required: true, message: '请选择', trigger: 'change' }],
      },

@@ -261,9 +269,7 @@
  },
  methods: {
    async init() {
      this.getWarehouseList();
      this.getgoodsTemplate();
      this.getgoodsModel();
      await this.getWarehouseList();
      await this.getCategoryTree();
      this.formData.scrappedGoodsInfo.push(JSON.parse(JSON.stringify(this.goodsItem)));
      this.formData.operatorId = this.userInfo.id;
@@ -271,6 +277,9 @@
      this.formData.agencyId = this.userInfo.tenantId;
      this.formData.agencyName = this.userInfo.tenantName;
      this.formData.warehouseType = 0;
      this.getgoodsTemplate();
      this.getgoodsModel();
      this.loading = false
      getDicts('SCRAP_REASON').then((res) => {
        this.scrapReasonOptions = res;
      });
@@ -282,8 +291,8 @@
    },

    // 获取报废仓库列表
    getWarehouseList() {
      selectTenantWarehouse({ agencyId: this.userInfo.tenantId })
    async getWarehouseList() {
      await selectTenantWarehouse({ agencyId: this.userInfo.tenantId })
        .then((res) => {
          this.warehouses = res;
          if (this.warehouses.length && !this.formData.warehouseId) {
@@ -309,7 +318,7 @@

    // 获取物品名称列表
    getgoodsTemplate(id, index) {
      goodsTemplate({ categoryId: id || '' }).then((res) => {
      goodsTemplate({ agencyId: this.userInfo.tenantId, categoryId: id || '' }).then((res) => {
        if (index || index == 0) {
          this.$set(this.formData.scrappedGoodsInfo[index], 'goodsOptions', res);
        } else {
@@ -355,10 +364,8 @@
      this.formData.scrappedGoodsInfo[index].modelsOptions = [];
      this.formData.scrappedGoodsInfo[index].modelsIds = [];
      this.formData.scrappedGoodsInfo[index].scrappedGoodsList = [];

      this.formData.scrappedGoodsInfo[index].baseCategoryId = e[e.length - 1];
      // 根据选中分类请求物品名称列表
      this.getgoodsTemplate(e[e.length - 1], index);
      this.getgoodsTemplate(e, index);
    },

    // 物品名称列表
@@ -394,6 +401,10 @@

    // 规格型号移除
    modelRemoveTag(e, index) {
      if(e===-1){
        this.formData.scrappedGoodsInfo[index].scrappedGoodsList = []
        return
      }
      let arr = this.formData.scrappedGoodsInfo[index].scrappedGoodsList;
      let delIndex = arr.findIndex((v) => v.baseGoodsModelsId == e);
      this.formData.scrappedGoodsInfo[index].scrappedGoodsList.splice(delIndex, 1);
@@ -419,13 +430,17 @@
    handleSubmit() {
      this.$refs['ruleForm'].validate((valid) => {
        if (valid) {
          if (this.loading) return
          this.loading = true;
          scrappedAdd(this.formData)
            .then((res) => {
              this.loading = false;
              this.$message.success('保存成功！');
              this.close();
              this.$emit('search');
            })
            .catch((err) => {
              this.loading = false;
              console.log('create err', err);
              this.$message.error('保存失败');
            });