|
|
@@ -348,7 +348,7 @@
|
|
|
v-model="form.fCorpid"
|
|
|
filterable
|
|
|
remote
|
|
|
- :disabled="notChange || formBrowseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
@change="changefCorpid(form)"
|
|
|
style="width: 80%"
|
|
|
:remote-method="corpsRemoteMethod"
|
|
|
@@ -368,7 +368,7 @@
|
|
|
<el-select
|
|
|
v-model="form.fStltypeid"
|
|
|
placeholder="请选择结算方式"
|
|
|
- :disabled="notChange || formBrowseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
clearable
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
@@ -386,8 +386,8 @@
|
|
|
<el-input
|
|
|
v-model="form.fMblno"
|
|
|
style="width: 80%"
|
|
|
- :disabled="notChange || formBrowseStatus"
|
|
|
- placeholder="手工输入"
|
|
|
+ disabled
|
|
|
+ placeholder=""
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -399,7 +399,7 @@
|
|
|
v-model="form.fBsdate"
|
|
|
style="width: 80%"
|
|
|
type="date"
|
|
|
- :disabled="notChange || formBrowseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
@change="changefBsdate"
|
|
|
value-format="timestamp"
|
|
|
placeholder="业务日期"
|
|
|
@@ -413,7 +413,7 @@
|
|
|
v-model="form.fStorekeeper"
|
|
|
filterable
|
|
|
remote
|
|
|
- :disabled="notChange || formBrowseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
:remote-method="userRemoteMethod"
|
|
|
placeholder="请输入模糊查找"
|
|
|
@@ -433,8 +433,8 @@
|
|
|
v-model="form.fWarehouseid"
|
|
|
filterable
|
|
|
remote
|
|
|
- @change="changefWarehouseid"
|
|
|
- :disabled="notChange || formBrowseStatus"
|
|
|
+ @change="changefWarehouseid(form)"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
:remote-method="warehouseRemoteMethod"
|
|
|
placeholder="请输入模糊查找"
|
|
|
@@ -465,7 +465,7 @@
|
|
|
<el-select
|
|
|
v-model="form.fIfdamage"
|
|
|
placeholder="请选择是否破损"
|
|
|
- :disabled="notChange || formBrowseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
clearable
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
@@ -483,7 +483,7 @@
|
|
|
<el-select
|
|
|
v-model="form.fIfweigh"
|
|
|
placeholder="请选择是否过磅"
|
|
|
- :disabled="notChange || formBrowseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
clearable
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
@@ -503,7 +503,7 @@
|
|
|
<el-select
|
|
|
v-model="form.fTrademodeid"
|
|
|
placeholder="请选择贸易方式"
|
|
|
- :disabled="notChange || formBrowseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
clearable
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
@@ -553,7 +553,7 @@
|
|
|
<el-input
|
|
|
v-model="form.fDriverName"
|
|
|
style="width: 80%"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
placeholder="司机姓名"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -563,7 +563,7 @@
|
|
|
<el-input
|
|
|
v-model="form.fDriverIdCar"
|
|
|
style="width: 80%"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
placeholder="司机身份证"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -575,7 +575,7 @@
|
|
|
<el-input
|
|
|
v-model="form.fDriverTel"
|
|
|
style="width: 80%"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
placeholder="司机电话"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -584,7 +584,7 @@
|
|
|
<el-form-item label="备注" prop="remark">
|
|
|
<el-input
|
|
|
v-model="form.remark"
|
|
|
- :disabled="notChange || formBrowseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
type="textarea"
|
|
|
placeholder="请输入内容"
|
|
|
/>
|
|
|
@@ -597,7 +597,7 @@
|
|
|
<el-form-item label="仓库联系人" prop="fContacts">
|
|
|
<el-input
|
|
|
v-model="form.fContacts"
|
|
|
- :disabled="notChange || formBrowseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
placeholder="仓库联系人"
|
|
|
/>
|
|
|
@@ -607,7 +607,7 @@
|
|
|
<el-form-item label="仓库电话" prop="ftel">
|
|
|
<el-input
|
|
|
v-model="form.fTel"
|
|
|
- :disabled="notChange || formBrowseStatus"
|
|
|
+ :disabled="browseStatus || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
placeholder="请输仓库入电话"
|
|
|
/>
|
|
|
@@ -735,7 +735,7 @@
|
|
|
header-align="center"
|
|
|
width="140px"
|
|
|
align="center"
|
|
|
- label="*商品属性"
|
|
|
+ label="*货物属性"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-select v-model="scope.row.fBusinessType"
|
|
|
@@ -1420,6 +1420,56 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
+ prop="fMblno"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="130px"
|
|
|
+ label="提单号"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.fMblno"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ placeholder="提单号"
|
|
|
+ show-word-limit
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
+ prop="fProductName"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="140px"
|
|
|
+ label="品名"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.fProductName"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ placeholder="品名"
|
|
|
+ show-word-limit
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
+ prop="fMarks"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="130px"
|
|
|
+ label="品牌"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.fMarks"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ placeholder="品牌"
|
|
|
+ show-word-limit
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
prop="remarks"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
@@ -1654,6 +1704,56 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
+ prop="fMblno"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="130px"
|
|
|
+ label="提单号"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.fMblno"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ placeholder="提单号"
|
|
|
+ show-word-limit
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
+ prop="fProductName"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="140px"
|
|
|
+ label="品名"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.fProductName"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ placeholder="品名"
|
|
|
+ show-word-limit
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
+ prop="fMarks"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="130px"
|
|
|
+ label="品牌"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.fMarks"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ placeholder="品牌"
|
|
|
+ show-word-limit
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
prop="remarks"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
@@ -1688,7 +1788,7 @@
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
|
|
|
<approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"></approval-comments>
|
|
|
- <el-button type="primary" v-if="notChange" @click="addOrUpdateHandle()">查看审批流</el-button>
|
|
|
+ <el-button type="primary" :disabled="approvalStatus" v-if="form.fBillstatus > 3" @click="addOrUpdateHandle()">查看审批流</el-button>
|
|
|
<el-button v-if="approve === true" @click="goApproval">审批</el-button>
|
|
|
<el-button type="danger" :disabled="disappear" v-if="form.fBillstatus == '4' && Operator == Lander" @click="backApproval">撤销审批</el-button>
|
|
|
<el-button type="success" @click="backrRconciliation" v-if="form.fBillstatus == '6'">撤销请核</el-button>
|
|
|
@@ -1999,6 +2099,7 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ approvalStatus:false,
|
|
|
Lander:'',
|
|
|
Operator:'',
|
|
|
cancelButton:true,
|
|
|
@@ -2693,8 +2794,9 @@ export default {
|
|
|
fWarehouselocids: this.dialogWhgenlegList[whgen].fWarehouseLocationids,
|
|
|
fWarehouseLocationids: this.dialogWhgenlegList[whgen].fWarehouseLocationids,
|
|
|
fTransferWarehouselocid: this.dialogWhgenlegList[whgen].fWarehouseLocationid,
|
|
|
- remark: null
|
|
|
+ remark: null,
|
|
|
});
|
|
|
+ console.log(this.fTransferWarehouselocid)
|
|
|
}
|
|
|
this.whgenlegVisible = false;
|
|
|
},
|
|
|
@@ -2706,8 +2808,11 @@ export default {
|
|
|
if(!this.printinglist[warehouseCr].fId) {
|
|
|
this.$message.error("请先保存!");
|
|
|
return false;
|
|
|
+ } else if (!this.printinglist[warehouseCr].fQty || this.printinglist[warehouseCr].fQty === 0) {
|
|
|
+ this.$message.error('请填写调拨件数')
|
|
|
+ return false
|
|
|
} else if (this.printinglist[warehouseCr].fTransferWarehouselocid === this.printinglist[warehouseCr].fWarehouselocid) {
|
|
|
- this.$message.error('调拨库区不德与原库区相同')
|
|
|
+ this.$message.error('调拨库区不得与原库区相同')
|
|
|
return false
|
|
|
} else if (!this.printinglist[warehouseCr].fTruckno || this.printinglist[warehouseCr].fTruckno !== fTruckno) {
|
|
|
this.$message.error('请填写车号或选择车相同车号')
|
|
|
@@ -2788,6 +2893,9 @@ export default {
|
|
|
fExrate: 1,
|
|
|
fTaxrate: this.fTaxrate,
|
|
|
remarks: null,
|
|
|
+ fMblno:this.form.fMblno,
|
|
|
+ fProductName:this.form.fProductName,
|
|
|
+ fMarks:this.form.fMarks
|
|
|
});
|
|
|
},
|
|
|
addpayment() {
|
|
|
@@ -2802,6 +2910,9 @@ export default {
|
|
|
fExrate: 1,
|
|
|
fTaxrate: this.fTaxrate,
|
|
|
remarks: null,
|
|
|
+ fMblno:this.form.fMblno,
|
|
|
+ fProductName:this.form.fProductName,
|
|
|
+ fMarks:this.form.fMarks
|
|
|
});
|
|
|
},
|
|
|
queryUser() {
|
|
|
@@ -2987,11 +3098,11 @@ export default {
|
|
|
this.title = "调拨单";
|
|
|
this.formBrowseStatus = false;
|
|
|
},
|
|
|
- check_s(row,status,res){
|
|
|
- this.disappear = true
|
|
|
- this.notChange = true
|
|
|
- this.browseStatus = status;
|
|
|
+ check_s(row,status){
|
|
|
+ // this.disappear = true
|
|
|
+ // this.notChange = true
|
|
|
this.reset();
|
|
|
+ this.browseStatus = status;
|
|
|
this.detailsHidden = false;
|
|
|
let data = row || this.ids;
|
|
|
getStockTransfer(data.fId).then((response) => {
|
|
|
@@ -3138,12 +3249,14 @@ export default {
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row, status) {
|
|
|
- this.notChange = false
|
|
|
- this.browseStatus = status;
|
|
|
this.reset();
|
|
|
+ console.log(this.formBrowseStatus)
|
|
|
+ this.browseStatus = status;
|
|
|
this.detailsHidden = false;
|
|
|
- let data = row || this.ids;
|
|
|
- getStockTransfer(data.fId).then((response) => {
|
|
|
+ this.formBrowseStatus = false;
|
|
|
+ let fId = row.fId || this.ids;
|
|
|
+ this.dataList = [];
|
|
|
+ getStockTransfer(fId).then((response) => {
|
|
|
if (response.data.warehousebills) {
|
|
|
this.form = response.data.warehousebills;
|
|
|
this.$set(this.form, "fEta", Date.parse(this.form.fEta));
|
|
|
@@ -3152,6 +3265,11 @@ export default {
|
|
|
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.corps) {
|
|
|
this.fMblnoOptions = response.data.corps;
|
|
|
@@ -3170,7 +3288,7 @@ export default {
|
|
|
if (!this.form.fMblno) {
|
|
|
this.$set(this.form, "fMblno", this.dataList[list].fMblno);
|
|
|
}
|
|
|
- if (this.dataList[list].fBillstatus >= 6) {
|
|
|
+ if (this.dataList[list].fBillstatus > 10) {
|
|
|
this.formBrowseStatus = true;
|
|
|
}
|
|
|
this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));
|
|
|
@@ -3230,9 +3348,9 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
// change仓库
|
|
|
- changefWarehouseid() {
|
|
|
+ changefWarehouseid(row) {
|
|
|
for (let corp in this.warehouseOptions) {
|
|
|
- if (this.form.fWarehouseid === this.warehouseOptions[corp].fId) {
|
|
|
+ if (row.fWarehouseid === this.warehouseOptions[corp].fId) {
|
|
|
this.fAddr = this.warehouseOptions[corp].fAddr;
|
|
|
this.$set(this.form, "fTel", this.warehouseOptions[corp].fTel);
|
|
|
this.$set(this.form, "fContacts", this.warehouseOptions[corp].fContacts);
|
|
|
@@ -3596,13 +3714,18 @@ export default {
|
|
|
return false
|
|
|
}
|
|
|
let fMarks = []
|
|
|
- let fGoodsid = []
|
|
|
+ let fProductName = []
|
|
|
+ let fMblno = []
|
|
|
for (let li in this.dataList) {
|
|
|
fMarks.push(this.dataList[li].fMarks)
|
|
|
- fGoodsid.push(this.dataList[li].fGoodsids)
|
|
|
+ fProductName.push(this.dataList[li].fGoodsids)
|
|
|
+ fMblno.push(this.dataList[li].fMblno)
|
|
|
+
|
|
|
}
|
|
|
this.$set(this.form, 'fMarks', Array.from(new Set(fMarks)).join(","))
|
|
|
- this.$set(this.form, 'fProductName', Array.from(new Set(fGoodsid)).join(","))
|
|
|
+ this.$set(this.form, 'fProductName', Array.from(new Set(fProductName)).join(","))
|
|
|
+ this.$set(this.form, 'fMblno', Array.from(new Set(fMblno)).join(","))
|
|
|
+
|
|
|
},
|
|
|
// 保存
|
|
|
saveForm () {
|
wengyuwen