|
|
@ -837,8 +837,7 @@ |
|
|
</el-dialog> |
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
<!-- workGuideline --> |
|
|
<!-- workGuideline --> |
|
|
<el-dialog title="工艺指导" :close-on-click-modal="false" v-drag :visible.sync="queryWorkGuidelineModal" |
|
|
|
|
|
width="1000px"> |
|
|
|
|
|
|
|
|
<el-dialog title="工艺指导" :close-on-click-modal="false" v-drag :visible.sync="queryWorkGuidelineModal" width="1000px"> |
|
|
<el-form :inline="true" label-position="top" :model="workGuidelineData" style="margin-left: 5px"> |
|
|
<el-form :inline="true" label-position="top" :model="workGuidelineData" style="margin-left: 5px"> |
|
|
<el-form-item :label="'物料编码'"> |
|
|
<el-form-item :label="'物料编码'"> |
|
|
<el-input v-model="workGuidelineData.partNo" readonly style="width: 120px"></el-input> |
|
|
<el-input v-model="workGuidelineData.partNo" readonly style="width: 120px"></el-input> |
|
|
@ -922,23 +921,20 @@ |
|
|
</el-dialog> |
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
<!-- workGuideline 新增模态框 --> |
|
|
<!-- workGuideline 新增模态框 --> |
|
|
<el-dialog title="工艺指导" :close-on-click-modal="false" v-drag :visible.sync="saveWorkGuidelineModal" |
|
|
|
|
|
width="664px"> |
|
|
|
|
|
<el-form :inline="true" label-position="top" :model="saveWorkGuidelineData" :rules="guidelineRules" |
|
|
|
|
|
style="margin-left: 5px"> |
|
|
|
|
|
|
|
|
<el-dialog title="工艺指导" :close-on-click-modal="false" v-drag :visible.sync="saveWorkGuidelineModal" width="664px"> |
|
|
|
|
|
<el-form :inline="true" label-position="top" :model="saveWorkGuidelineData" :rules="guidelineRules" style="margin-left: 5px"> |
|
|
<el-form-item :label="'序号'" prop="guidelineSeq" :rules="guidelineRules.guidelineSeq"> |
|
|
<el-form-item :label="'序号'" prop="guidelineSeq" :rules="guidelineRules.guidelineSeq"> |
|
|
<el-input-number :controls="false" :step="0" v-model="saveWorkGuidelineData.guidelineSeq" |
|
|
|
|
|
style="width: 60px"></el-input-number> |
|
|
|
|
|
|
|
|
<el-input-number :controls="false" :step="0" v-model="saveWorkGuidelineData.guidelineSeq" style="width: 60px"></el-input-number> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item :label="'工艺指导名称'" prop="guidelineDesc" :rules="guidelineRules.guidelineDesc"> |
|
|
<el-form-item :label="'工艺指导名称'" prop="guidelineDesc" :rules="guidelineRules.guidelineDesc"> |
|
|
<el-input v-model="saveWorkGuidelineData.guidelineDesc" style="width: 126px"></el-input> |
|
|
|
|
|
|
|
|
<!-- <el-input v-model="saveWorkGuidelineData.guidelineDesc" style="width: 126px"></el-input>--> |
|
|
|
|
|
<dict-data-select :site="saveWorkGuidelineData.site" v-if="saveWorkGuidelineData.site" v-model="saveWorkGuidelineData.guidelineDesc" style="width: 126px" dict-type="routing_work_guide_line"></dict-data-select> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item :label="'工艺指导描述'" prop="guidelineText" :rules="guidelineRules.guidelineText"> |
|
|
<el-form-item :label="'工艺指导描述'" prop="guidelineText" :rules="guidelineRules.guidelineText"> |
|
|
<el-input v-model="saveWorkGuidelineData.guidelineText" style="width: 413px"></el-input> |
|
|
<el-input v-model="saveWorkGuidelineData.guidelineText" style="width: 413px"></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-form> |
|
|
</el-form> |
|
|
<el-form :inline="true" label-position="top" :model="saveWorkGuidelineData" :rules="guidelineRules" |
|
|
|
|
|
style="margin-left: 5px"> |
|
|
|
|
|
|
|
|
<el-form :inline="true" label-position="top" :model="saveWorkGuidelineData" :rules="guidelineRules" style="margin-left: 5px"> |
|
|
<el-form-item :label="'工艺指导类型'" prop="guidelineType" :rules="guidelineRules.guidelineType"> |
|
|
<el-form-item :label="'工艺指导类型'" prop="guidelineType" :rules="guidelineRules.guidelineType"> |
|
|
<el-select v-model="saveWorkGuidelineData.guidelineType" style="width: 200px"> |
|
|
<el-select v-model="saveWorkGuidelineData.guidelineType" style="width: 200px"> |
|
|
<el-option label="Subtask" value="Subtask"></el-option> |
|
|
<el-option label="Subtask" value="Subtask"></el-option> |
|
|
@ -951,8 +947,7 @@ |
|
|
<el-option label="Not Required" value="Not Required"></el-option> |
|
|
<el-option label="Not Required" value="Not Required"></el-option> |
|
|
</el-select> |
|
|
</el-select> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item :label="'检验签字'" prop="inspectionSignOffRequired" |
|
|
|
|
|
:rules="guidelineRules.inspectionSignOffRequired"> |
|
|
|
|
|
|
|
|
<el-form-item :label="'检验签字'" prop="inspectionSignOffRequired" :rules="guidelineRules.inspectionSignOffRequired"> |
|
|
<el-select v-model="saveWorkGuidelineData.inspectionSignOffRequired" style="width: 200px"> |
|
|
<el-select v-model="saveWorkGuidelineData.inspectionSignOffRequired" style="width: 200px"> |
|
|
<el-option label="Required to Shop Order" value="Required to Shop Order"></el-option> |
|
|
<el-option label="Required to Shop Order" value="Required to Shop Order"></el-option> |
|
|
<el-option label="Required to Close Operation" value="Required to Close Operation"></el-option> |
|
|
<el-option label="Required to Close Operation" value="Required to Close Operation"></el-option> |
|
|
@ -1231,10 +1226,12 @@ import {getChooselistData, verifyData} from "@/api/chooselist/chooselist.js" |
|
|
import ChooseList from '@/views/modules/common/Chooselist' |
|
|
import ChooseList from '@/views/modules/common/Chooselist' |
|
|
import {queryWorkCenterList} from "../../../api/part/workCenter"; |
|
|
import {queryWorkCenterList} from "../../../api/part/workCenter"; |
|
|
import {queryWorkerLevelList} from "../../../api/base/laborClass"; |
|
|
import {queryWorkerLevelList} from "../../../api/base/laborClass"; |
|
|
|
|
|
import DictDataSelect from "../sys/dict-data-select-highlight.vue"; |
|
|
|
|
|
|
|
|
export default { |
|
|
export default { |
|
|
// 组件 |
|
|
// 组件 |
|
|
components: { |
|
|
components: { |
|
|
|
|
|
DictDataSelect, |
|
|
ChooseList |
|
|
ChooseList |
|
|
}, |
|
|
}, |
|
|
// 监听 |
|
|
// 监听 |
|
|
|