feat: 部门物品 报废

石广澎

2023-12-01 9497f101126c9f03dbd7917a3396696bdac6998c

feat: 部门物品
报废

 admin-web/public/static/config.js

@@ -4,8 +4,8 @@
  // 上传路径
  ftpUrl: 'https://yqzx.jinmingyuan.com/lowConsum',//开发
  // 接口请求地址
  apiBaseURL: 'http://172.16.20.2:8083/lowConsum',//开发
  // apiBaseURL: 'http://172.16.60.155:8083/lowConsum',//开发
  // apiBaseURL: 'http://172.16.20.2:8083/lowConsum',//开发
  apiBaseURL: 'http://172.16.60.155:8083/lowConsum',//开发
  // apiBaseURL: 'https://yqzx.jinmingyuan.com/lowConsum',//开发
  debug: false //调试开关  true时会输出请求日志
};

 admin-web/src/api/deptGoods/scrap.js

New file
@@ -0,0 +1,62 @@
import request from '@/utils/request';

// 物品报废
// 根据部门、物品查询分发单
export function getFfOrderByGoodsIdAndDept(params) {
  return request({
    url: '/pc/warehouse/procureModel/getFfOrderByGoodsIdAndDept',
    method: 'get',
    params,
  });
}
// 根据分发单id和物品查询在用数量 以及使用人信息
export function getGoodsUseInfoByFfOrderAndGoodId(params) {
  return request({
    url: '/pc/warehouse/procureModel/getGoodsUseInfoByFfOrderAndGoodId',
    method: 'get',
    params,
  });
}
// 新增
export function scrappedAdd(data) {
  return request({
    url: '/pc/l/wh/form/scrapped/add',
    method: 'post',
    data,
  });
}

// 列表
export function scrappedList(params) {
  return request({
    url: '/pc/l/wh/form/scrapped/list',
    method: 'get',
    params,
  });
}

// 详情
export function scrappedDetail(params) {
  return request({
    url: '/pc/l/wh/form/scrapped/detail',
    method: 'get',
    params,
  });
}
// 导出
export function scrappedExport(params) {
  return request({
    url: '/pc/l/wh/form/scrapped/export',
    method: 'get',
    params,
  });
}

// 明细列表
export function scrappedListDetailList(params) {
    return request({
      url: '/pc/l/wh/form/scrapped/list/detailList',
      method: 'get',
      params,
    });
  }

 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%"
@@ -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);

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

@@ -1,27 +1,31 @@
<template>
  <win-md class="stock-edit" title="物品报废" @close="close" :width="'800px'">
  <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="warehouseId">
              <el-input v-model="formData.departmentName" disabled></el-input>
            <el-form-item label="部门" prop="departmentId">
              <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>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="报废人" prop="createName">
              <el-input v-model="formData.createName" disabled></el-input>
            <el-form-item label="报废人" prop="operatorName">
              <el-input v-model="formData.operatorName" disabled></el-input>
            </el-form-item>
          </el-col>
          <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>
