|
|
@@ -24,11 +24,11 @@ Component({
|
|
|
type: Array,
|
|
|
value: [],
|
|
|
observer: function (newVal) {
|
|
|
- if(newVal){
|
|
|
- let filters = newVal.filter(it=>it.name == 'items')
|
|
|
- if(filters && filters.length > 0){
|
|
|
+ if (newVal) {
|
|
|
+ let filters = newVal.filter(it => it.name == 'items')
|
|
|
+ if (filters && filters.length > 0) {
|
|
|
this.setData({
|
|
|
- itemCard:{...filters[0]}
|
|
|
+ itemCard: { ...filters[0] }
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
@@ -237,24 +237,24 @@ Component({
|
|
|
this.setData({
|
|
|
form: JSON.parse(newVal) || {}
|
|
|
})
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
this.setData({
|
|
|
- form:{}
|
|
|
+ form: {}
|
|
|
})
|
|
|
// 清空明细的合计
|
|
|
- if(this.data.itemCard){
|
|
|
+ if (this.data.itemCard) {
|
|
|
let cardList = this.data.cardList
|
|
|
- let index = cardList.findIndex(it=>it.name == 'items');
|
|
|
+ let index = cardList.findIndex(it => it.name == 'items');
|
|
|
// 先删除掉
|
|
|
- cardList = cardList.filter(it=>it.name != 'items');
|
|
|
+ cardList = cardList.filter(it => it.name != 'items');
|
|
|
// 再插入
|
|
|
- cardList.splice(index,0,{...this.data.itemCard})
|
|
|
+ cardList.splice(index, 0, { ...this.data.itemCard })
|
|
|
// console.log('rrr1',filters);
|
|
|
// if(filters && filters.length > 0){
|
|
|
// filters[0] = {...this.data.itemCard}
|
|
|
// }
|
|
|
this.setData({
|
|
|
- cardList:cardList
|
|
|
+ cardList: cardList
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
@@ -277,7 +277,7 @@ Component({
|
|
|
dataItem: null,
|
|
|
dataIndex: null,
|
|
|
card: null,
|
|
|
- itemCard:null,// 记录明细信息，清空时使用
|
|
|
+ itemCard: null,// 记录明细信息，清空时使用
|
|
|
key: null,
|
|
|
// 下拉类型
|
|
|
dropType: null,
|
|
|
@@ -676,18 +676,38 @@ Component({
|
|
|
}
|
|
|
let form = this.data.form;
|
|
|
let contentObj = this.data.contentObj;
|
|
|
- cardList.forEach(card => {
|
|
|
+ for(let card of cardList){
|
|
|
if (contentObj[card.name]) {
|
|
|
- contentObj[card.name].forEach(item => {
|
|
|
- let title = this.$t(item.title ? item.title : item.code)
|
|
|
- // 如果必须输入，就要进行判断
|
|
|
- if (item.required && !form[item.code]) {
|
|
|
- item.errMsg = title + '不为空'
|
|
|
- flag = false;
|
|
|
+ // 明细
|
|
|
+ if (card.name == 'items') {
|
|
|
+ if(!form[this.data.itemName] || form[this.data.itemName].length == 0){
|
|
|
+ util.showToast('商品明细不能为空')
|
|
|
+ return false;
|
|
|
}
|
|
|
- })
|
|
|
+ contentObj[card.name].forEach(item => {
|
|
|
+ let title = this.$t(item.title ? item.title : item.code)
|
|
|
+ // 如果必须输入，就要进行判断
|
|
|
+ if (item.required && form[this.data.itemName] && form[this.data.itemName].length > 0) {
|
|
|
+ form[this.data.itemName].forEach(t => {
|
|
|
+ if (!t[item.code]) {
|
|
|
+ t[item.code + '_errMsg'] = title + '不为空'
|
|
|
+ flag = false;
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ contentObj[card.name].forEach(item => {
|
|
|
+ let title = this.$t(item.title ? item.title : item.code)
|
|
|
+ // 如果必须输入，就要进行判断
|
|
|
+ if (item.required && !form[item.code]) {
|
|
|
+ item.errMsg = title + '不为空'
|
|
|
+ flag = false;
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
}
|
|
|
- })
|
|
|
+ }
|
|
|
this.setData({
|
|
|
contentObj: contentObj
|
|
|
})
|
zhoux