java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

fix_bug_pro20231227
pref_mail@163.com 1 year ago
parent
47eb6ae2e4 2167c53012
commit
82772e19a5
8 changed files with 238 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/option/distribution/distributionStockup.js
  2. 2
      src/views/basicdata/warehouse/tray/basicdataTray.vue
  3. 47
      src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
  4. 46
      src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue
  5. 7
      src/views/distribution/inventory/distributionStockArticleDetails.vue
  6. 81
      src/views/distribution/stockup/distributionStockupDetailsSelf.vue
  7. 2
      src/views/distribution/stockup/distributionStockupSelf.vue
  8. 67
      src/views/warehouse/warehouseStock/warehouseStock.vue

4
src/option/distribution/distributionStockup.js
Unescape View File

@ -724,6 +724,10 @@ export default {
label: "备货区",
prop: "stockupArea",
},
{
label: "操作",
prop: "stockupArea",
},
],
columnBasic: [ //基本信息
{

2
src/views/basicdata/warehouse/tray/basicdataTray.vue
Unescape View File

@ -292,7 +292,7 @@
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
}) .then(() => {
console.log("this.selectionList>>>>>>>>>>>>>>>>>>",this.selectionList);
const newList = this.selectionList.map(item => item.palletCode);
return vacants(newList);

47
src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
Unescape View File

@ -279,6 +279,18 @@ export default {
border: true,
selection: true,
column: [
{
label: "服务号",
prop: "serviceNumber",
search: true,
width:"100px"
},
{
label: "运单号",
prop: "waybillNumber",
search: true,
width:"100px"
},
{
label: "包条码",
prop: "orderPackageCode",
@ -328,11 +340,42 @@ export default {
width:"100px"
},
{
label: "运单号",
prop: "waybillNumber",
label: "包件状态",
prop: "orderPackageStatusName",
search: true,
width:"100px"
},
{
label: "包件冻结状态",
prop: "orderPackageFreezeStatusName",
search: true,
width:"100px"
},
{
label: "包件上架状态",
prop: "orderPackageGroundingStatusName",
search: true,
width:"100px"
},
{
label: "包件备货状态",
prop: "orderPackageStockupStatusName",
search: true,
width:"100px"
},
{
label: "包件预约状态",
prop: "orderPackageReservationStatusName",
search: true,
width:"100px"
},
{
label: "包件装车状态",
prop: "orderPackageLoadingStatusName",
search: true,
width:"100px"
},
// {
// label: "托盘码",
// prop: "pallet",

46
src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue
Unescape View File

@ -299,6 +299,18 @@ export default {
border: true,
selection: true,
column: [
{
label: "服务号",
prop: "serviceNumber",
search: true,
width:"100px"
},
{
label: "运单号",
prop: "waybillNumber",
search: true,
width:"100px"
},
{
label: "包条码",
prop: "orderPackageCode",
@ -348,8 +360,38 @@ export default {
width:"100px"
},
{
label: "运单号",
prop: "waybillNumber",
label: "包件状态",
prop: "orderPackageStatusName",
search: true,
width:"100px"
},
{
label: "包件冻结状态",
prop: "orderPackageFreezeStatusName",
search: true,
width:"100px"
},
{
label: "包件上架状态",
prop: "orderPackageGroundingStatusName",
search: true,
width:"100px"
},
{
label: "包件备货状态",
prop: "orderPackageStockupStatusName",
search: true,
width:"100px"
},
{
label: "包件预约状态",
prop: "orderPackageReservationStatusName",
search: true,
width:"100px"
},
{
label: "包件装车状态",
prop: "orderPackageLoadingStatusName",
search: true,
width:"100px"
},

7
src/views/distribution/inventory/distributionStockArticleDetails.vue
Unescape View File

@ -1370,11 +1370,14 @@ export default {
},
onLoad(page, params = {}) {
this.loading = true;
console.log("执行了查询零零零零");
this.query.ids = this.$route.query.id;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
getDetail(this.$route.query.id).then(res => {
console.log("返回的数据》》》》",res.data.data);
const data = res.data.data;
// this.page.total = data.total;
this.data = data.records;
this.data[0]= data;
this.loading = false;
this.selectionClear();
});

81
src/views/distribution/stockup/distributionStockupDetailsSelf.vue
Unescape View File

@ -225,6 +225,7 @@
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{ row }">
<el-button type="primary" text icon="el-icon-view" v-if=" row.stockupStatusName== '待备货' " @click="handleStockUp(row,'2')">备货</el-button>
<el-button type="primary" text icon="el-icon-view" @click="handleQRCode(row)">查看包条码</el-button>
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
@ -248,6 +249,7 @@
</div>
</el-tab-pane>
<el-tab-pane label="库存品" name="enter">
<el-button type="primary" text icon="el-icon-view" >批量打印</el-button>
<el-table
ref="table"
v-loading="loading"
@ -278,6 +280,14 @@
</el-table-column>
</template>
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{ row }">
<el-button type="primary" text icon="el-icon-view" v-if=" row.stockupStatusName== '已备货' " >明细</el-button>
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
</template>
</el-table-column>
</el-table>
<div class="avue-crud__pagination" style="width: 100%">
<!-- 分页模块 -->
@ -312,6 +322,25 @@
</el-pagination>
</div>
</el-row>-->
<el-dialog title="二维码" :visible.sync="dialogVisible" width="780px" v-model="dialogVisible">
<div>
<div v-html="html"></div>
<!-- <div v-for="(item,index) in qrCodeObj">
<el-row>
<el-col :span="24" >
<el-image width="10" height="10" w-full :key="index" :src="item " alt="Preview Image"/>
</el-col>
</el-row>
</div> -->
</div>
<span slot="footer" class="dialog-footer">
<!-- <el-button type="primary" @click="ddd">导 出</el-button>-->
<el-button type="primary" @click="printTemplate">打 印</el-button>
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</span>
</el-dialog>
<el-dialog v-model="dialogHand" title="系统备货">
<el-form :model="form">
<el-form-item label="备货区域" :label-width="formLabelWidth" >
@ -381,10 +410,14 @@ import { getDictionaryBiz } from '@/api/system/dict';
import { getParcelListOwn, getParcelListOwnSelf } from '@/api/distribution/distributionParcelList';
import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
import { getStockDetail } from '@/api/distribution/distributionStock';
import { getStockTemplate, showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
import { getLodop } from '@/utils/LodopFuncs';
export default {
data() {
return {
html: null, // 页面包条码内容
dialogVisible: false, //二维码控制
height: 0,
activeName: 'reservation',
// 弹框标题
@ -489,6 +522,54 @@ export default {
},
},
methods: {
//打印
printTemplate() {
let LODOP = getLodop();
console.log("LODOP>>>>>",LODOP);
// console.log("this.ids>>>>>",this.selectionList);
// if (this.selectionList.length === 0){
// this.$message.warning("请选择至少一条数据");
// return;
// }
getStockTemplate({ id: this.materialQRCode.id }).then(res => {
console.log('返回的数据', res.data.data);
let templateData = res.data.data;
// let templateData = "res.data.data";
// console.log(templateData);
LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能');
LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
LODOP.SET_PRINT_STYLEA(0,"TextNeatRow",true);//允许标点溢出，且英文单词拆开
// // 设置打印整宽且不变形
LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width');
// // 设置打印后自动关闭
LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
// // data就是一段html文本
LODOP.ADD_PRINT_HTM('0%', '0%', '100%', '100%', templateData);
// LODOP.PREVIEW(); //预览(预览打印无脚标)
LODOP.PRINT(); //直接打印
});
},
//查看包条码
handleQRCode(row) {
// this.title = '查看'
// this.view = true;
// this.box = true;
this.materialQRCode = row;
let qr = {
ids: row.id,
};
showOrderPackgeCode(qr).then(res => {
// this.orderPackageCode = res.data
console.log(res.data);
this.html=''
this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
});
this.dialogVisible = true;
},
//选择
getForklift(row,ty){
switch (ty){

2
src/views/distribution/stockup/distributionStockupSelf.vue
Unescape View File

@ -65,7 +65,7 @@
>
<template #default="slotProps">
<el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-text>
<el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑</el-text>
<el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)" v-if="slotProps.scope.row.stockupStatus != '40'">编辑</el-text>
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">取消</el-button>-->
<!-- <el-text type="primary" text icon="el-icon-edit" @click="handleEditPrint(slotProps.scope)">打印</el-text>-->
</template>

67
src/views/warehouse/warehouseStock/warehouseStock.vue
Unescape View File

@ -79,6 +79,26 @@ export default {
sortable: false,
head: false,
},
{
prop: 'serviceNumber',
label: '服务号',
type: 2,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'waybillNumber',
label: '运单号',
type: 2,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'orderCode',
label: '订单自编码',
@ -170,18 +190,44 @@ export default {
sortable: true,
},
{
prop: 'warehouseEntryTimeEnd',
label: '入库时间',
type: 2,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
label: "包件状态",
prop: "orderPackageStatusName",
search: true,
width:"100px"
},
{
prop: 'waybillNumber',
label: '运单号',
label: "包件冻结状态",
prop: "orderPackageFreezeStatusName",
search: true,
width:"100px"
},
{
label: "包件上架状态",
prop: "orderPackageGroundingStatusName",
search: true,
width:"100px"
},
{
label: "包件备货状态",
prop: "orderPackageStockupStatusName",
search: true,
width:"100px"
},
{
label: "包件预约状态",
prop: "orderPackageReservationStatusName",
search: true,
width:"100px"
},
{
label: "包件装车状态",
prop: "orderPackageLoadingStatusName",
search: true,
width:"100px"
},
{
prop: 'warehouseEntryTimeEnd',
label: '入库时间',
type: 2,
values: '',
width: '180',
@ -189,6 +235,7 @@ export default {
fixed: false,
sortable: true,
},
{
prop: 'operatorName',
label: '操作员',

Write Preview
Loading…
Cancel
Save