From 1cf81a64af5bac57f2af8c419db0b22b3d5ba7c8 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 17 十一月 2023 16:37:50 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before
---
src/views/plan/masterproductionschedule/index.vue | 4 +-
src/views/common/customerorder.vue | 70 +++++++++++++++++-----------------
src/views/plan/customerorder/customerorder-form.vue | 34 +++++++++++++---
3 files changed, 64 insertions(+), 44 deletions(-)
diff --git a/src/views/common/customerorder.vue b/src/views/common/customerorder.vue
index 17f04bd..a1b2fdd 100644
--- a/src/views/common/customerorder.vue
+++ b/src/views/common/customerorder.vue
@@ -82,22 +82,22 @@
{
minWidth: '100',
width: '100px',
- prop: 'customerOrderNo',
+ prop: 'contractNo',
label: '瀹㈡埛璁㈠崟鍙�',
sort: true,
isTrue: true,
isSearch: true,
searchInfoType: 'text'
},
- {
- minWidth: '120',
- prop: 'customerNo',
- label: '瀹㈡埛缂栧彿',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'customerNo',
+ // label: '瀹㈡埛缂栧彿',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
{
minWidth: '120',
prop: 'customerName',
@@ -120,15 +120,15 @@
return this.coStateList
}
},
- {
- minWidth: '120',
- prop: 'coLineNo',
- label: '琛屽彿',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text'
- },
+ // {
+ // minWidth: '120',
+ // prop: 'coLineNo',
+ // label: '琛屽彿',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
{
minWidth: '120',
width: '100px',
@@ -142,7 +142,7 @@
{
minWidth: '120',
width: '100px',
- prop: 'partName',
+ prop: 'productName',
label: '闆朵欢鍚嶇О',
sort: true,
isTrue: true,
@@ -160,7 +160,7 @@
},
{
minWidth: '140',
- prop: 'requireNumber',
+ prop: 'buyQtyDue',
label: '宸蹭笅鍙戞暟閲�',
sort: true,
isTrue: true,
@@ -169,7 +169,7 @@
},
{
minWidth: '80',
- prop: 'unit',
+ prop: 'otcUnit',
label: '闆朵欢鍗曚綅',
sort: true,
isTrue: true,
@@ -179,25 +179,25 @@
{
minWidth: '140',
width: '120',
- prop: 'wantedDeliveryDate',
- label: '鏈熸湜浜よ揣鏃堕棿',
+ prop: 'deliveryDate',
+ label: '浜よ揣鏃堕棿',
sort: true,
isTrue: true,
isSearch: true,
searchInfoType: 'datetimerange',
formatter: this.formatDutyDate
},
- {
- minWidth: '200',
- width: '120',
- prop: 'plannedDeliveryDate',
- label: '璁″垝浜よ揣鏃堕棿',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'datetimerange',
- formatter: this.formatDutyDate
- },
+ // {
+ // minWidth: '200',
+ // width: '120',
+ // prop: 'plannedDeliveryDate',
+ // label: '璁″垝浜よ揣鏃堕棿',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'datetimerange',
+ // formatter: this.formatDutyDate
+ // },
{
minWidth: '200',
width: '120',
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index 3beeaf4..97c47e0 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -71,9 +71,9 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="瀹㈡埛璁㈠崟鐘舵��" prop="returnStatus">
+ <el-form-item label="瀹㈡埛璁㈠崟鐘舵��" prop="coState">
<el-input
- v-model="dataForm.returnStatus"
+ v-model="dataForm.coState"
placeholder=""
filterable
style="width: 100%"
@@ -909,6 +909,13 @@
)
}
}
+ let val=""
+ this.coStates.forEach(item=>{
+ if(item.value==this.dataForm.coState){
+ val=item.label
+ }
+ })
+ this.dataForm.coState=val
})
} else {
this.title = '鏂板'
@@ -916,6 +923,7 @@
}
})
},
+
getFileList() {
this.fileList = []
const queryParam = { orderNumber: this.dataForm.contractNo }
@@ -1095,10 +1103,23 @@
this.getConfigFiles()
},
delProcessConfigFile(row) {
- if (row.lineNumber !== this.dataForm.otcLineNo) {
- this.$message.error('涓婁紶鏂囦欢琛屽彿涓庡綋鍓嶉攢鍞鍗曡鍙蜂笉涓�鑷达紝涓嶅厑璁稿垹闄�')
- } else {
- this.$confirm('鏄惁鍒犻櫎宸ヨ壓閰嶇疆鏂囦欢', '鎻愮ず', {
+ // if (row.lineNumber !== this.dataForm.otcLineNo) {
+ // this.$message.error('涓婁紶鏂囦欢琛屽彿涓庡綋鍓嶉攢鍞鍗曡鍙蜂笉涓�鑷达紝涓嶅厑璁稿垹闄�')
+ // } else {
+ // this.$confirm('鏄惁鍒犻櫎宸ヨ壓閰嶇疆鏂囦欢', '鎻愮ず', {
+ // confirmButtonText: '纭畾',
+ // cancelButtonText: '鍙栨秷',
+ // type: 'warning',
+ // closeOnClickModal: false
+ // })
+ // .then(function() {
+ // return deleteProcessConfigFile(row.id)
+ // })
+ // .then((data) => {
+ // this.getConfigFiles()
+ // })
+ // }
+ this.$confirm('鏄惁鍒犻櫎宸ヨ壓閰嶇疆鏂囦欢', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning',
@@ -1110,7 +1131,6 @@
.then((data) => {
this.getConfigFiles()
})
- }
},
downloadProcessConfigFile(row) {
downloadProcessConfigFile(
diff --git a/src/views/plan/masterproductionschedule/index.vue b/src/views/plan/masterproductionschedule/index.vue
index e3c9141..46bb266 100644
--- a/src/views/plan/masterproductionschedule/index.vue
+++ b/src/views/plan/masterproductionschedule/index.vue
@@ -62,12 +62,12 @@
type="primary"
style="margin-left:10px;"
>SCM鐘舵�佸彉鏇�
- </el-button>
+ </el-button> -->
<el-button
type="primary"
style="margin-left:10px;"
>鏂板閲囪喘璁″垝
- </el-button> -->
+ </el-button>
</template>
</ttable>
--
Gitblit v1.9.3