石广澎
2023-12-02 19fe807c723fd8c4e6479a4f2c2c9de931aefb82
fix:
物品退回接口对接
5个文件已修改
34 ■■■■■ 已修改文件
admin-web/src/api/deptGoods/itemret.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/departmentitem/itemret/retDetails/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/departmentitem/itemret/returnNote/detail.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/departmentitem/itemret/returnNote/edit.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/departmentitem/itemret/returnNote/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/api/deptGoods/itemret.js
@@ -2,7 +2,7 @@
// 新增
export function returnAdd(data) {
    return request({
        url: '/pc/l/wh/form/scrapped/add',
        url: '/pc/l/wh/using/form/back/add',
        method: 'post',
        data,
    });
@@ -11,7 +11,7 @@
// 列表
export function returnList(params) {
    return request({
        url: '/pc/l/wh/form/scrapped/deptList',
        url: '/pc/l/wh/using/form/back/list',
        method: 'get',
        params,
    });
@@ -20,7 +20,7 @@
// 详情
export function returnDetail(params) {
    return request({
        url: '/pc/l/wh/form/scrapped/deptDetail',
        url: '/pc/l/wh/using/form/back/detail',
        method: 'get',
        params,
    });
admin-web/src/views/departmentitem/itemret/retDetails/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/using/form/back/list/detail', // 请求地址
        // 工具条
        tools: {
          columnsCtrl: {
admin-web/src/views/departmentitem/itemret/returnNote/detail.vue
@@ -86,12 +86,12 @@
  </win-md>
</template>
<script>
import {scrappedDetail} from '@/api/deptGoods/scrap';
import winMd from '@/components/win/win-md';
import * as DateFormatter from '@/utils/DateFormatter';
import {getDownUrl} from '@/utils/base';
import Viewer from 'viewerjs';
import 'viewerjs/dist/viewer.css';
import {returnDetail} from "@/api/deptGoods/itemret";
let viewer = null;
@@ -132,7 +132,7 @@
    }
  },
  created() {
    scrappedDetail({ id: this.setting.id }).then((res) => {
    returnDetail({ id: this.setting.id }).then((res) => {
      this.detail = res;
      this.loading = false
      this.fileList = this.detail.procureDoc ? JSON.parse(this.detail.procureDoc) : [];
@@ -163,12 +163,6 @@
          index++;
        }
      }
      // this.fileList.forEach((f, i) => {
      //   if (file.uid == f.uid) {
      //     index = i
      //   }
      // })
      // document.querySelector('#uploadPreviewImages').children[0].click()
      viewer.view(index);
    },
    checkImg(name) {
admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
@@ -209,7 +209,6 @@
<script>
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';
import winMd from '@/components/win/win-md';
@@ -219,7 +218,7 @@
import {mapGetters} from 'vuex';
import * as DateFormatter from '@/utils/DateFormatter';
import {getFfOrderByGoodsIdAndDept, getGoodsUseInfoByFfOrderAndGoodId} from "@/api/deptGoods/scrap";
import {getDicts} from "@/api/system/dict/data";
import {returnAdd} from "@/api/deptGoods/itemret";
export default {
  components: {MyButton, winMd, winSm, upload},
@@ -480,16 +479,17 @@
            })
            g.models = arr
          })
          console.log('params', params);
          return
          outputAdd(this.formData)
          if (this.loading) return
          this.loading = true
          returnAdd(params)
              .then((res) => {
              this.loading = false
                this.$message.success('保存成功!');
                this.close();
                this.$emit('search');
              })
              .catch((err) => {
                console.log('edit err', err);
              this.loading = false
                this.$message.error('保存失败');
              });
        } else {
admin-web/src/views/departmentitem/itemret/returnNote/index.vue
@@ -72,7 +72,6 @@
</template>
<script>
import {outputList} from '@/api/stock/accessStock';
import MyButton from '@/components/myButton/myButton';
import myImport from '@/views/components/myImport';
import edit from './edit';
@@ -80,6 +79,7 @@
import listPage from '@/views/mixins/listPage'
import {getUserDetail} from "@/utils/auth";
import SettingIplatform from "@/utils/settingIplatform";
import {returnList} from "@/api/deptGoods/itemret";
export default {
  name: 'index',
@@ -148,7 +148,7 @@
  methods: {
    fetchData() {
      this.loading = true;
      outputList({
      returnList({
        pageNum: this.pageNum,
        pageSize: this.pageSize,
        ...this.filterFrom,