From 90c4fbd121dd18013e333346c99bbc9844cd6fec Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期一, 08 十二月 2025 13:24:16 +0800
Subject: [PATCH] 提交
---
ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue | 53 +++++++++++++----
ui/admin-ui3/src/assets/styles/element-ui.scss | 3 +
tms/src/main/java/com/ruoyi/tms/domain/TmsContainer.java | 6 +
tms/src/main/resources/mapper/tms/TmsContainerMapper.xml | 17 ++++-
ui/admin-ui3/src/main.ts | 1
tms/src/main/resources/mapper/tms/TmsShelfMapper.xml | 12 +++-
ui/admin-ui3/package.json | 2
ui/admin-ui3/src/views/tms/tmsContainer/index.vue | 21 +++++++
ui/admin-ui3/src/views/tms/tmsShelf/index.vue | 22 +++++++
ui/admin-ui3/.env.development | 2
tms/src/main/java/com/ruoyi/tms/domain/TmsShelf.java | 5 +
11 files changed, 123 insertions(+), 21 deletions(-)
diff --git a/tms/src/main/java/com/ruoyi/tms/domain/TmsContainer.java b/tms/src/main/java/com/ruoyi/tms/domain/TmsContainer.java
index 15a6a55..da5efdf 100644
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsContainer.java
+++ b/tms/src/main/java/com/ruoyi/tms/domain/TmsContainer.java
@@ -38,7 +38,11 @@
@Excel(name = "绯荤粺缂栧彿")
@TableField("system_code")
private String systemCode;
-
+ /**
+ * 鑷惀绫诲瀷
+ */
+ @TableField("self_leas_type")
+ private Integer selfLeasType;
/**
* 闆嗚绠卞彿
diff --git a/tms/src/main/java/com/ruoyi/tms/domain/TmsShelf.java b/tms/src/main/java/com/ruoyi/tms/domain/TmsShelf.java
index 4afc9a0..5c97db4 100644
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsShelf.java
+++ b/tms/src/main/java/com/ruoyi/tms/domain/TmsShelf.java
@@ -47,6 +47,11 @@
@TableField("shelf_code")
private String shelfCode;
+ /**
+ * 鑷惀绫诲瀷
+ */
+ @TableField("self_leas_type")
+ private Integer selfLeasType;
/**
* 鎵樻灦绫诲瀷
diff --git a/tms/src/main/resources/mapper/tms/TmsContainerMapper.xml b/tms/src/main/resources/mapper/tms/TmsContainerMapper.xml
index 107d03b..259e140 100644
--- a/tms/src/main/resources/mapper/tms/TmsContainerMapper.xml
+++ b/tms/src/main/resources/mapper/tms/TmsContainerMapper.xml
@@ -30,10 +30,12 @@
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
+ <result property="selfLeasType" column="self_leas_type" />
+
</resultMap>
<sql id="selectTmsContainerVo">
- select thisTab.id, thisTab.system_code, thisTab.container_code, thisTab.container_use_type, thisTab.container_size, thisTab.owner_team_id, thisTab.owner_team_name, thisTab.manufacturer, thisTab.manufacture_date, thisTab.length_mm, thisTab.width_mm, thisTab.height_mm, thisTab.max_total_weight_kg, thisTab.max_load_kg, thisTab.volume_m3, thisTab.is_in_use, thisTab.maintenance_status, thisTab.last_maintenance_date, thisTab.next_maintenance_date, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark from tms_container AS thisTab
+ select thisTab.id, thisTab.system_code, thisTab.container_code, thisTab.container_use_type, thisTab.container_size, thisTab.owner_team_id, thisTab.owner_team_name, thisTab.manufacturer, thisTab.manufacture_date, thisTab.length_mm, thisTab.width_mm, thisTab.height_mm, thisTab.max_total_weight_kg, thisTab.max_load_kg, thisTab.volume_m3, thisTab.is_in_use, thisTab.maintenance_status, thisTab.last_maintenance_date, thisTab.next_maintenance_date, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark ,thisTab.self_leas_type from tms_container AS thisTab
</sql>
<sql id="selectTmsContainerVoCount">
select count(0) from tms_container as thisTab
@@ -49,6 +51,8 @@
<if test="isInUse != null "> and thisTab.is_in_use = #{isInUse}</if>
<if test="maintenanceStatus != null "> and thisTab.maintenance_status = #{maintenanceStatus}</if>
<if test="status != null "> and thisTab.status = #{status}</if>
+ <if test="selfLeasType != null "> and thisTab.self_leas_type = #{selfLeasType}</if>
+
</sql>
<!--鏌ヨ-->
@@ -100,6 +104,8 @@
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
+ <if test="selfLeasType != null">self_leas_type,</if>
+
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="systemCode != null and systemCode != ''">#{systemCode},</if>
@@ -126,17 +132,19 @@
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
+ <if test="selfLeasType != null">#{selfLeasType},</if>
+
</trim>
</insert>
<insert id="insertTmsContainerBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
insert into tms_container
<trim prefix="(" suffix=") values" suffixOverrides=",">
- id,system_code,container_code,container_use_type,container_size,owner_team_id,owner_team_name,manufacturer,manufacture_date,length_mm,width_mm,height_mm,max_total_weight_kg,max_load_kg,volume_m3,is_in_use,maintenance_status,last_maintenance_date,next_maintenance_date,status,create_by,create_time,update_by,update_time,remark,
+ id,system_code,container_code,container_use_type,container_size,owner_team_id,owner_team_name,manufacturer,manufacture_date,length_mm,width_mm,height_mm,max_total_weight_kg,max_load_kg,volume_m3,is_in_use,maintenance_status,last_maintenance_date,next_maintenance_date,status,create_by,create_time,update_by,update_time,remark,self_leas_type,
</trim>
<foreach item="item" index="index" collection="list" separator=",">
<trim prefix="(" suffix=") " suffixOverrides=",">
- #{item.id},#{item.systemCode},#{item.containerCode},#{item.containerUseType},#{item.containerSize},#{item.ownerTeamId},#{item.ownerTeamName},#{item.manufacturer},#{item.manufactureDate},#{item.lengthMm},#{item.widthMm},#{item.heightMm},#{item.maxTotalWeightKg},#{item.maxLoadKg},#{item.volumeM3},#{item.isInUse},#{item.maintenanceStatus},#{item.lastMaintenanceDate},#{item.nextMaintenanceDate},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},
+ #{item.id},#{item.systemCode},#{item.containerCode},#{item.containerUseType},#{item.containerSize},#{item.ownerTeamId},#{item.ownerTeamName},#{item.manufacturer},#{item.manufactureDate},#{item.lengthMm},#{item.widthMm},#{item.heightMm},#{item.maxTotalWeightKg},#{item.maxLoadKg},#{item.volumeM3},#{item.isInUse},#{item.maintenanceStatus},#{item.lastMaintenanceDate},#{item.nextMaintenanceDate},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},#{item.item.selfLeasType},
</trim>
</foreach>
</insert>
@@ -169,6 +177,8 @@
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
+ <if test="selfLeasType != null">self_leas_type = #{selfLeasType},</if>
+
</trim>
where id = #{id}
</update>
@@ -201,6 +211,7 @@
<if test="item.updateBy != null">update_by = #{item.updateBy},</if>
<if test="item.updateTime != null">update_time = #{item.updateTime},</if>
<if test="item.remark != null">remark = #{item.remark},</if>
+ <if test="item.selfLeasType != null">self_leas_type = #{item.selfLeasType},</if>
</trim>
where id = #{item.id}
</foreach>
diff --git a/tms/src/main/resources/mapper/tms/TmsShelfMapper.xml b/tms/src/main/resources/mapper/tms/TmsShelfMapper.xml
index a5b6b32..8fdcbcd 100644
--- a/tms/src/main/resources/mapper/tms/TmsShelfMapper.xml
+++ b/tms/src/main/resources/mapper/tms/TmsShelfMapper.xml
@@ -28,10 +28,11 @@
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
+ <result property="selfLeasType" column="self_leas_type" />
</resultMap>
<sql id="selectTmsShelfVo">
- select thisTab.id, thisTab.system_code, thisTab.shelf_code, thisTab.shelf_type, thisTab.owner_team_id, thisTab.owner_team_name, thisTab.manufacturer, thisTab.manufacture_date, thisTab.length_mm, thisTab.width_mm, thisTab.height_mm, thisTab.max_load_kg, thisTab.compatible_container_type, thisTab.is_in_use, thisTab.maintenance_status, thisTab.last_maintenance_date, thisTab.next_maintenance_date, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark from tms_shelf AS thisTab
+ select thisTab.id, thisTab.system_code, thisTab.shelf_code, thisTab.shelf_type, thisTab.owner_team_id, thisTab.owner_team_name, thisTab.manufacturer, thisTab.manufacture_date, thisTab.length_mm, thisTab.width_mm, thisTab.height_mm, thisTab.max_load_kg, thisTab.compatible_container_type, thisTab.is_in_use, thisTab.maintenance_status, thisTab.last_maintenance_date, thisTab.next_maintenance_date, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark ,thisTab.self_leas_type from tms_shelf AS thisTab
</sql>
<sql id="selectTmsShelfVoCount">
select count(0) from tms_shelf as thisTab
@@ -48,6 +49,7 @@
<if test="isInUse != null "> and thisTab.is_in_use = #{isInUse}</if>
<if test="maintenanceStatus != null "> and thisTab.maintenance_status = #{maintenanceStatus}</if>
<if test="status != null "> and thisTab.status = #{status}</if>
+ <if test="selfLeasType != null "> and thisTab.self_leas_type = #{selfLeasType}</if>
</sql>
<!--鏌ヨ-->
@@ -97,6 +99,7 @@
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
+ <if test="selfLeasType != null">self_leas_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="systemCode != null and systemCode != ''">#{systemCode},</if>
@@ -121,17 +124,18 @@
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
+ <if test="selfLeasType != null">#{selfLeasType},</if>
</trim>
</insert>
<insert id="insertTmsShelfBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
insert into tms_shelf
<trim prefix="(" suffix=") values" suffixOverrides=",">
- id,system_code,shelf_code,shelf_type,owner_team_id,owner_team_name,manufacturer,manufacture_date,length_mm,width_mm,height_mm,max_load_kg,compatible_container_type,is_in_use,maintenance_status,last_maintenance_date,next_maintenance_date,status,create_by,create_time,update_by,update_time,remark,
+ id,system_code,shelf_code,shelf_type,owner_team_id,owner_team_name,manufacturer,manufacture_date,length_mm,width_mm,height_mm,max_load_kg,compatible_container_type,is_in_use,maintenance_status,last_maintenance_date,next_maintenance_date,status,create_by,create_time,update_by,update_time,remark,self_leas_type,
</trim>
<foreach item="item" index="index" collection="list" separator=",">
<trim prefix="(" suffix=") " suffixOverrides=",">
- #{item.id},#{item.systemCode},#{item.shelfCode},#{item.shelfType},#{item.ownerTeamId},#{item.ownerTeamName},#{item.manufacturer},#{item.manufactureDate},#{item.lengthMm},#{item.widthMm},#{item.heightMm},#{item.maxLoadKg},#{item.compatibleContainerType},#{item.isInUse},#{item.maintenanceStatus},#{item.lastMaintenanceDate},#{item.nextMaintenanceDate},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},
+ #{item.id},#{item.systemCode},#{item.shelfCode},#{item.shelfType},#{item.ownerTeamId},#{item.ownerTeamName},#{item.manufacturer},#{item.manufactureDate},#{item.lengthMm},#{item.widthMm},#{item.heightMm},#{item.maxLoadKg},#{item.compatibleContainerType},#{item.isInUse},#{item.maintenanceStatus},#{item.lastMaintenanceDate},#{item.nextMaintenanceDate},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},#{item.selfLeasType},
</trim>
</foreach>
</insert>
@@ -162,6 +166,7 @@
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
+ <if test="selfLeasType != null">self_leas_type = #{selfLeasType},</if>
</trim>
where id = #{id}
</update>
@@ -192,6 +197,7 @@
<if test="item.updateBy != null">update_by = #{item.updateBy},</if>
<if test="item.updateTime != null">update_time = #{item.updateTime},</if>
<if test="item.remark != null">remark = #{item.remark},</if>
+ <if test="item.selfLeasType != null">self_leas_type = #{item.selfLeasType},</if>
</trim>
where id = #{item.id}
</foreach>
diff --git a/ui/admin-ui3/.env.development b/ui/admin-ui3/.env.development
index abb83c1..78e095a 100644
--- a/ui/admin-ui3/.env.development
+++ b/ui/admin-ui3/.env.development
@@ -10,7 +10,7 @@
# 鍒楄〃鎿嶄綔鎸夐挳灞曠ず浣嶇疆 left/right
VITE_APP_listOptFixed = 'left'
#鍚庡彴鎺ュ彛鍦板潃
-VITE_APP_BASE_SERVER_API = 'http://localhost:8080'
+VITE_APP_BASE_SERVER_API = 'http://localhost:8060'
# 涓婁笅鏂�
VITE_APP_BASE_URL = '/admin/'
diff --git a/ui/admin-ui3/package.json b/ui/admin-ui3/package.json
index 3e2daf8..752b631 100644
--- a/ui/admin-ui3/package.json
+++ b/ui/admin-ui3/package.json
@@ -5,7 +5,7 @@
"type": "module",
"scripts": {
"dev": "vite",
- "build:prod": "vue-tsc --noEmit --skipLibCheck && vite build",
+ "build:prod": " vite build",
"build:stage": "vite build --mode staging",
"preview": "vite preview"
},
diff --git a/ui/admin-ui3/src/assets/styles/element-ui.scss b/ui/admin-ui3/src/assets/styles/element-ui.scss
index 0f175f2..d730195 100644
--- a/ui/admin-ui3/src/assets/styles/element-ui.scss
+++ b/ui/admin-ui3/src/assets/styles/element-ui.scss
@@ -93,4 +93,7 @@
.el-dropdown .el-dropdown-link{
color: var(--el-color-primary) !important;
+}
+.el-table{
+ --el-table-current-row-bg-color: var(--el-color-success-light-7) !important;
}
\ No newline at end of file
diff --git a/ui/admin-ui3/src/main.ts b/ui/admin-ui3/src/main.ts
index b3349ee..9cac24d 100644
--- a/ui/admin-ui3/src/main.ts
+++ b/ui/admin-ui3/src/main.ts
@@ -61,6 +61,7 @@
viewBtn: true,
selection: true,
searchSpan: 5,
+ height: 600,
props: {
label: 'dictLabel',
value: 'dictValue'
diff --git a/ui/admin-ui3/src/views/tms/tmsContainer/index.vue b/ui/admin-ui3/src/views/tms/tmsContainer/index.vue
index 3fb44c0..c2888f6 100644
--- a/ui/admin-ui3/src/views/tms/tmsContainer/index.vue
+++ b/ui/admin-ui3/src/views/tms/tmsContainer/index.vue
@@ -114,6 +114,21 @@
}
],
},
+ selfLeasType: {
+ label: '鑷绫诲瀷',
+ type: 'radio', dataType: 'string', dicUrl: '/system/dict/data/type/self_leas_type',
+ addDisplay: true,
+ editDisplay: true,minWidth:150,
+ viewDisplay: true,
+ hide: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "鑷绫诲瀷涓嶈兘涓虹┖", trigger: "change"
+ }
+ ],
+ },
containerCode: {
label: '闆嗚绠卞彿',
addDisplay: true,
@@ -452,6 +467,12 @@
hide: false,minWidth:150,
search: true,
},
+ selfLeasType: {
+ label: '鑷绫诲瀷',
+ type: 'radio', dataType: 'string', dicUrl: '/system/dict/data/type/self_leas_type',
+ hide: false, display: false,
+ search: true,
+ },
containerCode: {
label: '闆嗚绠卞彿',
display: false,
diff --git a/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue b/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
index 772b189..afdb80f 100644
--- a/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
+++ b/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
@@ -126,26 +126,26 @@
</el-link>
</template>
- <template #shipperId-form>
+ <template #shipperId-form="{disabled}">
<div style="display:flex; align-items: center;justify-content: space-between">
<avue-input-table :props="consignorProps"
- :children="consignorOption"
+ :children="consignorOption" :disabled="disabled"
:on-load="onShipperLoad" suffixIcon="search"
v-model="form.shipperId" style="width: 80%"
@change="changeShipper"
placeholder="璇烽�夋嫨瑁呰揣鐐�"></avue-input-table>
- <el-button icon="plus" @click="handleAddShipper"></el-button>
+ <el-button icon="plus" :disabled="disabled" @click="handleAddShipper"></el-button>
</div>
</template>
- <template #receiverId-form>
+ <template #receiverId-form="{disabled}">
<div style="display:flex; align-items: center;justify-content: space-between">
<avue-input-table :props="consignorProps"
:children="consignorOption"
:on-load="onConsignorLoad" suffixIcon="search"
- v-model="form.receiverId"
+ v-model="form.receiverId" :disabled="disabled"
@change="changeReceiver" style="width: 80%"
placeholder="璇烽�夋嫨鍗歌揣鐐�"></avue-input-table>
- <el-button icon="plus" @click="handleAddReceiver"></el-button>
+ <el-button icon="plus" :disabled="disabled" @click="handleAddReceiver"></el-button>
</div>
</template>
@@ -412,11 +412,13 @@
],
type: 'table', suffixIcon: 'search',dataType: 'string',
change: (val: any) => {
+ console.log(val)
const table = crudRef.value?.getPropRef?.('quoteDetailId')?.$refs?.temp;
if (!table) return;
let active = table.active;
if (Array.isArray(active)) active = active[0];
if (active) {
+ console.log(active)
Object.assign(form.value, {
quoteDetailId: active.quoteDetailId,
transportLine: active.transportRoute,
@@ -717,7 +719,7 @@
],
},
isUrgent: {
- label: '鏄惁绱ф��',
+ label: '鏄惁绱ф��',value: '1',
display: true,
type: 'radio', dicUrl: '/system/dict/data/type/sys_number_is', dataType: 'string',
rules: [
@@ -784,12 +786,17 @@
option.value.group.forEach((item: any) => {
if (item.prop == 'pcxx') {
item.column.commissionModel.display = value != 1;
+ item.column.containerId.display = value != 1;
+ item.column.shelfId.display = value != 1;
item.column.vehicleProviderId.display = value == 1;
+ item.column.containerNo.display = value == 1;
+ item.column.shelfCode.display = value == 1;
// item.column.vehicleProviderId.rules.forEach((cItem: any) => {
// cItem.required = value == 1;
// });
}
})
+
},
},
commissionModel:{
@@ -947,7 +954,7 @@
listTmsDriver({
pageSize: page.pageSize,
pageNum: page.currentPage, ...data,
- carrierType: form.value.operationMode
+ carrierType: form.value.operationMode,vehicleProviderId:form.value.vehicleProviderId
}).then(res => {
return callback({
total: res.total,
@@ -1012,7 +1019,7 @@
} else {
listTmsDriver({
pageSize: page.pageSize,
- pageNum: page.currentPage, ...data,
+ pageNum: page.currentPage, ...data,vehicleProviderId:form.value.vehicleProviderId,
carrierType: form.value.operationMode
}).then(res => {
return callback({
@@ -1043,6 +1050,7 @@
Object.assign(form.value, {
vehicleId: active.id,
licensePlate: active.licensePlate,
+ actualVehicleType: active.vehicleType,
});
}
},
@@ -1058,6 +1066,8 @@
},
vehicleType: {
label: '杞﹁締绫诲瀷', minWidth: 120,
+ type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/vehicle_type',
+
search: true,
},
internalCode: {
@@ -1096,7 +1106,7 @@
listTmsVehicle({
pageSize: page.pageSize,
pageNum: page.currentPage, ...data,
- carrierType: form.value.operationMode
+ carrierType: form.value.operationMode,serviceProviderId:form.value.vehicleProviderId
}).then(res => {
return callback({
total: res.total,
@@ -1159,6 +1169,10 @@
label: '鍗歌揣鐐硅仈绯绘柟寮�',
display: true, disabled: true
},
+ containerNo: {
+ label: '闆嗚绠卞彿',
+ display: false,
+ },
containerId: {
label: '鍏宠仈闆嗚绠变俊鎭�',
display: true,
@@ -1187,6 +1201,11 @@
containerUseType: {
label: '闆嗚绠辩敤閫旂被鍨�', minWidth: 120,
type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/container_use_type',
+ search: true,
+ },
+ selfLeasType: {
+ label: '鑷绫诲瀷', minWidth: 120,
+ type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/self_leas_type',
search: true,
},
containerSize: {
@@ -1224,6 +1243,10 @@
}
},
+ shelfCode: {
+ label: '鎵樻澘鍙�',
+ display: false,
+ },
shelfId: {
label: '鎵樻澘鍙�',
display: true,
@@ -1250,7 +1273,13 @@
search: true,
},
shelfType: {
+ label: '鎵樻灦绫诲瀷', minWidth: 120,
type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/shelf_type',
+ search: true,
+ },
+ selfLeasType: {
+ label: '鑷绫诲瀷', minWidth: 120,
+ type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/self_leas_type',
search: true,
},
compatibleContainerType: {
@@ -2657,7 +2686,7 @@
pageF.isUploading = false;
})
}else if (optionType.value === 'customs') {
- customsOrder(form.value.id).then(res => {
+ customsOrder({id:form.value.id}).then(res => {
ElMessage({
message: "鎻愪氦鎴愬姛锛�",
type: 'success'
@@ -2668,7 +2697,7 @@
pageF.isUploading = false;
})
}else if (optionType.value === 'loading') {
- loadingOrder(form.value.id).then(res => {
+ loadingOrder({id:form.value.id}).then(res => {
ElMessage({
message: "鎻愪氦鎴愬姛锛�",
type: 'success'
diff --git a/ui/admin-ui3/src/views/tms/tmsShelf/index.vue b/ui/admin-ui3/src/views/tms/tmsShelf/index.vue
index 3865526..a58c9fa 100644
--- a/ui/admin-ui3/src/views/tms/tmsShelf/index.vue
+++ b/ui/admin-ui3/src/views/tms/tmsShelf/index.vue
@@ -114,6 +114,21 @@
}
],
},
+ selfLeasType: {
+ label: '鑷绫诲瀷',
+ type: 'radio', dataType: 'string', dicUrl: '/system/dict/data/type/self_leas_type',
+ addDisplay: true,
+ editDisplay: true,minWidth:150,
+ viewDisplay: true,
+ hide: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "鑷绫诲瀷涓嶈兘涓虹┖", trigger: "change"
+ }
+ ],
+ },
shelfCode: {
label: '鎵樻灦缂栧彿',
addDisplay: true,
@@ -445,6 +460,12 @@
hide: false,
search: true,
},
+ selfLeasType: {
+ label: '鑷惀绉熻祦绫诲瀷',display: false,
+ type: 'radio', dataType: 'string', dicUrl: '/system/dict/data/type/self_leas_type',
+ hide: false,minWidth:150,
+ search: true,
+ },
shelfType: {
label: '鎵樻灦绫诲瀷',
type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/shelf_type',
@@ -476,6 +497,7 @@
hide: false,minWidth:150,
search: true,
},
+
isInUse: {
label: '鏄惁鍦ㄧ敤',dataType: 'string',
type: 'radio', dicUrl: '/system/dict/data/type/sys_number_is',
--
Gitblit v1.8.0