Merge remote-tracking branch 'origin/master'

cy

2023-11-30 870a9499eb65de0031ef8e8f70607e5dfb64b806

Merge remote-tracking branch 'origin/master'

 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/exportExcel.js

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

// 出库单导出
export function outputExport(params) {
    return request({
        url: '/pc/l/wh/form/output/list/export',
        responseType: 'blob', // 指定响应数据类型为Blob
        method: 'get',
        params,
    });
}
// 采购单导出
export function procureExport(params) {
    return request({
        url: '/pc/l/wh/form/procure/list/export',
        responseType: 'blob', // 指定响应数据类型为Blob
        method: 'get',
        params,
    });
}
// 调拨单导出
export function transferExport(params) {
    return request({
        url: '/pc/l/wh/form/transfer/list/export',
        responseType: 'blob', // 指定响应数据类型为Blob
        method: 'get',
        params,
    });
}

// 库存盘点单导出
export function inventoryExport(params) {
    return request({
        url: '/pc/l/wh/form/inventory/list/export',
        responseType: 'blob', // 指定响应数据类型为Blob
        method: 'get',
        params,
    });
}

// 库存报废单导出
export function scrappedExport(params) {
    return request({
        url: '/pc/l/wh/form/scrapped/list/export',
        responseType: 'blob', // 指定响应数据类型为Blob
        method: 'get',
        params,
    });
}

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

@@ -72,15 +72,6 @@
}

// 导出
export function transferExport(params) {
  return request({
    url: '/pc/l/wh/form/transfer/export',
    method: 'get',
    params,
  });
}

// 导出
export function transferDetailListApi(params) {
  return '/pc/l/wh/form/transfer/detail/list'
}

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

@@ -19,7 +19,7 @@
        {{ item }}
      </div>
    </div>
    <el-form v-show="tabIndex == 0" ref="ruleForm" :model="formData" :rules="rules" class="demo-ruleForm">
    <el-form v-loading="loading" v-show="tabIndex == 0" ref="ruleForm" :model="formData" :rules="rules" class="demo-ruleForm">
      <div v-for="(item, index) in formData.list" :key="index">
        <el-row :gutter="20">
          <el-col :span="6">
@@ -61,7 +61,6 @@
        <el-divider v-if="index+1<formData.list.length"></el-divider>
      </div>
    </el-form>

    <el-form
        v-show="tabIndex == 1"
        ref="ruleForm"
@@ -74,7 +73,7 @@
        <el-row :gutter="20" class="item-header">
          <el-col :span="6">
            <el-form-item label="修改时间:">
              {{ item.updateTime }}
              {{ item.updateTime | formatTime }}
            </el-form-item>
          </el-col>
          <el-col :span="6">
@@ -129,9 +128,11 @@
<script>
import myButton from '@/components/myButton/myButton';
import {useInfoUpdate, useRecord} from "@/api/stock/transfer";
import listPage from '@/views/mixins/listPage';

export default {
  components: {myButton},
  mixins: [listPage],
  props: {
    setting: {
      type: Object,
@@ -141,6 +142,7 @@
  },
  data() {
    return {
      loading: true,
      tabs: ['修改使用人', '使用记录'],
      tabIndex: 0,
      list: [],

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

@@ -59,12 +59,12 @@
      </el-row>
      <el-form>
        <el-row class="card3" v-for="(mItem, mIndex) in goodsItem.models" :key="mIndex">
          <el-col :span="10">
            <el-form-item label="规格型号:"  style="margin-bottom: 0">
          <el-col style="padding: 10px 0" :span="10">
            <el-form-item label="规格型号1:"  style="margin-bottom: 0">
              {{ mItem.baseGoodsModelsName }}
            </el-form-item>
          </el-col>
          <el-col :span="4">
          <el-col style="padding: 10px 0" :span="4">
            <el-form-item label="单位:" style="margin-bottom: 0" label-width="80">
              {{mItem.unit}}
            </el-form-item>

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

@@ -568,6 +568,7 @@
    // 提交
    handleSubmit() {
      console.log('formData', this.formData);
      if(this.loading) return
      this.$refs['ruleForm'].validate((valid) => {
        if (valid) {
          this.formData.transferGoods.map(goods => {

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

@@ -91,7 +91,7 @@
import myImport from '@/views/components/myImport';
import edit from './edit';
import detail from './detail';
import listPage from '../../../mixins/listPage';
import listPage from '@/views/mixins/listPage';
import {getUserDetail} from "@/utils/auth";

export default {

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

@@ -77,7 +77,7 @@
import myImport from '@/views/components/myImport';
import edit from './edit';
import detail from './detail';
import listPage from '../../../mixins/listPage'
import listPage from '@/views/mixins/listPage'

export default {
  name: 'index',

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

@@ -82,7 +82,7 @@
import myImport from '@/views/components/myImport';
import edit from './edit';
import detail from './detail';
import listPage from '../../../mixins/listPage'
import listPage from '@/views/mixins/listPage'

export default {
  name: 'index',

 admin-web/src/views/mixins/listPage.js

@@ -1,5 +1,6 @@
import * as DateFormatter from '@/utils/DateFormatter';
import {mapGetters} from 'vuex';
import * as dataExport from "@/api/exportExcel"

export default {
    data() {
@@ -39,9 +40,40 @@
      },
    },
    methods:{
        fetchData() {},
        // 导出
        handleExport() {},
        handleExport(api, fileName, params) {
            console.log(fileName)
            let loading = this.$loading({
                lock: true,
                text: '导出中，请稍候...',
                spinner: 'el-icon-loading',
                background: 'rgba(0, 0, 0, 0.7)',
            });
            // 判断总条数是否大于最大支持条数
            dataExport[api](params)
                .then((res) => {
                    const blob = new Blob([res], {type: 'application/vnd.ms-excel'});
                    if ('download' in document.createElement('a')) {
                        // 非IE下载
                        const elink = document.createElement('a');
                        elink.download = `${fileName}.xls`;
                        elink.style.display = 'none';
                        elink.href = URL.createObjectURL(blob);
                        document.body.appendChild(elink);
                        elink.click();
                        URL.revokeObjectURL(elink.href);
                        document.body.removeChild(elink);
                    } else {
                        // IE10+下载
                        navigator.msSaveBlob(blob, `${fileName}.xls`);
                    }
                    this.$message.success('导出成功！');
                    loading.close();
                })
                .catch(() => {
                    loading.close();
                });
        },
        // 新增
        handleAdd() {
          this.editSetting.id = null;

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

@@ -24,7 +24,7 @@
                            <span class="value">{{ item.businessFormCode }}</span>
                          </div>
                          <div class="card-header-right">
                            <el-button site="form" type="success" size="mini" @click="handleExport(item)"
                            <el-button site="form" type="success" size="mini" @click="handleExport('outputExport',`出库单-${item.businessFormCode}`,{id:item.id})"
                            >导出出库单</el-button
                            >
                            <el-button name="查看详情" site="form" type="info" size="mini" @click="handleDetail(item)"
@@ -85,7 +85,7 @@
import myImport from '@/views/components/myImport';
import edit from './edit';
import detail from './detail';
import listPage from '../../../mixins/listPage'
import listPage from '@/views/mixins/listPage'
import SettingIplatform from '@/utils/settingIplatform';

export default {
@@ -163,19 +163,6 @@
        this.total = res.totalRows;
        this.loading = false;
      });
    },
    fifterForm(params) {
      this.filterFrom = Object.assign(this.filterFrom, params);
      if (this.filterFrom.startTime) {
        this.filterFrom.startTime = this.filterFrom.startTime.replace(/\-/g, '');
      }
      if (this.filterFrom.endTime) {
        this.filterFrom.endTime = this.filterFrom.endTime.replace(/\-/g, '');
      }
      if (this.filterFrom.agencyId&&this.filterFrom.agencyId.length) {
        this.filterFrom.agencyId = this.filterFrom.agencyId[this.filterFrom.agencyId.length - 1];
      }
      this.search(1);
    },
  },
};

 admin-web/src/views/stock/inventorycount/inventorytask/index.vue

@@ -21,7 +21,8 @@
            @close="inventorySetting.show = false"
            @search="search"
          />
          <detail v-if="inventoryDetail.show" :setting="inventoryDetail" @close="inventoryDetail.show = false" @search="search" />
          <detail v-if="inventoryDetail.show" :setting="inventoryDetail" @close="inventoryDetail.show = false"
                  @search="search"/>
        </el-card>
      </el-container>
    </el-container>
@@ -46,9 +47,11 @@
import {inventoryDel, inventoryListApi} from '@/api/stock/inventory';
import * as DateFormatter from '@/utils/DateFormatter';
import {mapGetters} from 'vuex';
import listPage from '@/views/mixins/listPage';

export default {
  name: 'index',
  mixins: [listPage],
  components: { MyButton, MyTableV2, edit, myImport, inventory,detail },
  data() {
    return {
@@ -271,7 +274,7 @@
                }
              },
              events: (row) => {
                this.showInventoryDetail(row);
                this.handleExport('inventoryExport', `盘点表-${row.businessFormCode}`, {id: row.id});
              },
            },
          ],
@@ -328,7 +331,8 @@
            this.search();
          });
        })
        .catch(() => {});
          .catch(() => {
          });
    },
    showAdd() {
      this.editSetting.id = null;
@@ -362,17 +366,6 @@
      } else {
        this.$refs.myTable.search();
      }
    },
    fifterForm(params) {
      this.filterFrom = Object.assign(this.filterFrom, params);

      if (this.filterFrom.startTime) {
        this.filterFrom.startTime = this.filterFrom.startTime.replace(/\-/g, '');
      }
      if (this.filterFrom.endTime) {
        this.filterFrom.endTime = this.filterFrom.endTime.replace(/\-/g, '');
      }
      this.search(1);
    },
  },
};

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

@@ -40,7 +40,7 @@
                              >
                            </template>
                            <template v-if="item.states != 1">
                              <el-button site="form" type="success" size="mini" @click="handleExport(item)"
                              <el-button site="form" type="success" size="mini" @click="handleExport('procureExport',`采购入库单-${item.businessFormCode}`,{id:item.id})"
                              >导出入库单</el-button
                              >
                            </template>
@@ -123,7 +123,7 @@
import edit from './edit';
import detail from './detail';
import {getBaseUrl} from '@/utils/base';
import listPage from '../../../mixins/listPage';
import listPage from '@/views/mixins/listPage';

export default {
  name: 'index',
@@ -202,13 +202,13 @@
        },
        {
          type: 'date-picker',
          dataIndex: 'incomeTimeStart',
          dataIndex: 'startTime',
          label: '入库时间',
          defaultValue: '',
        },
        {
          type: 'date-picker',
          dataIndex: 'incomeTimeEnd',
          dataIndex: 'endTime',
          label: '至',
          defaultValue: '',
        },
@@ -297,16 +297,6 @@
          })
          .catch(() => {});
      });
    },
    fifterForm(params) {
      this.filterFrom = Object.assign(this.filterFrom, params);
      if (this.filterFrom.incomeTimeStart) {
        this.filterFrom.incomeTimeStart = this.filterFrom.incomeTimeStart.replace(/\-/g, '');
      }
      if (this.filterFrom.incomeTimeEnd) {
        this.filterFrom.incomeTimeEnd = this.filterFrom.incomeTimeEnd.replace(/\-/g, '');
      }
      this.search(1);
    },
  },
};

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

