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

i18n/locale/zh-CN.js

@@ -1487,9 +1487,9 @@ export default {
     type:'类型',
     status:'状态',
     description:'描述',
-    levelNum:'编码分类层数',
-    codeLength:'编码分类位数',
-    materialCodeLength:'物料编码位数'
+    levelNum:'分类层数',
+    codeLength:'分类位数',
+    materialCodeLength:'流水位数'
     },
     //转续列表
     order_execute_handon:{

pages/materiel/codeRule/add.vue

@@ -21,11 +21,7 @@
           <Dictionary code="material.code.status" v-model="entity.status"></Dictionary>
         </FormItem>
       </Col>
-      <Col :span="24">
-        <FormItem :label="l('description')" prop="description">
-          <Input v-model="entity.description" type="textarea" :rows="2"></Input>
-        </FormItem>
-      </Col>
+     
       <Col :span="12">
         <FormItem :label="l('levelNum')" prop="levelNum">
           <InputNumber v-model="entity.levelNum" :max="10" :min="1"></InputNumber>
@@ -41,6 +37,11 @@
           <InputNumber v-model="entity.materialCodeLength" :max="10" :min="1"></InputNumber>
         </FormItem>
       </Col>
+       <Col :span="24">
+        <FormItem :label="l('description')" prop="description">
+          <Input v-model="entity.description" type="textarea" :rows="2"></Input>
+        </FormItem>
+      </Col>
     </Row>
     <FormItem>
       <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
@@ -66,7 +67,7 @@ export default {
         code: "",
         name: "",
         type: null,
-        status: null,
+        status: 0,
         description: "",
         levelNum: null,
         codeLength: null,

pages/materiel/codeRule/detail.vue

@@ -11,10 +11,11 @@
 <Filed :span="12" :name="l('status')">
     <state code="material.code.status" :value="entity.status" type="text"></state>
 </Filed> -->
-<Filed :span="24" :name="l('description')">{{entity.description}}</Filed>
+
 <Filed :span="12" :name="l('levelNum')">{{entity.levelNum}}</Filed>
 <Filed :span="12" :name="l('codeLength')">{{entity.codeLength}}</Filed>
 <Filed :span="12" :name="l('materialCodeLength')">{{entity.materialCodeLength}}</Filed>
+<Filed :span="24" :name="l('description')">{{entity.description}}</Filed>
         </Row>
        
     </div>

pages/materiel/codeRule/edit.vue

@@ -21,11 +21,7 @@
           <Dictionary code="material.code.status" v-model="entity.status"></Dictionary>
         </FormItem>
       </Col>
-      <Col :span="24">
-        <FormItem :label="l('description')" prop="description">
-          <Input v-model="entity.description" type="textarea" :rows="2"></Input>
-        </FormItem>
-      </Col>
+     
       <Col :span="12">
         <FormItem :label="l('levelNum')" prop="levelNum">
           <InputNumber v-model="entity.levelNum" disabled :max="10" :min="1"></InputNumber>
@@ -41,6 +37,11 @@
           <InputNumber v-model="entity.materialCodeLength" disabled :max="10" :min="1"></InputNumber>
         </FormItem>
       </Col>
+       <Col :span="24">
+        <FormItem :label="l('description')" prop="description">
+          <Input v-model="entity.description" type="textarea" :rows="2"></Input>
+        </FormItem>
+      </Col>
     </Row>
     <FormItem>
       <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>

pages/produce/execute/index.vue

@@ -8,7 +8,7 @@
             <div>工单编号: 12001011</div>
     </div>-->
     <component :is="detail" :gdid="gdId" :row="row" />
-    <a class="gd_list" @click="orderlistMode = true">工单列表</a>
+    <a class="gd_list" @click="changeFresh">工单列表</a>
     <a class="gn_area" @click="functionalMode = true">功能区</a>
     <!-- 工单列表 -->
     <Drawer
@@ -32,7 +32,6 @@
           ></Dictionary>
         </div>
         <div class="select_t" style="height:40px">
-        <Button @click="changeFresh" class="fl" shape="circle" icon="md-refresh">刷新</Button>
           <Button @click="changeAsc" class="fr" shape="circle" icon="md-calendar">{{ascTitle}}</Button>
         </div>
       </div>
@@ -73,8 +72,8 @@ export default {
       inputId: null,
       asc: true,
       ascTitle: "时间正序排序",
-      statu:-9,
-      refresh:true,
+      statu: -9,
+      refresh: true
     };
   },
   created() {
@@ -101,7 +100,7 @@ export default {
       if (value == null || typeof value == "undefined") {
         value = -9;
       }
-      this.statu=value
+      this.statu = value;
       // this.$refs.orderlistref.loadTree(value);
     },
     changeTitle(number, type) {
@@ -152,9 +151,9 @@ export default {
       }
     },
     //刷新orderlist列表
-    changeFresh()
-    {
-      this.refresh=!this.refresh 
+    changeFresh() {
+      this.refresh = !this.refresh;
+      this.orderlistMode = true;
     }
   },
   watch: {