|
@@ -111,12 +111,24 @@
|
|
|
class="uni-el-input"
|
|
class="uni-el-input"
|
|
|
v-model="item.packageCell"
|
|
v-model="item.packageCell"
|
|
|
disabled
|
|
disabled
|
|
|
- style="width: 200px"
|
|
|
|
|
|
|
+ style="width: 160px"
|
|
|
></el-input>
|
|
></el-input>
|
|
|
<div class="unit">{{ item.packageUnit }}</div
|
|
<div class="unit">{{ item.packageUnit }}</div
|
|
|
>/<div class="unit">{{ item.conversionUnit }}</div>
|
|
>/<div class="unit">{{ item.conversionUnit }}</div>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
+
|
|
|
|
|
+ <div class="rx ww55" v-if="isReelSpecification">
|
|
|
|
|
+ <div class="lable lable200 rx-cc">盘具规格:</div>
|
|
|
|
|
+ <div class="content content_num">
|
|
|
|
|
+ <el-input
|
|
|
|
|
+ class="uni-el-input"
|
|
|
|
|
+ v-model="item.reelSpecification"
|
|
|
|
|
+ style="width: 160px"
|
|
|
|
|
+ disabled
|
|
|
|
|
+ ></el-input>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </div>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
@@ -230,6 +242,18 @@
|
|
|
>/<div class="unit">{{ item.minimumConversionUnit }}</div>
|
|
>/<div class="unit">{{ item.minimumConversionUnit }}</div>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
+
|
|
|
|
|
+ <div class="rx ww55" v-if="isReelSpecification">
|
|
|
|
|
+ <div class="lable lable200 rx-cc">盘具规格:</div>
|
|
|
|
|
+ <div class="content content_num">
|
|
|
|
|
+ <el-input
|
|
|
|
|
+ class="uni-el-input"
|
|
|
|
|
+ v-model="item.reelSpecification"
|
|
|
|
|
+ style="width: 160px"
|
|
|
|
|
+ disabled
|
|
|
|
|
+ ></el-input>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </div>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
<div class="title_box rx-bc mt6">
|
|
<div class="title_box rx-bc mt6">
|
|
@@ -319,6 +343,8 @@
|
|
|
getPackingList
|
|
getPackingList
|
|
|
} from '@/api/produce/workOrder';
|
|
} from '@/api/produce/workOrder';
|
|
|
|
|
|
|
|
|
|
+ import { parameterGetByCode } from '@/api/system/dictionary-data';
|
|
|
|
|
+
|
|
|
// import {
|
|
// import {
|
|
|
// getByCode
|
|
// getByCode
|
|
|
// } from '@/api/pda/common.js'
|
|
// } from '@/api/pda/common.js'
|
|
@@ -415,7 +441,8 @@
|
|
|
}
|
|
}
|
|
|
],
|
|
],
|
|
|
cacheKeyUrlMin: 'cacheKeyUrlMin',
|
|
cacheKeyUrlMin: 'cacheKeyUrlMin',
|
|
|
- totalNumber: 0
|
|
|
|
|
|
|
+ totalNumber: 0,
|
|
|
|
|
+ isReelSpecification: false
|
|
|
// clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo").clientEnvironmentId,
|
|
// clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo").clientEnvironmentId,
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
@@ -680,6 +707,7 @@
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
created() {
|
|
created() {
|
|
|
|
|
+ this.getReelSpecification();
|
|
|
console.log(this.objData, 'objDataobjDataobjData');
|
|
console.log(this.objData, 'objDataobjDataobjData');
|
|
|
if (this.objData.packInfo && !this.storeType) {
|
|
if (this.objData.packInfo && !this.storeType) {
|
|
|
this.warehouseId = this.objData.packInfo.tier;
|
|
this.warehouseId = this.objData.packInfo.tier;
|
|
@@ -689,7 +717,8 @@
|
|
|
splitList: this.objData.packInfo.minimumPackage,
|
|
splitList: this.objData.packInfo.minimumPackage,
|
|
|
packageCell: this.objData.packInfo.minimumPackageCell,
|
|
packageCell: this.objData.packInfo.minimumPackageCell,
|
|
|
packageUnit: this.objData.packInfo.minimumPackageUnit,
|
|
packageUnit: this.objData.packInfo.minimumPackageUnit,
|
|
|
- conversionUnit: this.objData.packInfo.minimumConversionUnit
|
|
|
|
|
|
|
+ conversionUnit: this.objData.packInfo.minimumConversionUnit,
|
|
|
|
|
+ reelSpecification: this.objData.packInfo.reelSpecification
|
|
|
});
|
|
});
|
|
|
} else if (this.objData.packInfo.isNewUnpack == 1) {
|
|
} else if (this.objData.packInfo.isNewUnpack == 1) {
|
|
|
this.DispositionList.push({
|
|
this.DispositionList.push({
|
|
@@ -715,7 +744,8 @@
|
|
|
outsideConversionUnit: this.objData.packInfo.outsideConversionUnit,
|
|
outsideConversionUnit: this.objData.packInfo.outsideConversionUnit,
|
|
|
outsideFormedNumLast: this.objData.packInfo.outsideFormedNumLast,
|
|
outsideFormedNumLast: this.objData.packInfo.outsideFormedNumLast,
|
|
|
formedNumLast: this.objData.formingNum,
|
|
formedNumLast: this.objData.formingNum,
|
|
|
- packageUnit: this.objData.unit
|
|
|
|
|
|
|
+ packageUnit: this.objData.unit,
|
|
|
|
|
+ reelSpecification: this.objData.packInfo.reelSpecification
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
@@ -777,6 +807,14 @@
|
|
|
}, {});
|
|
}, {});
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
|
|
+ async getReelSpecification() {
|
|
|
|
|
+ await parameterGetByCode({
|
|
|
|
|
+ code: 'dishware_specifications'
|
|
|
|
|
+ }).then((res) => {
|
|
|
|
|
+ this.isReelSpecification = res.value == '1' ? true : false;
|
|
|
|
|
+ });
|
|
|
|
|
+ },
|
|
|
|
|
+
|
|
|
async packageDispositionFn() {
|
|
async packageDispositionFn() {
|
|
|
console.log();
|
|
console.log();
|
|
|
if (!this.newCategoryId) return;
|
|
if (!this.newCategoryId) return;
|