Skip to content

A
admin-base
Commit 280548ca authored by chenjundi's avatar chenjundi
Browse files
Options

Merge branch 'cjd' into dev

parents 38520c69 6945cede
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 10 deletions
src/components/contract/dialog.vue
View file @ 280548ca
...@@ -73,15 +73,15 @@ ...@@ -73,15 +73,15 @@
}, },
methods: { methods: {
sub() { sub() {
if (!this.form.contract_text.detail || this.form.contract_text.detail == "<!DOCTYPE html>\n<html>\n<head>\n</head>\n<body>\n\n</body>\n</html>") {
this.$message({
message: '合同/协议文本不能为空',
type: 'error'
});
return;
}
this.$refs['form'].validate((valid) => { this.$refs['form'].validate((valid) => {
if (valid) { if (valid) {
if (!this.form.contract_text.detail) {
this.$message({
message: '合同/协议文本不能为空',
type: 'error'
});
return;
}
let json = { let json = {
contract_name: this.form.contract_name, contract_name: this.form.contract_name,
contract_type: this.form.contract_type, contract_type: this.form.contract_type,
......
src/components/contract/index.vue
View file @ 280548ca
...@@ -13,7 +13,11 @@ ...@@ -13,7 +13,11 @@
<div v-if="scope.row.contract_type == 1">正式课合同</div> <div v-if="scope.row.contract_type == 1">正式课合同</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goods_name" label="关联商品"></el-table-column> <el-table-column prop="goods_name" label="关联商品">
<template slot-scope="scope">
<div v-for="data in goodsNameFilter(scope.row.goods_name)">{{data}}</div>
</template>
</el-table-column>
<el-table-column prop="created_at" label="创建时间"></el-table-column> <el-table-column prop="created_at" label="创建时间"></el-table-column>
<el-table-column prop="updated_at" label="最后编辑时间"></el-table-column> <el-table-column prop="updated_at" label="最后编辑时间"></el-table-column>
<el-table-column prop="operator" label="最后编辑人"></el-table-column> <el-table-column prop="operator" label="最后编辑人"></el-table-column>
...@@ -66,6 +70,11 @@ ...@@ -66,6 +70,11 @@
this.dataList = res; this.dataList = res;
}); });
}, },
goodsNameFilter(val) {
if (val) {
return val.split('--')
}
},
add() { add() {
this.dialogObj = { this.dialogObj = {
type: 0, type: 0,
...@@ -108,7 +117,8 @@ ...@@ -108,7 +117,8 @@
message: '启用成功' message: '启用成功'
}); });
this.getDataList(); this.getDataList();
}).catch(() => {}); }).catch(() => {
});
} }
if (json.status == 1) { if (json.status == 1) {
this.$confirm('此操作将停用合同?', '提示', { this.$confirm('此操作将停用合同?', '提示', {
...@@ -121,7 +131,8 @@ ...@@ -121,7 +131,8 @@
message: '停用成功' message: '停用成功'
}); });
this.getDataList(); this.getDataList();
}).catch(() => {}); }).catch(() => {
});
} }
}); });
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment