mesplan

i18n/locale/zh-CN.js

@@ -920,7 +920,7 @@ export default {
         productId: '产品Id',
         quantity: '数量',
         remark: '备注',
-        taskRequire: '任务节点要求',
+        taskRequire: '任务要求',
         status: '订单状态',
         divideMark: '分解标记:1-已分解;0-未分解',
         productCode: '产品序号:No1~No99',
@@ -930,13 +930,13 @@ export default {
         batchNumber: '批次号',
         projectNumber: '项目号',
         urgencyLevel: '紧急程度',
-        productingPreparationPeople: '生产准备(主制车间)',
-        productingPreparationFinishDate: '生产准备完成时间',
+        productingPreparationPeople: '生产车间',
+        productingPreparationFinishDate: '生产完成时间',
         quotationPeople: '订单报价人员',
         quotationFinishDate: '订单报价完成时间',
         upId: '父订单id',
-        demandStartDate: '投料时间',
-        demandFinishDate: '节点时间',
+        demandStartDate: '开始时间',
+        demandFinishDate: '完成时间',
         //tempTitle------
         stage: '阶段',
         materialId: '材料',

pages/mesPlan/index.vue

@@ -145,11 +145,6 @@ export default {
                     width: 50,
                     align: "center"
                 },
-                {
-                    key: "id",
-                    title: this.l("id"),
-                    hide: true
-                },
                 {
                     key: "mesCode",
                     title: this.l("mesCode"),

pages/mesPlan/send.vue

 <template>
-  <div style="width:100%;margin:0 auto">
+<div style="width:100%;margin:0 auto">
     <Detail ref="detailRow" :row="row1" v-show="dataList.length==1"></Detail>
-    <Table
-      border
-      :columns="columns1"
-      :data="dataList"
-      class="tableCommon"
-      v-show="dataList.length>1"
-      :height="tbHeight"
-    ></Table>
+    <Table border :columns="columns1" :data="dataList" class="tableCommon" v-show="dataList.length>1" :height="tbHeight"></Table>
     <div style="width100%;margin:40px auto">
-      <Form
-        :model="orderForm"
-        :label-width="110"
-        class="margin-top-20 margin-bottom-50"
-        :rules="ruleValidate"
-        ref="formValidate"
-      >
+        <Form :model="orderForm" :label-width="140" class="margin-top-20 margin-bottom-50" :rules="ruleValidate" ref="formValidate">
             <Row>
                 <Col span="6">
                 <FormItem label="生产车间" style="width:100%" prop="ProductingPreparationPeople">
@@ -24,13 +11,8 @@
                 </FormItem>
                 </Col>
                 <Col span="6">
-            <FormItem label="完成时间" style="width:100%" prop="ProductingPreparationFinishDate">
-              <DatePicker
-                v-model="orderForm.ProductingPreparationFinishDate"
-                type="date"
-                placeholder="请选择日期"
-                @on-change="getTimeProductPFD"
-              ></DatePicker>
+                <FormItem label="生产完成时间" style="width:100%" prop="ProductingPreparationFinishDate">
+                    <DatePicker v-model="orderForm.ProductingPreparationFinishDate" type="date" placeholder="请选择日期" @on-change="getTimeProductPFD"></DatePicker>
                 </FormItem>
                 </Col>
                 <Col span="6">
@@ -39,19 +21,14 @@
                 </FormItem>
                 </Col>
                 <Col span="6">
-            <FormItem label="完成时间" style="width:100%" prop="QuotationFinishDate">
-              <DatePicker
-                v-model="orderForm.QuotationFinishDate"
-                type="date"
-                placeholder="请选择日期"
-                @on-change="getTimeQuotationFD"
-              ></DatePicker>
+                <FormItem label="订单报价完成时间" style="width:100%" prop="QuotationFinishDate">
+                    <DatePicker v-model="orderForm.QuotationFinishDate" type="date" placeholder="请选择日期" @on-change="getTimeQuotationFD"></DatePicker>
                 </FormItem>
                 </Col>
             </Row>
         </Form>
     </div>
-  </div>
+</div>
 </template>
 
 <script>
@@ -72,8 +49,7 @@ export default {
                 QuotationPeople: null, //订单报价人员
                 QuotationFinishDate: "" //订单报价完成时间
             },
-      columns1: [
-        {
+            columns1: [{
                     title: this.l("mesCode"),
                     key: "mesCode",
                     width: 180,
@@ -113,36 +89,28 @@ export default {
             dataListRetrun: [], //确定后返回数据
 
             ruleValidate: {
-        ProductingPreparationPeople: [
-          {
+                ProductingPreparationPeople: [{
                     required: true,
                     message: "请选择人员",
                     trigger: "change",
                     type: "number"
-          }
-        ],
-        ProductingPreparationFinishDate: [
-          {
+                }],
+                ProductingPreparationFinishDate: [{
                     required: true,
                     message: "请选择时间",
                     trigger: "change"
-          }
-        ],
-        QuotationPeople: [
-          {
+                }],
+                QuotationPeople: [{
                     required: true,
                     message: "请选择人员",
                     trigger: "change",
                     type: "number"
-          }
-        ],
-        QuotationFinishDate: [
-          {
+                }],
+                QuotationFinishDate: [{
                     required: true,
                     message: "请选择时间",
                     trigger: "change"
-          }
-        ]
+                }]
             },
             rowList: [],
             row1: {},