Commit fac071ca authored by 李驰骋's avatar 李驰骋

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

parents 3fa4a948 96435e33
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
<u-input :border="true" v-model="ExceptionForms.processName"></u-input> <u-input :border="true" v-model="ExceptionForms.processName"></u-input>
</u-form-item> </u-form-item>
<u-form-item label="作业单元" prop="workstationName"> <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> </u-form-item>
...@@ -1037,7 +1037,9 @@ export default { ...@@ -1037,7 +1037,9 @@ export default {
processId: item.processId, processId: item.processId,
processCode: item.processCode, processCode: item.processCode,
processName: item.processName, processName: item.processName,
workstationId: item.workunitId, workstationId: this.vuex_workunit.workunitId,
workstationCode: this.vuex_workunit.workunitCode,
workstationName: this.vuex_workunit.workunitName,
abnormalType: '', abnormalType: '',
abnormalReason: '', abnormalReason: '',
abnormalTime: '' abnormalTime: ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment