|
|
|
@ -88,7 +88,7 @@ |
|
|
|
</el-pagination> |
|
|
|
|
|
|
|
<!-- 物料新增/编辑模态框 --> |
|
|
|
<el-dialog :title="modalData.title" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="737px"> |
|
|
|
<el-dialog :title="modalData.title" top="29vh" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="737px"> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="物料编码" prop="partNo" :rules="rules.partNo"> |
|
|
|
<el-input v-model="modalData.partNo" clearable style="width: 120px" :disabled="modalDisableFlag"></el-input> |
|
|
|
@ -101,6 +101,9 @@ |
|
|
|
<el-checkbox v-model="modalData.multilevelTrackingDb" true-label="Y">多级跟踪</el-checkbox><br> |
|
|
|
<el-checkbox v-model="modalData.allowAsNotConsumedDb" true-label="Y">允许为未使用</el-checkbox> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item v-if="modalData.flag === '2' && modalData.officialFlag !== 'Y'"> |
|
|
|
<el-button type="primary" @click="toBecomeOfficialPart" style="margin-top: 62px;margin-left: 10px;width: 110px">转正式物料</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item prop="umName" :rules="rules.umId"> |
|
|
|
@ -171,7 +174,7 @@ |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- 页签 --> |
|
|
|
<el-tabs v-model="activeTable" style="width: 100%" :style="{height: secondHeight + 'px'}" type="border-card" @tab-click="tabClick" class="customer-tab"> |
|
|
|
<el-tabs v-model="activeTable" style="width: 100%" :style="{height: this.secondHeight + 'px'}" type="border-card" @tab-click="tabClick" class="customer-tab"> |
|
|
|
<!-- 物料属性页签 --> |
|
|
|
<el-tab-pane label="物料属性" name="part_item"> |
|
|
|
<el-form label-position="top" style="margin-top: 2px; margin-left: 2px;"> |
|
|
|
@ -375,6 +378,7 @@ |
|
|
|
addMasterPartItem, // 新增物料属性 |
|
|
|
deleteMasterPartItem, // 删除物料属性 |
|
|
|
queryMasterPartItem, |
|
|
|
toBecomeOfficialMasterPart, // 转正式物料 |
|
|
|
} from '@/api/part/masterPartInformation.js' |
|
|
|
import Chooselist from '@/views/modules/common/Chooselist' |
|
|
|
import DictDataSelect from '../sys/dict-data-select.vue' |
|
|
|
@ -460,7 +464,8 @@ |
|
|
|
createDate: '', |
|
|
|
createBy: '', |
|
|
|
updateDate: '', |
|
|
|
updateBy: '' |
|
|
|
updateBy: '', |
|
|
|
officialFlag: '' |
|
|
|
}, |
|
|
|
itemData: { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
@ -519,6 +524,24 @@ |
|
|
|
fixed: '', |
|
|
|
columnWidth: 120 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 104001, |
|
|
|
serialNumber: '104001Table1OfficialFlag', |
|
|
|
tableId: '104001Table1', |
|
|
|
tableName: '物料信息表', |
|
|
|
columnProp: 'officialFlag', |
|
|
|
headerAlign: 'center', |
|
|
|
align: 'center', |
|
|
|
columnLabel: '是否为正式物料', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 100 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 104001, |
|
|
|
@ -1347,7 +1370,8 @@ |
|
|
|
lotQuantityRule: 'One Lot Per Production Order', |
|
|
|
subLotRule: 'No Sub Lots Allowed', |
|
|
|
componentLotRule: 'Many Lots Allowed', |
|
|
|
createBy: this.$store.state.user.name |
|
|
|
createBy: this.$store.state.user.name, |
|
|
|
officialFlag: 'N' |
|
|
|
} |
|
|
|
this.modalDisableFlag = false |
|
|
|
this.modalFlag = true |
|
|
|
@ -1380,7 +1404,8 @@ |
|
|
|
lotQuantityRule: row.lotQuantityRule, |
|
|
|
subLotRule: row.subLotRule, |
|
|
|
componentLotRule: row.componentLotRule, |
|
|
|
updateBy: this.$store.state.user.name |
|
|
|
updateBy: this.$store.state.user.name, |
|
|
|
officialFlag: row.officialFlag |
|
|
|
} |
|
|
|
this.modalDisableFlag = true |
|
|
|
this.modalFlag = true |
|
|
|
@ -1506,6 +1531,26 @@ |
|
|
|
this.$refs.selectDiv.setLengthselected(this.partSelections.length) |
|
|
|
}, |
|
|
|
|
|
|
|
// 转正式物料 |
|
|
|
toBecomeOfficialPart () { |
|
|
|
toBecomeOfficialMasterPart(this.modalData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.getDataList() |
|
|
|
this.modalFlag = false |
|
|
|
this.$message({ |
|
|
|
message: '操作成功', |
|
|
|
type: 'success', |
|
|
|
duration: 1500, |
|
|
|
onClose: () => {} |
|
|
|
}) |
|
|
|
} else { |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// ======== chooseList相关方法 ======== |
|
|
|
/** |
|
|
|
* 获取基础数据列表S |
|
|
|
|