feat: 部门物品报废 1、分发单选择增加校验 2、明细列表字段对接

石广澎

2023-12-02 f7163108fef21286a2b447f1958ee3204d7854d0

feat: 部门物品报废
1、分发单选择增加校验
2、明细列表字段对接

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

@@ -20,7 +20,7 @@
// 新增
export function scrappedAdd(data) {
  return request({
    url: '/pc/l/wh/form/scrapped/add',
    url: '/pc/l/wh/form/scrapped/deptAdd',
    method: 'post',
    data,
  });

 admin-web/src/api/stock/deptScrap.js

File was deleted

 admin-web/src/views/departmentitem/itemret/retDetails/index.vue

@@ -143,19 +143,19 @@
        // 列信息
        columns: [
          {title: '单号', field: 'businessFormCode', align: 'center', width: 130},
          {title: '物品名称', field: 'goodsName', align: 'left', minWidth: 140},
          {title: '物品名称', field: 'baseGoodsTemplateName', align: 'left', minWidth: 140},
          /*{
            title: '类别', field: 'type', align: 'center', formatter: (row) => {
              return {value: row.type + '类'};
            },
          },*/
          {title: '规格型号', field: 'goodsModelName', align: 'left', minWidth: 130},
          {title: '报废数量', field: 'count', align: 'center'},
          {title: '规格型号', field: 'baseGoodsModelsName', align: 'left', minWidth: 130},
          {title: '报废数量', field: 'counts', align: 'center'},
          /*{title: '所属机构', field: 'tenantName', align: 'left', minWidth: 130},*/
          {title: '部门', field: 'departmentName', align: 'left', minWidth: 130},
          {title: '创建人', field: 'operatorName', align: 'center', width: 100},
          {
            title: '操作时间', field: 'createTime', align: 'center',
            title: '操作时间', field: 'dealTime', align: 'center',
            width: 160,
            formatter: (row) => {
              return {value: DateFormatter.LongToDateTime(row.createTime)};

 admin-web/src/views/departmentitem/itemret/returnNote/detail.vue

@@ -51,22 +51,21 @@
          <span>{{ goodsItem.businessFormCode }}</span>
        </el-col>
      </el-row>
      <!--      <div v-for="(mItem,k) in goodsItem.models" :key="k">-->
      <div class="card3">
        <el-row v-if="goodsItem.models[0].goodsUserName" :gutter="24" type="flex" align="middle">
      <div class="card3" v-for="(mItem,k) in mItem" :key="k">
        <el-row v-if="mItem[0].goodsUserName" :gutter="24" type="flex" align="middle">
          <el-col :span="8">
            <span>规格型号：</span>
            <span>{{ goodsItem.models[0].baseGoodsModelsName }}</span>
            <span>{{ mItem[0].baseGoodsModelsName }}</span>
          </el-col>
          <el-col :span="4">
            <span>单位：</span>
            <span>{{ goodsItem.models[0].unit }}</span>
            <span>{{ mItem[0].unit }}</span>
          </el-col>
        </el-row>
        <el-table :data="goodsItem.models" style="margin-top: 15px">
          <el-table-column prop="baseGoodsModelsName" label="规格型号" align="left" v-if="!goodsItem.models[0].goodsUserName"/>
          <el-table-column prop="unit" label="单位" align="center" v-if="!goodsItem.models[0].goodsUserName"/>
          <el-table-column prop="goodsUserName" label="使用人" align="left" v-if="goodsItem.models[0].goodsUserName"/>
        <el-table :data="mItem" style="margin-top: 15px">
          <el-table-column prop="baseGoodsModelsName" label="规格型号" align="left" v-if="!mItem[0].goodsUserName"/>
          <el-table-column prop="unit" label="单位" align="center" v-if="!mItem[0].goodsUserName"/>
          <el-table-column prop="goodsUserName" label="使用人" align="left" v-if="mItem[0].goodsUserName"/>
          <el-table-column prop="useCount" label="在用数量" align="center"/>
          <el-table-column prop="counts" label="报废数量" align="center"/>
          <el-table-column prop="scrappedName" label="报废原因" align="left"/>

 admin-web/src/views/departmentitem/itemret/returnNote/edit.vue

@@ -231,18 +231,6 @@
    },
  },
  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) {
@@ -306,11 +294,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'}],
      },
@@ -411,9 +395,8 @@
    // 物品名称列表选择
    goodsTemplateChange(e, index) {
      this.formData.goods[index].models = [];

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

    },
    showFenFa(index) {
      this.loading = true
@@ -457,6 +440,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

 admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue

@@ -126,7 +126,7 @@
      table: {
        showIndex: true, // 是否显示序号
        expand: false, // 是否显示详情数据
        url: SettingIplatform.apiBaseURL + '/pc/l/wh/form/transfer/department/list', // 请求地址
        url: SettingIplatform.apiBaseURL + '/pc/l/wh/form/scrapped/deptListByModel', // 请求地址
        // 工具条
        tools: {
          columnsCtrl: {
@@ -143,19 +143,19 @@
        // 列信息
        columns: [
          {title: '单号', field: 'businessFormCode', align: 'center', width: 130},
          {title: '物品名称', field: 'goodsName', align: 'left', minWidth: 140},
          {title: '物品名称', field: 'baseGoodsTemplateName', align: 'left', minWidth: 140},
          /*{
            title: '类别', field: 'type', align: 'center', formatter: (row) => {
              return {value: row.type + '类'};
            },
          },*/
          {title: '规格型号', field: 'goodsModelName', align: 'left', minWidth: 130},
          {title: '报废数量', field: 'count', align: 'center'},
          {title: '规格型号', field: 'baseGoodsModelsName', align: 'left', minWidth: 130},
          {title: '报废数量', field: 'counts', align: 'center'},
          /*{title: '所属机构', field: 'tenantName', align: 'left', minWidth: 130},*/
          {title: '部门', field: 'departmentName', align: 'left', minWidth: 130},
          {title: '创建人', field: 'operatorName', align: 'center', width: 100},
          {
            title: '操作时间', field: 'createTime', align: 'center',
            title: '操作时间', field: 'dealTime', align: 'center',
            width: 160,
            formatter: (row) => {
              return {value: DateFormatter.LongToDateTime(row.createTime)};

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

@@ -51,22 +51,21 @@
          <span>{{ goodsItem.businessFormCode }}</span>
        </el-col>
      </el-row>
<!--      <div v-for="(mItem,k) in goodsItem.models" :key="k">-->
      <div class="card3">
        <el-row v-if="goodsItem.models[0].goodsUserName" :gutter="24" type="flex" align="middle">
      <div class="card3" v-for="(mItem,k) in goodsItem.models" :key="k">
        <el-row v-if="mItem[0].goodsUserName" :gutter="24" type="flex" align="middle">
          <el-col :span="8">
            <span>规格型号：</span>
            <span>{{ goodsItem.models[0].baseGoodsModelsName }}</span>
            <span>{{ mItem[0].baseGoodsModelsName }}</span>
          </el-col>
          <el-col :span="4">
            <span>单位：</span>
            <span>{{ goodsItem.models[0].unit }}</span>
            <span>{{ mItem[0].unit }}</span>
          </el-col>
        </el-row>
        <el-table :data="goodsItem.models" style="margin-top: 15px">
          <el-table-column prop="baseGoodsModelsName" label="规格型号" align="left" v-if="!goodsItem.models[0].goodsUserName"/>
          <el-table-column prop="unit" label="单位" align="center" v-if="!goodsItem.models[0].goodsUserName"/>
          <el-table-column prop="goodsUserName" label="使用人" align="left" v-if="goodsItem.models[0].goodsUserName"/>
        <el-table :data="mItem" style="margin-top: 15px">
          <el-table-column prop="baseGoodsModelsName" label="规格型号" align="left" v-if="!mItem[0].goodsUserName"/>
          <el-table-column prop="unit" label="单位" align="center" v-if="!mItem[0].goodsUserName"/>
          <el-table-column prop="goodsUserName" label="使用人" align="left" v-if="mItem[0].goodsUserName"/>
          <el-table-column prop="useCount" label="在用数量" align="center"/>
          <el-table-column prop="counts" label="报废数量" align="center"/>
          <el-table-column prop="scrappedName" label="报废原因" align="left"/>

 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,15 +142,15 @@
              <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"
                      type="number"
                      v-model.number="row.counts"
                    ></el-input>
                  </el-form-item>
                </template>
@@ -158,18 +158,18 @@
              <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="[
                    label-width="0"
                    :prop="`goods.${goodsIndex}.models.${mIndex}.scrappedCode`"
                    :rules="[
                          {validator: checkReason,scrappedCode:row.scrappedCode, trigger: ['blur', 'change']}
                        ]"
                  >
                    <el-select v-model="row.scrappedCode" 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>
@@ -179,22 +179,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
            >
@@ -251,18 +251,6 @@
    },
  },
  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) {
@@ -332,11 +320,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'}],
      },
@@ -379,13 +363,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) {
@@ -432,6 +416,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 = [];
      // 根据选中分类请求物品名称列表
@@ -441,9 +426,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
@@ -487,6 +471,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
@@ -513,26 +504,27 @@
      this.$refs['ruleForm'].validate((valid) => {
        if (valid) {
          let params = JSON.parse(JSON.stringify(this.formData))
          params.goods.map((g,gid)=>{
          params.goods.map((g, gid) => {
            delete g.goodsOptions
            let arr=[]
            g.models.map(m=>{
              arr=arr.concat(m)
            let arr = []
            g.models.map(m => {
              arr = arr.concat(m)
            })
            g.models = arr
          })
          // console.log('params', params);
          // return
          if(this.loading) return
          this.loading = true
          scrappedAdd(params)
              .then((res) => {
                this.$message.success('保存成功！');
                this.close();
                this.$emit('search');
              })
              .catch((err) => {
                console.log('edit err', err);
                this.$message.error('保存失败');
              });
            .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('校验未通过，请检查。');
        }