Compare commits

..

No commits in common. "f1a4fa24f046990a5b4d20b4217b56f2450534ee" and "397568b2ea346246d740970c079a9e626aae1514" have entirely different histories.

3 changed files with 19 additions and 22 deletions

View File

@ -444,7 +444,6 @@
{ header: "货位编码", field: "LOCATIONNAME", hide: false }, { header: "货位编码", field: "LOCATIONNAME", hide: false },
{ header: "货位名称", field: "LOCATIONNAMEDESC", hide: false }, { header: "货位名称", field: "LOCATIONNAMEDESC", hide: false },
{ header: "物料编号", field: "MATERIALSPECNAME", hide: false }, { header: "物料编号", field: "MATERIALSPECNAME", hide: false },
{ header: "NC物料编号", field: "OLDMATERIALSPECNAME", hide: false },
{ header: "阶段", field: "PHASE", hide: false }, { header: "阶段", field: "PHASE", hide: false },
{ header: "品名", field: "DESC_CN", hide: false }, { header: "品名", field: "DESC_CN", hide: false },
{ header: "系统规格", field: "DESCRIPTION", hide: false }, { header: "系统规格", field: "DESCRIPTION", hide: false },

View File

@ -133,10 +133,8 @@ const state = reactive({
{ value: 'B', label: '出库' }, { value: 'B', label: '出库' },
{ value: '调拨出库', label: '调拨出库' }, { value: '调拨出库', label: '调拨出库' },
{ value: '采购入库', label: '采购入库' }, { value: '采购入库', label: '采购入库' },
{ value: '自动转库', label: '自动转库' }, { value: '自动转库', label: '转库' },
{ value: 'QMS质检', label: '质检结果' }, { value: 'QMS质检', label: '质检结果' },
{ value: 'FGStockIn', label: '成品入库' },
{ value: '无来源转库', label: '转现场仓及无来源转库' }
], ],
page: { page: {
pageNum: 1, pageNum: 1,

View File

@ -257,25 +257,25 @@ function getpows() {
} }
// if('1' != state.queryParam.materialreceiveAct.MATERIALSPECNAME.slice(0,1) || '2' != state.queryParam.materialreceiveAct.MATERIALSPECNAME.slice(0,1)){ // if('1' != state.queryParam.materialreceiveAct.MATERIALSPECNAME.slice(0,1) || '2' != state.queryParam.materialreceiveAct.MATERIALSPECNAME.slice(0,1)){
if('6' == state.queryParam.materialreceiveAct.MATERIALSPECNAME.slice(0,1)) { if('6' == state.queryParam.materialreceiveAct.MATERIALSPECNAME.slice(0,1)) {
// if ('' == state.queryParam.materialreceiveAct.PHASE) { if ('' == state.queryParam.materialreceiveAct.PHASE) {
// ElMessageBox.alert('', { ElMessageBox.alert('请输入阶段', {
// confirmButtonText: 'OK' confirmButtonText: 'OK'
// }) })
// return return
// } }
} else if ('3' == state.queryParam.materialreceiveAct.MATERIALSPECNAME.slice(0, 1) || '4' == state.queryParam.materialreceiveAct.MATERIALSPECNAME.slice(0, 1)) { } else if ('3' == state.queryParam.materialreceiveAct.MATERIALSPECNAME.slice(0, 1) || '4' == state.queryParam.materialreceiveAct.MATERIALSPECNAME.slice(0, 1)) {
// if ('' == state.queryParam.materialreceiveAct.sdkid) { if ('' == state.queryParam.materialreceiveAct.sdkid) {
// ElMessageBox.alert('', { ElMessageBox.alert('请输入规格', {
// confirmButtonText: 'OK' confirmButtonText: 'OK'
// }) })
// return return
// } }
// if ('' == state.queryParam.materialreceiveAct.PHASE) { if ('' == state.queryParam.materialreceiveAct.PHASE) {
// ElMessageBox.alert('', { ElMessageBox.alert('请输入阶段', {
// confirmButtonText: 'OK' confirmButtonText: 'OK'
// }) })
// return return
// } }
} }
if('NaN-NaN-NaN' == state.queryParam.materialreceiveAct.MAKEDATE){ if('NaN-NaN-NaN' == state.queryParam.materialreceiveAct.MAKEDATE){
ElMessageBox.alert('请输入生产日期', { ElMessageBox.alert('请输入生产日期', {