@@ -12,8 +12,9 @@
            <div class="table-tool-bar" style="margin-bottom: 15px">
              <my-button name="新增" @click="handleAdd" site="tools" size="medium" />
            </div>
            <div v-loading="loading">
            <div :style="{ 'overflow-y': 'auto', height: 'calc(100vh - 352px)' }">
              <el-row class="card" :gutter="5" v-loading="loading">
                <el-row v-if="list.length" class="card" :gutter="5">
                <el-col v-for="(item, index) in list" :key="index" class="cm-item">
                  <el-card class="card-data">
                    <div class="card-container">
@@ -24,11 +25,14 @@

                        </div>
                        <div class="card-header-right">
                          <el-button site="form" type="success" size="mini" @click="handleExport(item)"
                            >导出报废单</el-button
                            <el-button site="form" type="success" size="mini"
                                       @click="handleExport('scrappedExport',`报废单-${item.businessFormCode}`, {id:item.id})"
                            >导出报废单
                            </el-button
                          >
                          <el-button name="查看详情" site="form" type="info" size="mini" @click="handleDetail(item)"
                            >查看详情</el-button
                            >查看详情
                            </el-button
                          >
                        </div>
                      </div>
@@ -55,7 +59,11 @@
                  </el-card>
                </el-col>
              </el-row>

                <el-empty v-else description="暂无数据"></el-empty>
            </div>
            </div>

            <el-pagination
              :small="false"
              :current-page="pageNum"
