diff --git a/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/status2.png b/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/status2.png
new file mode 100644
index 00000000..2ffc622d
Binary files /dev/null and b/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/status2.png differ
diff --git a/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/statusg.png b/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/statusg.png
new file mode 100644
index 00000000..f6b05287
Binary files /dev/null and b/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/statusg.png differ
diff --git a/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/statuszf.png b/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/statuszf.png
new file mode 100644
index 00000000..97c324a2
Binary files /dev/null and b/mes-ui/mes-ui-admin-vue3/src/assets/imgs/status/statuszf.png differ
diff --git a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
index 9395a945..de533acf 100644
--- a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
+++ b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss
@@ -105,10 +105,10 @@
}
.el-card__body {
- padding: 15px 0px;
+ padding: 10px 0px;
.el-row {
- margin: 10px;
+ margin: 5px 0;
}
}
}
@@ -204,43 +204,43 @@
//已变更
.ialteration {
- border: 1px solid #F39800;
- background-color: #F7F3ED;
- color: #F39800;
+ border: 1px solid #f39800;
+ background-color: #f7f3ed;
+ color: #f39800;
}
//已提交
.isubmit {
border: 1px solid #356899;
- background-color: #ECF0F4;
+ background-color: #ecf0f4;
color: #356899;
}
//已作废
.icancellation {
- border: 1px solid #95969D;
- background-color: #EBEBEB;
- color: #95969D;
+ border: 1px solid #95969d;
+ background-color: #ebebeb;
+ color: #95969d;
}
//已终止
.ibreakup {
- border: 1px solid #0D0D26;
- background-color: #E8E8E8;
- color: #0D0D26;
+ border: 1px solid #0d0d26;
+ background-color: #e8e8e8;
+ color: #0d0d26;
}
//全部发货
-.allshipments{
- color: #3AC33D;
- background-color:transparent;
+.allshipments {
+ color: #3ac33d;
+ background-color: transparent;
border: none;
}
//未发货
-.noshipments{
- color: #4589FF;
- background-color:transparent;
+.noshipments {
+ color: #4589ff;
+ background-color: transparent;
border: none;
}
-.partshipments{
- color: #19A998;
- background-color:transparent;
+.partshipments {
+ color: #19a998;
+ background-color: transparent;
border: none;
-}
\ No newline at end of file
+}
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
index cf2ba212..9842fc99 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
@@ -50,81 +50,164 @@
基础信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+ {{
+ query.active != 'detailArchive'
+ ? formatDate(formData.orderTime, 'YYYY-MM-DD')
+ : formatDate(formData.snapshotOrderTime, 'YYYY-MM-DD')
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ ' 共计' +
+ betweenDay(
+ new Date(formData.projectStartTime),
+ new Date(formData.projectEndTime)
+ ) +
+ '天'
+ }}
+
+
+
+
-
- {{
- query.active != 'detailArchive'
- ? formatDate(formData.orderTime, 'YYYY-MM-DD')
- : formatDate(formData.snapshotOrderTime, 'YYYY-MM-DD')
- }}
+
+ {{ getDictLabel(DICT_TYPE.HELI_PROJECT_ORDER_STATUS, formData.orderStatus) }}
-
+
@@ -174,73 +254,19 @@
-
-
-
-
-
-
-
-
-
- {{
- ' 共计' +
- betweenDay(
- new Date(formData.projectStartTime),
- new Date(formData.projectEndTime)
- ) +
- '天'
- }}
-
-
-
-
-
-
-
-
- {{ getDictLabel(DICT_TYPE.HELI_PROJECT_ORDER_STATUS, formData.orderStatus) }}
-
-
-
-
-
-
+
@@ -284,21 +310,6 @@
-
-
-
-
-
- {{ dict.label }}
-
-
-
-
-
@@ -322,12 +333,12 @@
-
+
@@ -366,31 +377,26 @@
-
-
-
+
+
-
+ :label="dict.value"
+ >
+ {{ dict.label }}
+
+
-
+
-
+
+
+
+
+
+
-
+
物料编码
@@ -275,7 +280,7 @@
-
+
@@ -517,10 +522,9 @@ const subFormRules = reactive({
storageOkQty: [{ required: true, message: '入库数量不能为空', trigger: 'blur' }]
})
const handleStatus = async (num) => {
-
// 校验表单
await formRef.value.validate()
- if(formData.value.matItemDOList.length === 0){
+ if (formData.value.matItemDOList.length === 0) {
message.alertWarning('请添加物料信息!')
return
}
@@ -576,10 +580,9 @@ const handleStatus = async (num) => {
isShowBtnOther.value = false
isShowBtnDelete.value = false
}
- query.type= 'update'
+ query.type = 'update'
query.id = formData.value.id
reload()
-
}
const userList = ref([]) // 用户列表
@@ -642,7 +645,7 @@ var commonResult = ''
/** 提交表单 */
const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调
-const saveFormData = async () =>{
+const saveFormData = async () => {
// 提交请求
formLoading.value = true
try {
@@ -671,7 +674,6 @@ const saveFormData = async () =>{
}
formData.value = await StorageApi.getStorage(storageid.value)
message.success(t(commonResult))
-
} finally {
formLoading.value = false
}
@@ -679,7 +681,7 @@ const saveFormData = async () =>{
const submitForm = async () => {
// 校验表单
await formRef.value.validate()
- if(formData.value.matItemDOList.length === 0){
+ if (formData.value.matItemDOList.length === 0) {
message.alertWarning('请添加物料信息!')
return
}
@@ -693,11 +695,11 @@ const submitForm = async () => {
await saveFormData()
// 成功后刷新
- query.type= 'update'
+ query.type = 'update'
query.id = storageid.value
formData.value.id = storageid.value
//页面重新加载
- reload();
+ reload()
}
var matCount = 1
@@ -866,7 +868,6 @@ onMounted(async () => {
isShowBtnDelete.value = false
}
-
//获得库区列表
const queryParamsRg = reactive({
pageNo: 1,
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
index 80439a0e..3b8340de 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
@@ -1,9 +1,14 @@
-
+
+
+
+
+
+
-
+
@@ -214,7 +224,7 @@
- 出库库位
+ 出库库位
{
-
// 校验表单
await formRef.value.validate()
- if(formData.value.matItemDOList.length === 0){
+ if (formData.value.matItemDOList.length === 0) {
message.alertWarning('请添加物料信息!')
return
}
@@ -547,7 +556,7 @@ const handleStatus = async (num) => {
isShowBtnDelete.value = false
}
query.id = storageid.value
- query.type= 'update'
+ query.type = 'update'
reload()
}
const userList = ref([]) // 用户列表
@@ -611,7 +620,7 @@ var commonResult = ''
/** 提交表单 */
const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调
-const saveFormData = async () =>{
+const saveFormData = async () => {
//获取最新库存信息
const matCurrentData = await StorageMatApi.getStorageMatList()
var hasRestNum = true
@@ -660,9 +669,6 @@ const saveFormData = async () =>{
}
formData.value = await StorageApi.getStorage(storageid.value)
message.success(t(commonResult))
-
-
-
} finally {
formLoading.value = false
}
@@ -670,7 +676,7 @@ const saveFormData = async () =>{
const submitForm = async () => {
// 校验表单
await formRef.value.validate()
- if(formData.value.matItemDOList.length === 0){
+ if (formData.value.matItemDOList.length === 0) {
message.alertWarning('请添加物料信息!')
return
}
@@ -684,7 +690,7 @@ const submitForm = async () => {
await saveFormData()
// 成功后刷新
query.id = storageid.value
- query.type= 'update'
+ query.type = 'update'
reload()
}
@@ -712,7 +718,6 @@ const onAddItem = () => {
}
matCount = matCount + 1
-
formData.value.matItemDOList.push(newData)
} else {
message.alertWarning('请选择出库仓库')
@@ -748,11 +753,14 @@ const handleWh = async (wid) => {
let matParams = {
pageNo: 1,
pageSize: 99,
- status: "1"
+ status: '1'
}
const dataMat = await MaterialApi.getMaterialPage(matParams)
matList.value = []
- matList.value = dataMat.list.filter((item) => matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == wid) !== undefined)
+ matList.value = dataMat.list.filter(
+ (item) =>
+ matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == wid) !== undefined
+ )
formData.value.matItemDOList = []
// formData.value.matItemDOList.forEach(item => {
@@ -792,7 +800,12 @@ const remoteMatCodeSearch = async (name) => {
const dataMat = await MaterialApi.getMaterialPage(matParams)
matList.value = []
- matList.value = dataMat.list.filter((item) => matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == formData.value.whId) !== undefined)
+ matList.value = dataMat.list.filter(
+ (item) =>
+ matLastRemoteData.find(
+ (fish) => fish.matId === item.id && fish.whId == formData.value.whId
+ ) !== undefined
+ )
matSelectLoading.value = false
}
@@ -840,7 +853,7 @@ const handleMatCode = async (scope, matid) => {
const isShowBtnGroup = ref(true)
const isShowBtnCancel = ref(false)
const isShowBtnOther = ref(false)
-const isShowBtnDelete = ref(true)
+const isShowBtnDelete = ref(true)
const btnWhClickable = ref(false)
const matLastData = ref([])
/** 初始化 **/
@@ -862,8 +875,6 @@ onMounted(async () => {
dialogTitle.value = t('action.' + query.type)
dialogTitle.value = query.type === 'review' ? '查看' : dialogTitle.value
-
-
//-------------------仓库全数据
const data = await WarehouseApi.getWarehouseSimpList()
warehouseList.value = data