@@ -38,124 +42,136 @@
          <el-row :gutter="24">
            <el-col :span="12">
              <el-form-item
                label="物品分类"
                :prop="`goods[${goodsIndex}].baseCategoryIds`"
                :rules="{
                  label="物品分类"
                  :prop="`goods.${goodsIndex}.baseCategoryId`"
                  :rules="{
                  required: true,
                  message: '请选择',
                  message: '请选择物品分类',
                  trigger: 'change',
                }"
              >
                <el-cascader
                  v-model="goodsItem.baseCategoryIds"
                  :options="categoryOptions"
                  :props="{ value: 'id' }"
                  @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="请先择物品分类"
                  filterable
                  :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-row>
          <el-row :gutter="24">
            <el-col :span="12">
              <el-form-item label="选择分发单" :prop="`goods[${goodsIndex}].modelsIds`">
                <el-input v-if="!goodsItem.baseGoodsTemplateId" placeholder="请先择物品名称" readonly suffix-icon="el-icon-arrow-down" class="cursor-p"></el-input>
                <div v-else @click="fenfaSetting.show=true">
                  <el-input placeholder="请选择" readonly suffix-icon="el-icon-arrow-down" class="cursor-p"></el-input>
              <el-form-item
                  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>
                </div>
              </el-form-item>
            </el-col>
          </el-row>
          <div class="card3" v-for="(mItem, mIndex) in goodsItem.models" :key="mIndex">
            <el-row :gutter="24" type="flex" align="middle" style="height: 50px">
              <el-col :span="8">
              <el-col :span="12">
                <el-form-item label="规格型号:" prop="baseGoodsModelsId" style="margin-bottom: 0">
                  {{ getGoodsModelsName(mItem.baseGoodsModelsId) }}
                  {{ mItem[0].modelName }}
                </el-form-item>
              </el-col>
              <el-col :span="6">
                <el-form-item label="单位:" prop="baseGoodsModelsId" style="margin-bottom: 0" label-width="80">
                  50
                  {{ mItem[0].unit }}
                </el-form-item>
              </el-col>
              <el-col :span="6">
                <el-form-item label="物品类别:" prop="baseGoodsModelsId" style="margin-bottom: 0" label-width="80">
                  A类
                  {{ mItem[0].classification }}
                </el-form-item>
              </el-col>
            </el-row>
            <el-table :data="mItem.models" :stripe="true">
            <el-table :data="mItem" :stripe="true">
              <!-- A类商品显示 -->
              <el-table-column prop="price" label="使用人" align="center" v-if="goodsItem.models.type===1">
              <el-table-column width="100" prop="price" label="使用人" align="center" v-if="mItem[0].nowUserName">
                <template slot-scope="scope">
                  {{ scope.row.worehouseCount }}
                  {{ scope.row.nowUserName }}
                </template>
              </el-table-column>
              <el-table-column prop="price" label="分发数量" align="center">
              <el-table-column width="100" prop="price" label="分发数量" align="center">
                <template slot-scope="scope">
                  {{ scope.row.worehouseCount }}
                  {{ scope.row.goodsNum }}
                </template>
              </el-table-column>
              <el-table-column prop="price" label="再用数量" align="center">
              <el-table-column width="100" prop="price" label="在用数量" align="center">
                <template slot-scope="scope">
                  {{ scope.row.worehouseCount }}
                  {{ scope.row.userUseCount }}
                </template>
              </el-table-column>
              <el-table-column prop="counts" label="报废数量" align="center">
                <template slot-scope="scope">
                <template slot-scope="{row,$index}">
                  <el-form-item
                    label-width="0"
                    style="margin-bottom: 0"
                    :prop="`goods[${goodsIndex}].models[${scope.$index}].counts`"
                    :rules="rules.counts"
                      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="scope.row.counts"
                      @change="countsChange($event, goodsIndex, scope.$index)"
                        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="scope">
                <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"
                    style="margin-bottom: 0"
                    :prop="`goods[${goodsIndex}].models[${scope.$index}].reason`"
                    :rules="rules.reason"
                      label-width="0"
                  >
                    <el-select v-model="scope.row.reason" placeholder="请选择">
                    <el-select v-model="row.scrappedCode" placeholder="请选择">
                      <el-option
                        v-for="item in reasonOptions"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value"
                        @change="countsChange($event, goodsIndex, scope.$index)">
                      </el-option>
                          v-for="item in scrapReasonOptions"
                          :key="item.dict_code"
                          :label="item.dict_label"
                          :value="item.dict_code"
                      />
                    </el-select>
                  </el-form-item>
                </template>
