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

layouts/basic-layout/header-bug/index.vue

 <template>
-  <span class="i-layout-header-trigger i-layout-header-trigger-min">
+<span class="i-layout-header-trigger i-layout-header-trigger-min">
     <Dropdown transfer trigger="hover" @on-click="handleClickUserDropdown">
-      <span  @click="openModelBugAdd">
-        <Badge :count="bugCount === 0 ? null : bugCount" :overflow-count="99"  :offset="[10, 0]">
-                 <Icon type="ios-bug" size="18" />
+        <span @click="openModelBugAdd">
+            <Badge :count="bugCount === 0 ? null : bugCount" :overflow-count="99" :offset="[10, 0]">
+                <Icon type="ios-bug" size="18" />
             </Badge>
-      </span>
-      <Icon type="md-arrow-dropdown"></Icon>
-      <DropdownMenu slot="list">
-        <DropdownItem name="bug">bug列表</DropdownItem>
-      </DropdownMenu>
+        </span>
+        <Icon type="md-arrow-dropdown"></Icon>
+        <DropdownMenu slot="list">
+            <DropdownItem name="bug">bug列表</DropdownItem>
+        </DropdownMenu>
     </Dropdown>
-    <Modal title="新增bug" v-model="bugAdd" fullscreen :z-index="10">
-      <addBugModal ref="addBug"></addBugModal>
-      <div slot="footer">
-        <Button @click="addCancel">取消</Button>
-        <Button type="primary" @click="addSave">确定</Button>
-      </div>
+    <Modal title="新增bug" v-model="bugAdd" fullscreen :z-index="999">
+        <addBugModal ref="addBug"></addBugModal>
+        <div slot="footer">
+            <Button @click="addCancel">取消</Button>
+            <Button type="primary" @click="addSave">确定</Button>
+        </div>
     </Modal>
-  </span>
+</span>
 </template>
+
 <script>
 import addBugModal from "@/pages/bug/component/add";
 export default {
-  name: "addBug",
-  components: {
-    addBugModal
-  },
-  data() {
-    return {
-      bugAdd: false,
-      bugCount:3
-    };
-  },
-  computed: {},
-  methods: {
-    async handleClickUserDropdown(name) {
-      if (name === "bug") {
-        this.$router.push({ name: "bug" });
-      }
+    name: "addBug",
+    components: {
+        addBugModal
     },
-    openModelBugAdd() {
-      this.bugAdd = true;
-      this.$refs.addBug.getEid();
-      this.$refs.addBug.initial();
+    data() {
+        return {
+            bugAdd: false,
+            bugCount: 3
+        };
     },
-    addCancel() {
-      this.$refs.addBug.resetFields();
-      this.bugAdd = false;
+    computed: {},
+    methods: {
+        async handleClickUserDropdown(name) {
+            if (name === "bug") {
+                this.$router.push({
+                    name: "bug"
+                });
+            }
+        },
+        openModelBugAdd() {
+            this.bugAdd = true;
+            this.$refs.addBug.getEid();
+            this.$refs.addBug.initial();
+        },
+        addCancel() {
+            this.$refs.addBug.resetFields();
+            this.bugAdd = false;
+        },
+        addSave() {
+            let param = this.$refs.addBug.addBugInfo();
+            //alert(JSON.stringify(param))
+            if (param.id == null) {
+                //增加确定
+                this.$http.bug.createorupdate(param).then(res => {
+                    if (res.result.status) {
+                        this.$Message.success("新增成功!");
+                        let newId = res.result.bugId;
+                        this.$refs.addBug.updateEid(newId);
+                    } else {
+                        this.$Message.error("新增失败!");
+                    }
+                    this.$refs.addBug.resetFields();
+                    this.bugAdd = false;
+                });
+            } else {
+                this.$Message.error("新增失败!");
+            }
+        }
     },
-    addSave() {
-      let param = this.$refs.addBug.addBugInfo();
-      //alert(JSON.stringify(param))
-      if (param.id == null) {
-        //增加确定
-        this.$http.bug.createorupdate(param).then(res => {
-          if (res.result.status) {
-            this.$Message.success("新增成功!");
-            let newId = res.result.bugId;
-            this.$refs.addBug.updateEid(newId);
-          } else {
-            this.$Message.error("新增失败!");
-          }
-          this.$refs.addBug.resetFields();
-          this.bugAdd = false;
-        });
-      } else {
-        this.$Message.error("新增失败!");
-      }
-    }
-  },
-  created() {},
-  mounted() {}
+    created() {},
+    mounted() {}
 };
-</script>
\ No newline at end of file
+</script>

libs/henq.js

@@ -344,7 +344,7 @@ henq.dirCode = (code, v) => {
   return items
 }
 
-
+//colums验证start
 henq.makeRules = (list, apiUrl) => {
 
   //测试数据start
@@ -551,4 +551,5 @@ henq.makeRules = (list, apiUrl) => {
   })
   return rules
 }
+//colums验证end
 export default henq;

pages/mesPlan/add.vue

@@ -52,7 +52,7 @@
             </FormItem>
             </Col>
             <Col span="8">
-            <FormItem label="紧急程度" style="width:100%">
+            <FormItem label="紧急程度" style="width:100%" prop="urgencyLevel">
                 <dictionary style="width:240px" code="plan.order.urgencyLevel" v-model="orderSearchForm.urgencyLevel"></dictionary>
             </FormItem>
             </Col>
@@ -136,6 +136,12 @@ export default {
                     type: "number",
                     trigger: "change",
                 }, ],
+                urgencyLevel: [{
+                    required: true,
+                    message: "请选择紧急程度",
+                    trigger: "change",
+                    type: "number",
+                }, ],
             },
 
             wfstatu: 1,