Merge remote-tracking branch 'origin/dev' into dev

pages/mes/prodReport/index.vue

@@ -196,7 +196,7 @@
               <u-input :border="true" v-model="ExceptionForms.processName"></u-input>
             </u-form-item>
             <u-form-item label="作业单元" prop="workstationName">
-              <u-input :border="true" v-model="ExceptionForms.workstationId"></u-input>
+              <u-input :border="true" v-model="ExceptionForms.workstationName"></u-input>
             </u-form-item>
 
 
@@ -1037,7 +1037,9 @@ export default {
           processId: item.processId,
           processCode: item.processCode,
           processName: item.processName,
-          workstationId: item.workunitId,
+          workstationId: this.vuex_workunit.workunitId,
+		  workstationCode: this.vuex_workunit.workunitCode,
+		  workstationName: this.vuex_workunit.workunitName,
           abnormalType: '',
           abnormalReason: '',
           abnormalTime: ''