From da81627f0b578ea7858ddae6e2fe7991dc734eb0 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 17 十一月 2023 18:32:34 +0800
Subject: [PATCH] modified: src/views/plan/manufacturingorder/index.vue modified: src/views/plan/manufacturingorder/productorder-form.vue modified: src/views/plan/outsourcingorder/index.vue
---
src/views/plan/manufacturingorder/index.vue | 13 +-----
src/views/plan/manufacturingorder/productorder-form.vue | 14 +++---
src/views/plan/outsourcingorder/index.vue | 63 +++++++++++++------------------
3 files changed, 36 insertions(+), 54 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index d90208e..c3a0093 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -91,14 +91,14 @@
:loading="loadingStructIfs"
>鐗╂枡鍚屾ERP
</el-button> -->
- <el-button
+ <!-- <el-button
v-if="permissions.manufacturingorder_refresh_ifsorder"
@click="refreshIfsorder()"
type="primary"
style="margin-left:10px;"
:loading="refreshIfsorderLoading"
>鍒锋柊ifs杞﹂棿璁㈠崟鍙�
- </el-button>
+ </el-button> -->
<el-button
@click="exportExcel"
@@ -823,14 +823,7 @@
}
],
toolbar: [],
- operator: [
- {
- text: '鏌ョ湅搴撳瓨',
- type: 'text',
- size: 'small',
- fun: this.searchStock
- }
- ],
+ operator: null,
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
diff --git a/src/views/plan/manufacturingorder/productorder-form.vue b/src/views/plan/manufacturingorder/productorder-form.vue
index 4b5e6b1..5a1225b 100644
--- a/src/views/plan/manufacturingorder/productorder-form.vue
+++ b/src/views/plan/manufacturingorder/productorder-form.vue
@@ -495,8 +495,8 @@
<testStandardTable
ref="moTestStandardTable"
:editable="editable"
- :dataFormId="dataForm.id"
- :moRoutingOperationId="moRoutingOperationId"
+ :dataFormId="Number(dataForm.id)"
+ :moRoutingOperationId="Number(moRoutingOperationId)"
@refreshTestStandardInfo="refreshTestStandardInfo"
></testStandardTable>
</el-tab-pane>
@@ -853,7 +853,7 @@
</el-row>
</el-tab-pane>
<el-tab-pane label="瀹㈡埛璁㈠崟" id="ta3" key="ta3" name="ta3">
- <CustomerOrder :orderId="dataForm.id" />
+ <CustomerOrder :orderId="Number(dataForm.id)" />
</el-tab-pane>
</el-tabs>
</el-card>
@@ -917,8 +917,8 @@
/>
<spotCheckRule
:currshowlist.sync="spotCheckRuleShow"
- :moId="dataForm.id"
- :moRoutingOperationId="moRoutingOperationId"
+ :moId="Number(dataForm.id)"
+ :moRoutingOperationId="Number(moRoutingOperationId)"
:moRoutingOperationName="moRoutingOperationName"
@refreshSpotCheckRuleList="refreshSpotCheckRuleList"
/>
@@ -2109,7 +2109,7 @@
} else {
if (this.structSelection.length === 1) {
this.selectedStruct = this.structSelection[0]
- this.moId = this.dataForm.id
+ this.moId = Number(this.dataForm.id)
this.showStructForm = true
} else {
this.$message.error('鍙兘涓哄崟涓妭鐐规坊鍔犲厓绱�')
@@ -2126,7 +2126,7 @@
refreshSpotCheckRuleList() {
this.spotCheckRuleList = []
qryMoSamplingRule({
- moId: this.dataForm.id,
+ moId: Number(this.dataForm.id),
moRoutingOperationId: this.moRoutingOperationId
}).then((response) => {
const resData = response.data
diff --git a/src/views/plan/outsourcingorder/index.vue b/src/views/plan/outsourcingorder/index.vue
index 858ffa0..eb35ef0 100644
--- a/src/views/plan/outsourcingorder/index.vue
+++ b/src/views/plan/outsourcingorder/index.vue
@@ -259,7 +259,7 @@
{
minWidth: '140',
prop: 'foreignState',
- label: '瀵瑰鐩村彂鐘舵��',
+ label: '澶栧崗鐩村彂鐘舵��',
sort: true,
isTrue: true,
formatter: this.formatForeignState,
@@ -357,12 +357,12 @@
loading: false,
fun: this.launchOaProcess
},
- {
- text: '鏂板澶栧崗鐩村彂鐢宠鍗�',
- type: 'primary',
- loading: false,
- fun: this.showForeign
- },
+ // {
+ // text: '鏂板澶栧崗鐩村彂鐢宠鍗�',
+ // type: 'primary',
+ // loading: false,
+ // fun: this.showForeign
+ // },
],
operator:[
{
@@ -376,23 +376,12 @@
key: 'oaState'
}
},
- {
- text: '鎵撳嵃妯″叿澶栧崗鐢熶骇鍗�',
- type: 'text',
- size: 'small',
- show: {
- val: [
- '03pass'
- ],
- key: 'oaState'
- }
- }
],
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
- width: 230,
- minWidth: 230
+ width: 100,
+ minWidth: 100
}
},
foreignStateList: [
@@ -524,23 +513,23 @@
},
methods: {
//灞曠ず鏂板澶栧崗鐩村彂妯℃�佹
- showForeign(){
- let data = this.currentOutsourcingOrder
- if(data){
- if(data.foreignState == "1"){
- this.$message.warning("璇ヨ鍗曟棤闇�澶栧崗鐩村彂鐢宠鍗�")
- return
- }
- if(data.foreignState == "0" && data.foreignId!= null){
- this.$message.warning("璇ヨ鍗曞凡鏈夊鍗忕洿鍙戠敵璇峰崟")
- return
- }
- //
- this.$message.success("鏂板")
- }else{
- this.$message.warning("璇烽�夋嫨涓�鏉″澶栬鍗�")
- }
- },
+ // showForeign(){
+ // let data = this.currentOutsourcingOrder
+ // if(data){
+ // if(data.foreignState == "1"){
+ // this.$message.warning("璇ヨ鍗曟棤闇�澶栧崗鐩村彂鐢宠鍗�")
+ // return
+ // }
+ // if(data.foreignState == "0" && data.foreignId!= null){
+ // this.$message.warning("璇ヨ鍗曞凡鏈夊鍗忕洿鍙戠敵璇峰崟")
+ // return
+ // }
+ // //
+ // this.$message.success("鏂板")
+ // }else{
+ // this.$message.warning("璇烽�夋嫨涓�鏉″澶栬鍗�")
+ // }
+ // },
// 鑾峰彇鏁版嵁鍒楄〃
getData() {
this.$refs.outsourcingOrderTable.refreshData()
--
Gitblit v1.9.3