|
|
|
@ -134,7 +134,8 @@ |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="actualStockInQty" header-align="center" align="right" min-width="100" label="实际入库数量"> |
|
|
|
</el-table-column> --> |
|
|
|
<el-table-column fixed="right" header-align="center" align="center" width="100" label="操作"> |
|
|
|
<!-- rqrq - 已申请物料操作列不冻结：页签表格fixed会额外叠表，表头空白格且操作列错位 --> |
|
|
|
<el-table-column header-align="center" align="center" width="100" label="操作"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<a type="text" size="small" @click="enterSOSDetail(scope.row)">物料</a> |
|
|
|
<!-- 不需要删除，这里如果删掉了，没地方添加，只允许关闭申请单重新下 --> |
|
|
|
@ -300,17 +301,19 @@ |
|
|
|
<div class="matched-labels">{{ scope.row.matchedSerialNos }}</div> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<!-- <el-table-column--> |
|
|
|
<!-- prop="failureMessage"--> |
|
|
|
<!-- label="失败原因"--> |
|
|
|
<!-- min-width="240"--> |
|
|
|
<!-- align="left">--> |
|
|
|
<!-- <template slot-scope="scope">--> |
|
|
|
<!-- <span v-if="scope.row.failureCode" class="failure-message">--> |
|
|
|
<!-- {{ scope.row.failureMessage || scope.row.failureCode }}--> |
|
|
|
<!-- </span>--> |
|
|
|
<!-- </template>--> |
|
|
|
<!-- </el-table-column>--> |
|
|
|
<el-table-column |
|
|
|
prop="failureMessage" |
|
|
|
label="不可推送原因" |
|
|
|
min-width="240" |
|
|
|
align="left" |
|
|
|
show-overflow-tooltip> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<!-- 服务端返回订单级阻断原因，避免库存数量满足但按钮禁用时现场无法判断处理方向 - rqrq --> |
|
|
|
<span v-if="scope.row.failureMessage || scope.row.failureCode" class="failure-message"> |
|
|
|
{{ formatFailureMessage(scope.row.failureMessage, scope.row.failureCode) }} |
|
|
|
</span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
<span slot="footer" class="dialog-footer"> |
|
|
|
<el-button type="primary" class="yzzButtonAn" @click="pushToWCS" :loading="pushLoading" |
|
|
|
@ -370,7 +373,8 @@ |
|
|
|
<el-button type="primary" @click="qtyAllForBom(scope.row)" style="width: 100%">全数领料</el-button> |
|
|
|
</template> |
|
|
|
</el-table-column> --> |
|
|
|
<el-table-column fixed="right" header-align="center" align="center" width="110" label="操作"> |
|
|
|
<!-- rqrq - 申请明细指定物料不冻结：弹窗内fixed会叠出空白列，末行指定物料会被裁切 --> |
|
|
|
<el-table-column header-align="center" align="center" width="110" label="操作"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-button type="text" size="small" v-if="currentRow && currentRow.status==='ISSUE'" @click="openNoOrderMaterialAllocDialog(scope.row)">指定物料</el-button> |
|
|
|
</template> |
|
|
|
@ -406,6 +410,7 @@ |
|
|
|
<el-button type="primary" size="small" @click="addNoOrderAllocRow('BATCH')">新增批次指定</el-button> |
|
|
|
<span style="margin-left: 10px; color: #909399; font-size: 12px;">保存后按当前列表顺序进行指定匹配</span> |
|
|
|
</div> |
|
|
|
<div class="rq"> |
|
|
|
<el-table :data="noOrderAllocForm.allocList" border v-loading="noOrderAllocLoading" height="360px" style="width: 100%;"> |
|
|
|
<el-table-column prop="rowNo" label="序号" width="60" align="center"></el-table-column> |
|
|
|
<el-table-column prop="allocType" label="类型" width="90" align="center"> |
|
|
|
@ -450,7 +455,8 @@ |
|
|
|
<!-- <el-input v-model="scope.row.remark"></el-input>--> |
|
|
|
<!-- </template>--> |
|
|
|
<!-- </el-table-column>--> |
|
|
|
<el-table-column fixed="right" label="操作" width="200" align="center"> |
|
|
|
<!-- rqrq - 指定物料弹窗操作列不冻结：弹窗内fixed会与输入行高冲突，出现空白列和末行裁切 --> |
|
|
|
<el-table-column label="操作" width="200" align="center"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-button type="text" size="small" @click="moveNoOrderAllocRow(scope.$index, -1)">上移</el-button> |
|
|
|
<el-button type="text" size="small" @click="moveNoOrderAllocRow(scope.$index, 1)">下移</el-button> |
|
|
|
@ -458,6 +464,7 @@ |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
</div> |
|
|
|
<el-footer style="height:40px;margin-top: 10px;text-align:center"> |
|
|
|
<el-button type="primary" :loading="noOrderAllocSaving" :disabled="noOrderAllocSaving" @click="saveNoOrderMaterialAlloc">保存</el-button> |
|
|
|
<el-button :disabled="noOrderAllocSaving" @click="noOrderAllocDialogVisible = false">关闭</el-button> |
|
|
|
@ -2684,6 +2691,14 @@ export default { |
|
|
|
return String(value).replace(/(\.\d*?[1-9])0+$|\.0+$/, '$1') |
|
|
|
}, |
|
|
|
|
|
|
|
/** |
|
|
|
* 不可推送原因包含后端拼接的数量文本，展示时去除小数尾部无效0，避免现场误读缺料数量 - rqrq |
|
|
|
*/ |
|
|
|
formatFailureMessage (message, fallback) { |
|
|
|
const text = message || fallback || '' |
|
|
|
return String(text).replace(/(-?\d+\.\d*?[1-9])0+(?!\d)/g, '$1').replace(/(-?\d+)\.0+(?!\d)/g, '$1') |
|
|
|
}, |
|
|
|
|
|
|
|
/** |
|
|
|
* 海安无单WCS确认推送：只提交site和notifyNo，实际订单和标签由服务端重新匹配决定 - rqrq |
|
|
|
*/ |
|
|
|
|