@@ -164,51 +180,56 @@
          </div>
          <div class="btn-group">
            <el-button
              v-if="formData.goods.length > 1"
              name="移除"
              type="danger"
              plain
              size="mini"
              @click="removeGoods(goodsIndex)"
              >移除</el-button
                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"
              >新增物品</el-button
                v-if="formData.goods.length - 1 == goodsIndex"
                name="新增物品"
                type="primary"
                plain
                size="mini"
                @click="addGoods"
            >新增物品
            </el-button
            >
          </div>
        </div>
      </div>
    </el-form>
    <div slot="footer" align="center" class="dialog-footer">
      <my-button name="取消" site="form" @click="close" />
      <my-button name="保存" site="form" @click="handleSubmit" />
      <my-button name="取消" site="form" @click="close"/>
      <my-button name="保存" site="form" @click="handleSubmit"/>
    </div>
    <div v-if="fenfaSetting.show">
      <win-sm title="选择分发单" @close="fenfaSetting.show=false" :width="'800px'">
      <el-table :data="fenfaData">
        <el-table-column type="selection" width="55"> </el-table-column>
        <el-table-column label="分发单号" prop="businessFormCode"></el-table-column>
        <el-table-column label="物品名称" prop="modelName"></el-table-column>
        <el-table-column label="分发数量" prop="fenfaCount"></el-table-column>
        <el-table-column label="剩余数量" prop="count"></el-table-column>
        <el-table-column label="分发时间" prop="time"></el-table-column>
    <win-md v-if="fenfaSetting.show" title="选择分发单" @close="fenfaSetting.show=false" :width="'800px'">
      <el-table @current-change="handleCurrentChange" :data="fenfaData" highlight-current-row height="407">
        <el-table-column label="分发单号" prop="businessFormCode" align="left"></el-table-column>
        <el-table-column label="物品名称" prop="baseGoodsTemplateName" align="left"></el-table-column>
        <el-table-column label="分发数量" prop="totalCount" align="center"></el-table-column>
        <el-table-column label="剩余数量" prop="useCount" align="center"></el-table-column>
        <el-table-column label="分发时间" prop="inTime" width="160" align="center">
          <template slot-scope="{row}">
            {{ DateFormatter.LongToDateTime(row.inTime) }}
          </template>
        </el-table-column>
      </el-table>
      <div slot="footer" align="center" class="dialog-footer">
        <my-button name="取消" site="form" @click="fenfaSetting.show=false" />
        <my-button name="确定" site="form" @click="handleConfirm" />
        <my-button name="取消" site="form"
                   @click="fenfaSetting.show=false;fenfaSetting.baseGoodsTemplateId=null;curFenfa=null;fenfaData=[]"/>
        <el-button @click="handleConfirm" type="primary" size="medium">确定</el-button>
      </div>
    </win-sm>
    </div>
    </win-md>
  </win-md>
</template>
<script>
import {goodsTemplate, selectTenantWarehouse,} from '@/api/baseSetting/finsystenant';
import {departmentListAll} from '@/api/system/deptment';
import {goodsTemplate} from '@/api/baseSetting/finsystenant';
import {outputAdd} from '@/api/stock/accessStock';
import {getTree} from '@/api/foudation/classification';
import MyButton from '@/components/myButton/myButton';
@@ -217,53 +238,78 @@
import upload from '@/components/upload/index';
import {getUploadUrl} from '@/utils/base';
import {mapGetters} from 'vuex';
import * as DateFormatter from '@/utils/DateFormatter';
import {getFfOrderByGoodsIdAndDept, getGoodsUseInfoByFfOrderAndGoodId} from "@/api/deptGoods/scrap";
import {getDicts} from "@/api/system/dict/data";

