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
qb 1 year ago
parent
63306f944c 5a6345cfb8
commit
0f8affb2a6
8 changed files with 1287 additions and 1454 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. 18
      src/api/distribution/distributionStockList.js
  2. 2
      src/config/website.js
  3. 169
      src/views/basicdata/vehicle/basicdataVehicle.vue
  4. 10
      src/views/basicdata/vehicle/basicdataVehicleform.vue
  5. 114
      src/views/distribution/inventory/distributionStockListDetails.vue
  6. 18
      src/views/distribution/reservation/reservationAddFrom.vue
  7. 6
      vite.config.js
  8. 2404
      yarn.lock

18
src/api/distribution/distributionStockList.js
Unescape View File

@ -37,7 +37,7 @@ export const getStockListOwn = (current, size, params) => {
}
/**
* 查看库存品包件库存品码
* 查看预约详细的包件码
* @param params
* @returns {AxiosPromise}
*/
@ -52,6 +52,22 @@ export const showInventoryPackgeCode = (reservationId,stockListId) => {
})
}
/**
* 查看库存品包件二维码
* @param params
* @returns {AxiosPromise}
*/
export const showInventorySourcePackageCode = (incomingBatch,packageIds) => {
return request({
url: '/api/logpm-distribution/distributionStockList/showInventorySourcePackageCode',
method: 'get',
params: {
incomingBatch,
packageIds
}
})
}
/**
* 商场的库存品列表
* @param {*} current

2
src/config/website.js
Unescape View File

@ -52,7 +52,7 @@ export default {
// 第三方系统授权地址
authUrl: 'http://localhost/blade-auth/oauth/render',
// 报表设计器地址(cloud端口为8108,boot端口为80)
reportUrl: 'http://8.137.14.82:8108/ureport',
reportUrl: 'http://localhost:8108/ureport',
// 单点登录系统认证(blade-auth服务的地)
ssoUrl: 'http://localhost:8100/oauth/authorize?client_id=saber&response_type=code&redirect_uri=',
// 单点登录回调地址(Saber服务的登录界面地址)

169
src/views/basicdata/vehicle/basicdataVehicle.vue
Unescape View File

@ -77,174 +77,6 @@ import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
import BasicdataVehicleform from '/src/views/basicdata/vehicle/basicdataVehicleform.vue';
// export default {
// components: { BasicdataVehicleform },
// data() {
// return {
// form: {},
// query: {},
// search: {},
// loading: true,
// vehicleformdata: {},
// dicDatas: [],
// edit: true, //修改
// page: {
// pageSize: 30,
// currentPage: 1,
// total: 0
// },
// selectionList: [],
// option: {
// height: 'auto',
// calcHeight: 30,
// tip: false,
// searchShow: false,
// searchMenuSpan: 6,
// border: true,
// index: true,
// viewBtn: false,
// editBtn: false,
// selection: true,
// dialogClickModal: false,
// column: [
// {
// label: '主键',
// prop: 'id',
// type: 'input',
// addDisplay: false,
// editDisplay: false,
// viewDisplay: false,
// hide: true
// },
// {
// label: '租户号',
// prop: 'tenantId',
// type: 'input',
// addDisplay: false,
// editDisplay: false,
// viewDisplay: false,
// hide: true
// },
// {
// label: '创建人',
// prop: 'createUser',
// type: 'input',
// addDisplay: false,
// editDisplay: false,
// viewDisplay: false,
// hide: true
// },
// {
// label: '创建时间',
// prop: 'createTime',
// type: 'input',
// addDisplay: false,
// editDisplay: false,
// viewDisplay: false,
// hide: true
// },
// {
// label: '更新人',
// prop: 'updateUser',
// type: 'input',
// addDisplay: false,
// editDisplay: false,
// viewDisplay: false,
// hide: true
// },
// {
// label: '更新时间',
// prop: 'updateTime',
// type: 'input',
// addDisplay: false,
// editDisplay: false,
// viewDisplay: false,
// hide: true
// },
// {
// label: '状态',
// prop: 'status',
// type: 'input',
// addDisplay: false,
// editDisplay: false,
// viewDisplay: false,
// hide: true
// },
// {
// label: '是否已删除;1-未删除，2-已删除',
// prop: 'isDeleted',
// type: 'input',
// addDisplay: false,
// editDisplay: false,
// viewDisplay: false,
// hide: true
// },
// {
// label: '创建部门',
// prop: 'createDept',
// type: 'input',
// addDisplay: false,
// editDisplay: false,
// viewDisplay: false,
// hide: true
// },
// {
// label: '车牌号',
// prop: 'vehicleNub',
// type: 'input',
// search: true,
// labelWidth: '150',
// width: '100px',
// align: 'center',
// span: 11
// },
// {
// label: '承运商名称',
// labelWidth: '150',
// // width: 'fit-content',
// width: '100px',
// align: 'center',
// span: 11,
// prop: 'carrierName',
// type: 'input',
// editDisplay: false,
// addDisplay: false
// },
// {
// label: '绑定驾驶人',
// prop: 'vehicleOwners',
// type: 'select',
// labelWidth: '150',
// width: '200px',
// align: 'center',
// span: 11,
// multiple: true,
// dicData: []
// // dicUrl: '/api/logpm-basicdata/vehicle/dictionary',
// // props: {
// // label: 'vehicleNub',
// // value: 'id',
// // },
// // addDisplay: false,
// // editDisplay: false,
// // viewDisplay: false,
// // hide: true,
// },
// {
// label: '车辆来源',
// prop: 'vehicleSource',
// type: 'select',
// search: true,
// labelWidth: '150',
// width: '100px',
// align: 'center',
// span: 11,
// dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_vehicle_source',
// props: {
// label: 'dictValue',
// value: 'dictKey'
// }
// }
export default {
components: { BasicdataVehicleform },
data() {
@ -1262,6 +1094,7 @@ export default {
this.dicDatas = [];
//查询绑定人
this.getOwns();
this.getOwns();
this.loading = false;
this.selectionClear();
});

10
src/views/basicdata/vehicle/basicdataVehicleform.vue
Unescape View File

@ -406,7 +406,7 @@ export default {
span: 6,
},
{
label: '车辆总质量(T)',
label: '车辆总质量(kg)',
prop: 'vehicleQuality',
type: 'input',
labelWidth: '150',
@ -415,7 +415,7 @@ export default {
span: 6,
},
{
label: '整备质量(T)',
label: '整备质量(kg)',
prop: 'curbWeight',
type: 'input',
labelWidth: '150',
@ -424,7 +424,7 @@ export default {
span: 6,
},
{
label: '载荷质量(T)',
label: '载荷质量(kg)',
prop: 'loadMass',
type: 'input',
labelWidth: '150',
@ -433,7 +433,7 @@ export default {
span: 6,
},
{
label: '外廓宽(M)',
label: '外廓宽(mm)',
prop: 'outerWidth',
type: 'input',
labelWidth: '150',
@ -516,7 +516,7 @@ export default {
filterable: true,
dicUrl: '/api/logpm-basicdata/carrier/dictionary',
props: {
label: 'number',
label: 'carrierName',
value: 'id',
},
rules: [{ required: true, message: '请选择承运商!', trigger: 'blur' }],

114
src/views/distribution/inventory/distributionStockListDetails.vue
Unescape View File

@ -142,7 +142,9 @@
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps"> </template>
<template #default="slotProps">
<el-text v-if="slotProps.scope.row.sourceType === '1'" size="small" @click="handleInventoryQRCode(slotProps.scope)">查看二维码</el-text>
</template>
</tablecmt>
<div class="avue-crud__pagination" style="width: 100%">
<!-- 分页模块 -->
@ -213,20 +215,37 @@
</div>
</el-row>-->
</div>
<el-dialog
title="二维码"
:visible.sync="dialogVisibleF"
width="780px"
v-model="dialogVisibleF"
>
<div>
<div v-html="html"></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 @click="dialogVisibleF = false">取 消</el-button>
</span>
</el-dialog>
</basic-container>
</template>
<script>
import {
getList,
getDetail,
add,
update,
remove,
getListAllocation,
stockExport,
stockInfoExport,
} from '@/api/distribution/distributionStockList';
import {
getList,
getDetail,
add,
update,
remove,
getListAllocation,
stockExport,
stockInfoExport, showInventoryPackgeCode, showInventorySourcePackageCode
} from '@/api/distribution/distributionStockList';
import option from '@/option/distribution/distributionStockList';
import { mapGetters } from 'vuex';
import { getListStock } from '@/api/distribution/distributionStock';
@ -236,6 +255,8 @@ import { downloadXls } from '@/utils/util';
export default {
data() {
return {
dialogVisibleF:false,
html:'',
columnListarrs: {
//入库明细
columnWarehousing: [
@ -249,7 +270,7 @@ export default {
// fixed: true,
// },
{
prop: 'warehousingTime',
prop: 'createTime',
label: '入库时间',
type: 2,
values: '',
@ -259,6 +280,28 @@ export default {
sortable: true,
head: false,
},
{
prop: 'despatch',
label: '运单号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'serviceNumber',
label: '服务号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'orderCode',
label: '订单自编号',
@ -271,8 +314,8 @@ export default {
head: false,
},
{
prop: 'brandName',
label: '品牌',
prop: 'packageCode',
label: '包条码',
type: 2,
values: '',
width: '150',
@ -282,8 +325,8 @@ export default {
head: false,
},
{
prop: 'despatch',
label: '运单号',
prop: 'brandName',
label: '品牌',
type: 2,
values: '',
width: '150',
@ -292,6 +335,17 @@ export default {
sortable: true,
head: false,
},
// {
// prop: 'despatch',
// label: '运单号',
// type: 2,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'licensePlate',
label: '车牌',
@ -314,6 +368,16 @@ export default {
sortable: true,
head: false,
},
{
prop: '',
label: '操作',
type: 6,
values: '',
width: '230',
checkarr: [],
fixed: 'right',
hide: true,
},
],
//库存品
column: [
@ -571,6 +635,24 @@ export default {
},
},
methods: {
//查看二维码
handleInventoryQRCode(scope){
const { row } = scope;
console.log('执行查看二维码------------>row:',row);
this.materialQRCode = row;
console.log('---------------->',row);
let qr = {
ids: row.id,
};
this.html = '';
showInventorySourcePackageCode(row.incomingBatch,row.parcelListId).then(res => {
// this.orderPackageCode = res.data
console.log(res.data);
this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
this.dialogVisibleF = true;
},
//导出
handleExport() {
let row = {};

18
src/views/distribution/reservation/reservationAddFrom.vue
Unescape View File

@ -2762,22 +2762,24 @@ export default {
console.log('orderList-------------》', this.orderList);
if (this.orderList.length === 0) return this.$message.warning('最少选择一条数据!!!');
const list = [...this.orderList, ...this.orderData];
let _name = list[0].customerName;
let _address = list[0].customerAddress;
let _phone = list[0].customerTelephone;
let _marketName = list[0].mallName;
let _name = list[0].customerName.trim();
let _address = list[0].customerAddress.trim();
let _phone = list[0].customerTelephone.trim();
let _marketName = list[0].mallName.trim();
// 循环查看数据是否符合要求
const isRturn = list.every(item => {
if (item.mallName !== _marketName) {
if (item.mallName.trim() !== _marketName) {
this.$message.warning('请选择统一商场!!!');
return false;
}
if (
item.customerName !== _name ||
item.customerAddress !== _address ||
item.customerTelephone !== _phone
(item.customerName.trim() !== _name) ||
(item.customerAddress.trim() !== _address) ||
(item.customerTelephone.trim() !== _phone)
) {
console.log("123");
this.$message.warning('请选择统一顾客订单!!!');
return false;
}

6
vite.config.js
Unescape View File

@ -26,11 +26,9 @@ export default ({ mode, command }) => {
// target: 'http://192.168.6.141:8777',
target: 'http://192.168.6.116:8777',
// tjj
// target: 'http://192.168.10.25:13000',
// cg
// target: 'http://192.168.10.200:13000',
// sst
// target: 'http://192.168.10.94:8888',
// target: 'http://test.api.huitongys.com',
// target: 'http://192.168.10.29:13000',
// target: 'http://h5uapi.huitongys.com',
changeOrigin: true,
rewrite: path => path.replace(/^\/api/, ''),

2404
yarn.lock
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save