From 4652431ce329b4dec6c4dcc0758d5c4ff97e0666 Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期六, 11 十一月 2023 09:57:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/product/workbench/index.vue | 54 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/src/views/product/workbench/index.vue b/src/views/product/workbench/index.vue
index 82cebc3..026fcfe 100644
--- a/src/views/product/workbench/index.vue
+++ b/src/views/product/workbench/index.vue
@@ -49,22 +49,22 @@
<el-image src="/img/workbench/icon_bg.png"></el-image>
<span class="item-name">鎶ュ伐</span>
</div>
- <div
+ <!-- <div
v-show="isShowStepBusiness"
:class="['wb-header-menu-item', stepShow ? 'item-show' : '']"
@click="selectItem('step')"
>
<el-image src="/img/workbench/icon_gb.png"></el-image>
<span class="item-name">宸ユ</span>
- </div>
- <div
+ </div> -->
+ <!-- <div
v-show="permissions.product_menu_split"
:class="['wb-header-menu-item', splitTaskShow ? 'item-show' : '']"
@click="selectItem('splitTask')"
>
<el-image src="/img/workbench/icon_sp.png"></el-image>
<span class="item-name">鍒嗗壊</span>
- </div>
+ </div> -->
<div
:class="['wb-header-menu-item', artificialShow ? 'item-show' : '']"
@click="selectItem('artificial')"
@@ -314,11 +314,11 @@
</div>
<div style="float:right;width:10%;">
<div class="open-edit-duty-div">
- <div>
+ <!-- <div>
<span class="duty-edit-span" @click="clearDutyRecord"
>娓呯┖</span
>
- </div>
+ </div> -->
<div>
<span class="duty-edit-span" @click="openDutyEdit"
>缂栬緫</span
@@ -378,15 +378,24 @@
<el-tooltip
class="item"
effect="dark"
- content="鎵归噺鎻愪氦"
+ content="娓呯┖"
placement="top"
>
- <button
+ <!-- <button
class="duty-circle-button"
@click="submitSaveDutyRecord"
>
<i
- class="el-icon-document-checked"
+ class="el-icon-delete"
+ style="color: #FFFFFF;"
+ ></i>
+ </button> -->
+ <button
+ class="duty-circle-button"
+ @click="clearDutyRecord"
+ >
+ <i
+ class="el-icon-delete"
style="color: #FFFFFF;"
></i>
</button>
@@ -464,7 +473,7 @@
:inline="true"
style="margin-left: 10px"
>
- <el-form-item prop="orderNumber" label="閿�鍞鍗曞彿">
+ <!-- <el-form-item prop="orderNumber" label="閿�鍞鍗曞彿">
<el-input
placeholder="璇疯緭鍏ラ攢鍞鍗曞彿"
v-model="operateTaskForm.orderNumber"
@@ -472,8 +481,8 @@
@keyup.enter.native="queryInfoForOrderNumber"
@clear="queryInfoForOrderNumber"
></el-input>
- </el-form-item>
- <el-form-item prop="spec" label="鎴愬搧瑙勬牸">
+ </el-form-item> -->
+ <!-- <el-form-item prop="spec" label="鎴愬搧瑙勬牸">
<el-select
placeholder="璇烽�夋嫨鎴愬搧瑙勬牸"
v-model="operateTaskForm.spec"
@@ -498,19 +507,19 @@
>
</el-option>
</el-select>
- </el-form-item>
- <el-form-item prop="outBatchNo" label="SN">
+ </el-form-item> -->
+ <el-form-item prop="outBatchNo" label="杞﹂棿璁㈠崟">
<el-input
- placeholder="璇疯緭鍏ユ姇鍏ュ崐鎴愬搧SN鍙�"
+ placeholder="璇疯緭鍏ヨ溅闂磋鍗曞彿"
v-model="operateTaskForm.outBatchNo"
clearable
@keyup.enter.native="refreshOperateTasksByConditions"
@clear="refreshOperateTasksByConditions"
></el-input>
</el-form-item>
- <el-form-item prop="mpsNo" label="璁″垝鍙�">
+ <el-form-item prop="mpsNo" label="宸ュ崟鍙�">
<el-input
- placeholder="璇疯緭鍏ヨ鍒掑彿"
+ placeholder="璇疯緭鍏ュ伐鍗曞彿"
v-model="operateTaskForm.mpsNo"
clearable
@keyup.enter.native="refreshOperateTasksByConditions"
@@ -1424,7 +1433,7 @@
.task-div-content {
// height: calc(100% - 40px);
flex: 1;
- padding: 0px 15px;
+ padding: 10px 15px;
box-sizing: border-box;
overflow-y: auto;
margin-bottom: 10px;
@@ -1491,7 +1500,7 @@
getPartNamesByOrderNo,
getProductSnByCustomerNoAndPartName
} from '@/api/product/personboard'
-import { getObj as getSysParam } from '@/api/admin/sys-public-param'
+import { getObj as getSysParam} from '@/api/admin/sys-public-param'
import { getAllCrewList } from '@/api/basic/crew'
import { getAllShiftList } from '@/api/basic/shift'
import { getAllWorkstationList, updateById } from '@/api/basic/workstation'
@@ -1661,7 +1670,7 @@
...mapGetters(['userInfo', 'tagWel', 'permissions'])
},
created() {
- document.title = '宸ヤ綔鍙扳�斺�擹TTMES'
+ document.title = '宸ヤ綔鍙扳�斺�擬ES'
if (!this.dutyForm.workstationId) {
const k = localStorage.getItem(storage_key)
if (k) {
@@ -1672,7 +1681,6 @@
this.getSysParam(sysParam.SHOW_STEP_BUSINESS)
this.getTrackingParam(sysParam.SHOW_TRACKING_TYPE)
this.timer = setInterval(this.clockTimer, 1000)
- console.log(this.permissions, 'ASSS')
},
watch: {
'dutyForm.workstationId'(val) {
@@ -2250,9 +2258,9 @@
if (!this.dutyForm.endTime) {
return { result: false, msg: '缁撴潫鏃堕棿涓嶈兘涓虹┖' }
}
- if (!this.dutyForm.dutyTime) {
+ /* if (!this.dutyForm.dutyTime) {
return { result: false, msg: '鐝鏃堕棿涓嶈兘涓虹┖' }
- }
+ } */
if (!this.dutyForm.shiftId) {
return { result: false, msg: '鐝涓嶈兘涓虹┖' }
}
--
Gitblit v1.9.3