mesPlan

components/page/dataGrid.vue

@@ -237,6 +237,7 @@ export default {
       type: Number,
       default: 24
     },
+    //table控件children子数据控制功能
     rowKey:{
       type:[String,Number]
     }

i18n/locale/zh-CN.js

@@ -903,7 +903,7 @@ export default {
     deleterUserId: '删除人',
     mesCode: '订单编号',
     taskType: '任务类型',
-    productId: '产品主键',
+    productId: '产品Id',
     quantity: '数量',
     remark: '备注',
     taskRequire: '任务节点要求',
@@ -923,6 +923,15 @@ export default {
     upId: '父订单id',
     demandStartDate: '投料时间',
     demandFinishDate: '节点时间',
+    //tempTitle------
+    stage:'阶段',
+    materialId:'材料',
+    routing_Method:'工艺方法',
+    outer_Envelope_Size:'外包络尺寸',
+    guestName:'甲方客户',
+    taskCode:'甲方任务号',
+    putintDocmentCode:'甲方投产输入文件（编号）',
+    technologyDocmentCode:'甲方技术输入文件（编号）',
   },
   mes_part_task_plan_simulate: {
     id: '',

pages/mesPlan/detail.vue

@@ -2,59 +2,45 @@
   <div class="detail">
     <Row>
       <Filed :span="12" :name="l('mesCode')">{{entity.mesCode}}</Filed>
-      <Filed :span="12" :name="l('taskType')">{{entity.taskType}}</Filed>
-      <Filed :span="12" :name="l('productId')">{{entity.productId}}</Filed>
+      <Filed :span="12" :name="l('taskType')"><state code="plan.order.taskType" :value="entity.taskType" type="text"></state></Filed>
       <Filed :span="12" :name="l('quantity')">{{entity.quantity}}</Filed>
-      <Filed :span="24" :name="l('remark')">{{entity.remark}}</Filed>
-      <Filed :span="24" :name="l('taskRequire')">{{entity.taskRequire}}</Filed>
-      <Filed :span="12" :name="l('status')">{{entity.status}}</Filed>
-      <Filed :span="12" :name="l('divideMark')">{{entity.divideMark}}</Filed>
-      <Filed :span="24" :name="l('productCode')">{{entity.productCode}}</Filed>
+      <Filed :span="12" :name="l('status')"><state code="plan.order.status" :value="entity.status" type="text"></state></Filed>
       <Filed :span="12" :name="l('productName')">{{entity.productName}}</Filed>
       <Filed :span="12" :name="l('drawnNumber')">{{entity.drawnNumber}}</Filed>
-      <Filed :span="12" :name="l('rootId')">{{entity.rootId}}</Filed>
       <Filed :span="12" :name="l('batchNumber')">{{entity.batchNumber}}</Filed>
       <Filed :span="12" :name="l('projectNumber')">{{entity.projectNumber}}</Filed>
-      <Filed :span="12" :name="l('urgencyLevel')">{{entity.urgencyLevel}}</Filed>
-      <Filed
-        :span="12"
-        :name="l('productingPreparationPeople')"
-      >{{entity.productingPreparationPeople}}</Filed>
-      <Filed
-        :span="12"
-        :name="l('productingPreparationFinishDate')"
-      >{{entity.productingPreparationFinishDate}}</Filed>
-      <Filed :span="12" :name="l('quotationPeople')">{{entity.quotationPeople}}</Filed>
-      <Filed :span="12" :name="l('quotationFinishDate')">{{entity.quotationFinishDate}}</Filed>
-      <Filed :span="12" :name="l('upId')">{{entity.upId}}</Filed>
+      <Filed :span="12" :name="l('urgencyLevel')"><state code="plan.order.urgencyLevel" :value="entity.urgencyLevel" type="text"></state></Filed>
       <Filed :span="12" :name="l('demandStartDate')">{{entity.demandStartDate}}</Filed>
       <Filed :span="12" :name="l('demandFinishDate')">{{entity.demandFinishDate}}</Filed>
+      <Filed :span="12" :name="l('taskRequire')">{{entity.taskRequire}}</Filed>
+       <Filed :span="24" :name="l('remark')">{{entity.remark}}</Filed>
     </Row>
   </div>
 </template>
 <script>
 import Api from "./api";
 export default {
-  name: "Add",
+  name: "detail",
   data() {
     return {
       entity: {},
-      rules: {
-        name: [{ required: true, message: "必填", trigger: "blur" }],
-        code: [{ required: true, message: "必填", trigger: "blur" }]
-      }
     };
   },
   props: {
-    eid: Number
+    row: {
+      type: Object,
+      default: () => {
+        return null;
+      }
+    }
   },
   methods: {
-    load(v) {
-      Api.get({ id: v }).then(r => {
-        this.entity = r.result;
-        this.$emit("on-load");
-      });
-    },
+    // load(v) {
+    //   Api.get({ id: v }).then(r => {
+    //     this.entity = r.result;
+    //     this.$emit("on-load");
+    //   });
+    // },
     handleClose() {
       this.$emit("on-close");
     },
@@ -64,9 +50,9 @@ export default {
     }
   },
   watch: {
-    eid(v) {
-      if (v != 0) {
-        this.load(v);
+    row(v) {
+      if (v != null) {
+        this.entity = this.$u.clone(this.row);
       }
     }
   }

pages/mesPlan/index.vue

@@ -28,9 +28,8 @@
           <Form ref="formInline" :model="easySearch" inline>
             <FormItem prop="keys">
               <Input
-                placeholder="请输入关键字订单编号/产品名称"
+                placeholder="请输入订单编号/产品名称"
                 v-model="easySearch.keys.value"
-                style="width:240px;"
               />
             </FormItem>
             <FormItem>
@@ -49,14 +48,14 @@
           <Button type="primary" class="mr10 ml10">批量删除</Button>
         </template>
       </DataGrid>
-      <Modal v-model="addModal" title="新增" footer-hide width="1000">
+      <Modal v-model="addModal" title="新增" footer-hide width="1200">
         <Add @on-close="cancel" @on-ok="addOk" />
       </Modal>
-      <Modal v-model="editModal" title="编辑" footer-hide width="1000">
-        <Edit :eid="curId" @on-close="cancel" @on-ok="addOk" />
+      <Modal v-model="editModal" title="编辑" footer-hide width="1200">
+        <Edit :row="rowData" @on-close="cancel" @on-ok="addOk" />
       </Modal>
-      <Modal v-model="detailModal" title="详情" width="1000">
-        <Detail :eid="curId" />
+      <Modal v-model="detailModal" title="详情" width="1200">
+        <Detail :row="rowData" />
       </Modal>
       <Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">
         <p>确定删除？</p>
@@ -137,13 +136,15 @@ export default {
           title: this.l("taskType"),
           align: "center",
           high: true,
-          code: "plan.order.taskType"
+          code: "plan.order.taskType",
+          width:100,
         },
         {
           key: "quantity",
           title: this.l("quantity"),
           align: "right",
-          high: true
+          high: true,
+          width:80,
         },
         {
           key: "taskRequire",
@@ -158,7 +159,8 @@ export default {
           title: this.l("status"),
           align: "center",
           high: true,
-          code: "plan.order.status"
+          code: "plan.order.status",
+          width:100,
         },
         {
           key: "productCode",
@@ -199,9 +201,10 @@ export default {
         {
           key: "urgencyLevel",
           title: this.l("urgencyLevel"),
-          align: "left",
+          align: "center",
           high: true,
-          code: "plan.order.urgencyLevel"
+          code: "plan.order.urgencyLevel",
+          width:100,
         },
         {
           key: "productingPreparationPeople",
@@ -256,7 +259,7 @@ export default {
                 "op",
                 {
                   attrs: { oprate: "detail" },
-                  on: { click: () => this.detail(params.row.id) }
+                  on: { click: () => this.detail(params.row) }
                 },
                 "查看"
               ),
@@ -264,7 +267,7 @@ export default {
                 "op",
                 {
                   attrs: { oprate: "edit" },
-                  on: { click: () => this.edit(params.row.id) }
+                  on: { click: () => this.edit(params.row) }
                 },
                 "编辑"
               ),
@@ -662,7 +665,8 @@ export default {
       ownerGustList: [], //甲方客户下拉
       mainDeptList: [], //厂内主体部门下拉
       taskTypeList: [], //任务类型
-      statusList: [] //状态类型
+      statusList: [], //状态类型
+      rowData:{},//编辑、查看的当前行数据
     };
   },
   created() {
@@ -718,13 +722,13 @@ export default {
     search() {
       this.$refs.grid.reload(this.easySearch);
     },
-    detail(id) {
+    detail(row) {
       this.detailModal = true;
-      this.curId = id;
+      this.rowData = row;
     },
-    edit(id) {
+    edit(row) {
       this.editModal = true;
-      this.curId = id;
+      this.rowData = row;
     },
 
     remove(id) {