@@ -94,14 +102,15 @@
import edit from './edit';
import detail from './detail';
import * as DateFormatter from '@/utils/DateFormatter';
import listPage from '@/views/mixins/listPage';

export default {
  name: 'index',
  mixins: [listPage],
  components: { MyButton, edit, detail },
  data() {
    return {
      loading: false,
      adddialog: false,
      list: [],
      // 搜索框
      items: [
@@ -198,65 +207,6 @@
        this.total = res.totalRows;
        this.loading = false;
      });
    },

    //导入
    importOrg() {
      this.importSetting.dialogShow = true;
      this.importSetting.onSuccess = (response, callBack) => {
        if (response.code === 1) {
          this.$message.success(response.msg);
          this.search(1);
        } else {
          this.$message.warning(response.msg);
        }
        callBack();
      };
    },
    // 导出
    handleExport() {},
    // 新增
    handleAdd() {
      this.editSetting.id = null;
      this.editSetting.info = null;
      this.editSetting.title = '新增';
      this.editSetting.show = true;
    },
    // 详情
    handleDetail(row) {
      this.detailSetting.id = row.id;
      this.detailSetting.show = true;
    },
    // 分页
    handleSizeChange(pageSize) {
      this.pageSize = pageSize;
      this.search(1);
    },
    handleCurrentChange(pageNum) {
      this.pageNum = pageNum;
      this.search(pageNum);
    },
    // 查询table列表
    search(pageNum) {
      if (pageNum) {
        this.pageNum = pageNum;
      }
      this.fetchData();
    },
    refreshData() {
      this.pageNum = 1;
      this.pageSize = 10;
      this.search();
    },
    fifterForm(params) {
      this.filterFrom = Object.assign(this.filterFrom, params);
      if (this.filterFrom.incomeTimeStart) {
        this.filterFrom.incomeTimeStart = this.filterFrom.incomeTimeStart.replace(/\-/g, '');
      }
      if (this.filterFrom.incomeTimeEnd) {
        this.filterFrom.incomeTimeEnd = this.filterFrom.incomeTimeEnd.replace(/\-/g, '');
      }
      this.search(1);
    },
  },
};

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

@@ -48,7 +48,7 @@
                            site="form"
                            type="primary"
                            size="mini"
                            @click="handleExport(item)"
                            @click="handleExport('transferExport',`调拨入库单-${item.businessFormCode}`,{id:item.id,type: 1})"
                            >导出调拨入库单</el-button
                          >
                          <el-button name="查看详情" site="form" type="info" size="mini" @click="handleDetail(item)"
@@ -121,13 +121,13 @@
</template>

<script>
import {transfeIncome, transferExport, transferList, transferUpdStatus} from '@/api/stock/transfer';
import {transfeIncome, transferList, transferUpdStatus} from '@/api/stock/transfer';
import MyButton from '@/components/myButton/myButton';
import myImport from '@/views/components/myImport';
import edit from './edit';
import detail from './detail';
import listPage from '../../../mixins/listPage';
import transfer from '../../../mixins/transfer';
import listPage from '@/views/mixins/listPage';
import transfer from '@/views/mixins/transfer';
import SettingIplatform from '@/utils/settingIplatform';

