workhourManage detail\indx\zh-cn\datagrid...

i18n/locale/zh-CN.js

@@ -2155,5 +2155,19 @@ document_category: {
         template: '模板',
         attachment: '附件',
         type: '模版类型',
+    },
+    workHour: {
+        userTitle: '员工姓名',
+        userCardNo: '员工编号',
+        totalWorkHour: '工时数量',
+        planQuantity: '计划数量',
+        qualified: '合格数量',
+        action: '操作',
+        mesCode: '订单编号',
+        productName: '产品名称',
+        drawnNumber: '产品图号',
+        routingDetailSeq: '工序号',
+        routingDetailName: '工序名称',
+        workHour: '工时数量',
     }
 }
\ No newline at end of file

pages/produce/workHourManage/detail.vue

@@ -2,7 +2,7 @@
 <div class="detail">
     <DataGrid :columns="columns" ref="grid" :data="data" :set="false">
         <template slot="easySearch">
-            <p class="pl10">用户姓名：<span class="mr20">{{entity.name}}</span>用户编号：<span class="mr20">{{entity.id}}</span>工时数量：<span class="mr20">{{entity.creatorUserId}}</span>计划数量：<span class="mr20">{{entity.creatorUserId}}</span>合格数量：<span class="mr20">{{entity.creatorUserId}}</span></p>
+            <p class="pl10">{{this.l('userTitle')}}：<span class="mr20">{{entity.userTitle}}</span>{{this.l('userTitle')}}：<span class="mr20">{{entity.userCardNo}}</span>{{this.l('totalWorkHour')}}：<span class="mr20">{{entity.totalWorkHour}}</span>{{this.l('planQuantity')}}：<span class="mr20">{{entity.planQuantity}}</span>{{this.l('qualified')}}：<span class="mr20">{{entity.qualified}}</span></p>
         </template>
     </DataGrid>
 </div>
@@ -30,39 +30,36 @@ export default {
             fileUrlPath: "",
             columns: [{
                     key: "mesCode",
-                    title: '订单编号',
+                    title: this.l('mesCode'),
                     align: "left",
-                    easy: true,
-                    high: true,
                 },
                 {
                     key: "productName",
-                    title: '产品名称',
+                    title: this.l('productName'),
                     align: "left",
-                    easy: true,
-                    high: true,
                 },
                 {
                     key: "drawnNumber",
-                    title: '产品图号',
+                    title: this.l('drawnNumber'),
                     align: "left",
-                    easy: true,
-                    high: true,
                 },
                 {
                     key: "routingDetailSeq",
-                    title: '工序号',
-                    align: "left",
-                    easy: true,
-                    high: true,
+                    title: this.l('routingDetailSeq'),
+                    align: "right",
+                    width: 100,
                 },
                 {
                     key: "routingDetailName",
-                    title: '工序名称',
+                    title: this.l('routingDetailName'),
                     align: "left",
-                    easy: true,
-                    high: true,
-                }
+                },
+                {
+                    key: "workHour",
+                    title: this.l('workHour'),
+                    align: "right",
+                },
+
             ],
             data: [],
         };
@@ -100,6 +97,10 @@ export default {
         handleClose() {
             this.$emit("on-close");
         },
+        l(key) {
+            let vkey = "workHour" + "." + key;
+            return this.$t(vkey) || key;
+        },
     },
     watch: {
         row(v) {

pages/produce/workHourManage/index.vue

 <template>
 <div class="h100">
-    <DataGrid :columns="columns" ref="grid" :action="action">
+    <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch">
         <template slot="easySearch">
             <Form ref="formInline" :model="easySearch" inline>
                 <FormItem prop="keys">
@@ -35,6 +35,7 @@ export default {
                     op: "userTitle,userCardNo",
                     value: null
                 },
+                sortBy: 'totalWorkHour'
             },
             modal: false,
             full: false,
@@ -50,41 +51,41 @@ export default {
                     title: "序号",
                 }, {
                     key: "userTitle",
-                    title: '员工姓名',
+                    title: this.l('userTitle'),
                     align: "left",
                     easy: true,
                     high: true,
                 },
                 {
                     key: "userCardNo",
-                    title: '员工编号',
+                    title: this.l('userCardNo'),
                     align: "left",
                     easy: true,
                     high: true,
                 },
                 {
                     key: "totalWorkHour",
-                    title: '工时数量',
+                    title: this.l('totalWorkHour'),
                     align: "left",
                     easy: true,
                     high: true,
                 },
                 {
                     key: "planQuantity",
-                    title: '计划数量',
+                    title: this.l('planQuantity'),
                     align: "left",
                     easy: true,
                     high: true,
                 },
                 {
                     key: "qualified",
-                    title: '合格数量',
+                    title: this.l('qualified'),
                     align: "left",
                     easy: true,
                     high: true,
                 },
                 {
-                    title: "操作",
+                    title: this.l("action"),
                     key: "action",
                     width: 140,
                     align: "center",
@@ -141,7 +142,7 @@ export default {
             this.modal = false;
         },
         l(key) {
-            let vkey = "import_center" + "." + key;
+            let vkey = "workHour" + "." + key;
             return this.$t(vkey) || key;
         },
     },