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

黎星凯

2024-05-08 b4adff68a07b783fc90da1c9370d8be5f383e700

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

@@ -1,11 +1,11 @@
<template>
  <win-md class="stock-edit" title="物品分发" @close="close" width="900px">
    <el-form v-loading="loading" class="form" ref="ruleForm" :model="formData" :rules="rules" label-width="120px">
  <win-md class="stock-edit" title="物品分发" @close="close" width="900px" :loading="loading">
    <el-form 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">
            <el-form-item label="部门" prop="departmentId">
              <el-select ref="department" v-model="formData.departmentId" placeholder="请选择" style="width: 100%">
              <el-select ref="department" v-model="formData.departmentId" clearable placeholder="请选择" style="width: 100%">
                <el-option v-for="item in departmentOptions" :key="item.id" :label="item.name" :value="item.id"
                           clearable/>
              </el-select>
@@ -61,6 +61,7 @@
                    :options="categoryOptions"
                    :props="{ value: 'id',emitPath: false }"
                    :show-all-levels="false"
                    filterable
                    clearable
                    @change="categoryChange($event, goodsIndex)"
                    style="width: 100%"
@@ -75,7 +76,7 @@
              >
                <el-select
                    v-model="goodsItem.baseGoodsTemplateId"
                    placeholder="请选择物品"
                    :placeholder="goodsItem.baseCategoryId?'请选择物品':'请先选择物品分类'"
                    filterable
                    clearable
                    :disabled="!goodsItem.baseCategoryId"
@@ -97,12 +98,12 @@
              <el-form-item
                  label="规格型号"
                  :prop="`transferGoods.${goodsIndex}.modelsIds`"
                  :rules="{required: true,message: '请选择',trigger: 'change',}">
                  :rules="{required: true,message: '请选择规格型号',trigger: 'change',}">
                <el-select
                    v-model="goodsItem.modelsIds"
                    multiple
                    placeholder="请选择物品规格型号"
                    :disabled="!goodsItem.baseCategoryId"
                    :placeholder="goodsItem.baseGoodsTemplateId?'请选择规格型号':'请先选择物品名称'"
                    :disabled="!goodsItem.baseGoodsTemplateId"
                    @change="modelChange($event, goodsIndex)"
                    @remove-tag="modelRemoveTag($event, goodsIndex)"
                    style="width: 100%"
@@ -118,12 +119,12 @@
            </el-col>
          </el-row>
          <el-row class="card3" v-for="(mItem, mIndex) in goodsItem.models" :key="mIndex">
            <el-col style="padding: 10px 0" :span="10">
            <el-col style="padding: 15px 0" :span="10">
              <el-form-item label="规格型号:" style="margin-bottom: 0">
                {{ getGoodsModelsName(mItem.baseGoodsModelsId) }}
              </el-form-item>
            </el-col>
            <el-col style="padding: 10px 0" :span="4">
            <el-col style="padding: 15px 0" :span="4">
              <el-form-item label="剩余数量:" style="margin-bottom: 0" label-width="80">
                {{ mItem.worehouseCount }}
              </el-form-item>
@@ -135,9 +136,12 @@
                  <template slot-scope="{$index,row}">
                    <el-form-item
                        :prop="`transferGoods.${goodsIndex}.models.${mIndex}.procureModelUserList.${$index}.goodsNum`"
                        :rules="[
                          {validator: checkCounts,type: 1, userList: mItem.procureModelUserList,worehouseCount: mItem.worehouseCount, trigger: ['blur', 'change']}
                        ]"
                        label-width="0"
                    >
                      <el-input v-model="row.goodsNum" style="width: 100%"></el-input>
                      <el-input v-model.number="row.goodsNum" style="width: 100%"></el-input>
                    </el-form-item>
                  </template>
                </el-table-column>
@@ -145,6 +149,7 @@
                  <template slot-scope="{$index,row}">
                    <el-form-item
                        :prop="`transferGoods.${goodsIndex}.models.${mIndex}.procureModelUserList.${$index}.nowUserName`"
                        :rules="[{required: true, message: '请输入使用人姓名', trigger: ['blur', 'change']}]"
                        label-width="0"
                    >
                      <el-input v-model="row.nowUserName" style="width: 100%"></el-input>