export default {
@@ -137,7 +137,6 @@
  data() {
    return {
      loading: false,
      adddialog: false,
      list: [],
      // 搜索框
      items: [
@@ -220,7 +219,6 @@
        this.list = res.datas;
        this.total = res.totalRows;
        this.loading = false;
        console.log(this.list);
      });
    },

@@ -248,11 +246,6 @@
      });
    },

    // 导出
    handleExport(row) {
      transferExport({ id: row.id }).then((res) => {});
    },

    // 撤销
    handleRevoke(row) {
      this.$confirm(`您确定撤销单号为"${row.businessFormCode}"  的数据吗?`, '撤销').then(() => {
@@ -261,22 +254,6 @@
          this.search(1);
        });
      });
    },
    fifterForm(params) {
      this.filterFrom = Object.assign(this.filterFrom, params);
      if (this.filterFrom.createTimeStart) {
        this.filterFrom.createTimeStart = this.filterFrom.createTimeStart.replace(/\-/g, '');
      }
      if (this.filterFrom.createTimeEnd) {
        this.filterFrom.createTimeEnd = this.filterFrom.createTimeEnd.replace(/\-/g, '');
      }
      if (this.filterFrom.startTime) {
        this.filterFrom.startTime = this.filterFrom.startTime.replace(/\-/g, '');
      }
      if (this.filterFrom.endTime) {
        this.filterFrom.endTime = this.filterFrom.endTime.replace(/\-/g, '');
      }
      this.search(1);
    },
  },
};

 admin-web/src/views/stock/transfer/transferissue/index.vue

@@ -24,22 +24,25 @@
                          <div v-if="item.states == 4" class="states states-info">已撤销</div>
                        </div>
                        <div class="card-header-right">
                          <el-button v-if="item.states == 1" site="form" type="success" size="mini"
                          <!--  <el-button v-if="item.states == 1" site="form" type="success" size="mini"
                            >导出调拨出库单</el-button
                          >
                              >-->
                          <el-button
                            v-if="item.states == 0"
                            site="form"
                            type="success"
                            size="mini"
                            @click="handleOutput(item)"
                            >出库</el-button
                          >出库
                          </el-button
                          >
                          <el-button v-if="item.states == 2" site="form" type="primary" size="mini"
                            >导出调拨入库单</el-button
                          >
                                     @click="handleExport('transferExport',`调拨出库单-${item.businessFormCode}`,{id:item.id,type: 2})">
                            导出调拨出库单
                          </el-button>
                          <el-button name="查看详情" site="form" type="info" size="mini" @click="handleDetail(item)"
                            >查看详情</el-button
                          >查看详情
                          </el-button
                          >
                        </div>
                      </div>
@@ -106,8 +109,8 @@
import MyButton from '@/components/myButton/myButton';
import myImport from '@/views/components/myImport';
import detail from './detail';
import listPage from '../../../mixins/listPage';
import transfer from '../../../mixins/transfer';
import listPage from '@/views/mixins/listPage';
import transfer from '@/views/mixins/transfer';
import {commonsApi} from '@/api/commonsApi';
import SettingIplatform from '@/utils/settingIplatform';

@@ -118,7 +121,6 @@
  data() {
    return {
      loading: false,
      adddialog: false,
      list: [],
      // 搜索框
      items: [
@@ -211,7 +213,6 @@
        this.list = res.datas;
        this.total = res.totalRows;
        this.loading = false;
        console.log(this.list);
      });
    },
    handleOutput(row) {
@@ -235,22 +236,6 @@
          }
        },
      });
    },
    fifterForm(params) {
      this.filterFrom = Object.assign(this.filterFrom, params);
      if (this.filterFrom.createTimeStart) {
        this.filterFrom.createTimeStart = this.filterFrom.createTimeStart.replace(/\-/g, '');
      }
      if (this.filterFrom.createTimeEnd) {
        this.filterFrom.createTimeEnd = this.filterFrom.createTimeEnd.replace(/\-/g, '');
      }
      if (this.filterFrom.startTime) {
        this.filterFrom.startTime = this.filterFrom.startTime.replace(/\-/g, '');
      }
      if (this.filterFrom.endTime) {
        this.filterFrom.endTime = this.filterFrom.endTime.replace(/\-/g, '');
      }
      this.search(1);
    },
  },
};