20240528修改: bug41、42、43修改 领用单(分发单)，调拨单，流程优化

黎星凯

2024-05-08 b4adff68a07b783fc90da1c9370d8be5f383e700

 admin-web/src/views/departmentitem/itemdis/distribution/edit.vue

@@ -61,6 +61,7 @@
                    :options="categoryOptions"
                    :props="{ value: 'id',emitPath: false }"
                    :show-all-levels="false"
                    filterable
                    clearable
                    @change="categoryChange($event, goodsIndex)"
                    style="width: 100%"
@@ -101,8 +102,8 @@
                <el-select
                    v-model="goodsItem.modelsIds"
                    multiple
                    :placeholder="goodsItem.baseCategoryId?'请选择规格型号':'请先选择物品名称'"
                    :disabled="!goodsItem.baseCategoryId"
                    :placeholder="goodsItem.baseGoodsTemplateId?'请选择规格型号':'请先选择物品名称'"
                    :disabled="!goodsItem.baseGoodsTemplateId"
                    @change="modelChange($event, goodsIndex)"
                    @remove-tag="modelRemoveTag($event, goodsIndex)"
                    style="width: 100%"
@@ -237,7 +238,7 @@
import {getUploadUrl} from '@/utils/base';
import {mapGetters} from 'vuex';
import * as DateFormatter from '@/utils/DateFormatter';
import {warehouseSelectNumber} from "@/api/baseSetting/finsystenant";
import {warehouseAllSelectNumber} from "@/api/baseSetting/finsystenant";

export default {
  components: {MyButton, winMd, upload},
@@ -330,6 +331,7 @@
        operatorName: [{required: true, message: '请填写领取人', trigger: 'blur'}],
        tel: [{required: true, message: '请填写联系电话', trigger: 'blur'}],
        createTime: [{required: true, message: '请选择分发时间', trigger: 'change'}],
        // 增加了分发的中间流程，若后期序号此流程（下载分发单，上传分发单）则注掉procureDoc
        procureDoc: [{required: true, message: '请上传审批手续', trigger: 'change'}],
        baseCategoryIds: [{required: true, message: '请选择', trigger: 'change'}],
        baseGoodsTemplateId: [{required: true, message: '请选择', trigger: 'change'},{validator: checkGoodsTemplateId, trigger: ['blur', 'change']}],
@@ -363,7 +365,6 @@
        uploadUrl: getUploadUrl(), // 上传路径
        multiple: true, // 是否支持批量上传
        disabled: false, // 是否禁用
        type: 'picture', // text/picture
      },
    };
  },
@@ -384,18 +385,12 @@
      this.getgoodsModel();
    },

    // 获取入库仓库列表
    // 获取部门列表
    getdeptmentList() {
      departmentListAll({tenantId: this.userInfo.tenantId})
          .then((res) => {
            this.departmentOptions = res;
            if (!this.setting.id && res.length) {
              this.formData.transferGoods.push(JSON.parse(JSON.stringify(this.goodsItem)));
            }
            if (this.departmentOptions.length && !this.formData.warehouseId) {
              // 默认选中第一个仓库
              this.formData.warehouseId = this.departmentOptions[0].id;
            }
            this.formData.transferGoods.push(JSON.parse(JSON.stringify(this.goodsItem)));
          })
          .catch((err) => {
            console.log('err', err);
@@ -483,9 +478,8 @@
      let str = JSON.stringify(arr);
      for (const item of e) {
        if (str.indexOf(item) === -1) {
          let num = await warehouseSelectNumber({
          let num = await warehouseAllSelectNumber({
            baseGoodsModelsId: item,
            warehouseType: 0,
            states: 1,
            agencyId: this.userInfo.tenantId,
          });
@@ -564,7 +558,7 @@
              .catch((err) => {
                this.loading = false
                console.log('create err', err);
                this.$message.error('保存失败');
                //this.$message.error('保存失败');
              });
        } else {
          this.$message.error('校验未通过，请检查。');