|
|
@@ -267,8 +267,31 @@
|
|
|
<!-- <el-table-column label="货转客户名称" align="center" prop="fTocorpid" /> -->
|
|
|
<el-table-column label="入库毛重" align="center" prop="fGrossweight" />
|
|
|
<el-table-column label="净重" align="center" prop="fNetweight" />
|
|
|
- <el-table-column width="150" label="费用状态" align="center" prop="fBillstatus" />
|
|
|
- <el-table-column width="150" label="入库状态" align="center" prop="fItemsStatus" />
|
|
|
+ <el-table-column
|
|
|
+ width="100"
|
|
|
+ label="入库状态"
|
|
|
+ align="center"
|
|
|
+ prop="fItemsStatus">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="scope.row.fItemsStatus === '1'">未入账</span>
|
|
|
+ <span v-if="scope.row.fItemsStatus === '2'">部分入账</span>
|
|
|
+ <span v-if="scope.row.fItemsStatus === '6'">全部入账</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ width="100"
|
|
|
+ label="费用状态"
|
|
|
+ align="center"
|
|
|
+ prop="fBillstatus">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="scope.row.fBillstatus === '1'">录入</span>
|
|
|
+ <span v-if="scope.row.fBillstatus === '2'">录入</span>
|
|
|
+ <span v-if="scope.row.fBillstatus === '3'">驳回</span>
|
|
|
+ <span v-if="scope.row.fBillstatus === '4'">请核</span>
|
|
|
+ <span v-if="scope.row.fBillstatus === '5'">审核中</span>
|
|
|
+ <span v-if="scope.row.fBillstatus === '6'">全部入账</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
label="操作"
|
|
|
align="center"
|
|
|
@@ -288,6 +311,7 @@
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-edit"
|
|
|
+ v-if="scope.row.fBillstatus === '1' || scope.row.fBillstatus === '2' || scope.row.fBillstatus === '3'"
|
|
|
@click="handleUpdate(scope.row, false)"
|
|
|
v-hasPermi="['warehouseBusiness:warehousebills:edit']"
|
|
|
>修改
|
|
|
@@ -296,7 +320,7 @@
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-delete"
|
|
|
- v-if="scope.row.fBillstatus !== '6'"
|
|
|
+ v-if="scope.row.fBillstatus !== '6' && scope.row.fItemsStatus === '1'"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
v-hasPermi="['warehouseBusiness:warehousebills:remove']"
|
|
|
>删除
|
|
|
@@ -328,7 +352,7 @@
|
|
|
filterable
|
|
|
remote
|
|
|
@change="changefCorpid(form)"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
:remote-method="corpsRemoteMethod"
|
|
|
placeholder="请输入模糊查找"
|
|
|
@@ -348,7 +372,7 @@
|
|
|
v-model="form.fStltypeid"
|
|
|
placeholder="请选择结算方式"
|
|
|
clearable
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -364,7 +388,7 @@
|
|
|
<el-form-item label="提单号" prop="fMblno">
|
|
|
<el-input
|
|
|
v-model="form.fMblno"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
placeholder="手工输入"
|
|
|
/>
|
|
|
@@ -378,7 +402,7 @@
|
|
|
v-model="form.fBsdate"
|
|
|
style="width: 80%"
|
|
|
type="date"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
@change="changefBsdate"
|
|
|
value-format="timestamp"
|
|
|
placeholder="业务日期"
|
|
|
@@ -392,7 +416,7 @@
|
|
|
v-model="form.fStorekeeper"
|
|
|
filterable
|
|
|
remote
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
:remote-method="userRemoteMethod"
|
|
|
placeholder="请输入模糊查找"
|
|
|
@@ -411,7 +435,7 @@
|
|
|
<el-select
|
|
|
v-model="form.fWarehouseid"
|
|
|
filterable
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
remote
|
|
|
style="width: 80%"
|
|
|
:remote-method="warehouseRemoteMethod"
|
|
|
@@ -445,7 +469,7 @@
|
|
|
v-model="form.fIfdamage"
|
|
|
placeholder="请选择是否破损"
|
|
|
clearable
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -463,7 +487,7 @@
|
|
|
v-model="form.fIfweigh"
|
|
|
placeholder="请选择是否过磅"
|
|
|
clearable
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -484,7 +508,7 @@
|
|
|
v-model="form.fIfpledge"
|
|
|
placeholder="请选择是否过磅"
|
|
|
clearable
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -499,22 +523,23 @@
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="质押银行" prop="fBankcorpid">
|
|
|
<el-select
|
|
|
- v-model="queryParams.fBankcorpid"
|
|
|
- filterable
|
|
|
- remote
|
|
|
- clearable
|
|
|
- style="width: 80%"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- :remote-method="corpsRemoteMethodd"
|
|
|
- placeholder="请输入模糊查找"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(dict, index) in Pledgebank"
|
|
|
- :key="index.fId"
|
|
|
- :label="dict.fName"
|
|
|
- :value="dict.fId"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
+ v-model="queryParams.fBankcorpid"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ clearable
|
|
|
+ style="width: 80%"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ :remote-method="corpsRemoteMethodd"
|
|
|
+ placeholder="请输入模糊查找"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in Pledgebank"
|
|
|
+ :key="index.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
@@ -523,7 +548,7 @@
|
|
|
v-model="form.fFeetunit"
|
|
|
placeholder="请选择计费单位"
|
|
|
clearable
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -540,11 +565,11 @@
|
|
|
<el-input
|
|
|
v-model="form.fMarks"
|
|
|
style="width: 80%"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
placeholder="唛头"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
+
|
|
|
</el-col>
|
|
|
<el-col :span="15">
|
|
|
<el-form-item label="备注" prop="fMarks">
|
|
|
@@ -552,15 +577,15 @@
|
|
|
style="width: 100%"
|
|
|
v-model="form.remark"
|
|
|
type="textarea"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
placeholder="请输入内容"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
+
|
|
|
</el-col>
|
|
|
-
|
|
|
+
|
|
|
</el-row>
|
|
|
-
|
|
|
+
|
|
|
<div v-if="detailsHidden">
|
|
|
<el-row style="margin-top: 30px">
|
|
|
<el-col :span="8">
|
|
|
@@ -568,7 +593,7 @@
|
|
|
<el-input
|
|
|
v-model="form.fContacts"
|
|
|
style="width: 80%"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
placeholder="仓库联系人"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -577,7 +602,7 @@
|
|
|
<el-form-item label="仓库电话" prop="fTel">
|
|
|
<el-input
|
|
|
v-model="form.fTel"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
placeholder="请输仓库入电话"
|
|
|
/>
|
|
|
@@ -588,7 +613,7 @@
|
|
|
<el-input
|
|
|
v-model="form.fVslvoy"
|
|
|
style="width: 80%"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
placeholder="船名航次"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -601,7 +626,7 @@
|
|
|
v-model="form.fEta"
|
|
|
style="width: 80%"
|
|
|
type="date"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
value-format="timestamp"
|
|
|
placeholder="到港日期"
|
|
|
>
|
|
|
@@ -613,7 +638,7 @@
|
|
|
<el-input
|
|
|
v-model="form.fCustomno"
|
|
|
style="width: 80%"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
laceholder="报关单号"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -625,7 +650,7 @@
|
|
|
v-model="form.fSbu"
|
|
|
filterable
|
|
|
remote
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
:remote-method="fSbuRemoteMethod"
|
|
|
style="width: 80%"
|
|
|
placeholder="请选择经营单位"
|
|
|
@@ -656,7 +681,7 @@
|
|
|
<el-select
|
|
|
v-model="form.fTrademodeid"
|
|
|
placeholder="请选择贸易方式"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
clearable
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
@@ -728,7 +753,7 @@
|
|
|
<!-- <el-button :disabled="browseStatus" @click.prevent="deleteRoww(warehouseDrList)"
|
|
|
>删除
|
|
|
</el-button> -->
|
|
|
- <el-button type="primary" @click="submitForm(2)">保 存</el-button>
|
|
|
+ <el-button :disabled="browseStatus" type="primary" @click="submitForm(2)">保 存</el-button>
|
|
|
<!--点击展开-->
|
|
|
<el-button style="margin-left:19%;"
|
|
|
@click="
|
|
|
@@ -754,8 +779,8 @@
|
|
|
@click="showEditDialog_sss"
|
|
|
>作业单
|
|
|
</el-button>
|
|
|
- <el-button type="primary" @click="submitForm(2)">保 存</el-button>
|
|
|
- <el-button type="primary" @click="submitForm(6)">请核</el-button>
|
|
|
+ <el-button :disabled="browseStatus" type="primary" @click="submitForm(2)">保 存</el-button>
|
|
|
+ <el-button :disabled="browseStatus" type="primary" @click="submitForm(6)">请核</el-button>
|
|
|
</div>
|
|
|
<el-table
|
|
|
:data="dataList"
|
|
|
@@ -1008,7 +1033,7 @@
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
-
|
|
|
+
|
|
|
<el-table-column
|
|
|
prop="fCntrno"
|
|
|
header-align="center"
|
|
|
@@ -1181,7 +1206,7 @@
|
|
|
label="上传附件"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <uploadFile @input="showFile" v-model="scope.row.fUrl" />
|
|
|
+ <uploadFile :disabled="browseStatus" @input="showFile" v-model="scope.row.fUrl" />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -1210,9 +1235,9 @@
|
|
|
<!-- <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseDrList)"
|
|
|
>删除
|
|
|
</el-button> -->
|
|
|
- <el-button type="primary" @click="submitForm(2)">保 存</el-button>
|
|
|
- <el-button type="warning">仓储费协议</el-button>
|
|
|
- <el-button type="danger">作业费协议</el-button>
|
|
|
+ <el-button :disabled="browseStatus" type="primary" @click="submitForm(2)">保 存</el-button>
|
|
|
+ <el-button :disabled="browseStatus" type="warning">仓储费协议</el-button>
|
|
|
+ <el-button :disabled="browseStatus" type="danger">作业费协议</el-button>
|
|
|
</div>
|
|
|
<el-table
|
|
|
:data="warehouseDrList"
|
|
|
@@ -1442,9 +1467,9 @@
|
|
|
<!-- <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseCrList)"
|
|
|
>删除
|
|
|
</el-button> -->
|
|
|
- <el-button type="primary" @click="submitForm(2)">保 存</el-button>
|
|
|
- <el-button type="warning">仓储费协议</el-button>
|
|
|
- <el-button type="danger">作业费协议</el-button>
|
|
|
+ <el-button :disabled="browseStatus" type="primary" @click="submitForm(2)">保 存</el-button>
|
|
|
+ <el-button :disabled="browseStatus" type="warning">仓储费协议</el-button>
|
|
|
+ <el-button :disabled="browseStatus" type="danger">作业费协议</el-button>
|
|
|
</div>
|
|
|
<el-table
|
|
|
:data="warehouseCrList"
|
|
|
@@ -1687,8 +1712,8 @@
|
|
|
@click="showEditDialog_sss"
|
|
|
>作业单
|
|
|
</el-button>
|
|
|
- <el-button type="primary" @click="submitForm(2)">保 存</el-button>
|
|
|
- <el-button type="primary" @click="submitForm(6)">请核</el-button>
|
|
|
+ <el-button :disabled="browseStatus" type="primary" @click="submitForm(2)">保 存</el-button>
|
|
|
+ <el-button :disabled="browseStatus" type="primary" @click="submitForm(6)">请核</el-button>
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
</div>
|
|
|
<el-dialog
|
|
|
@@ -1765,7 +1790,7 @@
|
|
|
<td width="100">入库重量</td>
|
|
|
<td width="100">入库件数</td>
|
|
|
</tr>
|
|
|
- <tr v-for="(item,index) in Printinglist" :key="index">
|
|
|
+ <tr v-for="(item,index) in dataListSelection" :key="index">
|
|
|
<td width="100">{{index+1}}</td>
|
|
|
<td width="100">{{item.fBsdate}}</td>
|
|
|
<td width="100">{{item.fCntqty}}</td>
|
|
|
@@ -1856,7 +1881,7 @@
|
|
|
{{fBsdate}}
|
|
|
</td>
|
|
|
</tr>
|
|
|
- <tr v-for="(item,index) in Printinglist" :key="index">
|
|
|
+ <tr v-for="(item,index) in dataListSelection" :key="index">
|
|
|
<td width="250">货物品名:</td>
|
|
|
<td width="250">{{item.fGoodsids}}</td>
|
|
|
<td width="250">白色聚吕</td>
|
|
|
@@ -1867,7 +1892,7 @@
|
|
|
<!-- <tr>
|
|
|
<td width="1400" colspan="6"> </td>
|
|
|
</tr> -->
|
|
|
- <tr v-for="(item,index) in Printinglist" :key="index">
|
|
|
+ <tr v-for="(item,index) in dataListSelection" :key="index">
|
|
|
<td>备注:</td>
|
|
|
<td colspan="5">{{item.remark}}</td>
|
|
|
</tr>
|
|
|
@@ -1939,7 +1964,7 @@
|
|
|
出库日期：{{fBsdate}}
|
|
|
</td>
|
|
|
</tr>
|
|
|
- <tr v-for="(item,index) in Printinglist" :key="index">
|
|
|
+ <tr v-for="(item,index) in dataListSelection" :key="index">
|
|
|
<td width="200">车号</td>
|
|
|
<td width="200">{{item.fTruckno}}</td>
|
|
|
<td width="200">货物品名</td>
|
|
|
@@ -2025,6 +2050,7 @@ export default {
|
|
|
// 修改查看状态
|
|
|
browseStatus: false,
|
|
|
detailsHidden: false,
|
|
|
+ formBrowseStatus: false,
|
|
|
fTruckno: '',
|
|
|
fBsdate: '',
|
|
|
fCntrtype: '',
|
|
|
@@ -2035,7 +2061,7 @@ export default {
|
|
|
fFeeUnitid: "",
|
|
|
fFeeUnitids: "",
|
|
|
fGrossweight: "",
|
|
|
- fid:"",
|
|
|
+ fid:null,
|
|
|
fCntqty: "",
|
|
|
fNetweight: "",
|
|
|
fQty: "",
|
|
|
@@ -2044,7 +2070,6 @@ export default {
|
|
|
loading: true,
|
|
|
// 选中数组
|
|
|
ids: [],
|
|
|
- Printinglist: [],
|
|
|
Collectionoptionss: [],
|
|
|
userVal: {
|
|
|
userName: null,
|
|
|
@@ -2162,7 +2187,9 @@ export default {
|
|
|
fCntqty: null,
|
|
|
},
|
|
|
// 表单参数
|
|
|
- form: {},
|
|
|
+ form: {
|
|
|
+ fItemsStatus: null
|
|
|
+ },
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
fDeptid: [
|
|
|
@@ -2178,7 +2205,7 @@ export default {
|
|
|
message: " ",
|
|
|
trigger: "blur",
|
|
|
},
|
|
|
- ],
|
|
|
+ ],
|
|
|
fMarks: [
|
|
|
{ required: true, message: " ", trigger: "blur" },
|
|
|
],
|
|
|
@@ -2244,7 +2271,7 @@ export default {
|
|
|
this.fBillstatusOptions = response.data;
|
|
|
});
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
methods: {
|
|
|
// 上传成功返回数据
|
|
|
showFile(row) {
|
|
|
@@ -2299,7 +2326,7 @@ export default {
|
|
|
},
|
|
|
// 收货单打印界面
|
|
|
showEditDialog_s() {
|
|
|
- if(this.Printinglist.length>0) {
|
|
|
+ if(this.dataListSelection.length>0) {
|
|
|
this.editDialogVisible_s = true;
|
|
|
for(let corp in this.fMblnoOptions){
|
|
|
if(this.form.fCorpid === this.fMblnoOptions[corp].fId) {
|
|
|
@@ -2315,10 +2342,10 @@ export default {
|
|
|
}else {
|
|
|
this.$message.error("请选择需要打印的明细!");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
showEditDialog_ss() {
|
|
|
- if(this.Printinglist.length>0) {
|
|
|
+ if(this.dataListSelection.length>0) {
|
|
|
this.editDialogVisible_ss = true;
|
|
|
}else {
|
|
|
this.$message.error("请选择需要打印的明细!");
|
|
|
@@ -2363,7 +2390,6 @@ export default {
|
|
|
console.log(response)
|
|
|
if (response.user !== null) {
|
|
|
this.userVal = response.user;
|
|
|
- console.log(this.userVal)
|
|
|
this.$set(this.form, "fDeptid", this.userVal.deptId);
|
|
|
this.$set(this.form, "createBy", this.userVal.userName);
|
|
|
this.$set(this.form, "fIfdamage", "1");
|
|
|
@@ -2383,29 +2409,6 @@ export default {
|
|
|
this.loading = true;
|
|
|
listWarehousebills(this.queryParams).then((response) => {
|
|
|
this.warehousebillsList = response.rows;
|
|
|
- for (let li in this.warehousebillsList) {
|
|
|
- if(this.warehousebillsList[li].fItemsStatus === '6') {
|
|
|
- this.warehousebillsList[li].fItemsStatus = "全部入账"
|
|
|
- // this.browseStatus = true;
|
|
|
- } else if(this.warehousebillsList[li].fItemsStatus === '1') {
|
|
|
- this.warehousebillsList[li].fItemsStatus = "录入"
|
|
|
- } else {
|
|
|
- this.warehousebillsList[li].fItemsStatus = "部分入账"
|
|
|
- }
|
|
|
- if (this.warehousebillsList[li].fBillstatus === '6') {
|
|
|
- this.warehousebillsList[li].fBillstatus = "审核通过"
|
|
|
- } else if(this.warehousebillsList[li].fBillstatus === '3') {
|
|
|
- this.warehousebillsList[li].fBillstatus = "驳回"
|
|
|
- }else if(this.warehousebillsList[li].fBillstatus === '4') {
|
|
|
- this.warehousebillsList[li].fBillstatus = "请核"
|
|
|
- }
|
|
|
- else if(this.warehousebillsList[li].fBillstatus === '2') {
|
|
|
- this.warehousebillsList[li].fBillstatus = "录入"
|
|
|
- }else if(this.warehousebillsList[li].fBillstatus === '5') {
|
|
|
- this.warehousebillsList[li].fBillstatus = "驳回"
|
|
|
- }
|
|
|
- }
|
|
|
- console.log(response.rows);
|
|
|
this.total = response.total;
|
|
|
this.loading = false;
|
|
|
});
|
|
|
@@ -2528,18 +2531,24 @@ export default {
|
|
|
},
|
|
|
// 库存明细多选
|
|
|
Selectinventory(selection) {
|
|
|
- console.log(selection);
|
|
|
- this.Printinglist = selection;
|
|
|
- this.dataListSelection = selection;
|
|
|
- if (this.Printinglist.length > 0) {
|
|
|
+ this.dataListSelection = []
|
|
|
+ if (!selection || selection.length === 0) {
|
|
|
+ return false
|
|
|
+ } else {
|
|
|
+ for (let se in selection) {
|
|
|
+ if (!selection[se].fBillstatus || selection[se].fBillstatus !== '6') {
|
|
|
+ this.dataListSelection.push(selection[se]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (this.dataListSelection.length > 0) {
|
|
|
this.fTruckno = selection[0].fTruckno;
|
|
|
- this.fBsdate = new Date(selection[0].fBsdate)
|
|
|
+ this.fBsdate = new Date(selection[0].fBsdate)
|
|
|
this.fCntrtype = selection[0].fCntrtype;
|
|
|
this.fGoodsids = selection[0].fGoodsids;
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
// 收款选择
|
|
|
Collectionoptions(selection) {
|
|
|
console.log(selection)
|
|
|
@@ -2574,15 +2583,16 @@ export default {
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row, status) {
|
|
|
- console.log(status);
|
|
|
this.browseStatus = status;
|
|
|
this.reset();
|
|
|
this.detailsHidden = false;
|
|
|
const fId = row.fId || this.ids;
|
|
|
getWarehousebills(fId).then((response) => {
|
|
|
- console.log(response)
|
|
|
if (response.data.warehousebills) {
|
|
|
this.form = response.data.warehousebills;
|
|
|
+ if (this.form.fItemsStatus !== '1') {
|
|
|
+ this.formBrowseStatus = true
|
|
|
+ }
|
|
|
}
|
|
|
if (response.data.corps) {
|
|
|
this.fMblnoOptions = response.data.corps;
|
|
|
@@ -2605,18 +2615,12 @@ export default {
|
|
|
this.$set(this.form, "fEta", Date.parse(this.form.fEta));
|
|
|
this.$set(this.form, "createTime", Date.parse(this.form.createTime));
|
|
|
this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
|
|
|
-
|
|
|
for (let list in this.dataList) {
|
|
|
this.$set(
|
|
|
this.dataList[list],
|
|
|
"fBsdate",
|
|
|
Date.parse(this.dataList[list].fBsdate)
|
|
|
);
|
|
|
- // if(this.dataList[list].fBillstatus === '6'){
|
|
|
- // this.$set(this.dataList[list], "fBillstatus", '已入账');
|
|
|
- // } else {
|
|
|
- // this.$set(this.dataList[list], "fBillstatus", '未入账');
|
|
|
- // }
|
|
|
}
|
|
|
this.goodsOptions = response.data.goodsList;
|
|
|
this.kqhouseOptions = response.data.warehouseAreas;
|
|
|
@@ -2838,10 +2842,9 @@ export default {
|
|
|
formData.append("warehousebillsitems", JSON.stringify(this.dataListSelection))
|
|
|
formData.append("whgenleg", JSON.stringify(this.relevantAttachments))
|
|
|
addWhgenleg(formData).then((response) => {
|
|
|
- console.log(response)
|
|
|
this.fid = response.data;
|
|
|
- this.creditStatus = true
|
|
|
this.msgSuccess("入账成功");
|
|
|
+ this.$refs.table.clearSelection();
|
|
|
for (let li in this.dataListSelection) {
|
|
|
for (let i in this.dataList) {
|
|
|
let fQty = this.dataList[i].fQty === this.dataListSelection[li].fQty;
|
|
|
@@ -2858,63 +2861,11 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
})
|
|
|
- console.log('有东西')
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
submitForm(status) {
|
|
|
- console.log(this.warehouseDrList);
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
- if (status === 2) {
|
|
|
- console.log("@@");
|
|
|
- console.log(this.form);
|
|
|
- console.log(this.dataList);
|
|
|
- console.log(this.warehouseCrList);
|
|
|
- console.log(this.warehouseDrList);
|
|
|
-
|
|
|
- if (valid) {
|
|
|
- this.form.fBillstatus = status;
|
|
|
- this.form.fNetweight = this.fNetweight;
|
|
|
- this.form.fPlangrossweight = this.fPlangrossweight;
|
|
|
- this.form.fPlannetweight = this.fPlannetweight;
|
|
|
- this.form.fPlanvolumn = this.fPlanvolumn;
|
|
|
- this.form.fPlanqty = this.fPlanqty;
|
|
|
- this.form.fGrossweight = this.fGrossweight;
|
|
|
- this.form.fQty = this.fQty;
|
|
|
- if(!this.form.fId) {
|
|
|
- this.form.fId = this.fid;
|
|
|
- }
|
|
|
-
|
|
|
- console.log(this.form)
|
|
|
- let formData = new window.FormData();
|
|
|
- // 附件数据
|
|
|
- formData.append("tWarehouseBills", JSON.stringify(this.form));
|
|
|
- // 库存明细
|
|
|
- formData.append(
|
|
|
- "tWarehousebillsitems",
|
|
|
- JSON.stringify(this.dataList)
|
|
|
- );
|
|
|
- // 附件数据
|
|
|
- formData.append(
|
|
|
- "tWhgenleg",
|
|
|
- JSON.stringify(this.relevantAttachments)
|
|
|
- );
|
|
|
- // 费用明细付款
|
|
|
- formData.append(
|
|
|
- "tWarehousebillsfeesCr",
|
|
|
- JSON.stringify(this.warehouseCrList)
|
|
|
- );
|
|
|
- // 收款
|
|
|
- formData.append(
|
|
|
- "tWarehousebillsfeesDr",
|
|
|
- JSON.stringify(this.warehouseDrList)
|
|
|
- );
|
|
|
- addWarehousebills(formData).then((response) => {
|
|
|
- this.msgSuccess("提交成功");
|
|
|
- this.open = false;
|
|
|
- this.getList();
|
|
|
- });
|
|
|
- }
|
|
|
- } else {
|
|
|
+ if (status !== 2) {
|
|
|
if (this.dataList.length === 0) {
|
|
|
this.$message.error("请新增库存明细!");
|
|
|
return false;
|
|
|
@@ -2971,52 +2922,35 @@ export default {
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
|
- console.log(this.warehouseCrList);
|
|
|
- if (valid) {
|
|
|
-
|
|
|
- this.form.fBillstatus = status;
|
|
|
- this.form.fNetweight = this.fNetweight;
|
|
|
- this.form.fPlangrossweight = this.fPlangrossweight;
|
|
|
- this.form.fPlannetweight = this.fPlannetweight;
|
|
|
- this.form.fPlanvolumn = this.fPlanvolumn;
|
|
|
- this.form.fPlanqty = this.fPlanqty;
|
|
|
- this.form.fGrossweight = this.fGrossweight;
|
|
|
- this.form.fQty = this.fQty;
|
|
|
- if(!this.form.fId) {
|
|
|
- this.form.fId = this.fid;
|
|
|
- }
|
|
|
- console.log(this.form)
|
|
|
- console.log(this.amt);
|
|
|
- let formData = new window.FormData();
|
|
|
-
|
|
|
- // 附件数据
|
|
|
- formData.append("tWarehouseBills", JSON.stringify(this.form));
|
|
|
- // 库存明细
|
|
|
- formData.append(
|
|
|
- "tWarehousebillsitems",
|
|
|
- JSON.stringify(this.dataList)
|
|
|
- );
|
|
|
- // 附件数据
|
|
|
- formData.append(
|
|
|
- "tWhgenleg",
|
|
|
- JSON.stringify(this.relevantAttachments)
|
|
|
- );
|
|
|
- // 费用明细付款
|
|
|
- formData.append(
|
|
|
- "tWarehousebillsfeesCr",
|
|
|
- JSON.stringify(this.warehouseCrList)
|
|
|
- );
|
|
|
- // 收款
|
|
|
- formData.append(
|
|
|
- "tWarehousebillsfeesDr",
|
|
|
- JSON.stringify(this.warehouseDrList)
|
|
|
- );
|
|
|
- addWarehousebills(formData).then((response) => {
|
|
|
- this.msgSuccess("提交成功");
|
|
|
- this.open = false;
|
|
|
- this.getList();
|
|
|
- });
|
|
|
+ }
|
|
|
+ if (valid) {
|
|
|
+ this.form.fBillstatus = status;
|
|
|
+ this.form.fNetweight = this.fNetweight;
|
|
|
+ this.form.fPlangrossweight = this.fPlangrossweight;
|
|
|
+ this.form.fPlannetweight = this.fPlannetweight;
|
|
|
+ this.form.fPlanvolumn = this.fPlanvolumn;
|
|
|
+ this.form.fPlanqty = this.fPlanqty;
|
|
|
+ this.form.fGrossweight = this.fGrossweight;
|
|
|
+ this.form.fQty = this.fQty;
|
|
|
+ if(!this.form.fId) {
|
|
|
+ this.form.fId = this.fid;
|
|
|
}
|
|
|
+ let formData = new window.FormData();
|
|
|
+ // 附件数据
|
|
|
+ formData.append("tWarehouseBills", JSON.stringify(this.form));
|
|
|
+ // 库存明细
|
|
|
+ formData.append("tWarehousebillsitems", JSON.stringify(this.dataList));
|
|
|
+ // 附件数据
|
|
|
+ formData.append("tWhgenleg",JSON.stringify(this.relevantAttachments));
|
|
|
+ // 费用明细付款
|
|
|
+ formData.append("tWarehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
|
|
|
+ // 收款
|
|
|
+ formData.append("tWarehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
|
|
|
+ addWarehousebills(formData).then((response) => {
|
|
|
+ this.msgSuccess("提交成功");
|
|
|
+ this.open = false;
|
|
|
+ this.getList();
|
|
|
+ });
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
@@ -3056,7 +2990,7 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
deleteRow(index, rows) {
|
|
|
-
|
|
|
+
|
|
|
rows.splice(index, 1);
|
|
|
},
|
|
|
/* 远程模糊查询用户 */
|
阿伏兔