From f980b32cd6d51f2208e07d44014fe6b605533b23 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 11 四月 2024 14:30:10 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into master
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 3 ++-
src/views/plan/customerorder/index.vue | 4 ++++
src/views/quality/teststandard/index.vue | 4 +++-
src/router/axios.js | 2 +-
src/views/technology/operation/operation-form.vue | 8 +++++++-
src/views/quality/rawMaterial/index.vue | 24 +++++++++++++-----------
src/views/technology/completeproductstructure/index.vue | 2 ++
7 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/src/router/axios.js b/src/router/axios.js
index 5c18a42..6dcb2fd 100644
--- a/src/router/axios.js
+++ b/src/router/axios.js
@@ -8,7 +8,7 @@
import qs from 'qs'
import store from '@/store' // progress bar style
import { webVersion } from '@/config/sysParam'
-axios.defaults.timeout = 60000
+axios.defaults.timeout = 20*60*1000
// 杩斿洖鍏朵粬鐘舵�佸悧
axios.defaults.validateStatus = function(status) {
return status >= 200 && status <= 500 // 榛樿鐨�
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index a9f5500..0123e22 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -1011,6 +1011,7 @@
created() {
// this.getManufactureAttrs()
this.getTitles()
+ if (this.permissions.plan_customerorder_add) {
this.table.toolbar.push({
text: '鏂板閿�鍞鍗�',
type: 'primary',
@@ -1018,6 +1019,7 @@
disabled: false,
permitArr: [],
})
+ }
if (this.permissions.customerorder_from_otc) {
this.table.toolbar.push({
text: '鑾峰彇閿�鍞鍗�',
@@ -1064,6 +1066,7 @@
fun: this.downloadProductionScheduling,
})
}
+ if(this.permissions.plan_relevance_order){
this.table.toolbar.push({
text: '鍏宠仈璁㈠崟',
disabled: false,
@@ -1071,6 +1074,7 @@
fun: this.interrelatedOrderFun,
permitArr: [],
})
+ }
if (this.permissions.customerorder_create_masterplan) {
this.table.toolbar.push({
text: '涓荤敓浜ц鍒�',
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index afa8ac8..1152cfb 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -285,17 +285,19 @@
})
}
- this.table.operator = [{
- text: '瀹℃牳',
- type: 'text',
- size: 'small',
- fun: this.examineHandle,
- showFun: (row)=>{return row.type==='棣栨'},
- show: {
- key: 'checkState',
- val: ['0']
- }
- }]
+ if(this.permissions.quality_rawMaterial_check){
+ this.table.operator = [{
+ text: '瀹℃牳',
+ type: 'text',
+ size: 'small',
+ fun: this.examineHandle,
+ showFun: (row)=>{return row.type==='棣栨'&& row.insState==='1'},
+ show: {
+ key: 'checkState',
+ val: ['0','2']
+ }
+ }]
+ }
if(this.permissions.quality_rawMaterial_del){
this.table.operator.push({
text: '浣滃簾',
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 9daa95d..074517c 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -704,6 +704,7 @@
if(res.data.code == 0 && (res.data.data=='1'|| res.data.data=='0')){
sessionStorage.setItem("raw-resultVal-"+this.dataForm.id,res.data.data)
this.$message.success("涓婃姤鎴愬姛");
+ this.$router.go(-1)
}else{
this.$message.error("涓婃姤澶辫触锛�",res.data.data);
}
@@ -1012,7 +1013,7 @@
data.rawInsProducts = this.list
addRawInspects(data).then(res=>{
this.$message.success("淇濆瓨鎴愬姛")
- // this.$router.go(-1)
+ this.$router.go(-1)
}).catch(error=>{
this.$message.error(error)
})
diff --git a/src/views/quality/teststandard/index.vue b/src/views/quality/teststandard/index.vue
index 72deceb..392c8ed 100644
--- a/src/views/quality/teststandard/index.vue
+++ b/src/views/quality/teststandard/index.vue
@@ -867,8 +867,10 @@
this.isSubmit = true
if (this.testStandardParams.length > 0) {
this.testStandardParams.map(m=>{
- m.referenceValue = m.referenceValue.replace(',','锛�').replace('(','锛�').replace(')','锛�')
+ if(m.referenceValue !== undefined) {
+ m.referenceValue = m.referenceValue.replace(',','锛�').replace('(','锛�').replace(')','锛�')
return m
+ }
})
addTestStandardParam(this.testStandardParams)
.then((response) => {
diff --git a/src/views/technology/completeproductstructure/index.vue b/src/views/technology/completeproductstructure/index.vue
index 3a79e2b..4f88d88 100644
--- a/src/views/technology/completeproductstructure/index.vue
+++ b/src/views/technology/completeproductstructure/index.vue
@@ -295,6 +295,7 @@
fun: ()=>{this.deleteAll()},
})
}
+ if(this.permissions.technology_completeproductstructure_bom_export){
this.table.toolbar.push({
text: 'BOM瀵煎嚭',
type:'primary',
@@ -302,6 +303,7 @@
permitArr: [],
fun: ()=>{this.exportBomFun()},
})
+ }
if(this.permissions.technology_completeproductstructure_del){
this.table.operator = [
{
diff --git a/src/views/technology/operation/operation-form.vue b/src/views/technology/operation/operation-form.vue
index dfdf857..455f8cb 100644
--- a/src/views/technology/operation/operation-form.vue
+++ b/src/views/technology/operation/operation-form.vue
@@ -36,6 +36,7 @@
style="width:100%"
v-model="dataForm.operationNo"
placeholder="宸ュ簭缂栧彿"
+ :disabled="isUpdate"
></el-input>
</el-form-item>
</el-col>
@@ -403,7 +404,8 @@
workCenterOptions: [],
runTimeCodeDbOptions: [],
laborClassNoOptions: [],
- outsideOpItemOptions: []
+ outsideOpItemOptions: [],
+ isUpdate:false
}
},
computed: {
@@ -512,6 +514,7 @@
init() {
// this.operationId = this.dataForm.id
// this.fetchCapabilityForOperation()
+
if (this.dataForm.id) {
getObj(this.dataForm.id).then((response) => {
this.dataForm = response.data.data
@@ -1067,6 +1070,9 @@
created() {
this.dataForm.id = this.$route.params.id
+ if(this.dataForm.id){
+ this.isUpdate=true
+ }
this.init()
this.initPartFamilySelect()
this.getParamType()
--
Gitblit v1.9.3