From f3e8b1999c8e6142764def9d5b5427abb843e922 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 16 十一月 2023 14:22:31 +0800
Subject: [PATCH] 改动
---
src/views/plan/manufacturingorder/index.vue | 20 +++---
src/views/plan/customerorder/index.vue | 2
src/views/plan/manufacturingorder/customerorder.vue | 4
src/views/plan/manufacturingorder/productorder-form.vue | 4
src/views/plan/masterproductionschedule/source-table.vue | 4
src/views/common/customerorder.vue | 70 +++++++++++-----------
src/views/plan/customerorder/schedule-table.vue | 18 +++--
src/views/plan/customerorder/customerorder-form.vue | 2
8 files changed, 64 insertions(+), 60 deletions(-)
diff --git a/src/views/common/customerorder.vue b/src/views/common/customerorder.vue
index 17f04bd..6cf7722 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 9012cb1..22b36b5 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -215,7 +215,7 @@
slot="append"
icon="el-icon-search"
@click="openSalesPartDialog()"
- v-show="dataForm.id"
+ v-show="dataForm.id==null"
></el-button>
</el-input>
</el-form-item>
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 8ac6bbd..973dd86 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -449,7 +449,7 @@
{
minWidth: '100',
width: '100px',
- prop: 'customerOrderNo',
+ prop: 'contractNo',
label: '鍚堝悓缂栧彿',
sort: true,
isTrue: true,
diff --git a/src/views/plan/customerorder/schedule-table.vue b/src/views/plan/customerorder/schedule-table.vue
index e5f306f..ac0ed90 100644
--- a/src/views/plan/customerorder/schedule-table.vue
+++ b/src/views/plan/customerorder/schedule-table.vue
@@ -93,8 +93,8 @@
<el-input
v-model="scope.row.qtyPlaned"
placeholder=""
- ></el-input>
- </el-form-item> -->
+ ></el-input> -->
+ </el-form-item>
</template>
</el-table-column>
<el-table-column
@@ -223,22 +223,26 @@
this.dataForm.customer = []
const _that = this
customer.forEach((item) => {
- console.log(item);
+ item.qtyPlaned=item.buyQtyDue
const outPutBatchList = []
_that.$set(item, 'outPutBatchList', outPutBatchList)
customerList.push(item)
})
this.dataForm.customer = JSON.parse(JSON.stringify(customerList))
- console.log(this.dataForm.customer);
})
- this.dataForm.customer.forEach(item=>{
- item.qtyPlaned=item.buyQtyDue
- })
+ // this.dataForm.forEach(item=>{
+ // console.log(1111);
+ // console.log("寰幆",item);
+ // item.qtyPlaned=item.buyQtyDue
+ // })
+ console.log("data",this.dataForm);
},
dataFormSubmit() {
this.isSubmit = true
this.$refs.dataForm.validate((valid) => {
if (valid) {
+ // console.log(this.dataForm);
+ // return
checkSchedule(this.dataForm.customer)
.then((res) => {
if (res.data.data.success) {
diff --git a/src/views/plan/manufacturingorder/customerorder.vue b/src/views/plan/manufacturingorder/customerorder.vue
index b49cfba..8cc4949 100644
--- a/src/views/plan/manufacturingorder/customerorder.vue
+++ b/src/views/plan/manufacturingorder/customerorder.vue
@@ -37,9 +37,9 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瀹㈡埛璁㈠崟鍙�" prop="customerOrderNo">
+ <el-form-item label="瀹㈡埛璁㈠崟鍙�" prop="contractNo">
<el-input
- v-model="dataForm.customerOrderNo"
+ v-model="dataForm.contractNo"
placeholder=""
:disabled="!ediSource"
></el-input>
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index d8e6d90..2f4af42 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -89,14 +89,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"
@@ -105,12 +105,12 @@
:loading="loadingExcel"
>瀵煎嚭
</el-button>
- <el-button
+ <!-- <el-button
v-if="permissions.manufacturingorder_update_orderno"
@click="updateOrderNo"
type="primary"
style="margin-left:10px;"
- >鏇存柊璁㈠崟鍙�
+ >鏇存柊璁㈠崟鍙� -->
</el-button>
</template>
</ttable>
@@ -934,12 +934,12 @@
fun: this.getOperationTaskByCustomer
})
}
- if (this.permissions.manufacturingorder_order_merge) {
- this.table.toolbar.push({
- text: '璁㈠崟鍚堝苟',
- fun: this.openOrderMerge
- })
- }
+ // if (this.permissions.manufacturingorder_order_merge) {
+ // this.table.toolbar.push({
+ // text: '璁㈠崟鍚堝苟',
+ // fun: this.openOrderMerge
+ // })
+ // }
/**
* {
diff --git a/src/views/plan/manufacturingorder/productorder-form.vue b/src/views/plan/manufacturingorder/productorder-form.vue
index 0c3b5ea..039af71 100644
--- a/src/views/plan/manufacturingorder/productorder-form.vue
+++ b/src/views/plan/manufacturingorder/productorder-form.vue
@@ -501,7 +501,7 @@
@refreshTestStandardInfo="refreshTestStandardInfo"
></testStandardTable>
</el-tab-pane>
- <el-tab-pane
+ <!-- <el-tab-pane
label="鎶芥瑙勫垯"
key="tb2"
id="tb2"
@@ -587,7 +587,7 @@
</el-table>
</div>
</div>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
</el-col>
</el-row>
diff --git a/src/views/plan/masterproductionschedule/source-table.vue b/src/views/plan/masterproductionschedule/source-table.vue
index 7bec52a..782dcb5 100644
--- a/src/views/plan/masterproductionschedule/source-table.vue
+++ b/src/views/plan/masterproductionschedule/source-table.vue
@@ -32,7 +32,7 @@
</el-table-column>
<el-table-column label="澶囨敞" show-overflow-tooltip prop="remark">
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
header-align="center"
align="center"
label="鎿嶄綔"
@@ -57,7 +57,7 @@
>淇濆瓨
</el-button>
</template>
- </el-table-column>
+ </el-table-column> -->
</el-table>
<div slot="footer" class="dialog-footer">
<el-button type="info" @click="visible = false">鍏抽棴</el-button>
--
Gitblit v1.9.3