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

pages/account/register/password/index.vue

@@ -17,7 +17,7 @@
             :label-width="95"
           >
             <Row>
-              <Col span="5">
+              <Col span="6">
                 <FormItem label="原密码：" prop="oldpass">
                   <Input
                     type="password"
@@ -28,7 +28,7 @@
               </Col>
             </Row>
             <Row>
-              <Col span="5" class="container">
+              <Col span="6" class="container">
                 <FormItem label="新密码：" prop="passwd">
                   <Input
                     type="password"
@@ -37,7 +37,7 @@
                   ></Input>
                 </FormItem>
                 <div class="input_span">
-                  <label style="margin-left: 40px">强度:</label>
+                  <label style="margin-left: 40px">强度：</label>
                   <span id="one"></span>
                   <span id="two"></span>
                   <span id="three"></span>
@@ -50,7 +50,7 @@
               </Col>
             </Row>
             <Row>
-              <Col span="5">
+              <Col span="6">
                 <FormItem label="确认密码：" prop="passwdCheck">
                   <Input
                     size="large"
@@ -244,7 +244,7 @@ export default {
   border-top-left-radius: 5px;
   border-bottom-left-radius: 5px;
   border-right: 0px solid;
-  margin-left: 20px;
+  margin-left: 10px;
   margin-right: 3px;
 }
 
@@ -266,7 +266,7 @@ export default {
 }
 #font span:nth-child(1) {
   color: red;
-  margin-left: 80px;
+  margin-left:100px;
 }
 #font span:nth-child(2) {
   color: orange;

pages/produce/orderlist.vue

@@ -8,7 +8,7 @@
                 </FormItem>
                 <!--
                 <FormItem>
-                    <Dictionary code="taskList.status" placeholder="请选择工单状态" :multiple="true" v-model="easySearch.status.value"></Dictionary>
+                    <Dictionary code="taskList.status" placeholder="请选择工单状态" :multiple="true" v-model="easySearch.DispatchStatus.value"></Dictionary>
                 </FormItem>
                 -->
                 <FormItem>