合同协议

6945cede · chenjundi · 214a0dcd · 6945cede · 6945cede
Commit 6945cede authored Sep 17, 2019 by chenjundi
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 10 deletions

dialog.vue src/components/contract/dialog.vue +7 -7

index.vue src/components/contract/index.vue +14 -3

No files found.
--- a/src/components/contract/dialog.vue
+++ b/src/components/contract/dialog.vue
@@ -73,15 +73,15 @@
        },
        methods: {
            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) => {
                    if (valid) {
-                        if (!this.form.contract_text.detail) {
-                            this.$message({
-                                message: '合同/协议文本不能为空',
-                                type: 'error'
-                            });
-                            return;
-                        }
                        let json = {
                            contract_name: this.form.contract_name,
                            contract_type: this.form.contract_type,

--- a/src/components/contract/index.vue
+++ b/src/components/contract/index.vue
@@ -13,7 +13,11 @@
            <div v-if="scope.row.contract_type == 1">正式课合同</div>
          </template>
        </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="updated_at" label="最后编辑时间"></el-table-column>
        <el-table-column prop="operator" label="最后编辑人"></el-table-column>
@@ -66,6 +70,11 @@
                    this.dataList = res;
                });
            },
+            goodsNameFilter(val) {
+                if (val) {
+                    return val.split('--')
+                }
+            },
            add() {
                this.dialogObj = {
                    type: 0,
@@ -108,7 +117,8 @@
                                message: '启用成功'
                            });
                            this.getDataList();
-                        }).catch(() => {});
+                        }).catch(() => {
+                        });
                    }
                    if (json.status == 1) {
                        this.$confirm('此操作将停用合同?', '提示', {
@@ -121,7 +131,8 @@
                                message: '停用成功'
                            });
                            this.getDataList();
-                        }).catch(() => {});
+                        }).catch(() => {
+                        });
                    }
                });
            },