|
@@ -354,6 +354,7 @@
|
|
|
:visible.sync="open"
|
|
|
:close-on-click-modal="false"
|
|
|
@close='addCloseDialog'
|
|
|
+ :show-close="closeButton"
|
|
|
width="80%"
|
|
|
append-to-body
|
|
|
>
|
|
@@ -1446,9 +1447,9 @@
|
|
|
<!-- <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseDrList)"
|
|
|
>删除
|
|
|
</el-button> -->
|
|
|
- <el-button type="primary" @click="submitForm(2)">保 存</el-button>
|
|
|
+ <el-button type="primary" :disabled="browseStatus" @click="submitForm(2)">保 存</el-button>
|
|
|
<!-- <el-button @click.prevent="addAgreement()" type="warning">仓储费协议</el-button> -->
|
|
|
- <el-button @click.prevent="addAgreement()" type="danger"
|
|
|
+ <el-button @click.prevent="addAgreement()" :disabled="browseStatus" type="danger"
|
|
|
>作业费协议</el-button
|
|
|
>
|
|
|
</div>
|
|
@@ -1693,9 +1694,9 @@
|
|
|
<!-- <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseCrList)"
|
|
|
>删除
|
|
|
</el-button> -->
|
|
|
- <el-button type="primary" @click="submitForm(2)">保 存</el-button>
|
|
|
+ <el-button type="primary" @click="submitForm(2)" :disabled="browseStatus">保 存</el-button>
|
|
|
<!-- <el-button type="warning">仓储费协议</el-button> -->
|
|
|
- <el-button type="danger" @click.prevent="addAgreements()"
|
|
|
+ <el-button type="danger" @click.prevent="addAgreements()" :disabled="browseStatus"
|
|
|
>作业费协议</el-button
|
|
|
>
|
|
|
</div>
|
|
@@ -1928,14 +1929,12 @@
|
|
|
type="primary"
|
|
|
:disabled="approvalStatus"
|
|
|
@click="addOrUpdateHandle(form)"
|
|
|
- >查看审批</el-button
|
|
|
- >
|
|
|
+ >查看审批</el-button>
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
- :disabled="approvalStatus"
|
|
|
+ v-if="approVal === true"
|
|
|
@click="addOrUpdateHand(form)"
|
|
|
- >审批弹窗</el-button
|
|
|
- >
|
|
|
+ >审批</el-button>
|
|
|
<!-- 弹窗, 新增 / 修改 -->
|
|
|
<add-or-update
|
|
|
v-if="addOrUpdateVisible"
|
|
@@ -1967,9 +1966,10 @@
|
|
|
:disabled="browseStatus"
|
|
|
style="background-color: #008000; color: #fff"
|
|
|
@click="submitForm(6)"
|
|
|
- >请核</el-button
|
|
|
- >
|
|
|
- <el-button @click="cancel">取 消</el-button>
|
|
|
+ >请核</el-button>
|
|
|
+ <el-button type="danger" v-if="form.fBillstatus == '6'" @click="revoke">撤销请核</el-button>
|
|
|
+ <el-button @click="cancelTwo" v-if="approVal === true">取 消</el-button>
|
|
|
+ <el-button @click="cancel" v-else>取 消</el-button>
|
|
|
</div>
|
|
|
<!-- 入库新行计划重量导入 -->
|
|
|
<el-dialog
|
|
@@ -2540,6 +2540,7 @@ import {
|
|
|
addWarehouse,
|
|
|
updateWarehousebills,
|
|
|
exportWarehousebills,
|
|
|
+ revoke
|
|
|
} from "@/api/warehouseBusiness/warehouseInStock";
|
|
|
import { listAgreement, operationAgreement } from "@/api/agreement/agreement";
|
|
|
import { listCorps } from "@/api/basicdata/corps";
|
|
@@ -2556,6 +2557,8 @@ import { listUser, queryUserVal } from "@/api/system/user";
|
|
|
import UploadFile from "@/components/Uploadfile";
|
|
|
import AddOrUpdate from "@/views/viewApproval";
|
|
|
import ApprovalComments from "@/views/startApproval";
|
|
|
+import { getCharge } from '@/api/finance/charge'
|
|
|
+import Global from '@/layout/components/global'
|
|
|
export default {
|
|
|
name: "Warehousebills",
|
|
|
components: {
|
|
@@ -2605,6 +2608,7 @@ export default {
|
|
|
nickName: null,
|
|
|
deptId: null,
|
|
|
},
|
|
|
+ closeButton:true,
|
|
|
//表单校验
|
|
|
checkout: {
|
|
|
fGoodsid:[
|
|
@@ -2787,6 +2791,7 @@ export default {
|
|
|
fPlannetweight: null,
|
|
|
fPlangrossweight: null,
|
|
|
},
|
|
|
+ approVal:false,
|
|
|
// 表单参数
|
|
|
form: {
|
|
|
fItemsStatus: null,
|
|
@@ -2862,12 +2867,136 @@ export default {
|
|
|
this.fBillstatusOptions = response.data;
|
|
|
});
|
|
|
},
|
|
|
-
|
|
|
+ activated() {
|
|
|
+ this.adoPt()
|
|
|
+ },
|
|
|
methods: {
|
|
|
+ adoPt(){
|
|
|
+ this.approval = this.$route.query.data
|
|
|
+ if (this.approval){
|
|
|
+ this.closeButton = false
|
|
|
+ this.approval = JSON.parse(this.approval)
|
|
|
+ this.approVal = true
|
|
|
+ this.browseStatus = status;
|
|
|
+ this.reset();
|
|
|
+ this.detailsHidden = false;
|
|
|
+ this.formBrowseStatus = false;
|
|
|
+ this.dataList = [];
|
|
|
+ getWarehousebills(this.approval.billId).then((response) => {
|
|
|
+ if (response.data.warehousebills) {
|
|
|
+ this.form = response.data.warehousebills;
|
|
|
+ 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;
|
|
|
+ this.KHblnoOptions = response.data.corps;
|
|
|
+ this.fSbuOptions = response.data.corps;
|
|
|
+ }
|
|
|
+ if (response.data.feesList) {
|
|
|
+ this.fWbuOptions = response.data.feesList;
|
|
|
+ }
|
|
|
+ if (response.data.warehouse) {
|
|
|
+ this.warehouseOptions = response.data.warehouse;
|
|
|
+ }
|
|
|
+ if (response.data.warehouseBillsItem) {
|
|
|
+ this.dataList = response.data.warehouseBillsItem;
|
|
|
+ }
|
|
|
+ if (response.data.enclosures) {
|
|
|
+ this.relevantAttachments = response.data.enclosures;
|
|
|
+ }
|
|
|
+ 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)
|
|
|
+ );
|
|
|
+ }
|
|
|
+ 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)
|
|
|
+ );
|
|
|
+ }
|
|
|
+ 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 = "修改仓入库";
|
|
|
+ });
|
|
|
+ }
|
|
|
+ },
|
|
|
//关闭弹框的事件
|
|
|
addCloseDialog(){
|
|
|
this.getList()
|
|
|
},
|
|
|
+ cancelTwo(){
|
|
|
+ this.open = false
|
|
|
+ let view = {
|
|
|
+ fullPath: "/business/inStock",
|
|
|
+ hash: "",
|
|
|
+ matched: Array(2),
|
|
|
+ meta: Object,
|
|
|
+ name: "InStock",
|
|
|
+ params: Object,
|
|
|
+ path: "/business/inStock",
|
|
|
+ query: Object,
|
|
|
+ title: "入库"
|
|
|
+ }
|
|
|
+ this.$router.push({ path: '/index'})
|
|
|
+ this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
|
|
|
+ if (this.isActive(view)) {
|
|
|
+ this.toLastView(visitedViews, view)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ Global.$emit("removeCache", "closeSelectedTag", view);
|
|
|
+ },
|
|
|
// 上传成功返回数据
|
|
|
showFile(row) {
|
|
|
for (let list in this.relevantAttachments) {
|
|
@@ -2875,6 +3004,14 @@ export default {
|
|
|
this.$set(this.relevantAttachments[list], "fName", row.fileName);
|
|
|
}
|
|
|
},
|
|
|
+ revoke(){
|
|
|
+ revoke(this.form.fId).then(data=>{
|
|
|
+ console.log(data)
|
|
|
+ if (data.code == 200){
|
|
|
+ this.open = false;
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
printSomething() {
|
|
|
// 此处的style即为打印时的样式
|
|
|
const style =
|
|
@@ -4326,6 +4463,7 @@ export default {
|
|
|
},
|
|
|
returnData() {
|
|
|
this.addOrUpdateVisib = false;
|
|
|
+ this.cancelTwo()
|
|
|
},
|
|
|
addOrUpdateHandle(form) {
|
|
|
this.addOrUpdateVisible = true;
|
|
@@ -4337,10 +4475,8 @@ export default {
|
|
|
},
|
|
|
addOrUpdateHand(form) {
|
|
|
this.addOrUpdateVisib = true;
|
|
|
- let id = form.fId;
|
|
|
- let actId = "110";
|
|
|
this.$nextTick(() => {
|
|
|
- this.$refs.ApprovalComments.init(id, actId);
|
|
|
+ this.$refs.ApprovalComments.init(form.fId, 110);
|
|
|
});
|
|
|
},
|
|
|
/* 远程模糊查询用户 */
|