From ec5790cd8e6bd32a3dd599ace9b27f298789bc2d Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 15 十一月 2023 15:42:23 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before
---
src/views/plan/customerorder/index.vue | 6 ++----
src/api/plan/customerorder.js | 2 +-
src/views/plan/customerorder/sample-customerorder-form.vue | 23 ++++++++++++++++++++++-
src/views/plan/customerorder/schedule-table.vue | 25 +++++++++++--------------
src/views/plan/customerorder/customerorder-form.vue | 2 +-
5 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/src/api/plan/customerorder.js b/src/api/plan/customerorder.js
index 112e721..a88f999 100644
--- a/src/api/plan/customerorder.js
+++ b/src/api/plan/customerorder.js
@@ -252,7 +252,7 @@
export function downloadProcessConfigFile(filename, bucket, originalFileName) {
return request({
url: '/mes/plan/customerOrder/processConfig/' + bucket + '/' + filename,
- method: 'get',
+ method: 'post',
responseType: 'blob'
}).then((response) => {
// 澶勭悊杩斿洖鐨勬枃浠舵祦
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index f916048..c36e379 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -32,7 +32,7 @@
<el-col :span="6">
<el-form-item label="鍚屾鏁版嵁鏉ユ簮" prop="sourceId">
<el-input
- v-model="dataForm.sourceId == 0 ? '鍚屾' : '鎵嬪姩'"
+ :value="dataForm.sourceId == 0 ? '澶栭儴' : '鍐呴儴'"
placeholder=""
disabled
></el-input>
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 713abf5..41d2c4f 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -345,11 +345,9 @@
sourceIdList: [{
label: '澶栭儴',
value: '0',
- type: 'success',
},{
label: '鍐呴儴',
value: '1',
- type: ''
}],
stateTagArr: [
{
@@ -817,7 +815,7 @@
}
},
immediate: true
- }
+ },
},
mounted() {
this.initQueryParams()
@@ -886,7 +884,6 @@
prop: 'coState',
searchInfoType: 'select',
// propVal: '01partUnCheck'
- propVal: ''
})
)
this.$refs.customerOrderTable.setQueryParam(queryParam)
@@ -930,6 +927,7 @@
}
}
this.scheduleVisible = true
+ console.log(this.multipleSelection);
this.$nextTick(() => {
this.$refs.schedule.init(this.multipleSelection)
})
diff --git a/src/views/plan/customerorder/sample-customerorder-form.vue b/src/views/plan/customerorder/sample-customerorder-form.vue
index 244ede5..04fded5 100644
--- a/src/views/plan/customerorder/sample-customerorder-form.vue
+++ b/src/views/plan/customerorder/sample-customerorder-form.vue
@@ -174,7 +174,7 @@
</el-select>
</template>
<template slot="menu" slot-scope="scope">
- <el-button type="text" icon="el-icon-circle-close" :disabled="tableData.length<2" @click="delRow(scope.row,scope.$index)">鍙栨秷</el-button>
+ <el-button type="text" icon="el-icon-circle-close" :disabled="tableData.length<2" @click="delRow(scope.row,scope.index)">鍙栨秷</el-button>
</template>
</avue-crud>
</div>
@@ -398,6 +398,27 @@
components: {
PartDialog
},
+ watch:{
+ visible(newVal){
+ if(!newVal){
+
+ this.tableData = [{
+ "$cellEdit": true,
+ "$index": 0,
+ "partNo": "",
+ "specs": "",
+ "manufactureAttr": "",
+ "productName": "",
+ "productType": "",
+ "otcUnit": "",
+ "buyQtyDue": "",
+ "shippingAddress": "",
+ "remark": "",
+ "isTrusted": true
+ }]
+ }
+ }
+ },
data() {
return {
salesSelectData: null,
diff --git a/src/views/plan/customerorder/schedule-table.vue b/src/views/plan/customerorder/schedule-table.vue
index a5588d4..d0aec79 100644
--- a/src/views/plan/customerorder/schedule-table.vue
+++ b/src/views/plan/customerorder/schedule-table.vue
@@ -19,6 +19,7 @@
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" class="l-mes">
<div class="avue-crud">
<el-table
+ border
:data="dataForm.customer"
style="width: 100%"
class="mps-table"
@@ -28,17 +29,17 @@
header-align="center"
align="center"
label="瀹㈡埛璁㈠崟缂栧彿"
- width="120px"
+ min-width="130px"
>
<template slot-scope="scope">
- <el-form-item>{{ scope.row.customerOrderNo }}</el-form-item>
+ <el-form-item>{{ scope.row.contractNo }}</el-form-item>
</template>
</el-table-column>
<el-table-column
header-align="center"
align="center"
label="闆朵欢鍙�"
- width="120px"
+ min-width="130"
>
<template slot-scope="scope">
<el-form-item>{{ scope.row.partNo }}</el-form-item>
@@ -53,7 +54,7 @@
>
<template slot-scope="scope">
<el-form-item class="inline-el-hidden">{{
- scope.row.partName
+ scope.row.productName
}}</el-form-item>
</template>
</el-table-column>
@@ -67,22 +68,20 @@
<el-form-item>{{ scope.row.buyQtyDue }}</el-form-item>
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
header-align="center"
align="center"
label="宸茶鍒掓暟閲�"
- width="120px"
>
<template slot-scope="scope">
<el-form-item>{{ scope.row.requireNumber }}</el-form-item>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
prop="remainderRequired"
header-align="center"
align="center"
label="鏈璁″垝鏁伴噺"
- width="170px"
>
<template scope="scope">
<el-form-item
@@ -91,7 +90,7 @@
>
<el-input
v-model="scope.row.qtyPlaned"
- placeholder=""
+ placeholder="璇疯緭鍏ユ湰娆¤鍒掓暟閲�"
></el-input>
</el-form-item>
</template>
@@ -100,10 +99,9 @@
header-align="center"
align="center"
label="鍗曚綅"
- width="60px"
>
<template slot-scope="scope">
- <span>{{ scope.row.unit }}</span>
+ <span>{{ scope.row.otcUnit }}</span>
</template>
</el-table-column>
<el-table-column
@@ -111,7 +109,6 @@
header-align="center"
align="center"
label="鍒堕�犲睘鎬�"
- width="170px"
>
<template scope="scope">
<el-form-item :prop="'manufactureAttr.' + scope.$index">
@@ -135,10 +132,9 @@
header-align="center"
align="center"
label="闇�姹傛棩鏈�"
- width="160px"
>
<template slot-scope="scope">
- <el-form-item>{{ scope.row.wantedDeliveryDate }}</el-form-item>
+ <el-form-item>{{ scope.row.deliveryDate }}</el-form-item>
</template>
</el-table-column>
<el-table-column
@@ -146,6 +142,7 @@
align="center"
show-overflow-tooltip
label="澶囨敞"
+ min-width="140"
>
<template slot-scope="scope">
<el-form-item>
--
Gitblit v1.9.3