From 16c4c1498daae97306c5b4cea9631ffc10b943ac Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 13 十月 2023 12:57:04 +0800
Subject: [PATCH] modified: src/const/crud/customerOrder/customerOrderForm.js modified: src/views/common/ztt-table.vue modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/plan/customerorder/index.vue modified: src/views/plan/customerorder/sample-customerorder-form.vue
---
src/views/plan/customerorder/customerorder-form.vue | 547 ++++++------------------------------------------------
1 files changed, 66 insertions(+), 481 deletions(-)
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index d4c5731..452eca0 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -32,40 +32,22 @@
<el-col :span="6">
<el-form-item label="鍚屾鏁版嵁鏉ユ簮" prop="sourceId">
<el-input
- v-model="dataForm.sourceId"
+ v-model="dataForm.sourceId == 0 ? '鍚屾' : '鎵嬪姩'"
placeholder=""
:disabled="!ediSource"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="璁㈠崟鍙�" prop="customerOrderNo">
+ <el-form-item label="璁㈠崟鍙�" prop="contractNo">
<el-input
- v-model="dataForm.customerOrderNo"
- @blur="dataForm.customerOrderNo = $event.target.value.trim()"
+ v-model="dataForm.contractNo"
+ @blur="dataForm.contractNo = $event.target.value.trim()"
placeholder=""
:disabled="!ediSource"
></el-input>
</el-form-item>
</el-col>
- <!-- <el-col :span="6">-->
- <!-- <el-form-item label="OTC琛屽彿" prop="otcLineNo">-->
- <!-- <el-input-->
- <!-- v-model="dataForm.otcLineNo"-->
- <!-- placeholder=""-->
- <!-- disabled-->
- <!-- ></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
- <!-- <el-col :span="6">-->
- <!-- <el-form-item label="GSM琛屽彿" prop="coLineNo">-->
- <!-- <el-input-->
- <!-- v-model="dataForm.coLineNo"-->
- <!-- placeholder=""-->
- <!-- disabled-->
- <!-- ></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
<el-col :span="6">
<el-form-item label="瀹㈡埛缂栧彿" prop="customerNo">
<el-input
@@ -89,27 +71,9 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="瀹㈡埛鐨勯浂浠跺彿" prop="customerPartNo">
- <el-input
- v-model="dataForm.customerPartNo"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <!-- <el-col :span="6">-->
- <!-- <el-form-item label="IFS琛屽彿" prop="ifsLineNo">-->
- <!-- <el-input-->
- <!-- v-model="dataForm.ifsLineNo"-->
- <!-- placeholder=""-->
- <!-- disabled-->
- <!-- ></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
- <el-col :span="6">
- <el-form-item label="瀹㈡埛璁㈠崟鐘舵��" prop="coState">
+ <el-form-item label="瀹㈡埛璁㈠崟鐘舵��" prop="returnStatus">
<el-select
- v-model="dataForm.coState"
+ v-model="dataForm.returnStatus"
placeholder=""
filterable
style="width: 100%"
@@ -126,38 +90,40 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="琛屽彿" prop="coLineNo">
- <el-input
- v-model="dataForm.coLineNo"
- placeholder=""
+ <el-form-item label="鏈熸湜浜よ揣鏃堕棿" prop="deliveryDate">
+ <el-date-picker
+ v-model="dataForm.deliveryDate"
+ style="width: 100%"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
:disabled="!ediSource"
- ></el-input>
+ >
+ </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="瀹㈡埛鐨勯浂浠惰鏍�" prop="customerPartName">
+ <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.customerPartName"
+ v-model="dataForm.packageRequire"
placeholder=""
disabled
></el-input>
</el-form-item>
</el-col>
</el-row>
- <!-- <el-row>-->
-
- <!-- <el-col :span="6">-->
- <!-- <el-form-item label="IFS浜よ揣鍙�" prop="ifsDeliveryNo">-->
- <!-- <el-input-->
- <!-- v-model="dataForm.ifsDeliveryNo"-->
- <!-- placeholder=""-->
- <!-- disabled-->
- <!-- ></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
- <!-- </el-row>-->
<el-row>
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="闆朵欢鍙�" prop="partNo">
<el-input v-model="dataForm.partNo" placeholder="" readonly>
<el-button
@@ -167,18 +133,27 @@
></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="otcQuantity">
+ <el-form-item label="閿�鍞暟閲�" prop="buyQtyDue">
<el-input
- v-model="dataForm.otcQuantity"
+ 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-form-item label="浜у搧鍚嶇О" prop="productName">
<el-input
v-model="dataForm.productName"
placeholder=""
@@ -187,19 +162,10 @@
</el-input>
</el-form-item>
</el-col>
- <!-- <el-col :span="6">-->
- <!-- <el-form-item label="IFS琛岄」鍙�" prop="ifsLineItemNo">-->
- <!-- <el-input-->
- <!-- v-model="dataForm.ifsLineItemNo"-->
- <!-- placeholder=""-->
- <!-- disabled-->
- <!-- ></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
<el-col :span="6">
- <el-form-item label="閿�鍞欢鍙�" prop="salesPartNo">
+ <el-form-item label="閿�鍞欢鍙�" prop="partNo">
<el-input
- v-model="dataForm.salesPartNo"
+ v-model="dataForm.partNo"
placeholder=""
disabled
>
@@ -257,87 +223,17 @@
></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-row>
<el-row>
- <el-col :span="6">
- <el-form-item label="鏈熸湜浜よ揣鏃堕棿" prop="wantedDeliveryDate">
- <el-date-picker
- v-model="dataForm.wantedDeliveryDate"
- style="width: 100%"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- :disabled="!ediSource"
- >
- </el-date-picker>
- </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="customerPartSpec">
- <el-input
- v-model="dataForm.customerPartSpec"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <!-- <el-col :span="6">-->
- <!-- <el-form-item label="浜嬩笟閮�" prop="division">-->
- <!-- <el-input-->
- <!-- v-model="dataForm.division"-->
- <!-- placeholder=""-->
- <!-- disabled-->
- <!-- ></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="鍗板瓧鏂瑰紡" prop="printType">
- <el-input
- v-model="dataForm.printType"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍗板瓧瑕佹眰" prop="printingRequirements">
- <el-input
- v-model="dataForm.printingRequirements"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍗板瓧鍐呭" prop="printContent">
- <el-input
- v-model="dataForm.printContent"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍖呰瑕佹眰" prop="packageRequire">
- <el-input
- v-model="dataForm.packageRequire"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
</el-row>
<el-row>
<el-col :span="6">
@@ -379,45 +275,7 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="涓氬姟鍛�" prop="salesmanName">
- <el-input
- v-model="dataForm.salesmanName"
- placeholder=""
- disabled
- ></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="remark">
- <el-input
- v-model="dataForm.finalCustomerName"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="浜у搧鍒嗙粍" prop="remark">
- <el-input
- v-model="dataForm.productGroup"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="浜у搧绫诲瀷" prop="remark">
+ <el-form-item label="浜у搧绫诲瀷" prop="productType">
<el-input
v-model="dataForm.productType"
placeholder=""
@@ -481,7 +339,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-card header="璁㈠崟鍙傛暟" shadow="never">
+ <!-- <el-card header="璁㈠崟鍙傛暟" shadow="never">
<el-row>
<el-form-item
style="float:left;width: 50%"
@@ -496,9 +354,9 @@
></el-input
></el-form-item>
</el-row>
- </el-card>
+ </el-card> -->
</el-tab-pane>
- <el-tab-pane label="闄勪欢" type="card">
+ <el-tab-pane label="OTC闄勪欢" type="card">
<el-table :data="fileList" style="width: 100%" height="500">
<el-table-column prop="original" label="鏂囦欢鍚�" align="center">
</el-table-column>
@@ -716,7 +574,7 @@
</el-col>
</el-row>
</el-tab-pane>
- <el-tab-pane label="宸ヨ壓闄勪欢" type="card">
+ <el-tab-pane label="闄勪欢涓婁紶" type="card">
<div style="display: flex;justify-content:flex-end;">
<div></div>
</div>
@@ -815,286 +673,6 @@
</template>
</el-table-column>
</el-table>
- </el-tab-pane>
- <el-tab-pane
- label="宸ヨ壓閰嶇疆鍗�"
- type="card"
- style="height: 650px;overflow-y: auto"
- >
- <div
- style="margin: 5px 20px;display: flex;justify-content:space-between;"
- >
- <el-radio-group
- v-model="configContent.modelType"
- :disabled="configContent.id ? true : false"
- @change="changeModal"
- >
- <el-radio v-model="radio" label="01">妯℃澘1</el-radio>
- <el-radio v-model="radio" label="02">妯℃澘2</el-radio>
- </el-radio-group>
-
- <span style="right: 0;">
- <el-button
- :disabled="!configContent.id"
- type="danger"
- size="mini"
- v-thinclick="`deleteConfig`"
- >
- 鍒犻櫎
- </el-button>
- <el-button type="success" size="mini" v-thinclick="`saveConfig`">
- 淇濆瓨
- </el-button>
- <el-button
- type="success"
- size="mini"
- v-thinclick="`saveConfigForAll`"
- >
- 淇濆瓨骞跺簲鐢ㄨ嚦鍏朵粬璁㈠崟琛�
- </el-button>
- </span>
- </div>
- <el-divider content-position="left">閰嶇疆鍗曞唴瀹�</el-divider>
- <!--妯℃澘1-->
- <div
- class="node-content-remark"
- v-if="configContent.modelType == configTypes[0].value"
- >
- <el-form
- class="configform1"
- :inline="true"
- ref="form"
- label-width="80px"
- >
- <el-form-item label="璁㈠崟缂栧彿">
- <el-input v-model="configContent.proNo" readonly></el-input>
- </el-form-item>
- <el-form-item label="椤圭洰鍚嶇О">
- <el-input v-model="configContent.proName" readonly></el-input>
- </el-form-item>
- </el-form>
- <!-- 鐢熶骇瑕佹眰鎻忚堪锛�-->
- <rich-text
- editor-id="editor1"
- :richContent="configContent.remark1"
- @contentChange="setConfigRemark1"
- placeholder="璇疯緭鍏ョ敓浜ц姹傛弿杩�"
- ></rich-text>
- <!-- 鍗板瓧涓句緥锛�-->
- <!-- <rich-text-->
- <!-- editor-id="editor2"-->
- <!-- :richContent="configContent.remark2"-->
- <!-- @contentChange="setConfigRemark2"-->
- <!-- placeholder="璇疯緭鍏ュ嵃瀛椾妇渚�"-->
- <!-- ></rich-text>-->
- <!-- 娉ㄦ剰锛�-->
- <!-- <rich-text-->
- <!-- editor-id="editor3"-->
- <!-- :richContent="configContent.remark3"-->
- <!-- @contentChange="setConfigRemark3"-->
- <!-- placeholder="璇疯緭鍏ユ敞鎰�"-->
- <!-- ></rich-text>-->
- <!-- 澶囨敞锛�-->
- <!-- <rich-text-->
- <!-- editor-id="editor4"-->
- <!-- :richContent="configContent.remark4"-->
- <!-- @contentChange="setConfigRemark4"-->
- <!-- placeholder="璇疯緭鍏ュ娉�"-->
- <!-- ></rich-text>-->
- </div>
-
- <!--妯℃澘2-->
- <div
- class="node-content-remark"
- v-if="configContent.modelType == configTypes[1].value"
- >
- <div
- class="node-content-remark2"
- style="width: 80%;margin-left: 30px;"
- >
- <el-button type="primary" size="mini" @click="getHistoryData"
- >鑾峰彇</el-button
- >
- <el-form
- class="configform2"
- :inline="true"
- ref="form"
- label-width="80px"
- >
- <el-form-item label="鍚堝悓缂栧彿锛�" style="width: 40%">
- <el-input v-model="configContent.proNo" readonly></el-input>
- </el-form-item>
- <el-form-item label="椤圭洰鍚嶇О锛�" style="width: 40%">
- <el-input v-model="configContent.proName"></el-input>
- </el-form-item>
- <el-form-item label="鍗板瓧瑕佹眰锛�" style="width: 100%">
- <el-input v-model="configContent.printReq"></el-input>
- </el-form-item>
- </el-form>
- <rich-text
- placeholder="鐢熶骇瑙勬牸鍨嬪彿鍙婃暟閲�"
- editor-id="editorb1"
- :richContent="configContent.remark1"
- @contentChange="setConfigRemark1"
- ></rich-text>
- <rich-text
- placeholder="鐢熶骇瑕佹眰鎻忚堪"
- editor-id="editorb2"
- :richContent="configContent.remark2"
- @contentChange="setConfigRemark2"
- ></rich-text>
- <el-form-item label="瀹為檯鍗板瓧瑕佹眰锛�" style="width: 80%">
- <el-input v-model="configContent.realPrintReq"></el-input>
- </el-form-item>
- <el-row class="bodyrow">
- <el-col :span="5">
- <div class="param-top">
- <div class="form-item" style="text-align: left">
- <label>鍙戞场缂嗚姱(桅mm)</label>
- <div style="color: #7A9EFD">
- <el-input v-model="configContent.cableCore"></el-input>
- </div>
- </div>
- </div>
- </el-col>
- <el-col :span="3">
- <div style="text-align: right;padding-right: 20px">
- 鎶ゅ妯″叿锛�
- </div>
- </el-col>
- <el-col :span="3">
- <div class="param-top">
- <div class="form-item">
- <label>妯¤姱(桅mm)</label>
- <div style="color: #7A9EFD">
- <el-input v-model="configContent.modelCore"></el-input>
- </div>
- </div>
- </div>
- </el-col>
- <el-col :span="3">
- <div class="param-top">
- <div class="form-item">
- <label>妯″(桅mm)</label>
- <div style="color: #7A9EFD">
- <el-input
- v-model="configContent.modelSleeve"
- ></el-input>
- </div>
- </div>
- </div>
- </el-col>
- <el-col :span="3"
- ><div class="param-top">
- <div class="form-item">
- <label>瀹氬緞妯�(桅mm)</label>
- <div style="color: #7A9EFD">
- <el-input
- v-model="configContent.sizingModel"
- ></el-input>
- </div>
- </div>
- </div>
- </el-col>
- <el-col :span="3"
- ><div class="param-top">
- <div class="form-item">
- <label>杩囨ā(桅mm)</label>
- <div style="color: #7A9EFD">
- <el-input
- v-model="configContent.strandModel"
- ></el-input>
- </div>
- </div>
- </div>
- </el-col>
- </el-row>
-
- <!-- <rich-text-->
- <!-- placeholder="浜у搧鐨勬�ц兘瑕佹眰"-->
- <!-- editor-id="editorb3"-->
- <!-- :richContent="configContent.remark3"-->
- <!-- @contentChange="setConfigRemark3"-->
- <!-- ></rich-text>-->
- <div>
- 浜у搧鐨勬�ц兘瑕佹眰锛�20鈩冩椂鐨勭數姘旂壒寰�
- </div>
-
- <el-table
- :data="configContent.processConfigDataList"
- style="width: 100%;margin-top: 10px"
- border
- >
- <el-table-column prop="date" label="棰戠巼(MHz)">
- <template slot-scope="scope">
- <el-input v-model="scope.row.frequency"></el-input>
- </template>
- </el-table-column>
- <el-table-column prop="name" label="鏈�澶т紶閫佽“鍑�(dB/km)">
- <template slot-scope="scope">
- <el-input v-model="scope.row.deliveryReduce"></el-input>
- </template>
- </el-table-column>
- <el-table-column
- prop="province"
- label="鑰﹀悎鎹熻�梞ax(dB),2绫�,95%"
- >
- <template slot-scope="scope">
- <el-input v-model="scope.row.couplingLoss"></el-input>
- </template>
- </el-table-column>
- <el-table-column fixed="right" label="鎿嶄綔" width="120">
- <template slot-scope="scope">
- <el-button
- @click.native.prevent="deleteConfigTableRow(scope.$index)"
- type="text"
- size="small"
- >
- 鍒犻櫎
- </el-button>
- <el-button
- v-if="
- scope.$index ==
- configContent.processConfigDataList.length - 1
- "
- @click.native.prevent="addConfigTableRow(scope.$index)"
- type="text"
- size="small"
- >
- 鏂板
- </el-button>
- </template>
- </el-table-column>
- </el-table>
- <el-form-item
- label="宸ヤ綔棰戝甫鍐呴┗娉㈡瘮锛�"
- style="width: 80%"
- label-width="120px"
- >
- <el-input v-model="configContent.workFrequency"></el-input>
- </el-form-item>
- <el-form-item
- label="棰戠巼鑼冨洿锛�"
- style="width: 80%"
- label-width="120px"
- >
- <el-input v-model="configContent.frequencyRange"></el-input>
- </el-form-item>
- <el-form-item
- label="鐩存祦鐢甸樆锛�"
- style="width: 80%"
- label-width="120px"
- >
- <el-input v-model="configContent.resistance"></el-input>
- </el-form-item>
- <rich-text
- placeholder="璇疯緭鍏�"
- editor-id="editorb4"
- :richContent="configContent.remark4"
- @contentChange="setConfigRemark4"
- ></rich-text>
- </div>
- </div>
</el-tab-pane>
</el-tabs>
</el-form>
@@ -1201,13 +779,17 @@
dataForm: {
id: 0,
sourceId: '',
+ contractNo: '',
customerOrderNo: '',
+ returnStatus: '',
+ deliveryDate: '',
customerNo: '',
customerName: '',
coState: '',
coLineNo: '',
partNo: '',
customerPartName: '',
+ otcQuantity: '',
buyQtyDue: '',
wantedDeliveryDate: '',
plannedDeliveryDate: '',
@@ -1238,7 +820,7 @@
otherProductRequire: null,
divisionSystem: null,
shippingAddress: null,
- salesmanName: null,
+ salesMan: null,
lengthRequirement: null,
remark: null,
otcPartSync: null,
@@ -1381,7 +963,7 @@
if (!this.dataForm.id) {
return true
}
- if (this.dataForm.id && this.dataForm.sourceId !== 'GSM') {
+ if (this.dataForm.id && (this.dataForm.sourceId != null && this.dataForm.sourceId !== 'GSM')) {
return true
}
return false
@@ -1419,7 +1001,10 @@
this.dataForm = response.data.data
// }
// this.fileList = response.data.data.customerOrderAttachmentList
- this.getFileList()
+ const sourceId = response.data.data.sourceId
+ if(sourceId != null){
+ this.getFileList()
+ }
this.orderParamList = response.data.data.orderParamList
this.title =
this.dataForm.customerName + this.dataForm.customerOrderNo
--
Gitblit v1.9.3