From 69fc3d41d2db8f5860f5982946117454ca2d16b3 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期二, 24 九月 2024 15:06:37 +0800
Subject: [PATCH] 1.客户管理-客户名称其他都不用必填 2.检验下单-生产单位下拉框,如果选择的单位是没有对应的英文名称就用/代替
---
src/components/do/b1-ins-order/add.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 480367f..5ba2e10 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -301,7 +301,7 @@
<div class="search_input">
<!-- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.production"
:readonly="active>1"></el-input> -->
- <el-input size="small" v-model="addObj.production" placeholder="閫夋嫨鐢熶骇鍗曚綅">
+ <el-input size="small" v-model="addObj.production" placeholder="閫夋嫨鐢熶骇鍗曚綅" :readonly="active>1">
<template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true,createState=2"
:disabled="active>1"></el-button></template>
</el-input>
@@ -1559,7 +1559,12 @@
}
}else if(this.createState==2){
this.addObj.production = selects.company
- this.addObj.productionEn = selects.companyEn
+ // 濡傛灉閫夋嫨鐨勫崟浣嶆槸娌℃湁瀵瑰簲鐨勮嫳鏂囧悕绉板氨鐢�'/'浠ｆ浛
+ if (!selects.companyEn) {
+ this.addObj.productionEn = '/'
+ } else {
+ this.addObj.productionEn = selects.companyEn
+ }
}
this.selectUserDia = false
},
@@ -2631,11 +2636,11 @@
'Content-Type': 'application/json'
}
}).then(res => {
+ this.getProductLoad = false
res.data.forEach(a => {
a.state = 0
})
row.insProduct = this.HaveJson(res.data)
- this.getProductLoad = false
this.productList = row.insProduct
this.productList0 = JSON.parse(JSON.stringify(this.productList))
this.$refs.sampleTable.setCurrentRow(row)
@@ -2644,6 +2649,8 @@
if (a.state == 1) this.toggleSelection(a)
})
}, 200)
+ }).catch(e => {
+ this.getProductLoad = false
})
this.searchProject()
this.searchTemList()
--
Gitblit v1.9.3