|
|
@ -1251,7 +1251,7 @@ |
|
|
</el-dialog> |
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
<!-- 标签模版设置新增 --> |
|
|
<!-- 标签模版设置新增 --> |
|
|
<el-dialog title="标签模版设置" :close-on-click-modal="false" v-drag :visible.sync="labelTemplateModal" width="490px"> |
|
|
|
|
|
|
|
|
<el-dialog title="标签模版设置" :close-on-click-modal="false" v-drag :visible.sync="labelTemplateModal" width="380px"> |
|
|
<el-form :inline="true" label-position="top" :model="labelTemplateData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
<el-form :inline="true" label-position="top" :model="labelTemplateData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
<el-form-item> |
|
|
<el-form-item> |
|
|
<span v-if="labelTemplateDisableFlag" slot="label">标签类型</span> |
|
|
<span v-if="labelTemplateDisableFlag" slot="label">标签类型</span> |
|
|
@ -1259,12 +1259,19 @@ |
|
|
<el-input v-model="labelTemplateData.labelTypeTb" :disabled="labelTemplateDisableFlag" @change="labelTemplateBlur(1099)" style="width: 100px"></el-input> |
|
|
<el-input v-model="labelTemplateData.labelTypeTb" :disabled="labelTemplateDisableFlag" @change="labelTemplateBlur(1099)" style="width: 100px"></el-input> |
|
|
<el-input v-model="labelTemplateData.labelType" disabled style="width: 230px"></el-input> |
|
|
<el-input v-model="labelTemplateData.labelType" disabled style="width: 230px"></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item label=" "> |
|
|
|
|
|
|
|
|
</el-form> |
|
|
|
|
|
<el-form :inline="true" label-position="top" :model="labelTemplateData" style="margin-left: 7px;"> |
|
|
|
|
|
<el-form-item label="默认标识"> |
|
|
<el-select v-model="labelTemplateData.defaultFlag" style="width: 100px"> |
|
|
<el-select v-model="labelTemplateData.defaultFlag" style="width: 100px"> |
|
|
<el-option label="默认" value="1"></el-option> |
|
|
<el-option label="默认" value="1"></el-option> |
|
|
<el-option label="非默认" value="0"></el-option> |
|
|
<el-option label="非默认" value="0"></el-option> |
|
|
</el-select> |
|
|
</el-select> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
|
|
|
<el-form-item label="工序" style="margin-left: -10px"> |
|
|
|
|
|
<el-select v-model="labelTemplateData.operationDesc" placeholder="请选择工序" filterable clearable style="width: 230px"> |
|
|
|
|
|
<el-option v-for="item in operationDescList" :key="item" :label="item" :value="item"></el-option> |
|
|
|
|
|
</el-select> |
|
|
|
|
|
</el-form-item> |
|
|
</el-form> |
|
|
</el-form> |
|
|
<el-footer style="height:35px;margin-top: 15px;text-align:center"> |
|
|
<el-footer style="height:35px;margin-top: 15px;text-align:center"> |
|
|
<el-button type="primary" @click="saveLabelTemplate()">保存</el-button> |
|
|
<el-button type="primary" @click="saveLabelTemplate()">保存</el-button> |
|
|
@ -1450,6 +1457,7 @@ |
|
|
partNo: '', |
|
|
partNo: '', |
|
|
labelTypeTb: '', |
|
|
labelTypeTb: '', |
|
|
labelType: '', |
|
|
labelType: '', |
|
|
|
|
|
operationDesc: '', |
|
|
defaultFlag: '', |
|
|
defaultFlag: '', |
|
|
createBy: '', |
|
|
createBy: '', |
|
|
}, |
|
|
}, |
|
|
@ -1936,6 +1944,19 @@ |
|
|
fixed: '', |
|
|
fixed: '', |
|
|
columnWidth: 120, |
|
|
columnWidth: 120, |
|
|
}, |
|
|
}, |
|
|
|
|
|
{ |
|
|
|
|
|
columnProp: 'operationDesc', |
|
|
|
|
|
headerAlign: "center", |
|
|
|
|
|
align: "left", |
|
|
|
|
|
columnLabel: '工序', |
|
|
|
|
|
columnHidden: false, |
|
|
|
|
|
columnImage: false, |
|
|
|
|
|
columnSortable: false, |
|
|
|
|
|
sortLv: 0, |
|
|
|
|
|
status: true, |
|
|
|
|
|
fixed: '', |
|
|
|
|
|
columnWidth: 120, |
|
|
|
|
|
}, |
|
|
{ |
|
|
{ |
|
|
columnProp: 'defaultFlagDesc', |
|
|
columnProp: 'defaultFlagDesc', |
|
|
headerAlign: "center", |
|
|
headerAlign: "center", |
|
|
@ -2170,7 +2191,7 @@ |
|
|
// 获取工序列表 |
|
|
// 获取工序列表 |
|
|
loadOperationDescList() { |
|
|
loadOperationDescList() { |
|
|
const params = { |
|
|
const params = { |
|
|
site: this.modalData.site |
|
|
|
|
|
|
|
|
site: this.partCurrentRow.site || this.modalData.site |
|
|
} |
|
|
} |
|
|
getAllOperationDescList(params).then(({data}) => { |
|
|
getAllOperationDescList(params).then(({data}) => { |
|
|
if (data && data.code === 0) { |
|
|
if (data && data.code === 0) { |
|
|
@ -3065,9 +3086,11 @@ |
|
|
partNo: this.partCurrentRow.partNo, |
|
|
partNo: this.partCurrentRow.partNo, |
|
|
labelTypeTb: '', |
|
|
labelTypeTb: '', |
|
|
labelType: '', |
|
|
labelType: '', |
|
|
|
|
|
operationDesc: '', |
|
|
defaultFlag: '', |
|
|
defaultFlag: '', |
|
|
createdBy: this.$store.state.user.name, |
|
|
createdBy: this.$store.state.user.name, |
|
|
} |
|
|
} |
|
|
|
|
|
this.loadOperationDescList() |
|
|
this.labelTemplateModal = true |
|
|
this.labelTemplateModal = true |
|
|
this.labelTemplateDisableFlag = false |
|
|
this.labelTemplateDisableFlag = false |
|
|
}, |
|
|
}, |
|
|
@ -3081,8 +3104,10 @@ |
|
|
partNo: row.partNo, |
|
|
partNo: row.partNo, |
|
|
labelTypeTb: row.labelTypeTb, |
|
|
labelTypeTb: row.labelTypeTb, |
|
|
labelType: row.labelType, |
|
|
labelType: row.labelType, |
|
|
|
|
|
operationDesc: row.operationDesc || '', |
|
|
defaultFlag: row.defaultFlag, |
|
|
defaultFlag: row.defaultFlag, |
|
|
} |
|
|
} |
|
|
|
|
|
this.loadOperationDescList() |
|
|
this.labelTemplateModal = true |
|
|
this.labelTemplateModal = true |
|
|
this.labelTemplateDisableFlag = true |
|
|
this.labelTemplateDisableFlag = true |
|
|
}, |
|
|
}, |
|
|
|