From 6098f630d190c3ba51a3749716ccc8ada2b450c8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 20 十一月 2023 11:32:41 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/product/workbench/operation-task-pane.vue | 29 ++++++---
src/views/product/workbench/batchproductout-form-new.vue | 2
vue.config.js | 4
src/api/product/personboard.js | 61 +++++++++++++++++---
src/views/product/workbench/workReportCard.vue | 12 ++-
src/api/product/handymantype.js | 15 +++++
6 files changed, 96 insertions(+), 27 deletions(-)
diff --git a/src/api/product/handymantype.js b/src/api/product/handymantype.js
index 6f71d44..09b43ea 100644
--- a/src/api/product/handymantype.js
+++ b/src/api/product/handymantype.js
@@ -119,3 +119,18 @@
params: query
})
}
+
+export function isProductionCounting(query) {
+ return request({
+ url: '/mes/product/isProductionCounting',
+ method: 'get',
+ params: query
+ })
+}
+
+export function qualifiedLocation(id) {
+ return request({
+ url: '/mes/product/qualifiedLocation/' + id,
+ method: 'get'
+ })
+}
diff --git a/src/api/product/personboard.js b/src/api/product/personboard.js
index f20b0c6..39dbfe5 100644
--- a/src/api/product/personboard.js
+++ b/src/api/product/personboard.js
@@ -134,6 +134,14 @@
})
}
+export function getOperationTaskCopy(query) {
+ return request({
+ url: '/mes/operationTask/getOperationTaskCopy',
+ method: 'get',
+ params: query
+ })
+}
+
export function changeOperationTaskState(ids, event) {
return request({
url: '/mes/operationTask/product/changeState/' + event,
@@ -260,14 +268,6 @@
})
}
-export function submitProductMain(obj) {
- return request({
- url: '/mes/product/submitProductMain',
- method: 'post',
- data: obj
- })
-}
-
export function batchSaveProductOutput(obj) {
return request({
url: '/mes/product/batchSaveProductOutput',
@@ -339,6 +339,15 @@
url: '/mes/product/state/batchChange/' + event,
method: 'post',
data: ids
+ })
+}
+
+// 鎵归噺鎻愪氦
+export function batchChangeCopy(qury, event) {
+ return request({
+ url: '/mes/product/state/batchChangeCopy/' + event,
+ method: 'post',
+ data: qury
})
}
@@ -518,9 +527,41 @@
})
}
-export function getOperationTaskCopy(query) {
+export function submitInsPart(obj) {
return request({
- url: '/mes/operationTask/getOperationTaskCopy',
+ url: '/mes/applyPart/submitIns',
+ method: 'post',
+ data: obj
+ })
+}
+
+export function submitProductMain(obj) {
+ return request({
+ url: '/mes/product/submitProductMain',
+ method: 'post',
+ data: obj
+ })
+}
+
+export function inputHandle(obj) {
+ return request({
+ url: '/mes/feeding/inputHandle',
+ method: 'post',
+ data: obj
+ })
+}
+
+export function cancellationOfWorkApplication(query) {
+ return request({
+ url: '/mes/product/cancellationOfWorkApplication',
+ method: 'get',
+ params: query
+ })
+}
+
+export function generateBackflush(query) {
+ return request({
+ url: '/mes/product/generateBackFlush',
method: 'get',
params: query
})
diff --git a/src/views/product/workbench/batchproductout-form-new.vue b/src/views/product/workbench/batchproductout-form-new.vue
index 56aeb54..d9868e6 100644
--- a/src/views/product/workbench/batchproductout-form-new.vue
+++ b/src/views/product/workbench/batchproductout-form-new.vue
@@ -191,7 +191,7 @@
<el-input v-model="item.remark"></el-input>
</el-col>-->
<el-col :span="2" class="batch-product-out-form-body-col l-mes">
- <el-input v-model="item.mainRemark"></el-input>
+ <el-input v-model="item.remark"></el-input>
</el-col>
<el-col :span="1" class="batch-product-out-form-body-col">
<span
diff --git a/src/views/product/workbench/operation-task-pane.vue b/src/views/product/workbench/operation-task-pane.vue
index d559810..7484173 100644
--- a/src/views/product/workbench/operation-task-pane.vue
+++ b/src/views/product/workbench/operation-task-pane.vue
@@ -18,9 +18,17 @@
<img class="selectedImg" src="/img/workbench/icon_selected.png" />
<div class="header">
<div>宸ュ崟鍙凤細{{ item.taskNo }}</div>
- <div class="tag" :style="{ backgroundColor: getTagColor(item.planFinishDay) }">
- {{ getTagText(item.planFinishDay) }}
- </div>
+ <!-- <div class="tag" :style="{ backgroundColor: getTagColor(item.planFinishDay) }">
+ {{ getTagText(item.planFinishDay) }}
+ </div> -->
+ <el-alert
+ center
+ style="width: 80px;height:30px;line-height: 30px;"
+ :title="getTagText(item.planFinishDay)"
+ :type="getTagColor(item.planFinishDay)"
+ effect="dark"
+ :closable="false">
+ </el-alert>
<!-- <div>璁″垝鍙凤細{{ item.mpsNo }}</div> -->
<div
:class="[
@@ -99,12 +107,12 @@
.tag{
width: 80px;
height: 30px;
+line-height: 30px;
border-radius:15% ;
text-align: center;
-text-size:8px;
+font-size:8px;
color:white;
align-content: 30px;
-
}
@@ -341,7 +349,7 @@
}
},
computed: {
- ...mapGetters(['permissions'])
+ ...mapGetters(['permissions']),
},
created() {
if (!this.defaultOperationId) {
@@ -382,14 +390,17 @@
const today = new Date();
const planDate = new Date(planFinishDay);
if (planDate < today) {
- return 'rgba( 255,0,0,1)'; // 瓒呮湡涓虹孩鑹�
+ //return 'rgba( 255,0,0,1)'; // 瓒呮湡涓虹孩鑹�
+ return 'error'; // 瓒呮湡涓虹孩鑹�
} else {
const timeDiff = planDate.getTime() - today.getTime();
const daysDiff = Math.ceil(timeDiff / (1000 * 3600 * 24));
if (daysDiff <= 3) {
- return 'rgba(255,204,62, 1)'; // 涓存湡涓洪粍鑹�
+ //return 'rgba(255,204,62, 1)'; // 涓存湡涓洪粍鑹�
+ return 'warning'; // 涓存湡涓洪粍鑹�
} else {
- return 'rgba(86,219, 25,1)'; // 姝ｅ父涓虹豢鑹�
+ //return 'rgba(86,219, 25,1)'; // 姝ｅ父涓虹豢鑹�
+ return 'success'; // 姝ｅ父涓虹豢鑹�
}
}
},
diff --git a/src/views/product/workbench/workReportCard.vue b/src/views/product/workbench/workReportCard.vue
index be4d807..7f40381 100644
--- a/src/views/product/workbench/workReportCard.vue
+++ b/src/views/product/workbench/workReportCard.vue
@@ -13,9 +13,9 @@
<div class="product-out-header-left">
<div style="height:28px;line-height:28px;">
<el-divider class="pane-divider" direction="vertical"></el-divider><span
- style="font-size:14px;font-weight:bold">浜у嚭</span>
+ style="font-size:14px;font-weight:bold;">浜у嚭 </span>
<el-tooltip effect="dark" content="鍒锋柊鍒楄〃" placement="top">
- <el-button class="step-refresh-btn" icon="el-icon-refresh" type="info" circle
+ <el-button size="small" class="step-refresh-btn" icon="el-icon-refresh" type="info" circle
@click="getBatchReport(5)"></el-button>
</el-tooltip>
</div>
@@ -126,7 +126,7 @@
<!-- <el-button class="tracking-out-revoke-btn" type="primary" icon="tracking-btn-out"
:disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" >浜ょ彮
</el-button> -->
- <el-button class="submit-out-btn" type="primary"
+ <el-button class="submit-out-btn" type="primary"
:disabled="currProductMainDisable || currentDutyRecord.isConfirm" v-if="!editShow" @click="submitList()"
:loading="submitLoading">鎻愪氦
</el-button>
@@ -3246,7 +3246,7 @@
// 鍒锋柊浜у嚭璁板綍
// this.$emit('refreshProductOutput')
} else if (refreshType === 5) {
- // 鎻愪氦鎶ュ憡鍚庯紝鍒锋柊
+ // 鎻愪氦鎶ュ憡鍚庯紝鍒�
// 鍒锋柊宸ュ崟鍒楄〃
this.$emit('refreshOperateTasks')
// 鍒锋柊浜у嚭璁板綍
@@ -3270,7 +3270,9 @@
this.options = res.data.data
if (this.options.length > 1) {
this.dialogVisible = true
- } else {
+ } else if(this.options.length == 0){
+ this.$message.error('宸ヤ綔绔欐湭缁戝畾鍚堟牸搴撲綅')
+ } else {
this.locationIdValue = this.options[0].id
this.submitListApi()
}
diff --git a/vue.config.js b/vue.config.js
index 228226e..8b62c9b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,8 +4,8 @@
*/
const url = 'http://192.168.0.23:9999'
- // const url = 'http://192.168.32.45:9999'
- // const url = 'http://localhost:9999'
+ // const url = 'http://192.168.0.60:9999'
+ const url = 'http://localhost:9999'
// const url = 'http://ztt-gateway:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3