diff --git a/README.md b/README.md
new file mode 100644
index 0000000..d13c73d
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+# 判分点前端
\ No newline at end of file
diff --git a/src/views/Transaction.vue b/src/views/Transaction.vue
index 6f1682d..ae0378c 100644
--- a/src/views/Transaction.vue
+++ b/src/views/Transaction.vue
@@ -335,6 +335,43 @@
+
+
+
+
+ 100元
+
+
+
+ 50元
+
+
+
+ 20元
+
+
+
+ 10元
+
+
+
+ 5元
+
+
+
+ 1元
+
+
+
+ 5角
+
+
+
+ 1角
+
+
+
+
@@ -413,6 +450,7 @@ export default {
SelectedObj:[],
counts:0,
loading:true,
+ moneys: [100, 50, 20, 10, 5, 1, 0.5, 0.1]
};
},
computed: {
@@ -537,6 +575,7 @@ export default {
this.configVisible = false
},
anewPosttingDatas(judgmentRuleList){
+ console.log("🚀 ~ file: Transaction.vue ~ line 577 ~ anewPosttingDatas ~ judgmentRuleList", judgmentRuleList)
let length = judgmentRuleList.length;
let tempArr = [];
if(this.tableData.length > 0){
@@ -554,6 +593,10 @@ export default {
obj.operationIds = item.operationIds
if(item.type == undefined || item.type == ''){
obj.type = null
+ for (let i = 1; i < 9; i++) {
+ obj['check' + i] = false
+ obj['val' + i] = ''
+ }
}else{
obj.type = item.type
}
@@ -590,6 +633,7 @@ export default {
}
}
});
+ console.log(444, tempArr)
for(var i=0;i {
+ const val = e.split('-')
+ const i = moneys.findIndex(n => n == val[0])
+ console.log(33, i)
+ obj['check' + (i + 1)] = true
+ obj['val' + (i + 1)] = val[1]
+ })
}
tempArr.push(obj);
if (length > 1 && index !== (length - 1)) {
@@ -687,15 +746,15 @@ export default {
}
},
getTreeData() { // 获取树结构数据
- if(this.treeDataStore.length) {
- const tmp = deepCopy(this.treeDataStore)
- this.treeData = this.toTreeId(tmp);
- if (this.$route.query.lcId) {
- this.lcId = this.$route.query.lcId;
- this.getInfoData(this.$route.query.lcId);
- }
- this.loading = false
- }else {
+ // if(this.treeDataStore.length) {
+ // const tmp = deepCopy(this.treeDataStore)
+ // this.treeData = this.toTreeId(tmp);
+ // if (this.$route.query.lcId) {
+ // this.lcId = this.$route.query.lcId;
+ // this.getInfoData(this.$route.query.lcId);
+ // }
+ // this.loading = false
+ // }else {
this.$post(this.api.getProcess).then(({ process, status, message }) => {
if (status == 200) {
if (process.length) {
@@ -713,7 +772,7 @@ export default {
}).catch(err => {
this.loading = false
});
- }
+ // }
},
toTreeId(data, parentId) { // id重新串连成(父+子+孙),已便达到树节点需要的key唯一性,且后面提交数据,需要传这个id串到后台
let result = [];
@@ -816,6 +875,14 @@ export default {
// obj.emptyOne = i.value1; // 选择指标不传
obj.emptyOne = i.subjectId ? i.subjectId.toString() : "";
obj.emptyTwo = `${i.value2}${i.value3}~${i.value4}${i.value5}`;
+ } else if (i.type == 6) {
+ const money = []
+ const { moneys } = this
+ for (let n = 1; n < 9; n++) {
+ if (i['check' + n] && i['val' + n]) money.push(moneys[n - 1] + '-' + i['val' + n])
+ }
+ obj.emptyOne = i.subjectId ? i.subjectId.toString() : "";
+ obj.emptyTwo = money.join()
}
tempArr.push(obj);
}
@@ -974,6 +1041,13 @@ export default {
this.$message.warning(`第一个指标必须小于第二个指标`);
return;
}
+ } else if (row.type == 6) {
+ for (let i = 1; i < 9; i++) {
+ if (row['check' + i] && row['val' + i] === '') {
+ this.$message.warning(`请输入数量`)
+ return
+ }
+ }
}
}
row.isSave = true;
@@ -1265,7 +1339,6 @@ export default {
width: auto;
}
}
-
.action {
flex: 1;
text-align: left;
@@ -1329,7 +1402,15 @@ export default {
}
}
}
-
+.money-box {
+ .line {
+ margin: 12px 0 !important;
+ }
+ /deep/.money-check {
+ width: 80px;
+ text-align: left;
+ }
+}
/deep/.el-dialog__wrapper {
:hover {
cursor: pointer;