|
@@ -95,7 +95,7 @@
|
|
|
|
|
|
<a-col :md="6" :sm="8">
|
|
|
<a-form-model-item label="托书号" prop="bookNum">
|
|
|
- {{clothesAdd.bookNum}}
|
|
|
+ {{clothesAdd.shippingOrderNumber}}
|
|
|
<!-- <a-input placeholder="请输入托书号" v-model="clothesAdd.bookNum" readOnly></a-input> -->
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
@@ -463,7 +463,6 @@ export default {
|
|
|
orderSpltListId({id:preId}).then(res => {
|
|
|
var data = res.result
|
|
|
if (res.success) {
|
|
|
- debugger
|
|
|
this.clothesAdd = {
|
|
|
documentNo:data.documentNo,
|
|
|
orderNum: data.orderNumber,
|
|
@@ -477,7 +476,7 @@ export default {
|
|
|
note: data.u8Remarks,
|
|
|
// clothesFactory: data.garmentFactory,
|
|
|
exportInvoiceNo: data.exportInvoiceNo,
|
|
|
- bookNum: '',
|
|
|
+ bookNum: data.shippingOrderNumber,
|
|
|
syPreAssembledPackingListId:data.syPreAssembledPackingListId,
|
|
|
elementsId:data.elementsId,
|
|
|
business_Type_Value:data.business_Type_Value,
|
|
@@ -578,45 +577,45 @@ export default {
|
|
|
this.$refs.ReferencePrePacklist.searchQuery()
|
|
|
},
|
|
|
// 増行
|
|
|
- handleAddColumn() {
|
|
|
- console.log('増行')
|
|
|
- const addrow = {
|
|
|
- accountSet: '',
|
|
|
- garmentFactory: '',
|
|
|
- hod: '',
|
|
|
- styleNo: '',
|
|
|
- poNo: '',
|
|
|
- itemCode: '',
|
|
|
- distributionPoint: '',
|
|
|
- s: '',
|
|
|
- m: '',
|
|
|
- l: '',
|
|
|
- xl: '',
|
|
|
- xxl: '',
|
|
|
- xxxl: '',
|
|
|
- startingBoxNumber: '',
|
|
|
- endCaseNumber: '',
|
|
|
- colour: '',
|
|
|
- withCode: '',
|
|
|
- piecesBox: '',
|
|
|
- boxNumber: '',
|
|
|
- total: '',
|
|
|
- netWeight: '',
|
|
|
- totalNetWeight: '',
|
|
|
- grossWeight: '',
|
|
|
- totalGrossWeight: '',
|
|
|
- outerBoxLength: '',
|
|
|
- outerBoxWidth: '',
|
|
|
- outerBoxHeight: '',
|
|
|
- totalVolume: '',
|
|
|
- netWeightToo: '',
|
|
|
- // unitPrice: '',
|
|
|
- // totalPrices: '',
|
|
|
- remarks: '',
|
|
|
- operation: ''
|
|
|
- }
|
|
|
- this.clothesAddData.push(addrow)
|
|
|
- },
|
|
|
+ // handleAddColumn() {
|
|
|
+ // console.log('増行')
|
|
|
+ // const addrow = {
|
|
|
+ // accountSet: '',
|
|
|
+ // garmentFactory: '',
|
|
|
+ // hod: '',
|
|
|
+ // styleNo: '',
|
|
|
+ // poNo: '',
|
|
|
+ // itemCode: '',
|
|
|
+ // distributionPoint: '',
|
|
|
+ // s: '',
|
|
|
+ // m: '',
|
|
|
+ // l: '',
|
|
|
+ // xl: '',
|
|
|
+ // xxl: '',
|
|
|
+ // xxxl: '',
|
|
|
+ // startingBoxNumber: '',
|
|
|
+ // endCaseNumber: '',
|
|
|
+ // colour: '',
|
|
|
+ // withCode: '',
|
|
|
+ // piecesBox: '',
|
|
|
+ // boxNumber: '',
|
|
|
+ // total: '',
|
|
|
+ // netWeight: '',
|
|
|
+ // totalNetWeight: '',
|
|
|
+ // grossWeight: '',
|
|
|
+ // totalGrossWeight: '',
|
|
|
+ // outerBoxLength: '',
|
|
|
+ // outerBoxWidth: '',
|
|
|
+ // outerBoxHeight: '',
|
|
|
+ // totalVolume: '',
|
|
|
+ // netWeightToo: '',
|
|
|
+ // // unitPrice: '',
|
|
|
+ // // totalPrices: '',
|
|
|
+ // remarks: '',
|
|
|
+ // operation: ''
|
|
|
+ // }
|
|
|
+ // this.clothesAddData.push(addrow)
|
|
|
+ // },
|
|
|
|
|
|
// -------------------------------------
|
|
|
// 操作 删除
|
|
@@ -748,6 +747,7 @@ export default {
|
|
|
var allSizeSum = this.getAllSizeSum(tableRow);
|
|
|
if (allSizeSum == 0){
|
|
|
this.$message.error('第'+(i+1)+'行所有尺码数量为0,无法保存');
|
|
|
+
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -765,7 +765,6 @@ export default {
|
|
|
]
|
|
|
for(var j=0 ; j<Valuable.length;j++){
|
|
|
if(tableRow[Valuable[j].key] == null || tableRow[Valuable[j].key] == "" || tableRow[Valuable[j].key] == undefined){
|
|
|
- debugger
|
|
|
this.$message.error('第'+(i+1)+'行'+Valuable[j].value+'无值,无法保存');
|
|
|
this.judge+=1
|
|
|
return
|
|
@@ -776,10 +775,10 @@ export default {
|
|
|
{key:'startingBoxNumber',value:'起始箱号'},
|
|
|
{key:'piecesBox',value:'件数/箱'},
|
|
|
{key:'endCaseNumber',value:'结束箱号'},
|
|
|
+ {key:'boxNumber',value:'箱数'},
|
|
|
]
|
|
|
for(var v=0 ; v<integer.length;v++){
|
|
|
if(!Number.isInteger(Number(tableRow[integer[v].key]))){
|
|
|
- debugger
|
|
|
this.$message.error('第'+(i+1)+'行'+integer[v].value+'不为整数,无法保存');
|
|
|
this.judge+=1
|
|
|
return
|
|
@@ -795,7 +794,6 @@ export default {
|
|
|
var position = tableRow[Several[s].key].toString().indexOf('.') + 1; //小数点的位置
|
|
|
var digit = tableRow[Several[s].key].toString().length - position; //小数的位值
|
|
|
if(digit > 2 && position!==0){
|
|
|
- debugger
|
|
|
this.$message.error('第'+(i+1)+'行'+Several[s].value+'小数超过两位,无法保存');
|
|
|
this.judge+=1
|
|
|
return
|
|
@@ -852,14 +850,14 @@ export default {
|
|
|
title: '账套',
|
|
|
key: 'acSetNo',
|
|
|
width: 160,
|
|
|
- fixed: 'left',
|
|
|
+ // fixed: 'left',
|
|
|
type: JVXETypes.normal,
|
|
|
},
|
|
|
{
|
|
|
title: '成衣工厂',
|
|
|
key: 'garmentFactory',
|
|
|
width: 120,
|
|
|
- fixed: 'left',
|
|
|
+ // fixed: 'left',
|
|
|
type: JVXETypes.normal,
|
|
|
},
|
|
|
{
|
|
@@ -1004,18 +1002,6 @@ export default {
|
|
|
width: 120,
|
|
|
type: JVXETypes.inputNumber,
|
|
|
},
|
|
|
- // {
|
|
|
- // title: '单价',
|
|
|
- // key: 'unitPrice',
|
|
|
- // width: 120,
|
|
|
- // type: JVXETypes.normal,
|
|
|
- // },
|
|
|
- // {
|
|
|
- // title: '总价',
|
|
|
- // key: 'totalPrice',
|
|
|
- // width: 120,
|
|
|
- // type: JVXETypes.normal,
|
|
|
- // },
|
|
|
{
|
|
|
title: '备注',
|
|
|
key: 'remarks',
|