feat: bug修复 12564

石广澎

2023-12-12 9cf4b513cfc65d641d46be6ea424a9f45e4d48f7

 admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue

@@ -20,12 +20,12 @@
          <el-col :span="12">
            <el-form-item label="报废时间" prop="dealTime">
              <el-date-picker
                  v-model="formData.dealTime"
                  type="datetime"
                  value="yyyy-MM-dd HH:mm:ss"
                  value-format="yyyyMMddHHmmss"
                  placeholder="请选择日期"
                  style="width: 100%"
                v-model="formData.dealTime"
                type="datetime"
                value="yyyy-MM-dd HH:mm:ss"
                value-format="yyyyMMddHHmmss"
                placeholder="请选择日期"
                style="width: 100%"
              >
              </el-date-picker>
            </el-form-item>
@@ -42,64 +42,64 @@
          <el-row :gutter="24">
            <el-col :span="12">
              <el-form-item
                  label="物品分类"
                  :prop="`goods.${goodsIndex}.baseCategoryId`"
                  :rules="{
                label="物品分类"
                :prop="`goods.${goodsIndex}.baseCategoryId`"
                :rules="{
                  required: true,
                  message: '请选择物品分类',
                  trigger: 'change',
                }"
              >
                <el-cascader
                    v-model="goodsItem.baseCategoryId"
                    :options="categoryOptions"
                    :props="{ value: 'id',emitPath: false }"
                    :show-all-levels="false"
                    filterable
                    clearable
                    @change="categoryChange($event, goodsIndex)"
                    style="width: 100%"
                  v-model="goodsItem.baseCategoryId"
                  :options="categoryOptions"
                  :props="{ value: 'id',emitPath: false }"
                  :show-all-levels="false"
                  filterable
                  clearable
                  @change="categoryChange($event, goodsIndex)"
                  style="width: 100%"
                ></el-cascader>
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item
                  label="物品名称"
                  :prop="`goods.${goodsIndex}.baseGoodsTemplateId`"
                  :rules="rules.baseGoodsTemplateId"
                label="物品名称"
                :prop="`goods.${goodsIndex}.baseGoodsTemplateId`"
                :rules="rules.baseGoodsTemplateId"
              >
                <el-select
                    v-model="goodsItem.baseGoodsTemplateId"
                    :placeholder="goodsItem.baseCategoryId?'请选择物品':'请先选择物品分类'"
                    filterable
                    clearable
                    :disabled="!goodsItem.baseCategoryId"
                    style="width: 100%"
                    @change="goodsTemplateChange($event, goodsIndex)"
                  v-model="goodsItem.baseGoodsTemplateId"
                  :placeholder="goodsItem.baseCategoryId?'请选择物品':'请先选择物品分类'"
                  filterable
                  clearable
                  :disabled="!goodsItem.baseCategoryId"
                  style="width: 100%"
                  @change="goodsTemplateChange($event, goodsIndex)"
                >
                  <el-option
                      v-for="item in goodsItem.goodsOptions"
                      :key="item.id"
                      :label="item.goodsName"
                      :value="item.id"
                    v-for="item in goodsItem.goodsOptions"
                    :key="item.id"
                    :label="item.goodsName"
                    :value="item.id"
                  />
                </el-select>
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item
                  label="选择分发单"
                  :prop="`goods.${goodsIndex}.businessFormCode`"
                  :rules="rules.businessFormCode">
                label="选择分发单"
                :prop="`goods.${goodsIndex}.businessFormCode`"
                :rules="rules.businessFormCode">
                <div @click="showFenFa(goodsIndex)">
                  <el-input
                      placeholder="请选择分发单"
                      readonly
                      v-model="goodsItem.businessFormCode"
                      :placeholder="goodsItem.baseGoodsTemplateId?'请选择分发单':'请先选择物品'"
                      :disabled="!goodsItem.baseGoodsTemplateId"
                      suffix-icon="el-icon-arrow-down"
                      class="cursor-p"></el-input>
                    placeholder="请选择分发单"
                    readonly
                    v-model="goodsItem.businessFormCode"
                    :placeholder="goodsItem.baseGoodsTemplateId?'请选择分发单':'请先选择物品'"
                    :disabled="!goodsItem.baseGoodsTemplateId"
                    suffix-icon="el-icon-arrow-down"
                    class="cursor-p"></el-input>
                </div>
              </el-form-item>
            </el-col>