export default {
  components: { MyButton, winMd, winSm, upload },
  components: {MyButton, winMd, winSm, upload},
  props: {
    setting: {
      type: Object,
      default: () => {},
      default: () => {
      },
    },
  },
  data() {
    // 自定义校验
    // 物品重复校验
    var checkGoodsTemplateId = (rule, value, callback) => {
    var checkBusinessFormCode= (rule, value, callback) => {
      if (!value) {
        return callback(new Error('请选择'));
      }
      let temp = this.formData.goods.filter((v) => v.baseGoodsTemplateId == value);
      let temp = this.formData.goods.filter((v) => v.businessFormCode == value);
      if (!temp || temp.length != 1) {
        return callback(new Error('已选过此物品'));
        return callback(new Error('已选过此分发单'));
      }
      callback();
    };
    return {
      loading: false,
      warehouseOptions: [], // 报废仓库列表
      checkCounts: (rule, value, callback) => {
        if (!rule.counts) {
          return callback(new Error('请输入报废数量'));
        }
        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();
      },
      DateFormatter: DateFormatter,
      loading: true,
      departmentOptions: [], // 部门列表
      categoryOptions: [], // 物品分类列表
      modelList: [], //型号列表
      fenfaSetting: {
        show: false,
        goodsIdx: null,
        baseGoodsTemplateId: null,
        id: '',
      },
      fenfaData:[],
      curFenfa: null,
      fenfaData: [],
      formData: {
        warehouseId: '', // 报废仓库id
        departmentId: '', // 报废部门id
        dealTime: '', // 报废时间
        procureDoc: '',
        goods: [],
      },
      goodsItem: {
        baseCategoryIds: '', // 分类编号数组
        businessFormCode: '', // 分发单id
        transBusinessId: '', // 分发单id
        baseCategoryId: '', // 分类编号
        baseGoodsTemplateId: '', // 物品模版编号
        goodsTemplateName: '', // 物品模版名称
        goodsOptions: [], // 物品列表select
        modelsOptions: [], //规格型号select
        models: [], // 物品名称
        modelsIds: [], //规格型号
      },
      modelsItem: {
        baseGoodsModelsId: '', // 规格型号编号
@@ -272,14 +318,18 @@
        unit: null, //单位
      },
      rules: {
        warehouseId: [{ required: true, message: '请选择', trigger: 'change' }],
        dealTime: [{ required: true, message: '请选择', trigger: 'change' }],
        buyType: [{ required: true, message: '请选择', trigger: 'change' }],
        baseCategoryIds: [{ required: true, message: '请选择', trigger: 'change' }],
        baseGoodsTemplateId: [{ validator: checkGoodsTemplateId, trigger: ['blur', 'change'] }],
        modelsIds: [{ required: true, message: '请选择', trigger: 'change' }],
        counts: [{ required: true, message: '请输入', trigger: 'change' }],
        reason: [{ required: true, message: '请选择', trigger: 'change' }],
        departmentId: [{required: true, message: '请选择部门', trigger: 'change'}],
        dealTime: [{required: true, message: '请选择', trigger: 'change'}],
        procureDoc: [{required: true, message: '请上传', trigger: 'change'}],
        baseCategoryId: [{required: true, message: '请选择', trigger: 'change'}],
        baseGoodsTemplateId: [{
          required: true,
          message: '请选择物品',
          trigger: 'change'
        }],
        businessFormCode: [{required: true,message: '请选择分发单',trigger: 'change'}, {validator: checkBusinessFormCode, trigger: ['blur', 'change']}],
        counts: [{required: true, message: '请输入', trigger: 'change'}],
        reason: [{required: true, message: '请选择', trigger: 'change'}],
      },

      uploadSettings: {
@@ -293,7 +343,7 @@
        disabled: false, // 是否禁用
        type: 'picture', // text/picture
      },
      reasonOptions:[] // 报废原因
      scrapReasonOptions: [] // 报废原因
    };
  },
  computed: {
@@ -304,31 +354,29 @@
  },
  methods: {
    async init() {
      this.getWarehouseList();
      this.getgoodsTemplate();
      // 获取物品分类列表
      await this.getdeptmentList();
      const treeRes = await getTree();
      this.categoryOptions = this.removeEmptyChildren(treeRes);
      this.formData.departmentName = this.userInfo.sysDeptName;
      this.formData.createName = this.userInfo.userName;
      this.getgoodsTemplate();
      // 获取物品分类列表
      this.formData.departmentId = this.userInfo.sysDeptId;
      this.formData.operatorName = this.userInfo.userName;
      this.loading = false
      getDicts('SCRAP_REASON').then((res) => {
        this.scrapReasonOptions = res;
      });
    },

    // 获取报废仓库列表
    getWarehouseList() {
      selectTenantWarehouse({ agencyId: this.userInfo.tenantId })
        .then((res) => {
          this.warehouseOptions = res;
          if (res.length) {
    // 获取部门列表
    async getdeptmentList() {
      await departmentListAll({tenantId: this.userInfo.tenantId})
          .then((res) => {
            this.departmentOptions = res;
            this.formData.goods.push(JSON.parse(JSON.stringify(this.goodsItem)));
          }
          if (this.warehouseOptions.length && !this.formData.warehouseId) {
            // 默认选中第一个仓库
            this.formData.warehouseId = this.warehouseOptions[0].id;
          }
        })
        .catch((err) => {
          console.log('err', err);
        });
          })
          .catch((err) => {
            console.log('err', err);
          });
    },

    removeEmptyChildren(arr) {
@@ -344,7 +392,7 @@

    // 获取物品名称列表
    getgoodsTemplate(id, index) {
      goodsTemplate({ categoryId: id || '' }).then((res) => {
      goodsTemplate({categoryId: id || ''}).then((res) => {
        if (index || index == 0) {
          this.$set(this.formData.goods[index], 'goodsOptions', res);
        } else {
@@ -376,24 +424,37 @@
      this.formData.goods[index].goodsOptions = [];
      this.formData.goods[index].baseGoodsTemplateId = '';
      this.formData.goods[index].goodsTemplateName = '';
      this.formData.goods[index].modelsOptions = [];
      this.formData.goods[index].modelsIds = [];
      this.formData.goods[index].models = [];

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

    // 物品名称列表选择
    goodsTemplateChange(e, index) {
      this.formData.goods[index].modelsOptions = [];
      this.formData.goods[index].modelsIds = [];
      this.formData.goods[index].models = [];

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

    },
    showFenFa(index) {
      this.loading = true
      getFfOrderByGoodsIdAndDept({
        departmentId: this.formData.departmentId,
        baseGoodsTemplateId: this.formData.goods[index].baseGoodsTemplateId
      }).then(res => {
        this.loading = false
        if (!res || res.length === 0) {
          this.$message.error('未查询到分发单');
          return
        }
        this.fenfaSetting.show = true
        this.fenfaSetting.baseGoodsTemplateId = this.formData.goods[index].baseGoodsTemplateId
        this.fenfaSetting.goodsIdx = index
        this.fenfaData = res
      }).catch((err) => {
        this.loading = false
      });
    },
    // 上传
    uploadChange() {
      let arr = this.$refs.uploadRef.fileList;
@@ -409,36 +470,51 @@
    removeGoods(index) {
      this.formData.goods.splice(index, 1);
    },

    // 报废数量校验
    countsChange(e, goodsIndex, index) {
      const curItem = this.formData.goods[goodsIndex].models[index];
      const worehouseCount = curItem.worehouseCount;
      if (e == 0) {
        this.$message.warning('数额不能为0');
        curItem.counts = null;
      }
      if (e > worehouseCount) {
        this.$message.warning('数额超过现有库存');
        curItem.counts = worehouseCount > 0 ? worehouseCount : null;
      }
    handleCurrentChange(e) {
      this.curFenfa = e
    },
    handleConfirm(){},
    handleConfirm() {
      if (!this.curFenfa) {
        this.$message.error('请选择分发单');
        return
      }
      getGoodsUseInfoByFfOrderAndGoodId({
        transBusinessId: this.curFenfa.transBusinessId,
        baseGoodsTemplateId: this.fenfaSetting.baseGoodsTemplateId
      }).then(res => {
        if (res) {
          let arr = []
          for (let resKey in res) {
            const item = res[resKey]
            item.map(t => {
              t.counts = null
              t.scrappedCode = null
            })
            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.fenfaSetting.show = false
      })
    },
    // 提交
    handleSubmit() {
      console.log('this.formData', this.formData);
      this.$refs['ruleForm'].validate((valid) => {
        if (valid) {
          console.log('this.formData', this.formData);
          return;
          outputAdd(this.formData)
            .then((res) => {
              this.$message.success('保存成功！');
              this.close();
              this.$emit('search');
            })
            .catch((err) => {
              console.log('edit err', err);
              this.$message.error('保存失败');
            });
              .then((res) => {
                this.$message.success('保存成功！');
                this.close();
                this.$emit('search');
              })
              .catch((err) => {
                console.log('edit err', err);
                this.$message.error('保存失败');
              });
        } else {
          this.$message.error('校验未通过，请检查。');
        }
@@ -458,6 +534,7 @@
</script>
<style scoped lang="scss">
@import url(../../../../styles/store.scss);

.cursor-p {
  ::v-deep {
    .el-input__inner {
@@ -465,6 +542,7 @@
    }
  }
}

.card3 {
  border-radius: 2px;
  background: #ffffff;

 admin-web/src/views/stock/accessStock/outbound/edit.vue

@@ -102,8 +102,8 @@
                  v-model="goodsItem.modelsIds"
                  multiple
                  clearable
                  :placeholder="goodsItem.baseCategoryId?'请选择规格型号':'请先选择物品名称'"
                  :disabled="!goodsItem.baseCategoryId"
                  :placeholder="goodsItem.baseGoodsTemplateId?'请选择规格型号':'请先选择物品名称'"
                  :disabled="!goodsItem.baseGoodsTemplateId"
                  @change="modelChange($event, goodsIndex)"
                  @remove-tag="modelRemoveTag($event, goodsIndex)"
                  @clear="modelRemoveTag(-1, goodsIndex)"

 admin-web/src/views/stock/procure/purchaseOrder/edit.vue

@@ -105,8 +105,8 @@
                    v-model="goodsItem.modelsIds"
                    multiple
                    clearable
                    :placeholder="goodsItem.baseCategoryId?'请选择规格型号':'请先选择物品名称'"
                    :disabled="!goodsItem.baseCategoryId"
                    :placeholder="goodsItem.baseGoodsTemplateId?'请选择规格型号':'请先选择物品名称'"
                    :disabled="!goodsItem.baseGoodsTemplateId"
                    @change="modelChange($event, goodsIndex)"
                    @remove-tag="modelRemoveTag($event, goodsIndex)"
                    @clear="modelRemoveTag(-1, goodsIndex)"

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

@@ -108,8 +108,8 @@
                  v-model="goodsItem.modelsIds"
                  multiple
                  clearable
                  :placeholder="goodsItem.baseCategoryId?'请选择规格型号':'请先选择物品名称'"
                  :disabled="!goodsItem.baseCategoryId"
                  :placeholder="goodsItem.baseGoodsTemplateId?'请选择规格型号':'请先选择物品名称'"
                  :disabled="!goodsItem.baseGoodsTemplateId"
                  @change="modelChange($event, goodsIndex)"
                  @remove-tag="modelRemoveTag($event, goodsIndex)"
                  @clear="modelRemoveTag(-1, goodsIndex)"

 admin-web/src/views/stock/transfer/transferApplication/edit.vue

@@ -96,8 +96,8 @@
                  v-model="goodsItem.modelsIds"
                  multiple
                  clearable
                  :placeholder="goodsItem.baseCategoryId?'请选择规格型号':'请先选择物品名称'"
                  :disabled="!goodsItem.baseCategoryId"
                  :placeholder="goodsItem.baseGoodsTemplateId?'请选择规格型号':'请先选择物品名称'"
                  :disabled="!goodsItem.baseGoodsTemplateId"
                  @change="modelChange($event, goodsIndex)"
                  @remove-tag="modelRemoveTag($event, goodsIndex)"
                  @clear="modelRemoveTag(-1, goodsIndex)"