diff --git a/src/api/distribution/distributionStockList.js b/src/api/distribution/distributionStockList.js
index bc4dfe24..5515d3ed 100644
--- a/src/api/distribution/distributionStockList.js
+++ b/src/api/distribution/distributionStockList.js
@@ -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
diff --git a/src/config/website.js b/src/config/website.js
index 5ce28c18..5f613e00 100644
--- a/src/config/website.js
+++ b/src/config/website.js
@@ -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服务的登录界面地址)
diff --git a/src/views/basicdata/vehicle/basicdataVehicle.vue b/src/views/basicdata/vehicle/basicdataVehicle.vue
index 21109e01..91197f44 100644
--- a/src/views/basicdata/vehicle/basicdataVehicle.vue
+++ b/src/views/basicdata/vehicle/basicdataVehicle.vue
@@ -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();
});
diff --git a/src/views/basicdata/vehicle/basicdataVehicleform.vue b/src/views/basicdata/vehicle/basicdataVehicleform.vue
index 25005c6d..22663579 100644
--- a/src/views/basicdata/vehicle/basicdataVehicleform.vue
+++ b/src/views/basicdata/vehicle/basicdataVehicleform.vue
@@ -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' }],
diff --git a/src/views/distribution/inventory/distributionStockListDetails.vue b/src/views/distribution/inventory/distributionStockListDetails.vue
index 4a94a9f5..c5da0c62 100644
--- a/src/views/distribution/inventory/distributionStockListDetails.vue
+++ b/src/views/distribution/inventory/distributionStockListDetails.vue
@@ -142,7 +142,9 @@
@selectCheck="selectsc"
@selection="selectionChange"
>
-
+
+ 查看二维码
+
-->
+
+
+
+
+
+