@@ -142,35 +142,35 @@
              <el-table-column prop="counts" label="报废数量" align="center">
                <template slot-scope="{row,$index}">
                  <el-form-item
                      label-width="0"
                      :prop="`goods.${goodsIndex}.models.${mIndex}.counts`"
                      :rules="[
                    label-width="0"
                    :prop="`goods.${goodsIndex}.models.${mIndex}.counts`"
                    :rules="[
                          {validator: checkCounts,counts:row.counts,userUseCount: row.userUseCount, trigger: ['blur', 'change']}
                        ]"
                  >
                    <el-input
                        type="number"
                        v-model.number="row.counts"
                      clearable
                      type="number"
                      v-model.number="row.counts"
                    ></el-input>
                  </el-form-item>
                </template>
              </el-table-column>
              <el-table-column prop="counts" label="报废原因" align="center">
                <template slot-scope="{row,$index}">
<!--                  <el-form-item
                      label-width="0"
                      :prop="`goods.${goodsIndex}.models.${mIndex}.scrappedCode`"
                      :rules="[{required: true, message: '请选择', trigger: 'change'}]"
                  >-->
                  <el-form-item
                      label-width="0"
                    label-width="0"
                    :prop="`goods.${goodsIndex}.models.${mIndex}.scrappedCode`"
                    :rules="[
                          {validator: checkReason,counts:row.counts,scrappedCode:row.scrappedCode, trigger: ['blur', 'change']}
                        ]"
                  >
                    <el-select v-model="row.scrappedCode" placeholder="请选择">
                    <el-select v-model="row.scrappedCode" clearable placeholder="请选择">
                      <el-option
                          v-for="item in scrapReasonOptions"
                          :key="item.dict_code"
                          :label="item.dict_label"
                          :value="item.dict_code"
                        v-for="item in scrapReasonOptions"
                        :key="item.dict_code"
                        :label="item.dict_label"
                        :value="item.dict_code"
                      />
                    </el-select>
                  </el-form-item>
@@ -180,22 +180,22 @@
          </div>
          <div class="btn-group">
            <el-button
                v-if="formData.goods.length > 1"
                name="移除"
                type="danger"
                plain
                size="mini"
                @click="removeGoods(goodsIndex)"
              v-if="formData.goods.length > 1"
              name="移除"
              type="danger"
              plain
              size="mini"
              @click="removeGoods(goodsIndex)"
            >移除
            </el-button
            >
            <el-button
                v-if="formData.goods.length - 1 == goodsIndex"
                name="新增物品"
                type="primary"
                plain
                size="mini"
                @click="addGoods"
              v-if="formData.goods.length - 1 == goodsIndex"
              name="新增物品"
              type="primary"
              plain
              size="mini"
              @click="addGoods"
            >新增物品
            </el-button
            >
@@ -230,7 +230,7 @@
<script>
import {departmentListAll} from '@/api/system/deptment';
import {goodsTemplate} from '@/api/baseSetting/finsystenant';
import {outputAdd} from '@/api/stock/accessStock';
import {scrappedAdd} from '@/api/deptGoods/scrap';
import {getTree} from '@/api/foudation/classification';
import MyButton from '@/components/myButton/myButton';
import winMd from '@/components/win/win-md';
@@ -252,34 +252,24 @@
    },
  },
  data() {
    // 自定义校验
    // 物品重复校验
    var checkBusinessFormCode= (rule, value, callback) => {
      if (!value) {
        return callback(new Error('请选择'));
      }
      let temp = this.formData.goods.filter((v) => v.businessFormCode == value);
      if (!temp || temp.length != 1) {
        return callback(new Error('已选过此分发单'));
      }
      callback();
    };
    return {
      checkCounts: (rule, value, callback) => {
        if (!rule.counts) {
          return callback(new Error('请输入报废数量'));
          return callback();
        }
        if (!Number.isInteger(rule.counts)) {
          // this.$message.warning('请输入数字值');
          return callback(new Error('请输入数字值'));
        }
        if (rule.counts < 1) {
          // this.$message.warning('数字值不能为0');
          return callback(new Error('数字值必须大于0'));
        }
        if (rule.counts > rule.userUseCount) {
          // this.$message.warning('分发数量不能大于剩余数量');
          return callback(new Error('报废数量不能大于在用数量'));
        }
        callback();
      },
      checkReason: (rule, value, callback) => {
        if (rule.counts && !rule.scrappedCode) {
          return callback(new Error('请选择报废原因'));
        }
        callback();
      },
@@ -298,7 +288,7 @@
      fenfaData: [],
      formData: {
        departmentId: '', // 报废部门id
        dealTime: '', // 报废时间
        dealTime: DateFormatter.formatDate(new Date(), 'yyyyMMddhhmmss'), // 报废时间
        procureDoc: '',
        goods: [],
      },
@@ -327,7 +317,7 @@
          message: '请选择物品',
          trigger: 'change'
        }],
        businessFormCode: [{required: true,message: '请选择分发单',trigger: 'change'}, {validator: checkBusinessFormCode, trigger: ['blur', 'change']}],
        businessFormCode: [{required: true, message: '请选择分发单', trigger: 'change'}],
        counts: [{required: true, message: '请输入', trigger: 'change'}],
        reason: [{required: true, message: '请选择', trigger: 'change'}],
      },
