|
@@ -232,7 +232,7 @@
|
|
@click="handleUpdateDayworkItem(scope.row)"
|
|
@click="handleUpdateDayworkItem(scope.row)"
|
|
>编辑</el-button
|
|
>编辑</el-button
|
|
>
|
|
>
|
|
- <el-button
|
|
|
|
|
|
+ <el-button v-model="flag"
|
|
v-else
|
|
v-else
|
|
link
|
|
link
|
|
type="primary"
|
|
type="primary"
|
|
@@ -291,6 +291,7 @@ const processList = ref([]);
|
|
const deptProcessList = ref([]);
|
|
const deptProcessList = ref([]);
|
|
const total = ref(0);
|
|
const total = ref(0);
|
|
const itemTotal = ref(0);
|
|
const itemTotal = ref(0);
|
|
|
|
+const flag = ref(false);
|
|
|
|
|
|
/** 查询对象 */
|
|
/** 查询对象 */
|
|
const queryDayworkParams = ref({
|
|
const queryDayworkParams = ref({
|
|
@@ -444,25 +445,24 @@ function getDayworkItems() {
|
|
res.rows[i].prodNum = currentDaywork.value.oneLotQuantity;
|
|
res.rows[i].prodNum = currentDaywork.value.oneLotQuantity;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
- dayworkItemList.value = res.rows;
|
|
|
|
- for (var i = 0; i < dayworkItemList.value.length; i++) {
|
|
|
|
- let timeStamp = dayworkItemList.value[i].workingHours;
|
|
|
|
|
|
+ for (var i = 0; i < res.rows.length; i++) {
|
|
|
|
+ let timeStamp = res.rows[i].workingHours;
|
|
let seconds = Math.floor((timeStamp / 1000) % 60);
|
|
let seconds = Math.floor((timeStamp / 1000) % 60);
|
|
let minutes = Math.floor((timeStamp / (1000 * 60)) % 60);
|
|
let minutes = Math.floor((timeStamp / (1000 * 60)) % 60);
|
|
let hours = Math.floor(timeStamp / (1000 * 60 * 60));
|
|
let hours = Math.floor(timeStamp / (1000 * 60 * 60));
|
|
let time = `${hours}小时${minutes}分钟${seconds}秒`;
|
|
let time = `${hours}小时${minutes}分钟${seconds}秒`;
|
|
- dayworkItemList.value[i].workingHours = time;
|
|
|
|
- dayworkItemList.value[i].deptProcessStatus = false;
|
|
|
|
|
|
+ res.rows[i].workingHours = time;
|
|
|
|
+ res.rows[i].deptProcessStatus = false;
|
|
for (var item = 0; item < deptProcessList.value.length; item++) {
|
|
for (var item = 0; item < deptProcessList.value.length; item++) {
|
|
if (
|
|
if (
|
|
- dayworkItemList.value[i].processId ==
|
|
|
|
|
|
+ res.rows[i].processId ==
|
|
deptProcessList.value[item].processId
|
|
deptProcessList.value[item].processId
|
|
) {
|
|
) {
|
|
- dayworkItemList.value[i].deptProcessStatus = true;
|
|
|
|
|
|
+ res.rows[i].deptProcessStatus = true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ dayworkItemList.value = res.rows;
|
|
getProcessList({
|
|
getProcessList({
|
|
technologicalProcessId: queryItemParams.value.technologicalProcessId,
|
|
technologicalProcessId: queryItemParams.value.technologicalProcessId,
|
|
}).then((res) => {
|
|
}).then((res) => {
|
|
@@ -472,7 +472,6 @@ function getDayworkItems() {
|
|
dayworkItemLoading.value = false;
|
|
dayworkItemLoading.value = false;
|
|
});
|
|
});
|
|
}
|
|
}
|
|
-
|
|
|
|
/** 搜索按钮操作 */
|
|
/** 搜索按钮操作 */
|
|
function handleQuery() {
|
|
function handleQuery() {
|
|
//queryDayworkParams.value.pageNum = 1
|
|
//queryDayworkParams.value.pageNum = 1
|