From 9ed716080ceb42c2694626e077b58a0aaa7b4f72 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 27 五月 2024 15:53:29 +0800
Subject: [PATCH] 对接下单新增字段
---
src/components/do/b1-ins-order/add.vue | 33 ++++++++++++++++++++-------------
src/main.js | 4 ++--
src/components/view/b1-inspection-order.vue | 9 +++++----
3 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index eeffd82..03ffe0e 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -107,7 +107,6 @@
<el-button size="medium" @click="templateDia=true" v-show="active==1">
<span style="color: #3A7BFA;">淇濆瓨妯℃澘</span>
</el-button>
- <el-button size="medium" type="primary" @click="$parent.playOrder(4)">鍏夌氦閰嶇疆</el-button>
<el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-show="active==1">鎻愪氦</el-button>
<!-- 瀹℃牳 -->
<el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3"
@@ -246,27 +245,27 @@
</div>
</el-col>
<el-col class="search_thing" :span="6">
- <div class="search_label">宸ョ▼鍚嶇О锛�</div>
+ <div class="search_label"><span class="required-span">* </span>宸ョ▼鍚嶇О锛�</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.value1" :readonly="active>1"></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.engineering" :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
- <div class="search_label">宸ュ巶鍚嶇ОEN锛�</div>
+ <div class="search_label"><span class="required-span">* </span>宸ョ▼鍚嶇ОEN锛�</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.value2" :readonly="active>1"></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.engineeringEn" :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
- <div class="search_label">鐢熶骇鍗曚綅锛�</div>
+ <div class="search_label"><span class="required-span">* </span>鐢熶骇鍗曚綅锛�</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.value3" :readonly="active>1"></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.production" :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
- <div class="search_label">鐢熶骇鍗曚綅EN锛�</div>
+ <div class="search_label"><span class="required-span">* </span>鐢熶骇鍗曚綅EN锛�</div>
<div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.value4" :readonly="active>1"></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.productionEn" :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6" style="align-items: flex-start;margin: 8px 0;">
@@ -588,10 +587,10 @@
orderType: null,
send: 1,
formType: '閫佹',
- value1: null,
- value2: null,
- value3: null,
- value4: null,
+ engineering: null,
+ engineeringEn: null,
+ production: null,
+ productionEn: null,
},
sample: {
sampleCode: null,
@@ -755,6 +754,14 @@
this.$message.error('璇疯緭鍏ユ潵鏍锋柟寮�')
} else if (!this.addObj.orderType) {
this.$message.error('璇烽�夋嫨妫�楠岀被鍒�')
+ }else if (!this.addObj.engineering) {
+ this.$message.error('璇疯緭鍏ュ伐绋嬪悕绉�')
+ } else if (!this.addObj.engineeringEn) {
+ this.$message.error('璇疯緭鍏ュ伐绋嬪悕绉癊N')
+ }else if (!this.addObj.production) {
+ this.$message.error('璇疯緭鍏ョ敓浜у崟浣�')
+ }else if (!this.addObj.productionEn) {
+ this.$message.error('璇疯緭鍏ョ敓浜у崟浣岴N')
} else if (this.sampleList.length < 1) {
this.$message.error('璇锋坊鍔犱竴涓牱鍝�')
} else if (!this.sampleList.every(m => m.sample)) {
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 9d19061..201ecea 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -77,6 +77,7 @@
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;">妫�楠屼笅鍗�</el-col>
<el-col :span="12" style="text-align: right;">
+ <el-button size="medium" type="primary" @click="playOrder(4)">鍏夌氦閰嶇疆</el-button>
<el-button size="medium" type="primary" @click="playOrder(1)" v-if="addPower">涓嬪崟</el-button>
</el-col>
</el-row>
@@ -125,12 +126,12 @@
<div class="search_thing" style="width: 20%;" v-if="more">
<div class="search_label">宸ョ▼鍚嶇О锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.value2" @keyup.enter.native="refreshTable()"></el-input></div>
+ v-model="componentData.entity.engineering" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing" style="width: 20%;" v-if="more">
<div class="search_label">鐢熶骇鍗曚綅锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.value3" @keyup.enter.native="refreshTable()"></el-input></div>
+ v-model="componentData.entity.production" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
</el-col>
<el-col :span="4">
@@ -273,8 +274,8 @@
sampleCode: null,
state: 0,
value1:null,
- value2:null,
- value3:null,
+ engineering:null,
+ production:null,
orderBy: {
field: 'id',
order: 'asc'
diff --git a/src/main.js b/src/main.js
index 580b072..1bd2650 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,8 +17,8 @@
// const javaApi = 'http://10.20.102.168:8001';//寮�
// const javaApi = 'http://172.20.10.3:8001';//濮�
// const javaApi = 'http://192.168.11.2:8001';//鏌�
- const javaApi = 'http://127.0.0.1:8001';//鏅�
-// const javaApi = 'http://114.132.189.42:1234';//娴嬭瘯鏈�
+// const javaApi = 'http://127.0.0.1:8001';//鏅�
+const javaApi = 'http://114.132.189.42:1234';//娴嬭瘯鏈�
//鑳滀簯鏈嶅姟鍣�
// Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";
// const javaApi = 'http://122.114.52.69:8001';
--
Gitblit v1.9.3