领用管理bug修改

purchase
anthonyywj2 3 years ago
parent cac8361e57
commit b5db3754b1

@ -55,6 +55,7 @@ import supProductAudit from "../views/purchase/supProductAudit.vue";
import supProductSearch from "../views/purchase/supProductSearch.vue";
import supCertAudit from "../views/purchase/supCertAudit.vue";
import supCertSearch from "../views/purchase/supCertSearch.vue";
import supCertSet from "../views/purchase/supCertSet.vue";
import supCertificationAdd from "../views/purchase/supCertificationAdd.vue";
import UdiInfoSmpUpload from "../views/smp/UdiInfoSmpUpload.vue";
@ -678,6 +679,16 @@ export const asyncRouterMap = [
}
},
{
path: "certSet",
component: supCertSet,
name: "资质上传设置",
icon: "",
meta: {
authRule: ["firstCamp/certSet"]
}
},
{
path: "/supplierManage",

@ -51,6 +51,7 @@
<el-button
type="text"
size="small"
:disabled="scope.row.systemDefault"
@click.native.stop="handleDeleteClick(scope.row)"
>删除
</el-button

@ -56,11 +56,12 @@
</div>
<el-select
size="small"
:disabled="inputQuery.systemDefault"
v-model="inputQuery.type"
placeholder="设置类型"
>
<el-option label="耗材领用" :value="1"></el-option>
<el-option label="产品申购" :value="2"></el-option>
<!-- <el-option label="产品申购" :value="2"></el-option>-->
<el-option label="采购计划" :value="3"></el-option>
</el-select>
</div>
@ -74,6 +75,7 @@
</div>
<el-select
size="small"
:disabled="inputQuery.systemDefault"
v-model="inputQuery.enable"
placeholder="启用状态"
>

@ -408,6 +408,7 @@ export default {
"1": "web端新增单据",
"2": "第三方系统",
"3": "扫码单据转换",
"4": "采购计划转换",
},
idQuery: {
id: "",

@ -260,6 +260,7 @@ export default {
"1": "web端新增单据",
"2": "第三方系统",
"3": "扫码单据转换",
"4": "采购计划转换",
},
fromTypeMap: {
"1": "UDIMS平台",

@ -213,9 +213,9 @@ export default {
billType: [
{required: true, message: "请选择业务类型", trigger: "blur"}
],
type: [
{required: true, message: "请选择采购类型", trigger: "blur"}
],
// type: [
// {required: true, message: "", trigger: "blur"}
// ],
},
codeArray: [],
total: 0,

@ -531,6 +531,7 @@ export default {
"1": "web端新增单据",
"2": "第三方系统",
"3": "扫码单据转换",
"4": "采购计划转换",
},
statusMap: {
"1": "草稿",

@ -427,9 +427,9 @@ export default {
billType: [
{required: true, message: "请选择业务类型", trigger: "blur"}
],
type: [
{required: true, message: "请选择采购类型", trigger: "blur"}
],
// type: [
// {required: true, message: "", trigger: "blur"}
// ],
},
codeArray: [],
fromStorageOptions: [],

@ -549,6 +549,7 @@ export default {
"1": "web端新增单据",
"2": "第三方系统",
"3": "扫码单据转换",
"4": "采购计划转换",
},
statusMap: {
"1": "草稿",

@ -394,6 +394,7 @@ export default {
"1": "web端新增单据",
"2": "第三方系统",
"3": "扫码单据转换",
"4": "采购计划转换",
},
isSp: store.getters.customerId,
detailFormVisible: false,

@ -507,6 +507,7 @@ export default {
"1": "web端新增单据",
"2": "第三方系统",
"3": "扫码单据转换",
"4": "采购计划转换",
},
typeMap: {
1: "预入库",

@ -361,6 +361,7 @@ export default {
let ids = [];
let data = {
relId: this.multipleSelection.rlId,
supId: this.multipleSelection.customerId
}
ids.push(data);
this.loading = true;

@ -547,6 +547,7 @@ export default {
"1": "web端新增单据",
"2": "第三方系统",
"3": "扫码单据转换",
"4": "采购计划转换",
},
isSp: store.getters.customerId,
detailFormVisible: false,

File diff suppressed because it is too large Load Diff

@ -387,6 +387,7 @@ export default {
"1": "web端新增单据",
"2": "第三方系统",
"3": "扫码单据转换",
"4": "采购计划转换",
},
idQuery: {
id: "",

@ -258,6 +258,7 @@ export default {
"1": "web端新增单据",
"2": "第三方系统",
"3": "扫码单据转换",
"4": "采购计划转换",
},
fromTypeMap: {
"1": "UDIMS平台",

@ -264,7 +264,7 @@ export default {
this.loading = true;
let tQuery = {
editStatus: 2,
purApplyEntity: row,
purPlanEntity: row,
}
inserThrOrderWeb(tQuery)
.then(response => {

@ -207,7 +207,7 @@
<script>
import draggable from "vuedraggable";
import stockOrderNewSelectProduct from "../business/stockOrderNewSelectProduct";
import {inserThrOrderWeb, delApplyDetail, listApplyDetail} from "@/api/purchase/purPlan";
import {auditOrder, delApplyDetail, listApplyDetail} from "@/api/purchase/purPlan";
import {filterAllByUser} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
@ -309,7 +309,7 @@ export default {
purPlanEntity: this.formData,
subErpOrders: this.codeArray,
}
inserThrOrderWeb(tQuery)
auditOrder(tQuery)
.then(response => {
this.loading = false;
if (response.code === 20000) {

@ -436,7 +436,7 @@ export default {
1: "success",
2: "danger",
6: "warning",
4: "warning",
3: "warning",
};
return statusMap[status];
},

@ -318,7 +318,7 @@ export default {
0: "warning",
1: "success",
2: "danger",
4: "warning",
3: "warning",
6: "warning",
};
return statusMap[status];

@ -92,7 +92,7 @@
<el-button
type="text"
size="small"
v-if="scope.row.auditStatus === '2'"
v-if="scope.row.auditStatus === 2"
@click.native.stop="rejectInfo(scope.row)"
>说明
</el-button>

@ -154,7 +154,7 @@
style="width: 100%">
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="证书名称" prop="name"></el-table-column>
<el-table-column label="证书编号" prop="name"></el-table-column>
<el-table-column label="证书编号" prop="code"></el-table-column>
<el-table-column label="有效期" prop="vailDate"></el-table-column>
<el-table-column label="失效期" prop="expireDate"></el-table-column>
<el-table-column label="审核状态" prop="auditStatus" width="120">
@ -311,7 +311,7 @@ export default {
required: true,
},
editType: {
type: Object,
type: Number,
required: true,
}
},

@ -32,9 +32,9 @@
type="primary"
size="mini"
icon="search"
v-if="inputQuery.auditStatus == 4|| inputQuery.auditStatus == 1|| inputQuery.auditStatus == 2"
@click="onModifySubmit(4)"
>提交变更
v-if="inputQuery.auditStatus == 3|| inputQuery.auditStatus == 1|| inputQuery.auditStatus == 2"
@click="onModifySubmit(3)"
>提交审核
</el-button
>
</div>
@ -469,14 +469,14 @@ export default {
2: "编辑生产企业资质证书",
},
manufacturerId: null,
customerId:null,
customerId: null,
selectCertVisible: false,
certType: 2,
};
},
created() {
console.log(this.fromType+"----------------------");
console.log(this.fromType + "----------------------");
if (this.editType == 0) {
this.inputQuery.manufacturerId = getUUID("")

Loading…
Cancel
Save