* classify

hksystem/src/views/housekeeper/edit.vue

@@ -3,7 +3,7 @@
 </style>
 
 <template>
-    <Modal v-model="editModal" :loading="loading" :closable="false">
+    <Modal v-model="editModal" :loading="loading" >
         <p slot="header">
             <Icon type="information-circled"></Icon>
             <span>修改</span>
@@ -39,6 +39,11 @@ export default {
         },
         editShow() {
             this.editModal = this.editShow;
+        },
+        editModal() {
+            if (!this.editModal) {
+                this.$emit("close");
+            }
         }
     },
     props: {

hksystem/src/views/housekeeper/index.vue

@@ -149,12 +149,14 @@ export default {
         },
         closeModal(row) {
             this.editShow = false;
-            this.products.forEach((product, i) => {
-                if (product.id == row.id) {
-                    product.price = row.price;
-                    this.$set(this.products, i, product);
-                }
-            });
+            if (row && row.id) {
+                this.products.forEach((product, i) => {
+                    if (product.id == row.id) {
+                        product.price = row.price;
+                        this.$set(this.products, i, product);
+                    }
+                });
+            }
         },
         back() {
             this.proShow = true;

hksystem/src/views/matron/edit.vue

@@ -3,7 +3,7 @@
 </style>
 
 <template>
-    <Modal v-model="editModal" :loading="loading" :closable="false">
+    <Modal v-model="editModal" :loading="loading">
         <p slot="header">
             <Icon type="information-circled"></Icon>
             <span>修改</span>
@@ -39,6 +39,11 @@ export default {
         },
         editShow() {
             this.editModal = this.editShow;
+        },
+        editModal() {
+            if (!this.editModal) {
+                this.$emit("close");
+            }
         }
     },
     props: {

hksystem/src/views/matron/index.vue

@@ -151,12 +151,14 @@ export default {
         },
         closeModal(row) {
             this.editShow = false;
-            this.products.forEach((product, i) => {
-                if (product.id == row.id) {
-                    product.price = row.price;
-                    this.$set(this.products, i, product);
-                }
-            });
+            if (row && row.id) {
+                this.products.forEach((product, i) => {
+                    if (product.id == row.id) {
+                        product.price = row.price;
+                        this.$set(this.products, i, product);
+                    }
+                });
+            }
         },
         back() {
             this.proShow = true;

hksystem/src/views/product-classify/add.vue

@@ -0,0 +1,64 @@
+<style lang="less">
+
+</style>
+
+<template>
+    <Modal v-model="addModal" :loading="loading">
+        <p slot="header">
+            <Icon type="information-circled"></Icon>
+            <span>新增</span>
+        </p>
+        <div>
+            <Form ref="form" :label-width="80">
+                <FormItem label="分类">
+                    <Input v-model="classify" />
+                </FormItem>
+            </Form>
+        </div>
+        <div slot="footer">
+            <Button type="primary" @click="submit">确定</Button>
+        </div>
+    </Modal>
+</template>
+
+<script>
+export default {
+    name: 'add',
+    data() {
+        return {
+            classify: '',
+            loading: true,
+            addModal: false
+        }
+    },
+    watch: {
+        addShow() {
+            this.addModal = this.addShow;
+        },
+        addModal() {
+            if (!this.addModal) {
+                this.$emit("close");
+            }
+        }
+    },
+    props: {
+        products: Array,
+        addShow: Boolean
+    },
+    methods: {
+        submit() {
+            if (!this.classify) {
+                this.$emit("close", {classifys: classifys});
+                this.loading = false;
+            }
+            let classify = this.products.concat(this.classify);
+            this.axios.post("/product_classify/store", {
+                classify: classify.join(",") 
+            }).then((res) => {
+                this.$emit("close", {classifys: classify});
+                this.loading = false;
+            });
+        }
+    }
+};
+</script>

hksystem/src/views/product-classify/edit.vue

@@ -3,7 +3,7 @@
 </style>
 
 <template>
-    <Modal v-model="editModal" :loading="loading" :closable="false">
+    <Modal v-model="editModal" :loading="loading">
         <p slot="header">
             <Icon type="information-circled"></Icon>
             <span>修改</span>
@@ -39,6 +39,11 @@ export default {
         },
         editShow() {
             this.editModal = this.editShow;
+        },
+        editModal() {
+            if (!this.editModal) {
+                this.$emit("close");
+            }
         }
     },
     props: {
@@ -57,11 +62,11 @@ export default {
                 editClassify.push(data.classify);
                 classifys.push(data);
             });
-            let classify_str = editClassify.join("");
+            let classify_str = editClassify.join(",");
             this.axios.post("/product_classify/store", {
                 classify: classify_str
             }).then((res) => {
-                this.$emit("close", {classifys: classifys});
+                this.$emit("close", {classifys: editClassify});
                 this.loading = false;
             });
         }

hksystem/src/views/product-classify/index.vue

@@ -28,15 +28,18 @@
                 </Card>
             </Col>
         </Row>
+        <add :addShow="addShow" :products="products" @close="closeAddModal"></add>
         <edit :editShow="editShow" :editClassify="prosHandle" :row="row" @close="closeModal"></edit>
     </div>
 </template>
 
 <script>
+import add from './add';
 import edit from './edit';
 export default {
     name: 'classify',
     components: {
+        add,
         edit
     },
     computed: {
@@ -57,6 +60,7 @@ export default {
             total: 0,
             pageSize: 20,
             proShow: true,
+            addShow: false,
             editShow: false,
             formContent: {},
             columns: [
@@ -114,8 +118,7 @@ export default {
     },
     methods: {
         add () {
-            this.proShow = false;
-            this.formContent = {};
+            this.addShow = true;
         },
         pubSuccess() {
             this.proShow = true;
@@ -134,7 +137,15 @@ export default {
         },
         closeModal(row) {
             this.editShow = false;
-            this.products = row.classifys;
+            if (row && row.classifys) {
+                this.products = row.classifys;
+            }
+        },
+        closeAddModal(row) {
+            this.addShow = false;
+            if (row && row.classifys) {
+                this.products = row.classifys;
+            }
         },
     },
     created () {

hksystem/src/views/product-order/edit.vue

@@ -3,7 +3,7 @@
 </style>
 
 <template>
-    <Modal v-model="editModal" :loading="loading" :closable="false">
+    <Modal v-model="editModal" :loading="loading">
         <p slot="header">
             <Icon type="information-circled"></Icon>
             <span>修改</span>
@@ -39,6 +39,11 @@ export default {
         },
         editShow() {
             this.editModal = this.editShow;
+        },
+        editModal() {
+            if (!this.editModal) {
+                this.$emit("close");
+            }
         }
     },
     props: {

hksystem/src/views/product-order/index.vue

@@ -150,12 +150,14 @@ export default {
         },
         closeModal(row) {
             this.editShow = false;
-            this.products.forEach((product, i) => {
-                if (product.id == row.id) {
-                    product.price = row.price;
-                    this.$set(this.products, i, product);
-                }
-            });
+            if (row && row.id) {
+                this.products.forEach((product, i) => {
+                    if (product.id == row.id) {
+                        product.price = row.price;
+                        this.$set(this.products, i, product);
+                    }
+                });
+            }
         },
         back() {
             this.proShow = true;