Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

assets/css/base.less

@@ -1085,6 +1085,7 @@ html [type=button] {
     }
 
     i {
+      font-size: 16px;
       padding: 4px;
       border-radius: 3px;
     }
@@ -1126,13 +1127,13 @@ html [type=button] {
     width: 22px;
     height: 22px;
     line-height: 22px;
-    margin: 0px 0 0 0;
+    margin: 0px 5px 0 0;
     border-radius: 50%;
     color: #515A6E;
     background: #F5F6FA;
     .ivu-icon {
       font-weight: bold;
-      font-size: 20px;
+      font-size: 18px;
     }
   }
   a.disable {

components/page/opration.vue

@@ -81,18 +81,17 @@ export default {
     },
     methods: {
         handler() {
-            if (!this.disable) {
-                if (this.oprate == "delete" || this.oprate == "remove") {
-                    this.$Modal.confirm({
-                        title: this.title,
-                        content: "<p>" + this.msg + "</p>",
-                        onOk: () => {
-                            this.$emit("click", event);
-                        }
-                    });
-                } else {
-                    this.$emit("click", event);
-                }
+
+            if (this.oprate == "delete" || this.oprate == "remove") {
+                this.$Modal.confirm({
+                    title: this.title,
+                    content: "<p>" + this.msg + "</p>",
+                    onOk: () => {
+                        this.$emit("click", event);
+                    }
+                });
+            } else {
+                this.$emit("click", event);
             }
         }
     },

pages/project/record/index.vue

 <template>
 <div>
-    <DataGrid :columns="columns" ref="grid" :action="action" :easy="false"><template slot="easySearch">
+    <DataGrid :columns="columns" ref="grid" :data="recordList" :easy="false" :set="false"><template slot="easySearch">
             <Form ref="formInline" :model="easySearch" inline>
                 <FormItem prop="keys"><Input placeholder="请输入关键字标题" v-model="easySearch.keys.value" /> </FormItem>
                 <FormItem><Button type="primary" @click="search">查询</Button></FormItem>
@@ -98,11 +98,14 @@ export default {
                         ])
                     }
                 },
-            ]
+            ],
+            recordList: []
         }
     },
     mounted() {
-        console.log(this);
+        if (this.eid != '' && this.eid != null) {
+            this.load(this.eid);
+        }
     },
     async fetch({
         store,
@@ -111,6 +114,23 @@ export default {
         await store.dispatch('loadDictionary') // 加载数据字典
     },
     methods: {
+        load(v) {
+            let params = {
+                conditions: [{
+                    fieldName: "taskId",
+                    fieldValue: v,
+                    conditionalType: "Equal",
+                }],
+                sortBy: "creationTime",
+                isDesc: false,
+            }
+            Api.list(params).then(r => {
+                if (r.success) {
+                    this.recordList = r.result
+
+                }
+            })
+        },
         ok() {
             this.$refs.grid.load()
             this.modal = false
@@ -159,6 +179,13 @@ export default {
             let vkey = "project_plan_record" + "." + key;
             return this.$t(vkey) || key
         }
+    },
+    watch: {
+        eid(v) {
+            if (v != '' && v != null) {
+                this.load(v);
+            }
+        }
     }
 }
 </script>

pages/project/task/index.vue

@@ -428,13 +428,12 @@ export default {
             };
             this.$refs.grid.reload(where);
         },
-        updatestatus(valId, valStatus) {
+        updatepart(valId, valStatus) {
             let params = {
                 id: valId,
-                status: valStatus,
-                detail: ''
+                status: valStatus
             }
-            Api.updatestatus(params).then(r => {
+            Api.updatepart(params).then(r => {
                 if (r.success) {
                     this.$refs.grid.load();
                     this.$Message.success('操作成功')