Merge branch 'master' of http://git.dongkesoft.com:9001/DK-MES-3.0/mes-web

src/locale/lang/zh-CN.js

@@ -377,6 +377,7 @@ export const columns = {
   saveDetail: '保存至明细',
   clearDefect: '清空',
   userMessage:'员工信息',
+  reverseMessage:'撤销信息',
 
   categoryCode: '分类编码',
   categoryName: '分类名称',
@@ -805,9 +806,9 @@ export const columns = {
   notCounted: '未盘点',
   counted: '已盘点',
   inventoryProfit: '盘盈',
-  finishTimeStart: '完成时间',
+  finishTimeStart: '开始时间',
   finishTimeEnd: '结束时间',
-  makeTimeStart: '生产时间',
+  makeTimeStart: '开始时间',
   makeTimeEnd: '结束时间',
   flowNodeIdList: '盘点工序',
   checkModelCategory: '产品类别',
@@ -835,7 +836,7 @@ export const columns = {
   recordTime: '记录时间',
   temperature: '温度(℃)',
   humidity: '湿度(%RH)',
-  thmeterRecord: '湿温度计',
+  thmeterRecord: '温湿度计',
 
   //报工
   workRecord:'报工记录',
@@ -846,6 +847,7 @@ export const columns = {
   workTimes:'报工工时',
   wordAmount:'报工金额',
   flgOvertime:'加班标识',
+  workJob:'报工工种',
 
   //工位打卡
   replaceStaffName: '替班员工',

src/view/pdm/molding-record/form.vue

@@ -1014,6 +1014,7 @@ export default {
             templist[it] = itt[it]
           })
           templist.ftyId = this.formData.ftyId
+          templist.manageUser =this.$store.state.user.id
           // 取出当前成型线对应的模具记录明细
           let temp = table.filter(it => it.groupId === itt.groupId)
           if (temp && temp.length > 0) {

src/view/report/product-follow-report/index.vue

@@ -65,7 +65,8 @@
           <DkTableColumn field="opnTime" :title="$t('operationTime')" data-type="dateTime"></DkTableColumn>
           <DkTableColumn field="opCreateUserCode"></DkTableColumn>
           <DkTableColumn field="opnUserName"></DkTableColumn>
-          <DkTableColumn field="operatingInstructions" width="auto"></DkTableColumn>
+<!--          <DkTableColumn field="operatingInstructions" width="auto"></DkTableColumn>-->
+          <DkTableColumn field="remarks" width="auto"></DkTableColumn>
         </DkTable>
       </div>
     </DkSplit>