@@ -154,7 +159,8 @@
                <el-table-column prop="nowUserPhone" label="联系电话" align="center">
                  <template slot-scope="{$index,row}">
                    <el-form-item
                        :prop="`transferGoods.${goodsIndex}.models.${mIndex}].procureModelUserList.${$index}.nowUserPhone`"
                        :prop="`transferGoods.${goodsIndex}.models.${mIndex}.procureModelUserList.${$index}.nowUserPhone`"
                        :rules="[{required: true, message: '请输入联系电话', trigger: ['blur', 'change']}]"
                        label-width="0"
                    >
                      <el-input v-model="row.nowUserPhone" style="width: 100%"></el-input>
@@ -180,12 +186,15 @@
              </el-table>
            </el-col>
            <!--BC类商品 -->
            <el-col style="padding: 10px 0" :span="10" v-else>
            <el-col style="padding: 15px 0" :span="10" v-else>
              <el-form-item
                  label="分发数量:"
                  :prop="`transferGoods.${goodsIndex}.models.${mIndex}.counts`"
                  :rules="[
                    {validator: checkCounts, type: 2,worehouseCount: mItem.worehouseCount, trigger: ['blur', 'change']}
                  ]"
                  style="margin-bottom: 0" label-width="80">
                <el-input v-model.number="goodsItem.models[mIndex].counts" style="width: 160px;"></el-input>
                <el-input v-model.number="mItem.counts" style="width: 160px;"></el-input>
              </el-form-item>
            </el-col>
          </el-row>
@@ -219,13 +228,8 @@
  </win-md>
</template>
<script>
import {
  goodsTemplate,
  goodsModel,
} from '@/api/stock/procure/purchaseOrder';
import {
  transferAdd
} from '@/api/stock/transfer';
import {goodsModel, goodsTemplate,} from '@/api/stock/procure/purchaseOrder';
import {transferAdd} from '@/api/stock/transfer';
import {departmentListAll} from '@/api/system/deptment';
import {getTree} from '@/api/foudation/classification';
import MyButton from '@/components/myButton/myButton';
@@ -234,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},
@@ -258,34 +262,36 @@
      }
      callback();
    };
    // 数量校验
    var checkCounts = (rule, value, callback) => {
      console.log(value);
      if (!value) {
        return callback(new Error('请输入'));
      }
      if (!Number.isInteger(value)) {
        this.$message.warning('请输入数字值');
        return callback(new Error('请输入数字值'));
      }
      if (value == 0) {
        this.$message.warning('数字值不能为0');
        return callback(new Error('数字值不能为0'));
      }
      callback();
    };
    return {
      loading: false,
      buyTypeOptions: [
        {
          label: '集采',
          value: '1',
        },
        {
          label: '自采',
          value: '2',
        },
      ],
      checkCounts: (rule, value, callback) => {
        if (!value) {
          return callback(new Error('请输入分发数量'));
        }
        if (!Number.isInteger(value)) {
          // this.$message.warning('请输入数字值');
          return callback(new Error('请输入数字值'));
        }
        if (value < 1) {
          // this.$message.warning('数字值不能为0');
          return callback(new Error('数字值必须大于0'));
        }
        if (value > rule.worehouseCount) {
          // this.$message.warning('分发数量不能大于剩余数量');
          return callback(new Error('分发数量不能大于剩余数量'));
        }
        if(rule.type===1){
          let sum = 0
          rule.userList.map(item=>{
            sum+=(item.goodsNum||0)
          })
          if (sum > rule.worehouseCount) {
            // this.$message.warning('分发数量总和不能大于剩余数量');
            return callback(new Error('分发数量总和不能大于剩余数量'));
          }
        }
        callback();
      },
      loading: true,
      fileList: [],
      departmentOptions: [], // 部门列表
      categoryOptions: [], // 物品分类列表
@@ -325,37 +331,40 @@
        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: [{validator: checkGoodsTemplateId, trigger: ['blur', 'change']}],
        baseGoodsTemplateId: [{required: true, message: '请选择', trigger: 'change'},{validator: checkGoodsTemplateId, trigger: ['blur', 'change']}],
        modelsIds: [{required: true, message: '请选择', trigger: 'change'}],
        transferGoods:{
          models:{
            counts: [
              { required: true, message: '请输入', trigger: 'change' },
              { type: 'number', message: '数量必须为整数' },
            ],
            procureModelUserList:{
              goodsNum: [ { required: true, message: '请输入', trigger: 'blur' }],
              nowUserName: [ { required: true, message: '请输入', trigger: 'blur' }],
              nowUserPhone: [ { required: true, message: '请输入', trigger: 'blur' }],
            }
        transferGoods: [
          {
            models: [
              {
                counts: [
                  {required: true, message: '请输入', trigger: 'change'},
                  {type: 'number', message: '数量必须为整数'},
                ],
                procureModelUserList: [
                  {
                    goodsNum: [{required: true, message: '请输入', trigger: 'blur'}],
                    nowUserName: [{required: true, message: '请输入', trigger: 'blur'}],
                    nowUserPhone: [{required: true, message: '请输入', trigger: 'blur'}],
                  }
                ]
              }
            ]
          }
        }


        ]
      },

      uploadSettings: {
        title: '上传',
        max: 20, // 最大大小，单位M
        num: 10, // 支持上传图片个数
        accept: '.jpg,.png', // 限制格式
        tip: '', // 提示 默认：`只能上传${this.defaultSettings.num}个${this.defaultSettings.accept}文件，且不超过${this.defaultSettings.max}kb`
        uploadUrl: getUploadUrl(), // 上传路径
        multiple: true, // 是否支持批量上传
        disabled: false, // 是否禁用
        type: 'picture', // text/picture
      },
    };
  },
