|
@@ -177,6 +177,14 @@
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
+ icon="el-icon-view"
|
|
|
+ @click="speed_s(scope.row,0)"
|
|
|
+ v-hasPermi="['agreement:agreementTask:remove']"
|
|
|
+ >查看
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
icon="el-icon-edit"
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
v-if="scope.row.fBillstatus <= 3"
|
|
@@ -195,14 +203,6 @@
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
- icon="el-icon-view"
|
|
|
- @click="speed(scope.row,0)"
|
|
|
- v-hasPermi="['agreement:agreementTask:remove']"
|
|
|
- >查看
|
|
|
- </el-button>
|
|
|
- <el-button
|
|
|
- size="mini"
|
|
|
- type="text"
|
|
|
icon="el-icon-delete"
|
|
|
@click="speed(scope.row,1)"
|
|
|
v-if="scope.row.fBillstatus == 4 || scope.row.fBillstatus == 5"
|
|
@@ -296,7 +296,7 @@
|
|
|
</el-form>
|
|
|
<el-button @click="confirmCharge" v-if="form.fBillstatus < 4" type="primary">请 核</el-button>
|
|
|
<el-button @click="revokeCharge" v-if="form.fBillstatus == 6" type="danger">撤销请核</el-button>
|
|
|
- <el-button @click="revocationApproval" :disabled="tablefilter" v-if="form.fBillstatus == 4" type="danger">撤销审批</el-button>
|
|
|
+ <el-button @click="revocationApproval" :disabled="tablefilter" v-if="form.fBillstatus == 4 && Operator == Lander" type="danger">撤销审批</el-button>
|
|
|
<div class="dialogTableTitle flex a-center jlr">
|
|
|
<h2>作业费明细</h2>
|
|
|
<el-button @click="getList_s" :disabled="prohibit">新增</el-button>
|
|
@@ -404,7 +404,7 @@
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button v-if="approvalProhibit" @click="immediateApproval">审批</el-button>
|
|
|
<el-button v-if="form.fBillstatus > 2" @click="viewAudit">查看审批</el-button>
|
|
|
- <el-button type="primary" @click="submitForm" :disabled="determine">确 定</el-button>
|
|
|
+ <el-button type="primary" @click="submitForm" :disabled="determine">保 存</el-button>
|
|
|
<el-button v-if="cancelButton === true" @click="cancel">取 消</el-button>
|
|
|
<el-button v-if="cancelButton === false" @click="homePage">取 消</el-button>
|
|
|
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
|
|
@@ -445,6 +445,8 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ Lander:'',
|
|
|
+ Operator:'',
|
|
|
dataList: '',
|
|
|
// 遮罩层
|
|
|
loading: true,
|
|
@@ -528,6 +530,9 @@ export default {
|
|
|
],
|
|
|
fCorpid: [
|
|
|
{ required: true, message: ' ', trigger: 'blur' }
|
|
|
+ ],
|
|
|
+ tPackages:[
|
|
|
+ { required: true, message: ' ', trigger: 'blur' }
|
|
|
]
|
|
|
}
|
|
|
}
|
|
@@ -549,11 +554,18 @@ export default {
|
|
|
// this.getDicts("data_unitfees").then(response => {
|
|
|
// this.jFeetunitOptions = response.data;
|
|
|
// });
|
|
|
+ this.register()
|
|
|
},
|
|
|
activated(){
|
|
|
this.adoPt()
|
|
|
},
|
|
|
methods: {
|
|
|
+ // 默认录入人
|
|
|
+ register() {
|
|
|
+ queryUserVal().then((response)=>{
|
|
|
+ this.Lander = response.user.userName
|
|
|
+ })
|
|
|
+ },
|
|
|
immediateApproval(){
|
|
|
this.addOrUpdateVisib = true
|
|
|
console.log(this.approval)
|
|
@@ -675,6 +687,58 @@ export default {
|
|
|
console.log(response)
|
|
|
})
|
|
|
},
|
|
|
+ speed_s(row,res) {
|
|
|
+ this.tablefilter = true
|
|
|
+ if (res == 1) {
|
|
|
+ this.determine = true
|
|
|
+ this.prohibit = true
|
|
|
+ this.browseStatus = true
|
|
|
+ this.approvalProhibit = false
|
|
|
+ this.reset()
|
|
|
+ const fId = row.fId || this.ids
|
|
|
+ getAgreement(fId).then(response => {
|
|
|
+ console.log(response.data.corps[0].createBy)
|
|
|
+ this.Operator = response.data.corps[0].createBy
|
|
|
+ console.log(this.deptName)
|
|
|
+ console.log(response)
|
|
|
+ this.deptName = response.data.dept.deptName
|
|
|
+ this.form = response.data.tWarehouseAgreement
|
|
|
+ this.fMblnoOptions = response.data.corps
|
|
|
+ this.agreementitemsList = response.data.tWarehouseAgreementitems
|
|
|
+ for (let item in this.agreementitemsList) {
|
|
|
+ this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
|
|
|
+ }
|
|
|
+ this.fWbuOptions = response.data.feesList
|
|
|
+ console.log(JSON.stringify(this.agreementitemsList))
|
|
|
+
|
|
|
+ this.open = true
|
|
|
+ this.title = '查看作业费'
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ this.prohibit = true
|
|
|
+ this.determine = true
|
|
|
+ this.browseStatus = true
|
|
|
+ this.approvalProhibit = false
|
|
|
+ this.reset()
|
|
|
+ const fId = row.fId || this.ids
|
|
|
+ getAgreement(fId).then(response => {
|
|
|
+ console.log(this.deptName)
|
|
|
+ console.log(response)
|
|
|
+ this.deptName = response.data.dept.deptName
|
|
|
+ this.form = response.data.tWarehouseAgreement
|
|
|
+ this.fMblnoOptions = response.data.corps
|
|
|
+ this.agreementitemsList = response.data.tWarehouseAgreementitems
|
|
|
+ for (let item in this.agreementitemsList) {
|
|
|
+ this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
|
|
|
+ }
|
|
|
+ this.fWbuOptions = response.data.feesList
|
|
|
+ console.log(JSON.stringify(this.agreementitemsList))
|
|
|
+
|
|
|
+ this.open = true
|
|
|
+ this.title = '查看作业费'
|
|
|
+ })
|
|
|
+ }
|
|
|
+ },
|
|
|
speed(row,res){
|
|
|
if(res == 1){
|
|
|
this.tablefilter = false
|
|
@@ -685,6 +749,8 @@ export default {
|
|
|
this.reset()
|
|
|
const fId = row.fId || this.ids
|
|
|
getAgreement(fId).then(response => {
|
|
|
+ console.log(response.data.corps[0].createBy)
|
|
|
+ this.Operator = response.data.corps[0].createBy
|
|
|
console.log(this.deptName)
|
|
|
console.log(response)
|
|
|
this.deptName = response.data.dept.deptName
|
|
@@ -747,21 +813,23 @@ export default {
|
|
|
if(this.agreementitemsList.length !== 0){
|
|
|
this.$refs['form'].validate(valid => {
|
|
|
if (valid) {
|
|
|
- if (this.form.fId != null) {
|
|
|
- updateAgreement(this.form).then(response => {
|
|
|
- let formData = new window.FormData();
|
|
|
- // 附件数据
|
|
|
- // this.form.fBillstatus = 4
|
|
|
- formData.append("agreement",JSON.stringify(this.form))
|
|
|
- formData.append("agreementitems", JSON.stringify(this.agreementitemsList));
|
|
|
- collecTask(formData).then(response => {
|
|
|
- this.msgSuccess('请核成功')
|
|
|
- this.open = false
|
|
|
- this.getList()
|
|
|
- this.agreementitemsList = []
|
|
|
- })
|
|
|
+ let formData = new window.FormData();
|
|
|
+ // 附件数据
|
|
|
+ // this.form.fBillstatus = 4
|
|
|
+ formData.append("agreement",JSON.stringify(this.form))
|
|
|
+ formData.append("agreementitems", JSON.stringify(this.agreementitemsList));
|
|
|
+
|
|
|
+ // updateAgreement(this.form).then(response => {
|
|
|
+ collecTask(formData).then(response => {
|
|
|
+ this.msgSuccess('请核成功')
|
|
|
+ this.open = false
|
|
|
+ this.getList()
|
|
|
+ this.agreementitemsList = []
|
|
|
})
|
|
|
- }
|
|
|
+ // })
|
|
|
+ // if (this.form.fId != null) {
|
|
|
+ //
|
|
|
+ // }
|
|
|
}
|
|
|
})
|
|
|
}else {
|
|
@@ -928,6 +996,7 @@ export default {
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd() {
|
|
|
this.prohibit = false
|
|
|
+ this.browseStatus = false
|
|
|
this.reset()
|
|
|
this.open = true
|
|
|
this.title = '添加作业费'
|
|
@@ -944,10 +1013,15 @@ export default {
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
|
+ this.prohibit = false
|
|
|
+ this.browseStatus = false
|
|
|
+ this.determine = false
|
|
|
this.reset()
|
|
|
this.cancelButton = true
|
|
|
const fId = row.fId || this.ids
|
|
|
getAgreement(fId).then(response => {
|
|
|
+ console.log(response.data.corps[0].createBy)
|
|
|
+ this.Operator = response.data.corps[0].createBy
|
|
|
console.log(this.deptName)
|
|
|
console.log(response)
|
|
|
this.deptName = response.data.dept.deptName
|