|
@@ -6,7 +6,7 @@
|
|
<el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true"
|
|
<el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true"
|
|
style="margin-right: 0px">
|
|
style="margin-right: 0px">
|
|
<el-form-item class="section-title" label="报工日报" />
|
|
<el-form-item class="section-title" label="报工日报" />
|
|
- <el-form-item label="生产计划单号:">
|
|
|
|
|
|
+ <el-form-item label="批次号:">
|
|
<el-input placeholder="请输入批次号" v-model.trim="queryParams.lotCode" @keydown.enter.prevent clearable
|
|
<el-input placeholder="请输入批次号" v-model.trim="queryParams.lotCode" @keydown.enter.prevent clearable
|
|
style="width: 130px" />
|
|
style="width: 130px" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -28,10 +28,10 @@
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="时间:">
|
|
<el-form-item label="时间:">
|
|
<el-date-picker v-model="queryParams.startTime" type="date" value-format="YYYY-MM-DD" :editable="false"
|
|
<el-date-picker v-model="queryParams.startTime" type="date" value-format="YYYY-MM-DD" :editable="false"
|
|
- :clearable="false" placeholder="请选择" style="width: 136px" @change="handleDateChange" />
|
|
|
|
|
|
+ clearable placeholder="请选择" style="width: 136px" @change="handleDateChange" />
|
|
<span>~</span>
|
|
<span>~</span>
|
|
<el-date-picker v-model="queryParams.endTime" type="date" value-format="YYYY-MM-DD" :editable="false"
|
|
<el-date-picker v-model="queryParams.endTime" type="date" value-format="YYYY-MM-DD" :editable="false"
|
|
- :clearable="false" placeholder="请选择" style="width: 136px" @change="handleDateChange" />
|
|
|
|
|
|
+ clearable placeholder="请选择" style="width: 136px" @change="handleDateChange" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item style="margin-left: 0">
|
|
<el-form-item style="margin-left: 0">
|
|
<el-button type="info" icon="Search" @click="handleQuery">搜索
|
|
<el-button type="info" icon="Search" @click="handleQuery">搜索
|
|
@@ -130,6 +130,7 @@ const queryParams = ref({
|
|
|
|
|
|
/*********************** 工段相关事件 ****************************/
|
|
/*********************** 工段相关事件 ****************************/
|
|
function getList() {
|
|
function getList() {
|
|
|
|
+ getNowDate();
|
|
loading.value = true;
|
|
loading.value = true;
|
|
getDeptList().then((response) => {
|
|
getDeptList().then((response) => {
|
|
deptList.value = response.data.rows;
|
|
deptList.value = response.data.rows;
|
|
@@ -143,6 +144,24 @@ function getList() {
|
|
getDayworkItems();
|
|
getDayworkItems();
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
+function getNowDate() {
|
|
|
|
+ var nowDate = new Date();
|
|
|
|
+ var date = {
|
|
|
|
+ year: nowDate.getFullYear(),
|
|
|
|
+ month: nowDate.getMonth() + 1,
|
|
|
|
+ day: nowDate.getDate(),
|
|
|
|
+ };
|
|
|
|
+ const dayDate =
|
|
|
|
+ date.year +
|
|
|
|
+ "-" +
|
|
|
|
+ (date.month >= 10 ? date.month : "0" + date.month) +
|
|
|
|
+ "-" +
|
|
|
|
+ (date.day >= 10 ? date.day : "0" + date.day);
|
|
|
|
+ console.log(dayDate);
|
|
|
|
+ queryParams.value.startTime = dayDate;
|
|
|
|
+ queryParams.value.endTime = dayDate;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
|
|
//切换工段
|
|
//切换工段
|
|
function handleDeptChange() {
|
|
function handleDeptChange() {
|
|
@@ -169,8 +188,14 @@ function handleProcessChange() {
|
|
|
|
|
|
/** 报工详情列表 */
|
|
/** 报工详情列表 */
|
|
function getDayworkItems() {
|
|
function getDayworkItems() {
|
|
- console.log(111111)
|
|
|
|
|
|
+ if(queryParams.value.startTime != null) {
|
|
|
|
+ queryParams.value.startTime = queryParams.value.startTime + " 00:00:00";
|
|
|
|
+ }
|
|
|
|
+ if(queryParams.value.endTime != null) {
|
|
|
|
+ queryParams.value.endTime = queryParams.value.endTime + " 23:59:59";
|
|
|
|
+ }
|
|
dayworkItemLoading.value = true;
|
|
dayworkItemLoading.value = true;
|
|
|
|
+ console.log(queryParams.value);
|
|
//查询该工段在工段资源分配时绑定的工序,传一个flag,如果flag有值则后端查询不分页
|
|
//查询该工段在工段资源分配时绑定的工序,传一个flag,如果flag有值则后端查询不分页
|
|
listDeptProcess({ deptId: queryParams.value.deptId, flag: 1 }).then(
|
|
listDeptProcess({ deptId: queryParams.value.deptId, flag: 1 }).then(
|
|
(res) => {
|
|
(res) => {
|