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

components/page/state.vue

 <template>
-<div class="ib">
-
-  <div  class="ib" v-if="!isMore">
-    <span v-if="type=='text'" :style="style">{{name}}</span>
-    <Tag v-if="type=='tag'" :color="tagcolor">{{name}}</Tag>
-    <Badge v-if="type=='dot'" :color="tagcolor" :text="name" />
-    <Icon v-if="type=='icon'" :type="item.icon" :color="tagcolor"  :title="name" size="24" />
+  <div class="ib">
+    <div class="ib" v-if="!isMore">
+      <span v-if="type=='text'" :style="style">{{name}}</span>
+      <Tag v-if="type=='tag'" :color="tagcolor">{{name}}</Tag>
+      <Badge v-if="type=='dot'" :color="tagcolor" :text="name" />
+      <Icon v-if="type=='icon'" :type="item.icon" :color="tagcolor" :title="name" size="24" />
+    </div>
+    <div class="ib" v-else v-for="(li,i) in items" :key="i">
+      <span v-if="type=='text'" :style="li.style">{{li.name}}</span>
+      <Tag v-if="type=='tag'" :color="li.tagcolor">{{li.name}}</Tag>
+      <Badge v-if="type=='dot'" :color="li.tagcolor" :text="li.name" />&nbsp;
+    </div>
   </div>
-  <div  class="ib" v-else v-for="(li,i) in items" :key="i">
-    <span v-if="type=='text'" :style="li.style">{{li.name}}</span>
-    <Tag v-if="type=='tag'" :color="li.tagcolor">{{li.name}}</Tag>
-    <Badge v-if="type=='dot'" :color="li.tagcolor" :text="li.name" />
-    &nbsp;
-  </div>
-</div>
-
 </template>
 <script>
 export default {
-  name: 'state',
+  name: "state",
   data() {
     return {
-      name: '',
-      isMore:false,
+      name: "",
+      isMore: false,
       item: {},
       items: [],
       data: []
-    }
+    };
   },
   props: {
     default: {
       type: String,
-      default: ''
+      default: ""
     },
     type: {
       type: String,
-      default: 'text',
+      default: "text",
       validator: function(value) {
-        return ['text', 'tag', 'dot','icon'].indexOf(value) != -1
+        return ["text", "tag", "dot", "icon"].indexOf(value) != -1;
       }
     },
     code: {
@@ -62,35 +59,39 @@ export default {
     }
   },
   created() {
-    this.data = this.$store.getters.dictionaryByKey(this.code) || []
+    this.data = this.$store.getters.dictionaryByKey(this.code) || [];
   },
   methods: {
     setName(v) {
-      if ((v+"").indexOf(',')==-1) {
-        var item
-        this.data.map((u) => {
+      if ((v + "").indexOf(",") == -1) {
+        var item;
+        this.data.map(u => {
           if (u.code == v) {
-            item = u
+            item = u;
           }
-        })
+        });
         if (item) {
-          this.name = item.name
-          this.item = item
+          this.name = item.name;
+          this.item = item;
         } else {
-          this.name = this.value
+          if (this.value == "undefined") {
+            this.name = ' '
+          } else {
+            this.name = this.value;
+          }
         }
       } else {
-        this.isMore=true;
-        var items=[];
-        var ul=(v+"").split(',')
-        this.data.map((u) => {
-          if (ul.indexOf(u.code)>-1) {
-            u.tagcolor=u.color|'default'
-            u.style={color: u.color|'inherit'}
-            items.push(u)
+        this.isMore = true;
+        var items = [];
+        var ul = (v + "").split(",");
+        this.data.map(u => {
+          if (ul.indexOf(u.code) > -1) {
+            u.tagcolor = u.color | "default";
+            u.style = { color: u.color | "inherit" };
+            items.push(u);
           }
-        })
-        this.items=items;       
+        });
+        this.items = items;
       }
     }
   },
@@ -99,36 +100,36 @@ export default {
       if (
         this.color &&
         this.item &&
-        this.item.color != '' &&
+        this.item.color != "" &&
         this.item.color != null
       ) {
-        return this.item.color
+        return this.item.color;
       }
-      return 'default'
+      return "default";
     },
     style() {
       if (!this.color) {
-        return {}
+        return {};
       }
       return {
         color:
-          this.item && this.item.color != '' && this.item.color != null
+          this.item && this.item.color != "" && this.item.color != null
             ? this.item.color
-            : 'inherit'
-      }
+            : "inherit"
+      };
     }
   },
   watch: {
     value(v) {
-      this.setName(v)
-        // this.$forceUpdate()
+      this.setName(v);
+      // this.$forceUpdate()
     },
-    data(v){
-      if(v.length>0){
-        this.setName(this.value)
-          this.$forceUpdate()
+    data(v) {
+      if (v.length > 0) {
+        this.setName(this.value);
+        this.$forceUpdate();
       }
     }
   }
-}
+};
 </script>
\ No newline at end of file

pages/aps/plan/dispatch.vue

     <template>
   <Form ref="form" :model="entity" :rules="rules" :label-width="90">
     <Row>
-      <Col span="24">
+      <Col span="12">
         <FormItem :label="l('DistributeMainRouting')" prop="DistributeMainRouting">
           <UserSelect ref="userSelected" v-model="entity.DistributeMainRouting" />
         </FormItem>
       </Col>
-      <Col span="24">
+      <Col span="12">
         <FormItem label="完成时间" style="width:100%" prop="MainRoutingFinishDate">
           <DatePicker
             v-model="entity.MainRoutingFinishDate"

pages/aps/plan/index.vue

@@ -13,7 +13,7 @@
             <Input
               search
               enter-button
-              placeholder="请输入关键字订单编号/任务类型/甲方客户/3D打印承制单位(基础数据)/厂内责任机关(基础数据)/厂内主主体责任部门(基础数据)/备注/任务接点要求/上传文件名称/上传文件名称/外部图号/模型号/模型版本/甲方任务号/手输/手输/手输/设备/工艺方法/外包络尺寸（mm）/产品序号:No1~No99///批次号/项目号/紧急程度/材料名称/(APS)产品名称增强"
+              placeholder="请输入关键字订单编号/项目名称"
               v-model="easySearch.keys.value"
               @on-search="search"
             />
@@ -86,7 +86,7 @@ export default {
       action: Api.index,
       easySearch: {
         keys: {
-          op: "mesCode,taskType,stage,projectNumber,materialName",
+          op: "mesCode,projectNumber",
           value: null
         }
       },

pages/aps/plan/search.vue

@@ -508,7 +508,7 @@ export default {
         projectNumber: { op: 'Equal', value: null, show: true },
         urgencyLevel: { op: 'Equal', value: null, show: true },
         materialName: { op: 'Equal', value: null, show: true },
-        isPreschedule: { op: 'Equal', value: null, show: true },
+        isPreschedule: { op: 'Equal', value: null, show: false },
         spareQty: { op: 'Equal', value: null, show: false },
         demandStart: { op: 'Range', value: null, show: false },
         demandFinish: { op: 'Range', value: null, show: false },