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]">
@@ -11,15 +11,16 @@
             <DropdownItem name="bug">bug列表</DropdownItem>
         </DropdownMenu>
     </Dropdown>
-    <Modal title="新增bug" v-model="bugAdd" fullscreen :z-index="10">
+    <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 {
@@ -30,14 +31,16 @@ export default {
     data() {
         return {
             bugAdd: false,
-      bugCount:3
+            bugCount: 3
         };
     },
     computed: {},
     methods: {
         async handleClickUserDropdown(name) {
             if (name === "bug") {
-        this.$router.push({ name: "bug" });
+                this.$router.push({
+                    name: "bug"
+                });
             }
         },
         openModelBugAdd() {

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,

pages/mesPlan/edit.vue

 <template>
-  <Form :model="orderSearchForm" :label-width="95" :rules="ruleValidate" ref="formValidate">
+<Form :model="orderSearchForm" :label-width="95" :rules="ruleValidate" ref="formValidate">
     <Row>
         <Col span="8">
         <FormItem label="订单编号" style="width:100%">{{this.orderSearchForm.mesCode}}</FormItem>
         </Col>
         <Col span="8">
         <FormItem :label="l('productName')" style="width:100%" prop="productId">
-          <Select
-            v-model="orderSearchForm.productId"
-            :placeholder="placeholdeinfo"
-            style="width:240px;"
-          >
-            <Option
-              v-for="(item,index) in list"
-              :key="index"
-              :value="item.value"
-              style="display:none"
-              :label="item.label"
-            ></Option>
+            <Select v-model="orderSearchForm.productId" :placeholder="placeholdeinfo" style="width:240px;">
+                <Option v-for="(item,index) in list" :key="index" :value="item.value" style="display:none" :label="item.label"></Option>
                 <Tree key="mytree" :data="data1" ref="mytree" :render="renderContent"></Tree>
             </Select>
         </FormItem>
@@ -33,11 +23,7 @@
     <Row>
         <Col span="8">
         <FormItem :label="l('taskType')" style="width:100%" prop="taskType">
-          <dictionary
-            code="plan.order.taskType"
-            v-model="orderSearchForm.taskType"
-            style="width:240px"
-          ></dictionary>
+            <dictionary code="plan.order.taskType" v-model="orderSearchForm.taskType" style="width:240px"></dictionary>
         </FormItem>
         </Col>
         <Col span="8">
@@ -47,26 +33,14 @@
         </Col>
         <Col span="8">
         <FormItem :label="l('demandStartDate')" style="width:100%">
-          <DatePicker
-            type="date"
-            placeholder="请选择日期"
-            style="width:240px"
-            @on-change="getStartDate"
-            v-model="orderSearchForm.demandStartDate"
-          ></DatePicker>
+            <DatePicker type="date" placeholder="请选择日期" style="width:240px" @on-change="getStartDate" v-model="orderSearchForm.demandStartDate"></DatePicker>
         </FormItem>
         </Col>
     </Row>
     <Row>
         <Col span="8">
         <FormItem :label="l('demandFinishDate')" style="width:100%">
-          <DatePicker
-            type="date"
-            placeholder="请选择日期"
-            style="width:240px"
-            @on-change="getFinishedDate"
-            v-model="orderSearchForm.demandFinishDate"
-          ></DatePicker>
+            <DatePicker type="date" placeholder="请选择日期" style="width:240px" @on-change="getFinishedDate" v-model="orderSearchForm.demandFinishDate"></DatePicker>
         </FormItem>
         </Col>
 
@@ -83,12 +57,8 @@
     </Row>
     <Row>
         <Col span="8">
-        <FormItem :label="l('urgencyLevel')" style="width:100%">
-          <dictionary
-            style="width:240px"
-            code="plan.order.urgencyLevel"
-            v-model="orderSearchForm.urgencyLevel"
-          ></dictionary>
+        <FormItem :label="l('urgencyLevel')" style="width:100%" prop="urgencyLevel">
+            <dictionary style="width:240px" code="plan.order.urgencyLevel" v-model="orderSearchForm.urgencyLevel"></dictionary>
         </FormItem>
         </Col>
         <Col span="24">
@@ -110,8 +80,9 @@
         </FormItem>
         </Col>
     </Row>
-  </Form>
+</Form>
 </template>
+
 <script>
 import Api from "./api";
 export default {
@@ -120,30 +91,30 @@ export default {
         return {
             orderSearchForm: {},
             ruleValidate: {
-        productId: [
-          {
+                productId: [{
                     required: true,
                     message: "请选择产品名称",
                     type: "number",
                     trigger: "change",
-          },
-        ],
-        taskType: [
-          {
+                }, ],
+                taskType: [{
                     required: true,
                     message: "请选择任务类型",
                     trigger: "change",
                     type: "number",
-          },
-        ],
-        quantity: [
-          {
+                }, ],
+                quantity: [{
                     required: true,
                     message: "请输入数量",
                     type: "number",
                     trigger: "change",
-          },
-        ],
+                }, ],
+                urgencyLevel: [{
+                    required: true,
+                    message: "请选择紧急程度",
+                    trigger: "change",
+                    type: "number",
+                }, ],
             },
             placeholdeinfo: "",
             list: [],
@@ -177,7 +148,9 @@ export default {
     },
     methods: {
         load(v) {
-      Api.get({ id: v }).then((r) => {
+            Api.get({
+                id: v
+            }).then((r) => {
                 this.entity = r.result;
                 this.$emit("on-load");
             });
@@ -215,7 +188,10 @@ export default {
                 this.selectdata = [];
                 this.selectdata = data;
                 this.list = [];
-        this.list.push({ label: data[0].title, value: data[0].id });
+                this.list.push({
+                    label: data[0].title,
+                    value: data[0].id
+                });
                 if (data[0].isProduct == "1") {
                     this.orderSearchForm.productName = data[0].title;
                     this.orderSearchForm.productId = data[0].productId;
@@ -258,7 +234,11 @@ export default {
                 }
             });
         },
-    renderContent(h, { root, node, data }) {
+        renderContent(h, {
+            root,
+            node,
+            data
+        }) {
             let type = "md-folder";
             let title = data.title;
             if (data.isProduct != 0) {
@@ -274,8 +254,7 @@ export default {
                 }
             }
             return h(
-        "span",
-        {
+                "span", {
                     on: {
                         click: () => {
                             let arrTree = [];
@@ -294,8 +273,7 @@ export default {
                         },
                     }),
                     h(
-            "span",
-            {
+                        "span", {
                             style: {
                                 color: data.isProduct == 0 ? "#000" : "rgba(38, 128, 235, 1)",
                             },