From 966aba5c5836fd565b7cbda905bade237c074a20 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 13 十月 2023 14:47:10 +0800
Subject: [PATCH] modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/plan/customerorder/schedule-table.vue
---
src/views/plan/customerorder/schedule-table.vue | 8
src/views/plan/customerorder/customerorder-form.vue | 268 ++++++++++++++++++++++++++--------------------------
2 files changed, 138 insertions(+), 138 deletions(-)
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index 452eca0..bbe1d58 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -34,7 +34,7 @@
<el-input
v-model="dataForm.sourceId == 0 ? '鍚屾' : '鎵嬪姩'"
placeholder=""
- :disabled="!ediSource"
+ disabled
></el-input>
</el-form-item>
</el-col>
@@ -102,98 +102,12 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="璁″垝浜よ揣鏃堕棿" prop="plannedDeliveryDate">
- <el-date-picker
- v-model="dataForm.plannedDeliveryDate"
- style="width: 100%"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- >
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍖呰瑕佹眰" prop="packageRequire">
+ <el-form-item label="涓氬姟鍛�" prop="salesMan">
<el-input
- v-model="dataForm.packageRequire"
+ v-model="dataForm.salesMan"
placeholder=""
disabled
></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <!-- <el-col :span="6">
- <el-form-item label="闆朵欢鍙�" prop="partNo">
- <el-input v-model="dataForm.partNo" placeholder="" readonly>
- <el-button
- slot="append"
- icon="el-icon-search"
- @click="openPartDialog()"
- ></el-button>
- </el-input>
- </el-form-item>
- </el-col> -->
- <el-col :span="6">
- <el-form-item label="鐩橀暱瑕佹眰" prop="lengthRequirement">
- <el-input
- v-model="dataForm.lengthRequirement"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="閿�鍞暟閲�" prop="buyQtyDue">
- <el-input
- v-model="dataForm.buyQtyDue"
- placeholder=""
- :disabled="!ediSource"
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="浜у搧鍚嶇О" prop="productName">
- <el-input
- v-model="dataForm.productName"
- placeholder=""
- disabled
- >
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="閿�鍞欢鍙�" prop="partNo">
- <el-input
- v-model="dataForm.partNo"
- placeholder=""
- disabled
- >
- <el-button
- slot="append"
- icon="el-icon-search"
- @click="openSalesPartDialog()"
- v-show="dataForm.id"
- ></el-button>
- </el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="閿�鍞欢鎻忚堪" prop="salesPartName">
- <el-input
- v-model="dataForm.salesPartName"
- placeholder=""
- disabled
- >
- <el-button
- slot="append"
- icon="el-icon-search"
- @click="openSalesPartDialog()"
- v-show="dataForm.id"
- ></el-button>
- </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -214,66 +128,67 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="宸ヨ壓鏂囦欢鍙�" prop="docNumber">
+ <!-- <el-col :span="6">
+ <el-form-item label="璁″垝浜よ揣鏃堕棿" prop="plannedDeliveryDate">
+ <el-date-picker
+ v-model="dataForm.plannedDeliveryDate"
+ style="width: 100%"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col> -->
+ <!-- <el-col :span="6">
+ <el-form-item label="鍖呰瑕佹眰" prop="packageRequire">
<el-input
- v-model="dataForm.docNumber"
+ v-model="dataForm.packageRequire"
placeholder=""
disabled
></el-input>
</el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="涓氬姟鍛�" prop="salesMan">
- <el-input
- v-model="dataForm.salesMan"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
<el-row>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="璐ㄩ噺瑕佹眰" prop="qualityRequire">
+ <!-- <el-col :span="6">
+ <el-form-item label="闆朵欢鍙�" prop="partNo">
+ <el-input v-model="dataForm.partNo" placeholder="" readonly>
+ <el-button
+ slot="append"
+ icon="el-icon-search"
+ @click="openPartDialog()"
+ ></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col> -->
+ <!-- <el-col :span="6">
+ <el-form-item label="鐩橀暱瑕佹眰" prop="lengthRequirement">
<el-input
- v-model="dataForm.qualityRequire"
+ v-model="dataForm.lengthRequirement"
placeholder=""
disabled
></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="6">
- <el-form-item label="鐢熶骇闇�姹傝鏄�" prop="otherProductRequire">
+ <el-form-item label="閿�鍞暟閲�" prop="buyQtyDue">
<el-input
- v-model="dataForm.otherProductRequire"
+ v-model="dataForm.buyQtyDue"
placeholder=""
- disabled
+ :disabled="!ediSource"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="绯荤粺" prop="divisionSystem">
+ <el-form-item label="浜у搧鍚嶇О" prop="productName">
<el-input
- v-model="dataForm.divisionSystem"
+ v-model="dataForm.productName"
placeholder=""
disabled
- ></el-input>
+ >
+ </el-input>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="鏀惰揣鍦板潃" prop="shippingAddress">
- <el-input
- v-model="dataForm.shippingAddress"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
<el-col :span="6">
<el-form-item label="浜у搧绫诲瀷" prop="productType">
<el-input
@@ -284,6 +199,90 @@
</el-form-item>
</el-col>
<el-col :span="6">
+ <el-form-item label="閿�鍞欢鍙�" prop="partNo">
+ <el-input
+ v-model="dataForm.partNo"
+ placeholder=""
+ disabled
+ >
+ <el-button
+ slot="append"
+ icon="el-icon-search"
+ @click="openSalesPartDialog()"
+ v-show="dataForm.id"
+ ></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <!-- <el-col :span="6">
+ <el-form-item label="閿�鍞欢鎻忚堪" prop="salesPartName">
+ <el-input
+ v-model="dataForm.salesPartName"
+ placeholder=""
+ disabled
+ >
+ <el-button
+ slot="append"
+ icon="el-icon-search"
+ @click="openSalesPartDialog()"
+ v-show="dataForm.id"
+ ></el-button>
+ </el-input>
+ </el-form-item>
+ </el-col> -->
+ <el-col :span="6">
+ <el-form-item label="宸ヨ壓鏂囦欢鍙�" prop="docNumber">
+ <el-input
+ v-model="dataForm.docNumber"
+ placeholder=""
+ disabled
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏀惰揣鍦板潃" prop="shippingAddress">
+ <el-input
+ v-model="dataForm.shippingAddress"
+ placeholder=""
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ </el-row>
+ <el-row>
+ <!-- <el-col :span="6">
+ <el-form-item label="璐ㄩ噺瑕佹眰" prop="qualityRequire">
+ <el-input
+ v-model="dataForm.qualityRequire"
+ placeholder=""
+ disabled
+ ></el-input>
+ </el-form-item>
+ </el-col> -->
+ <!-- <el-col :span="6">
+ <el-form-item label="鐢熶骇闇�姹傝鏄�" prop="otherProductRequire">
+ <el-input
+ v-model="dataForm.otherProductRequire"
+ placeholder=""
+ disabled
+ ></el-input>
+ </el-form-item>
+ </el-col> -->
+ <!-- <el-col :span="6">
+ <el-form-item label="绯荤粺" prop="divisionSystem">
+ <el-input
+ v-model="dataForm.divisionSystem"
+ placeholder=""
+ disabled
+ ></el-input>
+ </el-form-item>
+ </el-col> -->
+ </el-row>
+ <el-row>
+ <!-- <el-col :span="6">
<el-form-item label="閲囬泦鎬ц川" prop="centralizedMiningProperty">
<el-input
v-model="dataForm.centralizedMiningProperty"
@@ -291,8 +290,8 @@
disabled
></el-input>
</el-form-item>
- </el-col>
- <el-col :span="6">
+ </el-col> -->
+ <!-- <el-col :span="6">
<el-form-item label="璁㈠崟琛屽娉�" prop="remark">
<el-input
v-model="dataForm.remark"
@@ -309,10 +308,10 @@
disabled
></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
<el-row>
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="OTC鎺ㄩ�佺姸鎬�" prop="remark">
<span>{{
dataForm.otcPartSync != null
@@ -322,16 +321,16 @@
: ''
}}</span>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="璁㈠崟璇存槑" prop="orderDescription">
+ <el-form-item label="璁㈠崟璇存槑" prop="remark">
<el-input
type="textarea"
:rows="3"
placeholder=""
- v-model="dataForm.orderDescription"
+ v-model="dataForm.remark"
maxlength="500"
show-word-limit
>
@@ -1001,8 +1000,9 @@
this.dataForm = response.data.data
// }
// this.fileList = response.data.data.customerOrderAttachmentList
+ console.log(response.data.data.sourceId);
const sourceId = response.data.data.sourceId
- if(sourceId != null){
+ if(sourceId === '0'){
this.getFileList()
}
this.orderParamList = response.data.data.orderParamList
@@ -1060,7 +1060,7 @@
},
getFileList() {
this.fileList = []
- const queryParam = { orderNumber: this.dataForm.customerOrderNo }
+ const queryParam = { orderNumber: this.dataForm.contractNo }
getOtcCustomerOrderFileList(queryParam).then((response) => {
const resData = response.data
if (resData.code === 0) {
diff --git a/src/views/plan/customerorder/schedule-table.vue b/src/views/plan/customerorder/schedule-table.vue
index a5588d4..ae7702a 100644
--- a/src/views/plan/customerorder/schedule-table.vue
+++ b/src/views/plan/customerorder/schedule-table.vue
@@ -31,7 +31,7 @@
width="120px"
>
<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
@@ -53,7 +53,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>
@@ -103,7 +103,7 @@
width="60px"
>
<template slot-scope="scope">
- <span>{{ scope.row.unit }}</span>
+ <span>{{ scope.row.otcUnit }}</span>
</template>
</el-table-column>
<el-table-column
@@ -138,7 +138,7 @@
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
--
Gitblit v1.9.3