From 21bf0b0905450e6aab4c7f6068c1a4fbf57dc488 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 11:21:10 +0800
Subject: [PATCH] modified: src/views/plan/customerorder/customerorder-form.vue
---
src/views/plan/customerorder/customerorder-form.vue | 1060 ++++++++--------------------------------------------------
1 files changed, 152 insertions(+), 908 deletions(-)
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index d4c5731..f916048 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -26,46 +26,28 @@
class="l-mes"
:disabled="!editable"
>
- <el-tabs type="border-card" ref="tabs">
+ <el-tabs type="border-card" ref="tabs" @tab-click="tabsClick">
<el-tab-pane label="涓昏" type="card">
<el-row>
<el-col :span="6">
<el-form-item label="鍚屾鏁版嵁鏉ユ簮" prop="sourceId">
<el-input
- v-model="dataForm.sourceId"
+ v-model="dataForm.sourceId == 0 ? '鍚屾' : '鎵嬪姩'"
placeholder=""
- :disabled="!ediSource"
+ disabled
></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,145 +71,34 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="瀹㈡埛鐨勯浂浠跺彿" prop="customerPartNo">
+ <el-form-item label="瀹㈡埛璁㈠崟鐘舵��" prop="returnStatus">
<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-select
- v-model="dataForm.coState"
+ v-model="dataForm.returnStatus"
placeholder=""
filterable
style="width: 100%"
+ disabled></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <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-option
- v-for="item in coStates"
- :key="item.id"
- :label="item.label"
- :value="item.value"
- :disabled="!ediSource"
- />
- </el-select>
+ </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="琛屽彿" prop="coLineNo">
+ <el-form-item label="涓氬姟鍛�" prop="salesMan">
<el-input
- v-model="dataForm.coLineNo"
- placeholder=""
- :disabled="!ediSource"
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="瀹㈡埛鐨勯浂浠惰鏍�" prop="customerPartName">
- <el-input
- v-model="dataForm.customerPartName"
+ 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="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-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="otcQuantity">
- <el-input
- v-model="dataForm.otcQuantity"
- 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="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-input
- v-model="dataForm.salesPartNo"
- 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">
@@ -248,6 +119,54 @@
</el-select>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
+ <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="productType">
+ <el-input
+ v-model="dataForm.productType"
+ 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="docNumber">
<el-input
@@ -257,33 +176,34 @@
></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 label="宸ヨ壓鏂囦欢鍚嶇О" prop="docName">
+ <el-input
+ v-model="dataForm.docName"
+ placeholder=""
+ disabled
+ ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="璁″垝浜よ揣鏃堕棿" prop="plannedDeliveryDate">
- <el-date-picker
- v-model="dataForm.plannedDeliveryDate"
+ <el-form-item label="鍗曚綅" prop="otcUnit">
+ <el-select
+ v-model="dataForm.otcUnit"
+ placeholder=""
+ filterable
style="width: 100%"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
>
- </el-date-picker>
+ <el-option
+ v-for="item in units"
+ :key="item.id"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="瀹㈡埛闆朵欢瑙勬牸" prop="customerPartSpec">
+ <el-form-item label="浜у搧鍨嬪彿" prop="customerPartSpec">
<el-input
v-model="dataForm.customerPartSpec"
placeholder=""
@@ -291,189 +211,25 @@
></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">
- <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-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="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-input
- v-model="dataForm.productType"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="閲囬泦鎬ц川" prop="centralizedMiningProperty">
- <el-input
- v-model="dataForm.centralizedMiningProperty"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="璁㈠崟琛屽娉�" prop="remark">
- <el-input
- v-model="dataForm.remark"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="璁㈠崟澶村娉�" prop="comment">
- <el-input
- v-model="dataForm.comment"
- placeholder=""
- disabled
- ></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="OTC鎺ㄩ�佺姸鎬�" prop="remark">
- <span>{{
- dataForm.otcPartSync != null
- ? dataForm.otcPartSync
- ? '宸插悓姝�'
- : '鏈悓姝�'
- : ''
- }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="璁㈠崟璇存槑" prop="orderDescription">
+ <el-form-item label="璁㈠崟澶囨敞" prop="comment">
<el-input
type="textarea"
:rows="3"
placeholder=""
- v-model="dataForm.orderDescription"
+ v-model="dataForm.comment"
maxlength="500"
show-word-limit
>
@@ -481,24 +237,23 @@
</el-form-item>
</el-col>
</el-row>
- <el-card header="璁㈠崟鍙傛暟" shadow="never">
- <el-row>
- <el-form-item
- style="float:left;width: 50%"
- v-for="(item, index) in orderParamList"
- :property="item.renameField"
- :label="item.item"
- :key="index"
- ><el-input
- v-model="dataForm[item.renameField]"
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="浜у搧澶囨敞" prop="remark">
+ <el-input
+ type="textarea"
+ :rows="3"
placeholder=""
- :disabled="!ediSource"
- ></el-input
- ></el-form-item>
- </el-row>
- </el-card>
+ v-model="dataForm.remark"
+ maxlength="500"
+ show-word-limit
+ >
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
</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 +471,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>
@@ -751,15 +506,14 @@
show-overflow-tooltip
>
</el-table-column>
- <el-table-column prop="lineNumber" align="center" label="琛屽彿">
- </el-table-column>
<el-table-column
prop="originalFileName"
align="center"
label="鍘熸枃浠跺悕"
+ width="200"
>
</el-table-column>
- <el-table-column prop="fileName" align="center" label="鏂囦欢鍚�">
+ <el-table-column prop="fileName" align="center" label="鏂囦欢鍚庣紑">
</el-table-column>
<el-table-column prop="createUser" align="center" label="涓婁紶浜�">
</el-table-column>
@@ -779,31 +533,13 @@
show-overflow-tooltip
>
</el-table-column>
- <!-- <el-table-column align="center" label="鏄惁鍚屾宸ヨ壓閰嶇疆鍗�">-->
- <!-- <template slot-scope="scope">-->
- <!-- <el-switch-->
- <!-- :value="scope.row.effectiveRange"-->
- <!-- active-value="1"-->
- <!-- inactive-value="0"-->
- <!-- @input="handleInput(scope.row)"-->
- <!-- :disabled="scope.row.lineNumber !== dataForm.otcLineNo"-->
- <!-- />-->
- <!-- </template>-->
- <!-- </el-table-column>-->
<el-table-column fixed="right" align="center" label="鎿嶄綔">
<template slot-scope="scope">
- <el-button
- @click="synchronizeFile(scope.row)"
- type="text"
- size="small"
- :disabled="scope.row.lineNumber !== dataForm.otcLineNo"
- >鍚屾</el-button
- >
<el-button
@click="delProcessConfigFile(scope.row)"
type="text"
size="small"
- :disabled="scope.row.lineNumber !== dataForm.otcLineNo"
+ :disabled="scope.row.lineNumber !== dataForm.customerNo"
>鍒犻櫎</el-button
>
<el-button
@@ -815,286 +551,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>
@@ -1143,7 +599,7 @@
import {
getCustomerOrder,
addCustomerOrder,
- putCustomerOrder,
+ updateCustomerOrderById,
download,
getOtcCustomerOrderFileList,
otcDownload,
@@ -1151,13 +607,6 @@
updateConfigFileEffectiveRange,
deleteProcessConfigFile,
downloadProcessConfigFile,
- newProcessConfigAdd,
- newProcessConfigEdit,
- newProcessConfigAddOne,
- newProcessConfigEditOne,
- newProcessConfigDelete,
- getProcessConfigPage,
- getBeSelectedLineNoList
} from '@/api/plan/customerorder'
import { remote } from '@/api/admin/dict'
import PartDialog from '@/views/common/part.vue'
@@ -1167,7 +616,6 @@
import { validateSixDecimal } from '@/util/validate'
import { getStore } from '@/util/store'
import RichText from '@/views/common/rich-text.vue'
-import { getProductMainV1 } from '@/api/product/personboard'
import OtherCustomerOrderLine from './other-customer-order-line'
const defaultConfigTableData = {
@@ -1201,14 +649,36 @@
dataForm: {
id: 0,
sourceId: '',
- customerOrderNo: '',
+ contractNo: '',
customerNo: '',
customerName: '',
- coState: '',
- coLineNo: '',
+ returnStatus: '',
+ deliveryDate: '',
+ salesMan: '',
+ salerWorkCode: '',
+ manufactureAttr: '',
+ buyQtyDue: 0,
+ productName: '',
+ productType: '',
partNo: '',
+ docNumber: '',
+ docName: '',
+ shippingAddress: '',
+ remark: '',
+ otcUnit: '',
+ coState: '',
+ customerPartSpec: '',
+ entityName: '',
+ factoryPlaceOrderDate: '',
+ isCp: '',
+ originalContractStatus: '',
+ placeOrderDate: '',
+ province: '',
+
+ customerOrderNo: '',
+ coLineNo: '',
customerPartName: '',
- buyQtyDue: '',
+ otcQuantity: '',
wantedDeliveryDate: '',
plannedDeliveryDate: '',
customerPoNo: '',
@@ -1224,11 +694,7 @@
ifsSalesUnit: null,
ifsConvFactor: null,
unit: null,
- otcUnit: null,
otcQuantity: null,
- docNumber: null,
- manufactureAttr: 'N',
- customerPartSpec: null,
division: null,
printType: null,
printingRequirements: null,
@@ -1237,14 +703,10 @@
qualityRequire: null,
otherProductRequire: null,
divisionSystem: null,
- shippingAddress: null,
- salesmanName: null,
lengthRequirement: null,
- remark: null,
otcPartSync: null,
finalCustomerName: null,
productGroup: null,
- productType: null,
centralizedMiningProperty: null,
orderDescription: null,
otcLineNo: null,
@@ -1356,13 +818,7 @@
resistance: '', // 鐩存祦鐢甸樆
processConfigDataList: [] // 闄勮〃
},
- configTypes: [
- { value: '01', label: '妯℃澘1' },
- { value: '02', label: '妯℃澘2' }
- ],
historyShow: false,
- radio: '',
- showOutPutBatch: false,
showOtherCustomerOrder: false,
otherCustomerOrderLineList: []
}
@@ -1381,7 +837,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
@@ -1392,6 +848,11 @@
this.getManufactureAttrs('manufacture_attr_type')
},
methods: {
+ tabsClick(tab,even){
+ if(tab.index == 2){
+ this.getConfigFiles();
+ }
+ },
init(id) {
this.orderParamList = []
this.dataForm.id = id || 0
@@ -1401,25 +862,11 @@
this.$refs.dataForm.resetFields()
if (this.dataForm.id) {
getCustomerOrder(this.dataForm.id).then((response) => {
- // if (response.data.data.customerOrderList != null) {
- // this.dataForm = response.data.data.customerOrderList
- //
- // console.log('0')
- // if (this.dataForm.OrderOrContract) {
- // console.log('1')
- // // 灏嗚鍗曡繕鏄悎鍚岃浆涔�
- // if (this.dataForm.OrderOrContract == '0') {
- // this.dataForm.OrderOrContract = '鍚堝悓'
- // } else if (this.dataForm.OrderOrContract == '1') {
- // this.dataForm.OrderOrContract = '璁㈠崟'
- // }
- // }
- // } else {
- // console.log('2')
this.dataForm = response.data.data
- // }
- // this.fileList = response.data.data.customerOrderAttachmentList
- this.getFileList()
+ const sourceId = response.data.data.sourceId
+ if(sourceId === '0'){
+ this.getFileList()
+ }
this.orderParamList = response.data.data.orderParamList
this.title =
this.dataForm.customerName + this.dataForm.customerOrderNo
@@ -1428,10 +875,6 @@
// 宸ヨ壓闄勪欢
this.processConfigFileTableData = response.data.data.configFiles
// 宸ヨ壓閰嶇疆鍗�
- // this.this.configContent.modelType = '01'
- // this.configContent.orderId = this.dataForm.id
- // this.configContent.orderId = response.data.data.customerOrderNo
- console.log(response.data.data)
if (response.data.data.processConfigDTO) {
// 鏈変繚瀛樼殑鏁版嵁
this.configContent = response.data.data.processConfigDTO
@@ -1475,7 +918,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) {
@@ -1529,7 +972,7 @@
this.$refs.dataForm.validate((valid) => {
if (valid) {
if (this.dataForm.id) {
- putCustomerOrder(this.dataForm)
+ updateCustomerOrderById(this.dataForm)
.then((data) => {
this.$message.success('淇敼鎴愬姛')
this.visible = false
@@ -1625,14 +1068,9 @@
this.dataForm.ifsConvFactor = row.ifsConvFactor
this.dataForm.unit = row.unit
},
- updateOutPutBatch(row) {
- row.edit = false
- },
- delOutPutBatch(row) {},
- addOutPutBatch() {},
submitUpload() {
- this.paramData.orderNumber = this.dataForm.customerOrderNo
- this.paramData.lineNumber = this.dataForm.otcLineNo
+ this.paramData.orderNumber = this.dataForm.contractNo
+ this.paramData.lineNumber = this.dataForm.customerNo
this.progrecessFileLoading = true
},
uploadSuccess() {
@@ -1641,8 +1079,8 @@
},
getConfigFiles() {
const param = {
- orderNumber: this.dataForm.customerOrderNo,
- lineNumber: this.dataForm.otcLineNo
+ orderNumber: this.dataForm.contractNo,
+ lineNumber: this.dataForm.customerNo
}
getProcessConfigFiles(param).then((res) => {
this.processConfigFileTableData = res.data.data
@@ -1694,200 +1132,6 @@
this.getConfigFiles()
})
}
- },
-
- // 鍒犻櫎閰嶇疆鍗�
- deleteConfig() {
- const configId = this.configContent.id
- if (configId) {
- newProcessConfigDelete(configId).then((res) => {
- this.$message.success('鍒犻櫎鎴愬姛')
- this.init(this.configContent.orderId)
- })
- }
- },
- // 淇濆瓨閰嶇疆鍗�
- saveConfig() {
- const configId = this.configContent.id
- console.log(this.configContent)
- for (
- let i = this.configContent.processConfigDataList.length - 1;
- i >= 0;
- i--
- ) {
- if (
- !this.configContent.processConfigDataList[i].frequency &&
- !this.configContent.processConfigDataList[i].deliveryReduce &&
- !this.configContent.processConfigDataList[i].couplingLoss
- ) {
- this.configContent.processConfigDataList.splice(i, 1)
- }
- }
- if (configId) {
- newProcessConfigEditOne(this.configContent).then((res) => {
- console.log(res)
- if (res.data.code === 0) {
- this.$message.success('淇濆瓨鎴愬姛')
- this.init(this.configContent.orderId)
- } else {
- this.$message.success('淇濆瓨澶辫触')
- }
- })
- } else {
- newProcessConfigAddOne(this.configContent).then((res) => {
- console.log(res)
- if (res.data.code === 0) {
- this.$message.success('淇濆瓨鎴愬姛')
- this.init(this.configContent.orderId)
- } else {
- this.$message.success('淇濆瓨澶辫触')
- }
- })
- }
- },
- // 淇濆瓨閰嶇疆鍗�
- saveConfigForAll() {
- // 鍏堣皟鐢ㄦ帴鍙ｏ紝鏌ヨ璁㈠崟鍙蜂笅鏄惁瀛樺湪澶氭潯璁㈠崟琛�
- getBeSelectedLineNoList({
- customerOrderNo: this.dataForm.customerOrderNo,
- id: this.dataForm.id
- }).then((response) => {
- const resData = response.data
- const otherCustomerOrderLineData = resData.data
- if (otherCustomerOrderLineData != null) {
- this.otherCustomerOrderLineList = otherCustomerOrderLineData
- this.showOtherCustomerOrder = true
- } else {
- this.$message.error('璇ラ攢鍞鍗曞彿涓嬶紝娌℃湁鍏朵粬璁㈠崟琛�')
- /* const configId = this.configContent.id
- console.log(this.configContent)
- for (
- let i = this.configContent.processConfigDataList.length - 1;
- i >= 0;
- i--
- ) {
- if (
- !this.configContent.processConfigDataList[i].frequency &&
- !this.configContent.processConfigDataList[i].deliveryReduce &&
- !this.configContent.processConfigDataList[i].couplingLoss
- ) {
- this.configContent.processConfigDataList.splice(i, 1)
- }
- }
- if (configId) {
- newProcessConfigEdit(this.configContent).then((res) => {
- console.log(res)
- if (res.data.code === 0) {
- this.$message.success('淇濆瓨鎴愬姛')
- this.init(this.configContent.orderId)
- } else {
- this.$message.success('淇濆瓨澶辫触')
- }
- })
- } else {
- newProcessConfigAdd(this.configContent).then((res) => {
- console.log(res)
- if (res.data.code === 0) {
- this.$message.success('淇濆瓨鎴愬姛')
- this.init(this.configContent.orderId)
- } else {
- this.$message.success('淇濆瓨澶辫触')
- }
- })
- } */
- }
- })
- /* const configId = this.configContent.id
- console.log(this.configContent)
- for (
- let i = this.configContent.processConfigDataList.length - 1;
- i >= 0;
- i--
- ) {
- if (
- !this.configContent.processConfigDataList[i].frequency &&
- !this.configContent.processConfigDataList[i].deliveryReduce &&
- !this.configContent.processConfigDataList[i].couplingLoss
- ) {
- this.configContent.processConfigDataList.splice(i, 1)
- }
- }
- if (configId) {
- newProcessConfigEdit(this.configContent).then((res) => {
- console.log(res)
- if (res.data.code === 0) {
- this.$message.success('淇濆瓨鎴愬姛')
- this.init(this.configContent.orderId)
- } else {
- this.$message.success('淇濆瓨澶辫触')
- }
- })
- } else {
- newProcessConfigAdd(this.configContent).then((res) => {
- console.log(res)
- if (res.data.code === 0) {
- this.$message.success('淇濆瓨鎴愬姛')
- this.init(this.configContent.orderId)
- } else {
- this.$message.success('淇濆瓨澶辫触')
- }
- })
- } */
- },
- // 瀵屾枃鏈娉ㄦ敼鍙橈紝鍒欒繘琛岃祴鍊�
- setConfigRemark1(val) {
- this.configContent.remark1 = val
- },
- setConfigRemark2(val) {
- this.configContent.remark2 = val
- },
- setConfigRemark3(val) {
- this.configContent.remark3 = val
- },
- setConfigRemark4(val) {
- this.configContent.remark4 = val
- },
- deleteConfigTableRow(index) {
- this.configContent.processConfigDataList.splice(index, 1)
- },
- addConfigTableRow(index) {
- this.configContent.processConfigDataList.push(
- Object.assign({}, defaultConfigTableData)
- )
- },
- // 鍒囨崲妯℃澘
- changeModal(value) {
- if (value === '01') {
- this.configContent.proNo = this.dataForm.customerOrderNo
- this.configContent.proName = this.dataForm.customerName
- } else if (value === '02') {
- this.configContent.proNo = this.dataForm.customerOrderNo
- this.configContent.proName = ''
- this.configContent.printReq =
- '鍗板瓧鏂瑰紡锛�' +
- (this.dataForm.printType || '鏃�') +
- ' | 鍗板瓧瑕佹眰锛�' +
- (this.dataForm.printingRequirements || '鏃�') +
- ' | 鍗板瓧鍐呭锛�' +
- (this.dataForm.printContent || '鏃�')
- this.configContent.remark1 =
- '瑙勬牸鍨嬪彿涓猴細' +
- this.dataForm.productName +
- ' | 鏁伴噺锛�' +
- this.dataForm.otcQuantity +
- ' ' +
- this.dataForm.otcUnit +
- ''
- }
- },
- // 妯℃澘2 鑾峰彇鎸夐挳
- getHistoryData() {
- this.historyShow = true
- // var param = Object.assign({ current: 1, size: 20 })
- // getProcessConfigPage(param).then((res) => {
- // const list = res.data.data.records
- // console.log(list)
- // })
},
// 鑾峰彇纭
selectHistory(data) {
--
Gitblit v1.9.3