|
|
@@ -91,7 +91,7 @@
|
|
|
v-model="form.fFeetUnit"
|
|
|
placeholder="请选择计费单位"
|
|
|
clearable
|
|
|
- :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
+ :disabled="browseStatus || form.warehouseStatus > 3||detailList.findIndex(function(item){return item.fBillstatus == 40}) == -1?false:true"
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -538,12 +538,11 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</div>
|
|
|
-
|
|
|
<el-row>
|
|
|
- <el-col :span="24">
|
|
|
+ <el-col :span="12">
|
|
|
<el-form-item label="备注" prop="remark">
|
|
|
<el-input
|
|
|
- style="width: 91.5%"
|
|
|
+ style="width: 80%"
|
|
|
v-model="form.remark"
|
|
|
type="textarea"
|
|
|
:disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
@@ -551,6 +550,17 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="收费指示" prop="remark">
|
|
|
+ <el-input
|
|
|
+ style="width: 80%"
|
|
|
+ v-model="form.fRemarksFees"
|
|
|
+ type="textarea"
|
|
|
+ :disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
+ placeholder="请输入内容"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :offset="16" :span="6">
|
|
|
@@ -2100,10 +2110,10 @@
|
|
|
<td>入库日期</td>
|
|
|
<td>{{ form.fBsdate | fBsdateFormat }}</td>
|
|
|
<td>流水号</td>
|
|
|
- <td colspan="2" v-if="form.fBillno">
|
|
|
+ <td colspan="3" v-if="form.fBillno">
|
|
|
{{ form.fBillno }}-{{ lsTime }}
|
|
|
</td>
|
|
|
- <td colspan="2" v-else></td>
|
|
|
+ <td colspan="3" v-else></td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>车号</td>
|
|
|
@@ -2111,16 +2121,17 @@
|
|
|
<td>提单号</td>
|
|
|
<td>{{ form.fMblno }}</td>
|
|
|
<td>箱号</td>
|
|
|
- <td colspan="2" v-if="Printinglist.length">
|
|
|
+ <td colspan="3" v-if="Printinglist.length">
|
|
|
{{ Printinglist[0].fCntrno }}
|
|
|
</td>
|
|
|
- <td colspan="2" v-else></td>
|
|
|
+ <td colspan="3" v-else></td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>货名</td>
|
|
|
<td>箱量</td>
|
|
|
<td>件数</td>
|
|
|
- <td>毛重</td>
|
|
|
+ <td>毛重(吨)</td>
|
|
|
+ <td>净重(吨)</td>
|
|
|
<td>规格</td>
|
|
|
<td>区位</td>
|
|
|
<td>备注</td>
|
|
|
@@ -2130,9 +2141,10 @@
|
|
|
<td>{{ item.fCntqty }}</td>
|
|
|
<td>{{ item.fQty }}</td>
|
|
|
<td v-if="item.fGrossweight">
|
|
|
- {{ (item.fGrossweight / 1000).toFixed(2) }}
|
|
|
+ {{ (item.fGrossweight / 1000).toFixed(4) }}
|
|
|
</td>
|
|
|
<td v-else></td>
|
|
|
+ <td>{{ (item.fNetweight/1000).toFixed(4)}}</td>
|
|
|
<td>{{ item.fPackagespecs }}</td>
|
|
|
<td>{{ item.fWarehouseInformation }}</td>
|
|
|
<td>{{ item.remark }}</td>
|
|
|
@@ -2141,7 +2153,7 @@
|
|
|
<td>备注</td>
|
|
|
<td colspan="4">不贴标签不卸货</td>
|
|
|
<td>总件数</td>
|
|
|
- <td>{{ allfQty }}</td>
|
|
|
+ <td colspan="2">{{ allfQty }}</td>
|
|
|
</tr>
|
|
|
</table>
|
|
|
</div>
|
|
|
@@ -2203,24 +2215,25 @@
|
|
|
</td>
|
|
|
<td colspan="2" v-else></td>
|
|
|
<td>流水号</td>
|
|
|
- <td colspan="2" v-if="form.fBillno">
|
|
|
+ <td colspan="3" v-if="form.fBillno">
|
|
|
{{ form.fBillno }}-{{ lsTime }}
|
|
|
</td>
|
|
|
- <td colspan="2" v-else></td>
|
|
|
+ <td colspan="3" v-else></td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>车号</td>
|
|
|
<td colspan="2" v-if="Printinglist.length">{{ Printinglist[0].fTruckno }}</td>
|
|
|
<td colspan="2" v-else></td>
|
|
|
<td colspan="2">提单号</td>
|
|
|
- <td colspan="3">{{ form.fMblno }}</td>
|
|
|
+ <td colspan="4">{{ form.fMblno }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td style="width: 15%">货名</td>
|
|
|
<td>箱号</td>
|
|
|
<td>箱量</td>
|
|
|
<td>件数</td>
|
|
|
- <td>毛重</td>
|
|
|
+ <td>毛重(吨)</td>
|
|
|
+ <td>净重(吨)</td>
|
|
|
<td>规格</td>
|
|
|
<td>区位</td>
|
|
|
<td style="width: 20%">备注</td>
|
|
|
@@ -2230,14 +2243,18 @@
|
|
|
<td>{{ item.fCntrno }}</td>
|
|
|
<td>{{ item.fCntqty }}</td>
|
|
|
<td>{{ item.fQty }}</td>
|
|
|
- <td></td>
|
|
|
+ <td v-if="item.fGrossweight">
|
|
|
+ {{ (item.fGrossweight / 1000).toFixed(4) }}
|
|
|
+ </td>
|
|
|
+ <td v-else></td>
|
|
|
+ <td>{{ (item.fNetweight/1000).toFixed(4)}}</td>
|
|
|
<td>{{ item.fPackagespecs }}</td>
|
|
|
<td>{{ item.fWarehouseInformation }}</td>
|
|
|
<td>{{ item.remark }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>备注</td>
|
|
|
- <td colspan="3"></td>
|
|
|
+ <td colspan="4"></td>
|
|
|
<td>总件数</td>
|
|
|
<td colspan="3">{{ allfQty }}</td>
|
|
|
</tr>
|
|
|
@@ -5862,7 +5879,7 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- recordStatus:false,
|
|
|
+ recordStatus: false,
|
|
|
timeOut: '',
|
|
|
plannedGrossWeight: 0,
|
|
|
container: '',
|
|
|
@@ -7486,7 +7503,7 @@ export default {
|
|
|
} else {
|
|
|
this.form.fMarks = "";
|
|
|
}
|
|
|
- this.$set(this.form,'fFeetunit',this.form.fFeetUnit)
|
|
|
+ this.$set(this.form, 'fFeetunit', this.form.fFeetUnit)
|
|
|
formData.append("tWarehouseBills", JSON.stringify(this.form));
|
|
|
// 库存明细
|
|
|
formData.append(
|
|
|
@@ -7683,7 +7700,7 @@ export default {
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
this.deliveryConfirmation = false
|
|
|
}
|
|
|
}
|
|
|
@@ -8429,10 +8446,10 @@ export default {
|
|
|
cancelButtonText: "取消",
|
|
|
type: "warning",
|
|
|
}).then(() => {
|
|
|
- this.saveForm("goBack");
|
|
|
- }).catch(() => {
|
|
|
- this.cancel();
|
|
|
- });
|
|
|
+ this.saveForm("goBack");
|
|
|
+ }).catch(() => {
|
|
|
+ this.cancel();
|
|
|
+ });
|
|
|
},
|
|
|
openUploadExcel() {
|
|
|
this.uploadExcel = !this.uploadExcel;
|
caojunjie