diff --git a/src/views/inventory/inner/innerOrderSelectProduct.vue b/src/views/inventory/inner/innerOrderSelectProduct.vue
index 1fd614d..b57b77b 100644
--- a/src/views/inventory/inner/innerOrderSelectProduct.vue
+++ b/src/views/inventory/inner/innerOrderSelectProduct.vue
@@ -109,7 +109,10 @@
- {{ item }}
+ {{
+ item
+ }}
+
@@ -128,6 +131,7 @@ import {addApplyDetail, addApply} from "../../../api/purchase/purApply";
import store from "../../../store";
import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
import {addOrderDetail} from "@/api/inventory/innerOrder";
+import {isBlank} from "@/utils/strUtil";
export default {
name: "stockOrderNewSelectProduct",
@@ -324,7 +328,7 @@ export default {
}
}
let str = this.multipleSelection.zczbhhzbapzbh;
- if (str.search(",") != -1) {
+ if (!isBlank(str) && str.search(",") != -1) {
this.currentCert = null;
this.certList = str.split(',');
this.dialogFormVisible = true;
diff --git a/src/views/purchase/purApply/purOrderSelectProduct.vue b/src/views/purchase/purApply/purOrderSelectProduct.vue
index 843cd58..ff519b7 100644
--- a/src/views/purchase/purApply/purOrderSelectProduct.vue
+++ b/src/views/purchase/purApply/purOrderSelectProduct.vue
@@ -1,375 +1,384 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- 显示/隐藏搜索栏
- 重置
- 查询
- 确定
-
-
-
+
+
+ 显示/隐藏搜索栏
+ 重置
+ 查询
+ 确定
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 详情
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
-
-
+ >
+
-
-
-
+
+
+
-
-
-
-
- {{ item }}
-
-
-
-
-
+
+
+
+
+ {{
+ item
+ }}
+
+
+
+
+
+
-
-
+
-
+
-
+
@@ -18,16 +20,18 @@
-
+
-
+
-
+
@@ -50,7 +54,7 @@
-
@@ -66,7 +70,7 @@
-
+
详情
@@ -100,7 +104,10 @@
- {{ item }}
+ {{
+ item
+ }}
+
@@ -118,6 +125,7 @@ import {filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevan
import store from "../../../store";
import {addOrderDetail} from "@/api/purchase/purDelivery"
import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
+import {isBlank} from "@/utils/strUtil";
export default {
name: "stockOrderNewSelectProduct",
@@ -138,7 +146,7 @@ export default {
type: Object,
required: true,
},
- customerId:{
+ customerId: {
type: Object,
required: true,
}
@@ -164,7 +172,7 @@ export default {
erpName: "",
keys: [],
},
- ids:[],
+ ids: [],
radioCheck: null,
dataList: [],
pageTotal: 1,
@@ -305,16 +313,16 @@ export default {
return;
}
- if(this.ids.length>0){
- for(var i=0;i 0) {
+ for (var i = 0; i < this.ids.length; i++) {
+ if (this.ids[i] == this.multipleSelection.rlId) {
this.$message.error("该产品已录入！");
return
}
}
}
let str = this.multipleSelection.zczbhhzbapzbh;
- if (str.search(",") != -1) {
+ if (!isBlank(str) && str.search(",") != -1) {
this.currentCert = null;
this.certList = str.split(',');
this.dialogFormVisible = true;
@@ -326,12 +334,12 @@ export default {
combine() {
this.loading = true;
let tQuery = {
- productId:this.multipleSelection.rlId,
- productName:this.multipleSelection.cpmctymc,
- count:1,
- orderIdFk:this.pId,
- supId:this.multipleSelection.customerId,
- zczbhhzbapzbh:this.multipleSelection.zczbhhzbapzbh
+ productId: this.multipleSelection.rlId,
+ productName: this.multipleSelection.cpmctymc,
+ count: 1,
+ orderIdFk: this.pId,
+ supId: this.multipleSelection.customerId,
+ zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh
};
addOrderDetail(tQuery).then((response) => {
this.loading = false;
@@ -354,7 +362,7 @@ export default {
selectCert() {
if (this.currentCert == null) {
this.$message.error("请先选择对应的注册证！");
- }else{
+ } else {
this.multipleSelection.zczbhhzbapzbh = this.currentCert;
this.combine();
}
@@ -366,9 +374,9 @@ export default {
created() {
console.log(this.data)
if (this.$isNotBlank(this.data)) {
- this.ids=[];
- if(this.data.stockOrderLists.length>0){
- for(var i=0;i 0) {
+ for (var i = 0; i < this.data.stockOrderLists.length; i++) {
this.ids.push(this.data.stockOrderLists[i].productId);
}
}
diff --git a/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue b/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue
index d6118c4..c93447a 100644
--- a/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue
+++ b/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue
@@ -1,440 +1,447 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
- 查询
- 确定
-
-
-
-
+
+
+
+ 查询
+ 确定
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 详情
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- 显示/隐藏搜索栏
- 重置
- 查询
- 确定
-
-
-
+
+
+ 显示/隐藏搜索栏
+ 重置
+ 查询
+ 确定
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 详情
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
-
-
+ >
+
-
-
-
+
+
+
-
-
-
-
- {{ item }}
-
-
-
-
-
+
+
+
+
+ {{
+ item
+ }}
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
- 查询
- 确定
-
-
-
-
+
+
+
+ 查询
+ 确定
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 详情
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+
+