@@ -367,48 +376,21 @@
  },
  methods: {
    async init() {
      this.getdeptmentList();
      this.getgoodsTemplate();
      this.getgoodsModel();
      await this.getdeptmentList();
      // 获取物品分类列表
      const treeRes = await getTree();
      this.categoryOptions = this.removeEmptyChildren(treeRes);
      /*if (this.setting.id) {
        const detail = await procureDetail({ id: this.setting.id });
        this.formData = Object.assign(this.formData, detail);
        if (this.formData.procureDoc) {
          this.fileList = JSON.parse(this.formData.procureDoc);
        }
        this.$set(this.formData, 'buyType', this.formData.buyType.toString());
        this.formData.procureTime = this.formData.procureTime.toString();
        this.formData.transferGoods.map((item, index) => {
          this.$set(
            this.formData.transferGoods[index],
            'modelsIds',
            item.models.map((v) => v.baseGoodsModelsId),
          );
          this.getgoodsTemplate(item.baseCategoryId, index);
          this.getgoodsModel(item.baseGoodsTemplateId, index);
          item.models.forEach((child, childIndex) => {
            this.$set(this.formData.transferGoods[index].models[childIndex], 'priceYuan', child.price / 100);
          });
          return item;
        });
      }*/
      this.loading = false
      this.getgoodsTemplate();
      this.getgoodsModel();
    },

    // 获取入库仓库列表
    // 获取部门列表
    getdeptmentList() {
      departmentListAll({agencyId: this.userInfo.tenantId})
      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);
@@ -496,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,
          });
@@ -565,6 +546,7 @@

          this.formData.departmentName = this.$refs.department.selected.currentLabel
          this.formData.outAgencyId = this.userInfo.tenantId
          if(this.loading) return
          this.loading = true
          transferAdd(this.formData)
              .then((res) => {
@@ -576,7 +558,7 @@
              .catch((err) => {
                this.loading = false
                console.log('create err', err);
                this.$message.error('保存失败');
                //this.$message.error('保存失败');
              });
        } else {
          this.$message.error('校验未通过，请检查。');