|
@@ -344,7 +344,7 @@
|
|
|
v-model="form.fCorpid"
|
|
|
filterable
|
|
|
remote
|
|
|
- :disabled="notChange"
|
|
|
+ :disabled="notChange || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
:remote-method="corpsRemoteMethod"
|
|
|
placeholder="请选择货权方"
|
|
@@ -364,7 +364,7 @@
|
|
|
v-model="form.fTocorpid"
|
|
|
filterable
|
|
|
remote
|
|
|
- :disabled="notChange"
|
|
|
+ :disabled="notChange || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
@change="changefCorpid(form)"
|
|
|
:remote-method="corpsRemoteMethod"
|
|
@@ -397,7 +397,7 @@
|
|
|
v-model="form.fBsdate"
|
|
|
style="width: 80%"
|
|
|
type="date"
|
|
|
- :disabled="notChange"
|
|
|
+ :disabled="notChange || formBrowseStatus"
|
|
|
value-format="timestamp"
|
|
|
placeholder="货转日期"
|
|
|
>
|
|
@@ -410,7 +410,7 @@
|
|
|
v-model="form.fChargedate"
|
|
|
style="width: 80%"
|
|
|
type="date"
|
|
|
- :disabled="notChange"
|
|
|
+ :disabled="notChange || formBrowseStatus"
|
|
|
value-format="timestamp"
|
|
|
placeholder="仓储计费日期">
|
|
|
</el-date-picker>
|
|
@@ -421,7 +421,7 @@
|
|
|
<el-select
|
|
|
v-model="form.fWarehouseid"
|
|
|
filterable
|
|
|
- :disabled="notChange"
|
|
|
+ :disabled="notChange || formBrowseStatus"
|
|
|
remote
|
|
|
style="width: 80%"
|
|
|
:remote-method="warehouseRemoteMethod"
|
|
@@ -443,7 +443,7 @@
|
|
|
v-model="form.fStltypeid"
|
|
|
placeholder="请选择结算方式"
|
|
|
clearable
|
|
|
- :disabled="notChange"
|
|
|
+ :disabled="notChange || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
@@ -461,7 +461,7 @@
|
|
|
v-model="form.fFeetunit"
|
|
|
placeholder="请选择计费单位"
|
|
|
clearable
|
|
|
- :disabled="notChange"
|
|
|
+ :disabled="notChange || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
@@ -479,7 +479,7 @@
|
|
|
v-model="form.fTrademodeid"
|
|
|
placeholder="请选择贸易方式"
|
|
|
clearable
|
|
|
- :disabled="notChange"
|
|
|
+ :disabled="notChange || formBrowseStatus"
|
|
|
style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
@@ -497,7 +497,7 @@
|
|
|
<el-form-item label="提单号" prop="fMblno">
|
|
|
<el-input
|
|
|
v-model="form.fMblno"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="notChange"
|
|
|
style="width: 80%"
|
|
|
placeholder="手工输入"
|
|
|
/>
|
|
@@ -508,7 +508,7 @@
|
|
|
<el-input
|
|
|
v-model="form.fOriginalbillno"
|
|
|
style="width: 80%"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="notChange"
|
|
|
placeholder="原始入库单号"
|
|
|
/>
|
|
|
</el-form-item>
|
|
@@ -521,7 +521,7 @@
|
|
|
value-format="yyyy-MM-dd"
|
|
|
range-separator="至"
|
|
|
style="width: 80%"
|
|
|
- :disabled="browseStatus"
|
|
|
+ :disabled="notChange"
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
|
>
|
|
@@ -1389,7 +1389,7 @@
|
|
|
<el-button type="success" @click="backrRconciliation" v-if="form.fBillstatus == '6'">撤销请核</el-button>
|
|
|
<el-button type="primary" v-if="notChange" @click="addOrUpdateHandle()">查看审批流</el-button>
|
|
|
<el-button type="primary" :disabled="notChange" @click="submitForm">提交审核</el-button>
|
|
|
- <el-button type="danger" :disabled="disappear" v-if="form.fBillstatus == '4'" @click="backApproval">撤销审批</el-button>
|
|
|
+ <el-button type="danger" :disabled="disappear" v-if="form.fBillstatus == '4' && Operator == Lander" @click="backApproval">撤销审批</el-button>
|
|
|
<el-button v-if="cancelButton === true" @click="cancel">取 消</el-button>
|
|
|
<el-button v-if="cancelButton === false" @click="homePage">取消</el-button>
|
|
|
</div>
|
|
@@ -1509,6 +1509,8 @@
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ Lander:'',
|
|
|
+ Operator:'',
|
|
|
colseButton:true,
|
|
|
cancelButton:true,
|
|
|
disappear:false,
|
|
@@ -1736,9 +1738,9 @@
|
|
|
backFee(this.form.fId).then(response=>{
|
|
|
this.msgSuccess("撤回成功")
|
|
|
this.getList()
|
|
|
+ this.open = false
|
|
|
+ this.getList()
|
|
|
})
|
|
|
- this.open = false
|
|
|
- this.getList()
|
|
|
},
|
|
|
// 默认录入人
|
|
|
register() {
|
|
@@ -2160,11 +2162,14 @@
|
|
|
this.title = '货权转移'
|
|
|
},
|
|
|
// 查看按钮
|
|
|
- check(row, res) {
|
|
|
+ check(row) {
|
|
|
+ this.disappear = false
|
|
|
this.notChange = true
|
|
|
this.browseStatus = true
|
|
|
const fId = row.fId || this.ids
|
|
|
getGoodsTransfer(fId).then((response) => {
|
|
|
+ console.log(response.data.corps[0].createBy)
|
|
|
+ this.Operator = response.data.corps[0].createBy
|
|
|
this.form = response.data.warehousebills
|
|
|
this.$set(this.form, 'fStltypeid', this.form.fStltypeid + '')
|
|
|
this.$set(this.form, 'fFeetunit', Number(this.form.fFeetunit))
|
|
@@ -2195,84 +2200,8 @@
|
|
|
this.$set(this.form, 'fBsdate', Date.parse(this.form.fBsdate))
|
|
|
this.open = true
|
|
|
this.title = '修改货存转移'
|
|
|
- // if (res == 1) {
|
|
|
- // this.notChange = true
|
|
|
- // if (this.Operator == this.Lander) {
|
|
|
- // this.disappear = false
|
|
|
- // this.reset()
|
|
|
- // const fId = row.fId || this.ids
|
|
|
- // getGoodsTransfer(fId).then((response) => {
|
|
|
- // this.form = response.data.warehousebills
|
|
|
- // this.$set(this.form, 'fStltypeid', this.form.fStltypeid + '')
|
|
|
- // this.$set(this.form, 'fFeetunit', Number(this.form.fFeetunit))
|
|
|
- // this.$set(this.form, 'fChargedate', Date.parse(this.form.fChargedate))
|
|
|
- // this.$set(this.form, 'fTrademodeid', this.form.fTrademodeid + '')
|
|
|
- // this.fMblnoOptions = response.data.corps
|
|
|
- // this.KHblnoOptions = response.data.corps
|
|
|
- // this.fWbuOptions = response.data.feesList
|
|
|
- // this.warehouseOptions = response.data.warehouse
|
|
|
- // this.dataList = response.data.warehouseBillsItem
|
|
|
- // for (let list in this.dataList) {
|
|
|
- // if (this.dataList[list].fBillstatus && this.dataList[list].fBillstatus === 6) {
|
|
|
- // this.formBrowseStatus = true
|
|
|
- // }
|
|
|
- // this.$set(this.dataList[list], 'fBsdate', Date.parse(this.dataList[list].fBsdate))
|
|
|
- // }
|
|
|
- // this.goodsOptions = response.data.goodsList
|
|
|
- // if (response.data.warehousebillsfeesDr) {
|
|
|
- // this.warehouseDrList = response.data.warehousebillsfeesDr
|
|
|
- // }
|
|
|
- // if (response.data.warehousebillsfeesCr) {
|
|
|
- // this.warehouseCrList = response.data.warehousebillsfeesCr
|
|
|
- // }
|
|
|
- // if (response.data.enclosures) {
|
|
|
- // this.relevantAttachments = response.data.enclosures;
|
|
|
- // }
|
|
|
- // this.userOptions = response.data.sysUser
|
|
|
- // this.$set(this.form, 'fBsdate', Date.parse(this.form.fBsdate))
|
|
|
- // this.open = true
|
|
|
- // this.title = '修改货存转移'
|
|
|
- // })
|
|
|
- // } else {
|
|
|
- // // this.notChange = true
|
|
|
- // }
|
|
|
- // } else {
|
|
|
- // // this.notChange = true
|
|
|
- // this.reset()
|
|
|
- // const fId = row.fId || this.ids
|
|
|
- // getGoodsTransfer(fId).then((response) => {
|
|
|
- // this.form = response.data.warehousebills
|
|
|
- // this.$set(this.form, 'fStltypeid', this.form.fStltypeid + '')
|
|
|
- // this.$set(this.form, 'fFeetunit', Number(this.form.fFeetunit))
|
|
|
- // this.$set(this.form, 'fChargedate', Date.parse(this.form.fChargedate))
|
|
|
- // this.$set(this.form, 'fTrademodeid', this.form.fTrademodeid + '')
|
|
|
- // this.fMblnoOptions = response.data.corps
|
|
|
- // this.KHblnoOptions = response.data.corps
|
|
|
- // this.fWbuOptions = response.data.feesList
|
|
|
- // this.warehouseOptions = response.data.warehouse
|
|
|
- // this.dataList = response.data.warehouseBillsItem
|
|
|
- // for (let list in this.dataList) {
|
|
|
- // if (this.dataList[list].fBillstatus && this.dataList[list].fBillstatus === 6) {
|
|
|
- // this.formBrowseStatus = true
|
|
|
- // }
|
|
|
- // this.$set(this.dataList[list], 'fBsdate', Date.parse(this.dataList[list].fBsdate))
|
|
|
- // }
|
|
|
- // this.goodsOptions = response.data.goodsList
|
|
|
- // if (response.data.warehousebillsfeesDr) {
|
|
|
- // this.warehouseDrList = response.data.warehousebillsfeesDr
|
|
|
- // }
|
|
|
- // if (response.data.warehousebillsfeesCr) {
|
|
|
- // this.warehouseCrList = response.data.warehousebillsfeesCr
|
|
|
- // }
|
|
|
- // if (response.data.enclosures) {
|
|
|
- // this.relevantAttachments = response.data.enclosures;
|
|
|
- // }
|
|
|
- // this.userOptions = response.data.sysUser
|
|
|
- // this.$set(this.form, 'fBsdate', Date.parse(this.form.fBsdate))
|
|
|
- // this.open = true
|
|
|
- // this.title = '修改货存转移'
|
|
|
- // })
|
|
|
- // }
|
|
|
+ console.log(this.Operator)
|
|
|
+ console.log(this.Lander)
|
|
|
})
|
|
|
},
|
|
|
|