From 71780527b9bf5fc832e27bf6429602e462103833 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 11 四月 2026 11:56:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光印刷' into dev_天津_阳光印刷
---
src/views/inventoryManagement/stockManagement/New.vue | 171 +++++++++++++++++++++++++-----------------
src/views/inventoryManagement/stockManagement/Qualified.vue | 4
src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue | 23 ++---
src/views/inventoryManagement/stockManagement/rawMaterialRecord.vue | 6
src/views/inventoryManagement/stockManagement/Unqualified.vue | 6
5 files changed, 120 insertions(+), 90 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
index 998fa33..df88ad8 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
@@ -46,10 +46,10 @@
<el-form-item label="璇峰亣寮�濮嬫椂闂达細" prop="startDate">
<el-date-picker
v-model="form.startDate"
- type="date"
- placeholder="璇烽�夋嫨寮�濮嬫棩鏈�"
- value-format="YYYY-MM-DD"
- format="YYYY-MM-DD"
+ type="datetime"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ format="YYYY-MM-DD HH:mm:ss"
clearable
style="width: 100%"
/>
@@ -59,10 +59,10 @@
<el-form-item label="璇峰亣缁撴潫鏃堕棿锛�" prop="endDate">
<el-date-picker
v-model="form.endDate"
- type="date"
- placeholder="璇烽�夋嫨缁撴潫鏃ユ湡"
- value-format="YYYY-MM-DD"
- format="YYYY-MM-DD"
+ type="datetime"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ format="YYYY-MM-DD HH:mm:ss"
clearable
style="width: 100%"
/>
@@ -381,9 +381,8 @@
proxy.$modal.msgError("璇烽�夋嫨璇峰亣缁撴潫鏃堕棿锛�")
return
}
- // 鏍￠獙缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�
- if (new Date(form.value.endDate) < new Date(form.value.startDate)) {
- proxy.$modal.msgError("璇峰亣缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂达紒")
+ if (new Date(form.value.startDate).getTime() >= new Date(form.value.endDate).getTime()) {
+ proxy.$modal.msgError("璇峰亣寮�濮嬫椂闂村繀椤绘棭浜庣粨鏉熸椂闂达紒")
return
}
}
@@ -473,4 +472,4 @@
<style scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index 341010d..8120ee1 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -7,83 +7,114 @@
@close="closeModal"
>
<el-form label-width="140px" :model="formState" :rules="rules" label-position="top" ref="formRef">
- <el-form-item
- label="浜у搧鍚嶇О"
- prop="productModelId"
- :rules="[
- {
- required: true,
- message: '璇烽�夋嫨浜у搧',
- trigger: 'change',
- }
- ]"
- >
- <el-button type="primary" @click="showProductSelectDialog = true">
- {{ formState.productName ? formState.productName : '閫夋嫨浜у搧' }}
- </el-button>
- </el-form-item>
+ <el-row :gutter="16">
+ <el-col :xs="24" :sm="12">
+ <el-form-item
+ label="浜у搧鍚嶇О"
+ prop="productModelId"
+ :rules="[
+ {
+ required: true,
+ message: '璇烽�夋嫨浜у搧',
+ trigger: 'change',
+ }
+ ]"
+ >
+ <el-button type="primary" @click="showProductSelectDialog = true">
+ {{ formState.productName ? formState.productName : '閫夋嫨浜у搧' }}
+ </el-button>
+ </el-form-item>
+ </el-col>
- <el-form-item
- label="瑙勬牸"
- prop="productModelName"
- >
- <el-input v-model="formState.productModelName" disabled />
- </el-form-item>
+ <el-col :xs="24" :sm="12">
+ <el-form-item
+ label="瑙勬牸"
+ prop="productModelName"
+ >
+ <el-input v-model="formState.productModelName" disabled />
+ </el-form-item>
+ </el-col>
- <el-form-item
- label="鍗曚綅(涓�)"
- prop="unit"
- >
- <el-input v-model="formState.unit" disabled />
- </el-form-item>
- <el-form-item
- label="鍗曚綅(杈�)"
- prop="subUnit"
- >
- <el-input v-model="formState.subUnit" disabled />
- </el-form-item>
+ <el-col :xs="24" :sm="12">
+ <el-form-item
+ label="鍗曚綅(涓�)"
+ prop="unit"
+ >
+ <el-input v-model="formState.unit" disabled />
+ </el-form-item>
+ </el-col>
- <el-form-item
- label="浠撳簱缂栫爜"
- prop="warehouseCode"
- >
- <el-select v-model="formState.warehouseCode" :options="warehouseCode" placeholder="璇烽�夋嫨浠撳簱缂栫爜" @change="handleWarehouseSelect">
- <el-option v-for="item in warehouseCode" :key="item.value" :label="item.value" :value="item.value" />
- </el-select>
- </el-form-item>
+ <el-col :xs="24" :sm="12">
+ <el-form-item
+ label="鍗曚綅(杈�)"
+ prop="subUnit"
+ >
+ <el-input v-model="formState.subUnit" disabled />
+ </el-form-item>
+ </el-col>
- <el-form-item
- label="浠撳簱鍚嶇О"
- prop="warehouseName"
- >
- <el-input v-model="formState.warehouseName" disabled />
- </el-form-item>
+ <el-col :xs="24" :sm="12">
+ <el-form-item
+ label="浠撳簱缂栫爜"
+ prop="warehouseCode"
+ >
+ <el-select v-model="formState.warehouseCode" :options="warehouseCode" placeholder="璇烽�夋嫨浠撳簱缂栫爜" @change="handleWarehouseSelect">
+ <el-option v-for="item in warehouseCode" :key="item.value" :label="item.value" :value="item.value" />
+ </el-select>
+ </el-form-item>
+ </el-col>
- <el-form-item
- label="瀛樿揣缂栫爜"
- prop="productCode"
- >
- <el-input v-model="formState.productCode" />
- </el-form-item>
+ <el-col :xs="24" :sm="12">
+ <el-form-item
+ label="浠撳簱鍚嶇О"
+ prop="warehouseName"
+ >
+ <el-input v-model="formState.warehouseName" disabled />
+ </el-form-item>
+ </el-col>
- <el-form-item
- label="搴撳瓨鏁伴噺"
- prop="qualitity"
- >
- <el-input-number v-model="formState.qualitity" :step="1" :min="1" style="width: 100%" />
- </el-form-item>
+ <el-col :xs="24" :sm="12">
+ <el-form-item
+ label="瀛樿揣缂栫爜"
+ prop="productCode"
+ >
+ <el-input v-model="formState.productCode" />
+ </el-form-item>
+ </el-col>
- <el-form-item
- v-if="type === 'qualified'"
- label="搴撳瓨棰勮鏁伴噺"
- prop="warnNum"
- >
- <el-input-number v-model="formState.warnNum" :step="1" :min="0" :max="formState.qualitity" style="width: 100%" />
- </el-form-item>
+ <el-col :xs="24" :sm="12">
+ <el-form-item
+ label="搴撳瓨(涓�)鏁伴噺"
+ prop="qualitity"
+ >
+ <el-input-number v-model="formState.qualitity" :step="1" :min="1" style="width: 100%" />
+ </el-form-item>
+ </el-col>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="formState.remark" type="textarea" />
- </el-form-item>
+ <el-col :xs="24" :sm="12">
+ <el-form-item
+ label="搴撳瓨(杈�)鏁伴噺"
+ prop="subQualitity"
+ >
+ <el-input-number v-model="formState.subQualitity" :step="1" :min="1" style="width: 100%" />
+ </el-form-item>
+ </el-col>
+
+ <el-col :xs="24" :sm="12" v-if="type === 'qualified'">
+ <el-form-item
+ label="搴撳瓨棰勮鏁伴噺"
+ prop="warnNum"
+ >
+ <el-input-number v-model="formState.warnNum" :step="1" :min="0" :max="formState.qualitity" style="width: 100%" />
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="24">
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input v-model="formState.remark" type="textarea" />
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<!-- 浜у搧閫夋嫨寮圭獥 -->
@@ -143,6 +174,7 @@
warehouseName: "",
qualitity: 0,
warnNum: 0,
+ subQualitity: 0,
remark: '',
});
@@ -181,6 +213,7 @@
warehouseCode: "",
warehouseName: "",
warnNum: 0,
+ subQualitity: 0,
remark: '',
};
isShow.value = false;
diff --git a/src/views/inventoryManagement/stockManagement/Qualified.vue b/src/views/inventoryManagement/stockManagement/Qualified.vue
index 7c427d6..9e6991c 100644
--- a/src/views/inventoryManagement/stockManagement/Qualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Qualified.vue
@@ -201,11 +201,9 @@
<style scoped lang="scss">
:deep(.row-low-stock td) {
- background-color: #fde2e2;
- color: #c45656;
}
:deep(.row-low-stock:hover > td) {
- background-color: #fcd4d4;
+ // background-color: #fcd4d4;
}
</style>
diff --git a/src/views/inventoryManagement/stockManagement/Unqualified.vue b/src/views/inventoryManagement/stockManagement/Unqualified.vue
index 343984a..f1b7a2a 100644
--- a/src/views/inventoryManagement/stockManagement/Unqualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Unqualified.vue
@@ -202,11 +202,11 @@
<style scoped lang="scss">
:deep(.row-low-stock td) {
- background-color: #fde2e2;
- color: #c45656;
+ // background-color: #fde2e2;
+ // color: #c45656;
}
:deep(.row-low-stock:hover > td) {
- background-color: #fcd4d4;
+ // background-color: #fcd4d4;
}
</style>
diff --git a/src/views/inventoryManagement/stockManagement/rawMaterialRecord.vue b/src/views/inventoryManagement/stockManagement/rawMaterialRecord.vue
index 65b780f..8744374 100644
--- a/src/views/inventoryManagement/stockManagement/rawMaterialRecord.vue
+++ b/src/views/inventoryManagement/stockManagement/rawMaterialRecord.vue
@@ -202,11 +202,11 @@
<style scoped lang="scss">
:deep(.row-low-stock td) {
- background-color: #fde2e2;
- color: #c45656;
+ // background-color: #fde2e2;
+ // color: #c45656;
}
:deep(.row-low-stock:hover > td) {
- background-color: #fcd4d4;
+ // background-color: #fcd4d4;
}
</style>
--
Gitblit v1.9.3