Skip to content

E
electron-printer
Commit 44033317 by linjinhong
Options

fix:修改字段名称

parent 44895c66
Showing with 27 additions and 14 deletions
src/views/design/head/index.vue
...@@ -230,7 +230,7 @@ export default { ...@@ -230,7 +230,7 @@ export default {
} }
}, },
async setData(data) { async setData(data) {
if (!data) return this.$message.warning("请扫描生产单号"); if (!data) return this.$message.warning("请扫描生产单号/操作单号");
let params = { let params = {
id: data.id, id: data.id,
orderType: this.orderType, orderType: this.orderType,
...@@ -265,7 +265,7 @@ export default { ...@@ -265,7 +265,7 @@ export default {
}, },
async sureData() { async sureData() {
if (!this.detail || Object.keys(this.detail).length <= 1) { if (!this.detail || Object.keys(this.detail).length <= 1) {
return this.$message.warning("请扫描生产单号"); return this.$message.warning("请扫描生产单号/操作单号");
} }
this.$confirm(`确定生产完成？`, "提示", { this.$confirm(`确定生产完成？`, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
...@@ -599,7 +599,7 @@ export default { ...@@ -599,7 +599,7 @@ export default {
//判断生产单号是否为空 //判断生产单号是否为空
if (this.productionNo === "") if (this.productionNo === "")
return this.$message.warning("请录入生产单号"); return this.$message.warning("请录入生产单号/操作单号");
const today = moment(new Date()).format("YYYY-MM-DD"); const today = moment(new Date()).format("YYYY-MM-DD");
...@@ -1083,7 +1083,7 @@ export default { ...@@ -1083,7 +1083,7 @@ export default {
@keyup.enter.native="getDataInfo" @keyup.enter.native="getDataInfo"
style="width: 40%;" style="width: 40%;"
size="medium" size="medium"
placeholder="请扫描生产单号" placeholder="请扫描生产单号/操作单号"
ref="searchRef" ref="searchRef"
v-model="productionNo" v-model="productionNo"
></el-input> ></el-input>
......
src/views/design/main/index.vue
...@@ -1474,7 +1474,7 @@ export default { ...@@ -1474,7 +1474,7 @@ export default {
class="div-item" class="div-item"
> >
<div class="item-label"> <div class="item-label">
{{ orderType == "OP" ? "工厂订单号" : "生产单号" }}: {{ orderType == "OP" ? "工厂订单号" : "生产单号" }}：
</div> </div>
<div class="item-value"> <div class="item-value">
{{ {{
...@@ -1496,18 +1496,18 @@ export default { ...@@ -1496,18 +1496,18 @@ export default {
<div <div
:title=" :title="
orderType == `OP` orderType == `OP`
? detail.detail.factorySubOrderNumber ? detail.operationNo
: detail.factorySubOrderNumber : detail.factorySubOrderNumber
" "
class="div-item" class="div-item"
> >
<div class="item-label"> <div class="item-label">
{{ orderType == "OP" ? "工厂操作单号" : "工厂单号" }}: {{ orderType == "OP" ? "工厂操作单号" : "工厂单号" }}：
</div> </div>
<div class="item-value"> <div class="item-value">
{{ {{
orderType == "OP" orderType == "OP"
? detail.detail.factorySubOrderNumber ? detail.operationNo
: detail.factorySubOrderNumber : detail.factorySubOrderNumber
}} }}
</div> </div>
...@@ -1522,14 +1522,14 @@ export default { ...@@ -1522,14 +1522,14 @@ export default {
</div> </div>
</div> </div>
<div <div
:title="orderType == `OP` ? detail.thirdskucode : detail.baseSku" :title="orderType == `OP` ? detail.thirdSkuCode : detail.baseSku"
class="div-item" class="div-item"
> >
<div class="item-label"> <div class="item-label">
{{ orderType == "OP" ? "库存SKU" : "基版" }}： {{ orderType == "OP" ? "库存SKU" : "基版" }}：
</div> </div>
<div class="item-value"> <div class="item-value">
{{ orderType == "OP" ? detail.thirdskucode : detail.baseSku }} {{ orderType == "OP" ? detail.thirdSkuCode : detail.baseSku }}
</div> </div>
</div> </div>
<div :title="detail.size" class="div-item"> <div :title="detail.size" class="div-item">
...@@ -1546,17 +1546,30 @@ export default { ...@@ -1546,17 +1546,30 @@ export default {
{{ orderType == "OP" ? detail.quantity : detail.num }} {{ orderType == "OP" ? detail.quantity : detail.num }}
</div> </div>
</div> </div>
<div :title="detail.supplierItemNo" class="div-item"> <div
:title="
orderType == `OP`
? detail.supplierProductNo
: detail.supplierItemNo
"
class="div-item"
>
<div class="item-label">货号：</div> <div class="item-label">货号：</div>
<div class="item-value">{{ detail.supplierItemNo }}</div> <div class="item-value">
{{
orderType == "OP"
? detail.supplierProductNo
: detail.supplierItemNo
}}
</div>
</div> </div>
<div :title="detail.color" class="div-item"> <div :title="detail.color" class="div-item">
<div class="item-label">颜色：</div> <div class="item-label">颜色：</div>
<div class="item-value"> <div class="item-value">
{{ {{
orderType == "OP" orderType == "OP"
? detail.thirdskucode ? detail.thirdSkuCode
? detail.thirdskucode.split("_")[1] ? detail.thirdSkuCode.split("_")[1]
: null : null
: detail.baseSku : detail.baseSku
? detail.baseSku.split("_")[1] ? detail.baseSku.split("_")[1]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment