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

i18n/locale/zh-CN.js

@@ -946,6 +946,7 @@ export default {
         taskCode: '甲方任务号',
         putintDocmentCode: '甲方投产输入文件（编号）',
         technologyDocmentCode: '甲方技术输入文件（编号）',
+        productionType:'生产类型'
     },
     mes_part_task_plan_simulate: {
         id: '',

pages/mesPlan/add.vue

@@ -58,7 +58,12 @@
             </Col>
         </Row>
         <Row>
-            <Col span="24">
+            <Col span="8">
+            <FormItem label="生产类型" style="width:100%" prop="productionType">
+                <dictionary style="width:240px" code="plan.order.productionType" v-model="orderSearchForm.productionType"></dictionary>
+            </FormItem>
+            </Col>
+            <Col span="16">
             <FormItem label="任务要求" style="width:100%">
                 <Input v-model="orderSearchForm.taskRequire" placeholder />
             </FormItem>

pages/mesPlan/detail.vue

@@ -67,6 +67,12 @@
         </Col>
     </Row>
     <Row>
+        <Col span="8">
+        <span class="fwBold">{{l('productionType')}}</span>
+        <p>
+            <state code="plan.order.productionType" :value="entity.productionType" type="text"></state>
+        </p>
+        </Col>
         <Col span="8">
         <span class="fwBold">{{l('productingPreparationPeople')}}</span>
         <p>
@@ -79,10 +85,6 @@
             <User v-model="entity.quotationPeople" v-if="entity.quotationPeople>0"></User>
         </p>
         </Col>
-        <Col span="8">
-        <span class="fwBold">&nbsp;</span>
-        <p>&nbsp;</p>
-        </Col>
     </Row>
     <Row class="lastRow">
         <Col span="24">

pages/mesPlan/edit.vue

@@ -61,6 +61,11 @@
             <dictionary style="width:240px" code="plan.order.urgencyLevel" v-model="orderSearchForm.urgencyLevel"></dictionary>
         </FormItem>
         </Col>
+        <Col span="8">
+        <FormItem :label="l('productionType')" style="width:100%" prop="productionType">
+            <dictionary style="width:240px" code="plan.order.productionType" v-model="orderSearchForm.productionType"></dictionary>
+        </FormItem>
+        </Col>
         <Col span="24">
         <FormItem :label="l('taskRequire')" style="width:100%">
             <Input v-model="orderSearchForm.taskRequire" placeholder />

pages/mesPlan/index.vue

@@ -179,6 +179,14 @@ export default {
                     code: "plan.order.taskType",
                     width: 100
                 },
+                {
+                    key: "productionType",
+                    title: this.l("productionType"),
+                    align: "center",
+                    high: true,
+                    code: "plan.order.productionType",
+                    width: 100
+                },
                 {
                     key: "quantity",
                     title: this.l("quantity"),

pages/project/task/index.vue

@@ -8,7 +8,7 @@
             <Icon type="ios-arrow-forward" size="24" />
         </a>
     </div>
-    <Content class="content" :class="!showMenu?'con_bord':''" >
+    <Content class="content" :class="!showMenu?'con_bord':''">
         <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :lazy="true">
             <template slot="easySearch">
                 <Form ref="formInline" inline>
@@ -175,6 +175,8 @@ export default {
                         return h('DateRange', {
                             props: {
                                 value: params.row,
+                                start: 'plansToStartDate',
+                                end: 'plansToEndTime',
                             }
                         })
                     }