diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
index 613425d2..f24bd983 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
@@ -184,6 +184,7 @@
and (departmentHeadTime != 0 and FIND_IN_SET(#{userId},departmenthead) != 0)
or (depositoryManagerTime != 0 and FIND_IN_SET(#{userId},depositoryManager) != 0)
+
@@ -293,6 +294,7 @@
and (state != 3 and departmentManagerState != 3 and FIND_IN_SET(#{userId},st.departmentManager) != 0 )
or (state != 3 and departmentManagerState != 3 and #{userId} = st.originator)
+ ORDER BY st.createTime desc
LIMIT #{begin},#{size}
@@ -321,6 +323,7 @@
from stocktaking st
where 1 = 1
and originator = #{userId}
+ ORDER BY st.createTime desc
LIMIT #{begin},#{size}
diff --git a/src/main/resources/templates/pages/application/application-in.html b/src/main/resources/templates/pages/application/application-in.html
index 32326b0b..b436056b 100644
--- a/src/main/resources/templates/pages/application/application-in.html
+++ b/src/main/resources/templates/pages/application/application-in.html
@@ -659,7 +659,7 @@
// 获取当前高度
var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
params.push(NewIdNumber);
- $("#stepForm").css("height", height + 623 + 'px');
+ $("#stepForm").css("height", height + 558 + 'px');
$("#" + parentId).after(materialItem);
};
// 实现卡片删除
@@ -671,7 +671,7 @@
// 获取祖父节点
var reparent = parent.parentNode;
var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
- $("#stepForm").css("height", height - 623 + 'px');
+ $("#stepForm").css("height", height - 558 + 'px');
params = remove(params, parentId);
reparent.removeChild(parent);
};
diff --git a/src/main/resources/templates/pages/warehouse/depository_add.html b/src/main/resources/templates/pages/warehouse/depository_add.html
index 8cd697d4..d7290274 100644
--- a/src/main/resources/templates/pages/warehouse/depository_add.html
+++ b/src/main/resources/templates/pages/warehouse/depository_add.html
@@ -40,7 +40,7 @@
-
+
@@ -55,7 +55,7 @@
+ name="address" />
diff --git a/src/main/resources/templates/pages/warehouse/warehouse_view.html b/src/main/resources/templates/pages/warehouse/warehouse_view.html
index b3c05da5..162d6e3b 100644
--- a/src/main/resources/templates/pages/warehouse/warehouse_view.html
+++ b/src/main/resources/templates/pages/warehouse/warehouse_view.html
@@ -43,7 +43,7 @@