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

pages/order/monitoring/index.vue

@@ -4,8 +4,7 @@
       <template slot="easySearch">
         <Form ref="formInline" :model="easySearch" inline style="margin-top:5px;">
           <FormItem prop="productingpreparationpeople" style="width:200px">
-            <!-- <departmentSelect v-model="easySearch.productingpreparationpeople.value"></departmentSelect>-->
-             <workShop v-model="easySearch.productingpreparationpeople.value"></workShop>
+            <departmentSelect v-model="easySearch.productingpreparationpeople.value" :type="3"></departmentSelect>
           </FormItem>
           <FormItem prop="keys">
             <Input placeholder="请输入订单编号" v-model="easySearch.keys.value" />