|
|
@@ -167,10 +167,10 @@
|
|
|
icon="el-icon-search"
|
|
|
size="mini"
|
|
|
@click="handleQuery"
|
|
|
- >搜索
|
|
|
+ >搜索
|
|
|
</el-button>
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
|
- >重置
|
|
|
+ >重置
|
|
|
</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
@@ -182,7 +182,7 @@
|
|
|
icon="el-icon-plus"
|
|
|
size="mini"
|
|
|
@click="handleAdd(false)"
|
|
|
- v-hasPermi="['warehouseBusiness:warehousebills:add']"
|
|
|
+ v-hasPermi="['warehouseBusiness:outStock:add']"
|
|
|
>新增
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
@@ -193,7 +193,7 @@
|
|
|
size="mini"
|
|
|
:disabled="single"
|
|
|
@click="handleUpdate"
|
|
|
- v-hasPermi="['warehouseBusiness:warehousebills:edit']"
|
|
|
+ v-hasPermi="['warehouseBusiness:outStock:edit']"
|
|
|
>修改
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
@@ -203,7 +203,7 @@
|
|
|
icon="el-icon-download"
|
|
|
size="mini"
|
|
|
@click="handleExport"
|
|
|
- v-hasPermi="['warehouseBusiness:warehousebills:export']"
|
|
|
+ v-hasPermi="['warehouseBusiness:outStock:export']"
|
|
|
>导出
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
@@ -214,7 +214,7 @@
|
|
|
size="mini"
|
|
|
@click="handleExport"
|
|
|
:disabled="multiple"
|
|
|
- v-hasPermi="['warehouseBusiness:warehousebills:export']"
|
|
|
+ v-hasPermi="['warehouseBusiness:outStock:export']"
|
|
|
>导入
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
@@ -244,9 +244,9 @@
|
|
|
align="center"
|
|
|
prop="createTime"
|
|
|
style="width: 60%"
|
|
|
- ><template slot-scope="scope">
|
|
|
- <span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>
|
|
|
- </template>
|
|
|
+ ><template slot-scope="scope">
|
|
|
+ <span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="仓库" align="center" prop="fWarehouseid" />
|
|
|
<el-table-column label="计划出库件数" align="center" prop="fPlanqty" />
|
|
|
@@ -292,9 +292,8 @@
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-edit"
|
|
|
- v-if="scope.row.fBillstatus === 6"
|
|
|
@click="handleUpdate(scope.row, true)"
|
|
|
- v-hasPermi="['warehouseBusiness:warehousebills:edit']"
|
|
|
+ v-hasPermi="['warehouseBusiness:outStock:edit']"
|
|
|
>查看
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
@@ -307,18 +306,16 @@
|
|
|
scope.row.fBillstatus === 3
|
|
|
"
|
|
|
@click="handleUpdate(scope.row, false)"
|
|
|
- v-hasPermi="['warehouseBusiness:warehousebills:edit']"
|
|
|
+ v-hasPermi="['warehouseBusiness:outStock:edit']"
|
|
|
>修改
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-delete"
|
|
|
+ v-if="scope.row.fBillstatus !== 6 && scope.row.fItemsStatus === 1"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
- v-if="
|
|
|
- scope.row.fBillstatus !== 6 && scope.row.fItemsStatus === 1
|
|
|
- "
|
|
|
- v-hasPermi="['warehouseBusiness:warehousebills:remove']"
|
|
|
+ v-hasPermi="['warehouseBusiness:outStock:remove']"
|
|
|
>删除
|
|
|
</el-button>
|
|
|
</template>
|
|
|
@@ -681,7 +678,7 @@
|
|
|
type="primary"
|
|
|
:disabled="browseStatus"
|
|
|
@click.prevent="addRelevant(10)"
|
|
|
- >新行
|
|
|
+ >新行
|
|
|
</el-button>
|
|
|
<!-- <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseDrList)"
|
|
|
>删除
|
|
|
@@ -695,28 +692,27 @@
|
|
|
<el-button
|
|
|
:disabled="dataListSelection.length <= 0 || browseStatus"
|
|
|
@click.prevent="creditClick"
|
|
|
- >出库确认
|
|
|
+ >出库确认
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
:disabled="dataWithdrawList.length <= 0 || browseStatus"
|
|
|
@click.prevent="withdrawClick"
|
|
|
- >撤回出库</el-button
|
|
|
+ >撤回出库</el-button
|
|
|
>
|
|
|
<el-button type="warning" prop="打印" :disabled="printinglist.length <= 0" @click="showEditDialog_s"
|
|
|
- >出库单
|
|
|
+ >出库单
|
|
|
</el-button>
|
|
|
<!-- <el-button type="primary" :disabled="browseStatus" @click="saveForm">保 存</el-button> -->
|
|
|
<el-button
|
|
|
style="background-color: #008000; color: #fff"
|
|
|
@click="submitForm"
|
|
|
:disabled="browseStatus"
|
|
|
- >请核</el-button
|
|
|
+ >请核</el-button
|
|
|
>
|
|
|
</div>
|
|
|
<div style="font-size: 18px">出库明细</div>
|
|
|
<!--点击展开-->
|
|
|
</div>
|
|
|
- <el-form v-model="dataList" :rules="checkout" ref="checkout">
|
|
|
<el-table
|
|
|
:data="dataList"
|
|
|
ref="tableList"
|
|
|
@@ -751,7 +747,7 @@
|
|
|
header-align="center"
|
|
|
width="150px"
|
|
|
align="center"
|
|
|
- label="库区"
|
|
|
+ label="*库区"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -759,7 +755,7 @@
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="140px"
|
|
|
- label="品牌"
|
|
|
+ label="*品牌"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -767,7 +763,7 @@
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="180px"
|
|
|
- label="当前库存"
|
|
|
+ label="*当前库存"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -778,7 +774,6 @@
|
|
|
label="*出库件数"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-form-item :prop="'dataList.'+scope.$index+'.fQty'" :rules="checkout.fQty">
|
|
|
<el-input
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "")'
|
|
|
@change="qtyChange(scope.row)"
|
|
|
@@ -787,7 +782,6 @@
|
|
|
placeholder="出库件数"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
- </el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -798,7 +792,6 @@
|
|
|
label="*出库毛重"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-form-item prop="fGrossweight" :rules="checkout.fGrossweight">
|
|
|
<el-input
|
|
|
:disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
@@ -806,7 +799,6 @@
|
|
|
placeholder="出库毛重"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
- </el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -817,7 +809,6 @@
|
|
|
label="*出库净重"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-form-item prop="fNetweight" :rules="checkout.fNetweight">
|
|
|
<el-input
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fNetweight"
|
|
|
@@ -825,7 +816,6 @@
|
|
|
placeholder="出库净重"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
- </el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -853,7 +843,6 @@
|
|
|
label="*包装规格"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-form-item prop="fPackagespecs" :rules="checkout.fPackagespecs">
|
|
|
<el-input
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fPackagespecs"
|
|
|
@@ -861,7 +850,6 @@
|
|
|
placeholder="包装规格"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
- </el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -939,18 +927,16 @@
|
|
|
label="*车号"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-form-item prop="ftruckno" :rules="checkout.ftruckno">
|
|
|
<el-input
|
|
|
v-model="scope.row.fTruckno"
|
|
|
placeholder="车号"
|
|
|
:disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
- </el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
|
- <el-table-column
|
|
|
+ <el-table-column
|
|
|
prop="fDriverName"
|
|
|
header-align="center"
|
|
|
width="130px"
|
|
|
@@ -958,14 +944,12 @@
|
|
|
label="*司机名"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-form-item prop="fDriverName" :rules="checkout.fDriverName">
|
|
|
<el-input
|
|
|
v-model="scope.row.fDriverName"
|
|
|
placeholder="司机名"
|
|
|
:disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
- </el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
|
@@ -977,14 +961,12 @@
|
|
|
label="*司机电话"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-form-item prop="fDriverTel" :rules="checkout.fDriverTel">
|
|
|
<el-input
|
|
|
v-model="scope.row.fDriverTel"
|
|
|
placeholder="司机电话"
|
|
|
:disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
- </el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
|
@@ -996,14 +978,12 @@
|
|
|
label="*司机身份证"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-form-item prop="fDriverIdCar" :rules="checkout.fDriverIdCar">
|
|
|
<el-input
|
|
|
v-model="scope.row.fDriverIdCar"
|
|
|
placeholder="司机身份证"
|
|
|
:disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
- </el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
|
@@ -1085,7 +1065,6 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
- </el-form>
|
|
|
<div
|
|
|
class="dialogTableTitle flex a-center jlr"
|
|
|
style="
|
|
|
@@ -1097,7 +1076,7 @@
|
|
|
>
|
|
|
<div>
|
|
|
<el-button :disabled="browseStatus" @click.prevent="addRelevt()"
|
|
|
- >新行
|
|
|
+ >新行
|
|
|
</el-button>
|
|
|
</div>
|
|
|
<div style="font-size: 18px">附件明细</div>
|
|
|
@@ -1179,7 +1158,7 @@
|
|
|
@click.native.prevent="deleteRow(scope.$index, relevantAttachments)"
|
|
|
:disabled="browseStatus"
|
|
|
size="small"
|
|
|
- >移除
|
|
|
+ >移除
|
|
|
</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -1195,15 +1174,15 @@
|
|
|
>
|
|
|
<div>
|
|
|
<el-button :disabled="browseStatus" @click.prevent="addCollection()"
|
|
|
- >新行
|
|
|
+ >新行
|
|
|
</el-button>
|
|
|
<el-button type="primary" :disabled="browseStatus" @click="saveForm">保 存</el-button>
|
|
|
<!--暂时隐藏-->
|
|
|
-<!-- <el-button type="warning" @click.prevent="addStorages('Dr')">仓储费协议</el-button >-->
|
|
|
+ <!-- <el-button type="warning" @click.prevent="addStorages('Dr')">仓储费协议</el-button >-->
|
|
|
<el-button type="danger"
|
|
|
:disabled="browseStatus"
|
|
|
@click.prevent="addAgreement('Dr')"
|
|
|
- >作业费协议</el-button
|
|
|
+ >作业费协议</el-button
|
|
|
>
|
|
|
</div>
|
|
|
<div style="font-size: 18px">收款信息</div>
|
|
|
@@ -1407,7 +1386,7 @@
|
|
|
<el-input
|
|
|
v-model="scope.row.remarks"
|
|
|
:disabled="browseStatus"
|
|
|
- placeholder="备1注"
|
|
|
+ placeholder="备注"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
@@ -1422,7 +1401,7 @@
|
|
|
<el-button
|
|
|
@click.native.prevent="deleteRow(scope.$index, warehouseDrList)"
|
|
|
size="small"
|
|
|
- >移除</el-button
|
|
|
+ >移除</el-button
|
|
|
>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -1438,14 +1417,14 @@
|
|
|
>
|
|
|
<div>
|
|
|
<el-button :disabled="browseStatus" @click.prevent="addpayment()"
|
|
|
- >新行
|
|
|
+ >新行
|
|
|
</el-button>
|
|
|
<!-- <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseDrList)"
|
|
|
>删除
|
|
|
</el-button> -->
|
|
|
<el-button type="primary" :disabled="browseStatus" @click="saveForm">保 存</el-button>
|
|
|
<!--暂时隐藏-->
|
|
|
-<!-- <el-button type="warning" @click.prevent="addStorages('Cr')">仓储费协议</el-button>-->
|
|
|
+ <!-- <el-button type="warning" @click.prevent="addStorages('Cr')">仓储费协议</el-button>-->
|
|
|
<el-button type="danger"
|
|
|
:disabled="browseStatus"
|
|
|
@click.prevent="addAgreement('Cr')"
|
|
|
@@ -1668,7 +1647,7 @@
|
|
|
<el-button
|
|
|
@click.native.prevent="deleteRow(scope.$index, warehouseCrList)"
|
|
|
size="small"
|
|
|
- >移除</el-button
|
|
|
+ >移除</el-button
|
|
|
>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -1678,18 +1657,18 @@
|
|
|
>收货单
|
|
|
</el-button> -->
|
|
|
<el-button type="warning" prop="打印" :disabled="printinglist.length <= 0 || browseStatus" @click="showEditDialog_s"
|
|
|
- >出库单
|
|
|
+ >出库单
|
|
|
</el-button>
|
|
|
<el-button :disabled="printinglist.length <= 0 || browseStatus" @click="discharge">装货</el-button>
|
|
|
<el-button type="info" prop="打印" :disabled="printinglist.length <= 0 || browseStatus" @click="printJobSheet"
|
|
|
- >作业单
|
|
|
+ >作业单
|
|
|
</el-button>
|
|
|
<el-button type="primary" :disabled="browseStatus" @click="saveForm">保 存</el-button>
|
|
|
<el-button
|
|
|
style="background-color: #008000; color: #fff"
|
|
|
@click="submitForm"
|
|
|
:disabled="browseStatus"
|
|
|
- >请核</el-button
|
|
|
+ >请核</el-button
|
|
|
>
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
</div>
|
|
|
@@ -1893,7 +1872,7 @@
|
|
|
@pagination="getWhgenlegList"
|
|
|
/>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="storageFeeExport">导入仓储费</el-button>
|
|
|
+ <el-button type="primary" @click="storageFeeExport">导入仓储费</el-button>
|
|
|
<el-button @click="storageAgreements = false">取 消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
@@ -2124,9 +2103,9 @@
|
|
|
:modal="false"
|
|
|
>
|
|
|
<table id="print_area"
|
|
|
- class="biaoge zzss"
|
|
|
- border="1"
|
|
|
- style="border-collapse: collapse; border: none"
|
|
|
+ class="biaoge zzss"
|
|
|
+ border="1"
|
|
|
+ style="border-collapse: collapse; border: none"
|
|
|
>
|
|
|
<tr>
|
|
|
<td
|
|
|
@@ -2206,8 +2185,8 @@
|
|
|
</tr>
|
|
|
</table>
|
|
|
<div style="display: flex; justify-content: space-between">
|
|
|
- <el-button type="primary" @click="printSomething">打印</el-button>
|
|
|
- <el-button @click="closeWindow">取消</el-button>
|
|
|
+ <el-button type="primary" @click="printSomething">打印</el-button>
|
|
|
+ <el-button @click="closeWindow">取消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
</el-dialog>
|
|
|
@@ -2437,33 +2416,6 @@ export default {
|
|
|
fTrademodeid: null,
|
|
|
fWarehouseid: null,
|
|
|
},
|
|
|
-
|
|
|
- checkout: {
|
|
|
- fQty:[{
|
|
|
- type:"string",required: true, message: " ", trigger: "blur"
|
|
|
- }],
|
|
|
- fGrossweight:[{
|
|
|
- required: true, message: " ", trigger: "blur"
|
|
|
- }],
|
|
|
- fNetweight:[{
|
|
|
- required: true, message: " ", trigger: "blur"
|
|
|
- }],
|
|
|
- fPackagespecs:[{
|
|
|
- required: true, message: " ", trigger: "blur"
|
|
|
- }],
|
|
|
- ftruckno:[{
|
|
|
- required: true, message: " ", trigger: "blur"
|
|
|
- }],
|
|
|
- fDriverName:[{
|
|
|
- required: true, message: " ", trigger: "blur"
|
|
|
- }],
|
|
|
- fDriverTel:[{
|
|
|
- required: true, message: " ", trigger: "blur"
|
|
|
- }],
|
|
|
- fDriverIdCar:[{
|
|
|
- required: true, message: " ", trigger: "blur"
|
|
|
- }]
|
|
|
- },
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
fDeptid: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
@@ -2903,33 +2855,33 @@ export default {
|
|
|
return false;
|
|
|
}
|
|
|
if (!this.printinglist[warehouseCr].fGoodsid) {
|
|
|
- this.$message.error("请选择品名");
|
|
|
- return false;
|
|
|
- }
|
|
|
+ this.$message.error("请选择品名");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
if (!this.printinglist[warehouseCr].fWarehouselocid) {
|
|
|
- this.$message.error("请选择库区");
|
|
|
- return false;
|
|
|
- }
|
|
|
- if (!this.printinglist[warehouseCr].fGrossweight) {
|
|
|
- this.$message.error("请选择入库毛重");
|
|
|
- return false;
|
|
|
- }
|
|
|
- if (!this.printinglist[warehouseCr].fNetweight) {
|
|
|
- this.$message.error("请选择入库净重");
|
|
|
- return false;
|
|
|
- }
|
|
|
- if (!this.printinglist[warehouseCr].fQty) {
|
|
|
- this.$message.error("请选择入库件数");
|
|
|
- return false;
|
|
|
- }
|
|
|
- if (!this.printinglist[warehouseCr].fDriverName) {
|
|
|
- this.$message.error("请输入司机姓名");
|
|
|
- return false;
|
|
|
- }
|
|
|
- if (!this.printinglist[warehouseCr].fDriverTel) {
|
|
|
- this.$message.error("请输入司机电话");
|
|
|
- return false;
|
|
|
- }
|
|
|
+ this.$message.error("请选择库区");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (!this.printinglist[warehouseCr].fGrossweight) {
|
|
|
+ this.$message.error("请选择入库毛重");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (!this.printinglist[warehouseCr].fNetweight) {
|
|
|
+ this.$message.error("请选择入库净重");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (!this.printinglist[warehouseCr].fQty) {
|
|
|
+ this.$message.error("请选择入库件数");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (!this.printinglist[warehouseCr].fDriverName) {
|
|
|
+ this.$message.error("请输入司机姓名");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (!this.printinglist[warehouseCr].fDriverTel) {
|
|
|
+ this.$message.error("请输入司机电话");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
}
|
|
|
this.openPrintJobSheet = true;
|
|
|
// this.addList()
|
|
|
@@ -3129,16 +3081,27 @@ export default {
|
|
|
this.browseStatus = status;
|
|
|
this.reset();
|
|
|
this.detailsHidden = false;
|
|
|
- let data = row || this.ids;
|
|
|
- getWarehousebills(data.fId).then((response) => {
|
|
|
+ this.formBrowseStatus = false;
|
|
|
+ const fId = row.fId || this.ids;
|
|
|
+ this.dataList = [];
|
|
|
+ getWarehousebills(fId).then((response) => {
|
|
|
+ this.before = response.data.corps[0].createBy
|
|
|
+ console.log(response.data.corps[0].createBy)
|
|
|
if (response.data.warehousebills) {
|
|
|
this.form = response.data.warehousebills;
|
|
|
- this.$set(this.form, "fEta", Date.parse(this.form.fEta));
|
|
|
- this.$set(this.form, "fStltypeid", this.form.fStltypeid + '');
|
|
|
- this.$set(this.form, 'fFeetunit', Number(this.form.fFeetunit))
|
|
|
- this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
|
|
|
- this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + '');
|
|
|
- this.$set(this.form, 'createTime', Date.parse(this.form.createTime))
|
|
|
+ if (this.form.fBillstatus > 2) {
|
|
|
+ this.approvalStatus = false;
|
|
|
+ } else {
|
|
|
+ this.approvalStatus = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (response.data.warehouseBillsItem) {
|
|
|
+ this.dataList = response.data.warehouseBillsItem;
|
|
|
+ for (let list in this.dataList) {
|
|
|
+ if (this.dataList[list].fBillstatus > 10) {
|
|
|
+ this.formBrowseStatus = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
if (response.data.corps) {
|
|
|
this.fMblnoOptions = response.data.corps;
|
|
|
@@ -3153,48 +3116,69 @@ export default {
|
|
|
}
|
|
|
if (response.data.warehouseBillsItem) {
|
|
|
this.dataList = response.data.warehouseBillsItem;
|
|
|
- for (let list in this.dataList) {
|
|
|
- if (!this.form.fMblno) {
|
|
|
- this.$set(this.form, "fMblno", this.dataList[list].fMblno);
|
|
|
- }
|
|
|
- if (this.dataList[list].fBillstatus > 10) {
|
|
|
- this.formBrowseStatus = true;
|
|
|
- }
|
|
|
- this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));
|
|
|
- }
|
|
|
}
|
|
|
if (response.data.enclosures) {
|
|
|
this.relevantAttachments = response.data.enclosures;
|
|
|
}
|
|
|
- if (response.data.warehouse) {
|
|
|
- this.warehouseDrList = response.data.warehousebillsfeesDr;
|
|
|
- }
|
|
|
- if (response.data.warehousebillsfeesCr) {
|
|
|
- this.warehouseCrList = response.data.warehousebillsfeesCr;
|
|
|
- }
|
|
|
- if (response.data.sysUser) {
|
|
|
- this.userVal = response.data.sysUser
|
|
|
- this.userOptions = response.data.sysUser;
|
|
|
- }
|
|
|
- if (response.data.dept) {
|
|
|
- this.deptOptions = []
|
|
|
- this.deptOptions.push(response.data.dept)
|
|
|
- }
|
|
|
- if (response.data.feesList) {
|
|
|
- this.fWbuOptions = response.data.feesList;
|
|
|
- }
|
|
|
- if (response.data.goodsList) {
|
|
|
- this.goodsOptions = response.data.goodsList;
|
|
|
+ this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
|
|
|
+ this.$set(this.form, "fEta", Date.parse(this.form.fEta));
|
|
|
+ this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
|
|
|
+ this.$set(this.form, "createTime", Date.parse(this.form.createTime));
|
|
|
+ this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
|
|
|
+ this.$set(
|
|
|
+ this.form,
|
|
|
+ "fPlannetweight",
|
|
|
+ this.form.fPlannetweight.toFixed(2)
|
|
|
+ );
|
|
|
+ this.$set(
|
|
|
+ this.form,
|
|
|
+ "fPlangrossweight",
|
|
|
+ this.form.fPlangrossweight.toFixed(2)
|
|
|
+ );
|
|
|
+ for (let list in this.dataList) {
|
|
|
+ this.$set(
|
|
|
+ this.dataList[list],
|
|
|
+ "fBsdate",
|
|
|
+ Date.parse(this.dataList[list].fBsdate)
|
|
|
+ );
|
|
|
}
|
|
|
- if (response.data.warehouse) {
|
|
|
- this.warehouseOptions = response.data.warehouse;
|
|
|
+ this.goodsOptions = response.data.goodsList;
|
|
|
+ this.kqhouseOptions = response.data.warehouseAreas;
|
|
|
+ this.warehouseDrList = response.data.warehousebillsfeesDr;
|
|
|
+ for (let dr in this.warehouseDrList) {
|
|
|
+ this.$set(
|
|
|
+ this.warehouseDrList[dr],
|
|
|
+ "fFeeUnitid",
|
|
|
+ this.warehouseDrList[dr].fFeeunitid + ""
|
|
|
+ );
|
|
|
+ this.$set(
|
|
|
+ this.warehouseDrList[dr],
|
|
|
+ "fQty",
|
|
|
+ this.warehouseDrList[dr].fQty.toFixed(2)
|
|
|
+ );
|
|
|
+ this.$set(
|
|
|
+ this.warehouseDrList[dr],
|
|
|
+ "fAmount",
|
|
|
+ this.warehouseDrList[dr].fAmount.toFixed(2)
|
|
|
+ );
|
|
|
}
|
|
|
- if (response.data.warehouseAreas) {
|
|
|
- this.kqhouseOptions = response.data.warehouseAreas;
|
|
|
+ this.warehouseCrList = response.data.warehousebillsfeesCr;
|
|
|
+ for (let cr in this.warehouseCrList) {
|
|
|
+ this.$set(
|
|
|
+ this.warehouseCrList[cr],
|
|
|
+ "fFeeUnitid",
|
|
|
+ this.warehouseCrList[cr].fFeeunitid + ""
|
|
|
+ );
|
|
|
}
|
|
|
+ this.userOptions = response.data.sysUser;
|
|
|
this.open = true;
|
|
|
- this.title = "修改出库";
|
|
|
+ this.title = "修改仓入库";
|
|
|
});
|
|
|
+ queryUserVal().then((response)=>{
|
|
|
+ console.log(response)
|
|
|
+ this.current = response.user.userName
|
|
|
+ console.log(this.queryParams)
|
|
|
+ })
|
|
|
},
|
|
|
// 数量计算
|
|
|
changeContractAmt(row) {
|
|
|
@@ -3373,6 +3357,7 @@ export default {
|
|
|
},
|
|
|
// 出库确认
|
|
|
creditClick() {
|
|
|
+ console.log(this.dataList)
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
console.log(this.dataListSelection[0].fIsPass)
|
|
|
for (let warehouseCr in this.dataListSelection) {
|
|
|
@@ -3498,7 +3483,7 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- // 装货按钮
|
|
|
+ // 装货按钮
|
|
|
discharge() {
|
|
|
if (this.printinglist.length <= 0) {
|
|
|
this.$message.error("请选择需要装货的明细!");
|
|
|
@@ -3597,52 +3582,48 @@ export default {
|
|
|
},
|
|
|
// 保存
|
|
|
saveForm () {
|
|
|
- this.$refs['checkout'].validate(valid => {
|
|
|
- if (valid){
|
|
|
- this.updateDeduplication()
|
|
|
- this.$refs['form'].validate((valid) => {
|
|
|
- if (this.dataList.length === 0) {
|
|
|
- this.$message.error('请添加库存明细!')
|
|
|
- return false
|
|
|
- }
|
|
|
- for (let list in this.dataList) {
|
|
|
- if (!this.dataList[list].fQty || Number(this.dataList[list].fQty) === 0) {
|
|
|
- this.$message.error('请维护序号为' + (Number(list) + 1) + '的出库件数!')
|
|
|
- return false
|
|
|
- }
|
|
|
- if (!this.dataList[list].fGrossweight || Number(this.dataList[list].fGrossweight) === 0) {
|
|
|
- this.$message.error('请维护序号为' + (Number(list) + 1) + '的出库毛重!')
|
|
|
- return false
|
|
|
- }
|
|
|
- if (!this.dataList[list].fNetweight || Number(this.dataList[list].fNetweight) === 0) {
|
|
|
- this.$message.error('请维护序号为' + (Number(list) + 1) + '的出库净重!')
|
|
|
- return false
|
|
|
- }
|
|
|
- }
|
|
|
- if (valid) {
|
|
|
- setTimeout(() => {
|
|
|
- this.form.fBillstatus = 2
|
|
|
- let formData = new window.FormData()
|
|
|
- formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
- formData.append("warehousebillsitems", JSON.stringify(this.dataList));
|
|
|
- formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
- formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
|
|
|
- formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
|
|
|
- addWarehousebills(formData).then((response) => {
|
|
|
- this.msgSuccess('保存成功')
|
|
|
- this.form = response.data.warehouseBills
|
|
|
- this.$set(this.form, 'fEta', Date.parse(this.form.fEta))
|
|
|
- this.$set(this.form, 'fTrademodeid', this.form.fTrademodeid + '')
|
|
|
- this.$set(this.form, 'fStltypeid', this.form.fStltypeid + '')
|
|
|
- this.$set(this.form, 'fFeetunit', Number(this.form.fFeetunit))
|
|
|
- this.$set(this.form, 'fBsdate', Date.parse(this.form.fBsdate))
|
|
|
- this.$set(this.form, 'createTime', Date.parse(this.form.createTime))
|
|
|
- this.$set(this.form, 'fChargedate', Date.parse(this.form.fChargedate))
|
|
|
- this.dataList = response.data.warehousebillsitems
|
|
|
- })
|
|
|
- }, 200);
|
|
|
- }
|
|
|
- })
|
|
|
+ this.updateDeduplication()
|
|
|
+ this.$refs['form'].validate((valid) => {
|
|
|
+ if (this.dataList.length === 0) {
|
|
|
+ this.$message.error('请添加库存明细!')
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ for (let list in this.dataList) {
|
|
|
+ if (!this.dataList[list].fQty || Number(this.dataList[list].fQty) === 0) {
|
|
|
+ this.$message.error('请维护序号为' + (Number(list) + 1) + '的出库件数!')
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ if (!this.dataList[list].fGrossweight || Number(this.dataList[list].fGrossweight) === 0) {
|
|
|
+ this.$message.error('请维护序号为' + (Number(list) + 1) + '的出库毛重!')
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ if (!this.dataList[list].fNetweight || Number(this.dataList[list].fNetweight) === 0) {
|
|
|
+ this.$message.error('请维护序号为' + (Number(list) + 1) + '的出库净重!')
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (valid) {
|
|
|
+ setTimeout(() => {
|
|
|
+ this.form.fBillstatus = 2
|
|
|
+ let formData = new window.FormData()
|
|
|
+ formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
+ formData.append("warehousebillsitems", JSON.stringify(this.dataList));
|
|
|
+ formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
|
|
|
+ formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
|
|
|
+ formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
|
|
|
+ addWarehousebills(formData).then((response) => {
|
|
|
+ this.msgSuccess('保存成功')
|
|
|
+ this.form = response.data.warehouseBills
|
|
|
+ this.$set(this.form, 'fEta', Date.parse(this.form.fEta))
|
|
|
+ this.$set(this.form, 'fTrademodeid', this.form.fTrademodeid + '')
|
|
|
+ this.$set(this.form, 'fStltypeid', this.form.fStltypeid + '')
|
|
|
+ this.$set(this.form, 'fFeetunit', Number(this.form.fFeetunit))
|
|
|
+ this.$set(this.form, 'fBsdate', Date.parse(this.form.fBsdate))
|
|
|
+ this.$set(this.form, 'createTime', Date.parse(this.form.createTime))
|
|
|
+ this.$set(this.form, 'fChargedate', Date.parse(this.form.fChargedate))
|
|
|
+ this.dataList = response.data.warehousebillsitems
|
|
|
+ })
|
|
|
+ }, 200);
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
@@ -3857,7 +3838,7 @@ export default {
|
|
|
height: 50px;
|
|
|
text-align: center;
|
|
|
border-right: 1px solid #dfe6ec !important;
|
|
|
- order-bottom: 1px solid #dfe6ec !important;
|
|
|
+ // order-bottom: 1px solid #dfe6ec !important;
|
|
|
border-bottom: 1px solid #dfe6ec !important;
|
|
|
}
|
|
|
.el-table thead th {
|
wengyuwen