fix: 物品退回接口对接

石广澎

2023-12-02 f75031d68076a00fdc4e2aa04bbb255452ff7f7f

fix:
物品退回接口对接

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

@@ -50,7 +50,7 @@
          placeholder: '请选择',
          defaultValue: '',
          options: [],
          cascader: [{key: 'goodsModelId', queryKey: 'goodsTemplatesId'}],
          cascader: [{key: 'baseGoodsModelsId', queryKey: 'goodsTemplatesId'}],
          optionsConfig: {
            label: 'goodsName',
            value: 'id',
@@ -59,7 +59,7 @@
        },
        {
          type: 'select',
          dataIndex: 'goodsModelId',
          dataIndex: 'baseGoodsModelsId',
          label: '规格型号',
          placeholder: '请输入',
          defaultValue: '',
@@ -85,7 +85,7 @@
        },
        {
          type: 'text',
          dataIndex: 'operatorName',
          dataIndex: 'createName',
          label: '创建人',
          placeholder: '请输入',
          defaultValue: '',
@@ -158,7 +158,7 @@
            title: '操作时间', field: 'dealTime', align: 'center',
            width: 160,
            formatter: (row) => {
              return {value: DateFormatter.LongToDateTime(row.createTime)};
              return {value: DateFormatter.LongToDateTime(row.dealTime)};
            },
          },
        ],

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

@@ -32,7 +32,7 @@
        </div>
      </el-col>
    </el-row>
    <div class="goods-card" v-for="(goodsItem, goodsIndex) in detail.goods" :key="goodsIndex">
    <div class="goods-card" v-for="(goodsItem, goodsIndex) in detail.goodsTemplateInfoList" :key="goodsIndex">
      <el-row :gutter="20">
        <el-col :span="7">
          <span>物品分类：</span>
@@ -44,31 +44,38 @@
        </el-col>
        <el-col :span="3">
          <span>类别：</span>
          <span>{{ goodsItem.classification }}类</span>
          <span>{{ goodsItem.type }}类</span>
        </el-col>
        <el-col :span="6">
          <span>分发单号：</span>
          <span>{{ goodsItem.businessFormCode }}</span>
        </el-col>
      </el-row>
      <div class="card3" v-for="(mItem,k) in mItem" :key="k">
        <el-row v-if="mItem[0].goodsUserName" :gutter="24" type="flex" align="middle">
      <div class="card3" v-for="(mItem,k) in goodsItem.modelInfoList" :key="k">
        <el-row v-if="goodsItem.type==='A'" :gutter="24" type="flex" align="middle">
          <el-col :span="8">
            <span>规格型号：</span>
            <span>{{ mItem[0].baseGoodsModelsName }}</span>
            <span>{{ mItem.baseGoodsModelsName }}</span>
          </el-col>
          <el-col :span="4">
            <span>单位：</span>
            <span>{{ mItem[0].unit }}</span>
            <span>{{ mItem.unit }}</span>
          </el-col>
        </el-row>
        <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"/>
        <el-table :data="mItem.useInfoList" style="margin-top: 15px">
          <el-table-column prop="baseGoodsModelsName" label="规格型号" align="left" v-if="goodsItem.type!=='A'">
            <template slot-scope="{row}">
              {{mItem.baseGoodsModelsName}}
            </template>
          </el-table-column>
          <el-table-column prop="unit" label="单位" align="center" v-if="goodsItem.type!=='A'">
            <template slot-scope="{row}">
              {{mItem.unit}}
            </template>
          </el-table-column>
          <el-table-column prop="useName" label="使用人" align="left" v-if="goodsItem.type==='A'"/>
          <el-table-column prop="useUnm" label="在用数量" align="center"/>
          <el-table-column prop="returnNum" label="退回数量" align="center"/>
        </el-table>
      </div>
    </div>

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

@@ -124,17 +124,17 @@
            </el-row>
            <el-table :data="mItem" :stripe="true">
              <!-- A类商品显示 -->
              <el-table-column width="100" prop="price" label="使用人" align="center" v-if="mItem[0].nowUserName">
              <el-table-column prop="price" label="使用人" align="center" v-if="mItem[0].nowUserName">
                <template slot-scope="scope">
                  {{ scope.row.nowUserName }}
                </template>
              </el-table-column>
              <el-table-column width="100" prop="price" label="分发数量" align="center">
              <el-table-column prop="price" label="分发数量" align="center">
                <template slot-scope="scope">
                  {{ scope.row.goodsNum }}
                </template>
              </el-table-column>
              <el-table-column width="100" prop="price" label="可退数量" align="center">
              <el-table-column prop="price" label="可退数量" align="center">
                <template slot-scope="scope">
                  {{ scope.row.userUseCount }}
                </template>

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

@@ -34,13 +34,13 @@
                        </div>
                      </div>
                      <div class="card-end">
                        <div v-for="(just, index) in item.goods" :key="index" class="item">
                        <div v-for="(just, index) in item.goodsTemplateInfoList" :key="index" class="item">
                          <div class="name">{{ just.baseGoodsTemplateName }}</div>
                          <div class="value-box">
                            <div class="value-box-item">
                              <span class="label">数量：</span>
                              <span class="value">{{ just.totalCount }}</span>
                              <span class="unit">{{ just.unit }}</span>
                              <span class="value">{{ just.count }}</span>
                              <span class="unit">{{ just.unit||'' }}</span>
                            </div>
                          </div>
                        </div>
@@ -99,7 +99,7 @@
        },
        {
          type: 'select',
          dataIndex: 'inAgencyId',
          dataIndex: 'departmentId',
          label: '分发部门',
          placeholder: '请选择',
          optionsConfig: {
@@ -125,7 +125,7 @@
        },
        {
          type: 'text',
          dataIndex: 'operatorName',
          dataIndex: 'createName',
          label: '创建人',
          placeholder: '请输入',
          defaultValue: '',
@@ -145,6 +145,9 @@
      ],
    };
  },
  created() {
    this.fetchData()
  },
  methods: {
    fetchData() {
      this.loading = true;
@@ -156,6 +159,8 @@
        this.list = res.datas;
        this.total = res.totalRows;
        this.loading = false;
      }).catch(()=>{
        this.loading = false;
      });
    },
  },

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

@@ -169,6 +169,8 @@
        this.list = res.datas;
        this.total = res.totalRows;
        this.loading = false;
      }).catch(()=>{
        this.loading = false;
      });
    },
  },