@@ -370,13 +360,13 @@
    // 获取部门列表
    async getdeptmentList() {
      await departmentListAll({tenantId: this.userInfo.tenantId})
          .then((res) => {
            this.departmentOptions = res;
            this.formData.goods.push(JSON.parse(JSON.stringify(this.goodsItem)));
          })
          .catch((err) => {
            console.log('err', err);
          });
        .then((res) => {
          this.departmentOptions = res;
          this.formData.goods.push(JSON.parse(JSON.stringify(this.goodsItem)));
        })
        .catch((err) => {
          console.log('err', err);
        });
    },

    removeEmptyChildren(arr) {
@@ -423,6 +413,7 @@
    categoryChange(e, index) {
      this.formData.goods[index].goodsOptions = [];
      this.formData.goods[index].baseGoodsTemplateId = '';
      this.formData.goods[index].businessFormCode = '';
      this.formData.goods[index].goodsTemplateName = '';
      this.formData.goods[index].models = [];
      // 根据选中分类请求物品名称列表
@@ -432,9 +423,8 @@
    // 物品名称列表选择
    goodsTemplateChange(e, index) {
      this.formData.goods[index].models = [];

      this.formData.goods[index].goodsTemplateName = this.getGoodsTemplateName(e);

      this.formData.goods[index].businessFormCode = '';
    },
    showFenFa(index) {
      this.loading = true
@@ -478,6 +468,13 @@
        this.$message.error('请选择分发单');
        return
      }
      let bIdx = this.formData.goods.findIndex((v) => v.businessFormCode == this.curFenfa.businessFormCode);
      let gIdx = this.formData.goods.findIndex((v) => v.baseGoodsTemplateId == this.fenfaSetting.baseGoodsTemplateId);

      if (gIdx !== -1 && gIdx !== this.fenfaSetting.goodsIdx && bIdx !== -1 && bIdx !== this.fenfaSetting.goodsIdx) {
        this.$message.error('同一个物品不能选择相同的分发单');
        return;
      }
      getGoodsUseInfoByFfOrderAndGoodId({
        transBusinessId: this.curFenfa.transBusinessId,
        baseGoodsTemplateId: this.fenfaSetting.baseGoodsTemplateId
@@ -492,29 +489,48 @@
            })
            arr.push(item)
          }
          console.log(arr)
          this.formData.goods[this.fenfaSetting.goodsIdx].models = arr
          this.formData.goods[this.fenfaSetting.goodsIdx].businessFormCode = this.curFenfa.businessFormCode
          this.formData.goods[this.fenfaSetting.goodsIdx].transBusinessId = this.curFenfa.transBusinessId
        }
        this.fenfaSetting.show = false
      })
    },
    // 提交
    handleSubmit() {
      console.log('this.formData', this.formData);
      this.$refs['ruleForm'].validate((valid) => {
        if (valid) {
          return;
          outputAdd(this.formData)
              .then((res) => {
                this.$message.success('保存成功！');
                this.close();
                this.$emit('search');
          let params = JSON.parse(JSON.stringify(this.formData))
          params.goods.map(g => {
            delete g.goodsOptions
            let arr = []
            g.models.map(m => {
              m.map(item=>{
                if(item.counts&&item.counts>0){
                  arr.push(item)
                }
              })
              .catch((err) => {
                console.log('edit err', err);
                this.$message.error('保存失败');
              });
            })
            g.models = arr
          })
          params.goods = params.goods.filter(g=>g.models.length>0)
          if(params.goods.length===0){
            this.$message.error('请至少填写一个报废物品');
            return;
          }
          if (this.loading) return
          this.loading = true
          scrappedAdd(params)
            .then((res) => {
              this.loading = false
              this.$message.success('保存成功！');
              this.close();
              this.$emit('search');
            })
            .catch((err) => {
              this.loading = false
              this.$message.error('保存失败');
            });
        } else {
          this.$message.error('校验未通过，请检查。');
        }