From 1dc18db8439ce29fee28edf6627aaadc8726c49c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 25 十二月 2023 17:02:02 +0800
Subject: [PATCH] modified: src/api/plan/productionschedul.js modified: src/views/plan/productionschedul/index.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue modified: src/views/technology/routing/index.vue modified: vue.config.js
---
src/views/plan/productionschedul/index.vue | 15 +++++++++++++--
src/views/quality/rawMaterial/rawMaterial-form.vue | 16 +++++++++-------
vue.config.js | 2 +-
src/api/plan/productionschedul.js | 8 ++++++++
src/views/technology/routing/index.vue | 6 +++---
5 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/src/api/plan/productionschedul.js b/src/api/plan/productionschedul.js
index 7b43570..55a0947 100644
--- a/src/api/plan/productionschedul.js
+++ b/src/api/plan/productionschedul.js
@@ -23,6 +23,14 @@
})
}
+export function checkTimeLines(data) {
+ return request({
+ url: '/mes/productionSchedul/checkTimeLines',
+ method: 'post',
+ data: data
+ })
+}
+
export function deleteSchedul(mId) {
return request({
url: '/mes/productionSchedul/'+mId,
diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index ecf9c7a..ea93866 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -185,6 +185,7 @@
fillTime,
deleteSchedul,
updateState,
+ checkTimeLines,
} from '@/api//plan/productionschedul'
import ttable from '@/views/common/ztt-table.vue'
import { mapGetters } from 'vuex'
@@ -547,8 +548,18 @@
this.$message.error("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�")
return
}
- this.scheduleEditList = JSON.parse(JSON.stringify(this.scheduleList))
- this.dialogVisible = true
+ let mIds = this.multipleSelection.map(ele=>{
+ return ele.mid
+ })
+ checkTimeLines(mIds).then(res=>{
+ console.log(res);
+ if(res.data.code===200){
+ this.scheduleEditList = JSON.parse(JSON.stringify(this.scheduleList))
+ this.dialogVisible = true
+ }
+ }).catch(error=>{
+ console.error(error);
+ })
},
confirmEditSchedul(){
let data = this.scheduleEditList
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 2698021..b9aa4b5 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -241,6 +241,7 @@
element-loading-text="璇风◢绛夛紝鏂囦欢涓婁紶涓�"
>
<el-upload
+ :disabled="dataForm.rawInsNo==null"
drag
ref="upload"
action="/mes/rawInsProduct/upload"
@@ -493,6 +494,10 @@
methods:{
tabsClick(tab,even){
if(tab.index == 1){
+ if(this.dataForm.rawInsNo==null){
+ this.$message.error("璇峰厛淇濆瓨鍘熸潗鏂欐楠屼俊鎭�")
+ return
+ }
this.getConfigFiles();
}
},
@@ -518,13 +523,11 @@
cancelButtonText: '鍙栨秷',
type: 'warning',
closeOnClickModal: false
+ }).then(function() {
+ return deleteProcessConfigFile(row.id)
+ }).then((data) => {
+ this.getConfigFiles()
})
- .then(function() {
- return deleteProcessConfigFile(row.id)
- })
- .then((data) => {
- this.getConfigFiles()
- })
},
submitUpload() {
this.paramData.rawInsNo = this.dataForm.rawInsNo
@@ -539,7 +542,6 @@
this.deviceCode = false
},
getDeviceResultInfo(val){
- console.log("鎵弿鍚庢暟鎹�",val);
let id=val.split("id@")[1]
if(id!=undefined&&id!=''&&id!=null){
let filterData=this.deviceList.filter(item=>{
diff --git a/src/views/technology/routing/index.vue b/src/views/technology/routing/index.vue
index 748d0bb..8c9a5b9 100644
--- a/src/views/technology/routing/index.vue
+++ b/src/views/technology/routing/index.vue
@@ -16,13 +16,13 @@
<el-button v-if="permissions.technology_routing_add"
type="primary" @click="addOrUpdateHandle">鏂板</el-button>
<el-button @click="() => {this.approveHandle('ACCEPT')}"
- :disabled="uniqueStateArr.includes('01draft')"
+ :disabled="!uniqueStateArr.includes('01draft')"
v-if="permissions.technology_routing_accept">鎵瑰噯</el-button>
<el-button @click="() => {this.approveHandle('REVOKE')}"
- :disabled="uniqueStateArr.includes('02accepted')"
+ :disabled="!uniqueStateArr.includes('02accepted')"
v-if="permissions.technology_routing_revoke">鎾ゅ洖</el-button>
<el-button @click="() => {this.approveHandle('CANCEL')}"
- :disabled="uniqueStateArr.includes('02accepted')"
+ :disabled="!uniqueStateArr.includes('02accepted')"
v-if="permissions.technology_routing_cancel">鎷掔粷</el-button>
<el-button @click="copyRouting"
v-if="permissions.technology_routing_cancel">澶嶅埗</el-button>
diff --git a/vue.config.js b/vue.config.js
index 9fd7884..6e02942 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -5,7 +5,7 @@
// const url = 'http://192.168.32.45:9999'
-const url = 'http://192.168.2.7:9999'
+// const url = 'http://192.168.2.7:9999'
const url = 'http://localhost:9999'
--
Gitblit v1.9.3