UDI
/
udiwms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

领用管理bug修改

Browse Source
purchase
anthonyywj2 3 years ago
parent cac8361e57
commit b5db3754b1
23 changed files with 614 additions and 589 deletions
Show Stats Download Patch File Download Diff File

11
src/router/index.js
Unescape Escape View File

@ -55,6 +55,7 @@ import supProductAudit from "../views/purchase/supProductAudit.vue";
import supProductSearch from "../views/purchase/supProductSearch.vue"; import supProductSearch from "../views/purchase/supProductSearch.vue";
import supCertAudit from "../views/purchase/supCertAudit.vue"; import supCertAudit from "../views/purchase/supCertAudit.vue";
import supCertSearch from "../views/purchase/supCertSearch.vue"; import supCertSearch from "../views/purchase/supCertSearch.vue";
import supCertSet from "../views/purchase/supCertSet.vue";
import supCertificationAdd from "../views/purchase/supCertificationAdd.vue"; import supCertificationAdd from "../views/purchase/supCertificationAdd.vue";
import UdiInfoSmpUpload from "../views/smp/UdiInfoSmpUpload.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", path: "/supplierManage",

1
src/views/basic/BusTypeChange.vue
Unescape Escape View File

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

4
src/views/basic/BusTypeChangeModify.vue
Unescape Escape View File

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

1
src/views/business/stockOrder.vue
Unescape Escape View File

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

1
src/views/business/stockOrderDelete.vue
Unescape Escape View File

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

6
src/views/business/stockOrderDistribution.vue
Unescape Escape View File

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

1
src/views/business/stockOrderEdit.vue
Unescape Escape View File

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

6
src/views/business/stockOrderEditDistribution.vue
Unescape Escape View File

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

1
src/views/business/stockOrderEditor.vue
Unescape Escape View File

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

1
src/views/business/stockOrderInvSearch.vue
Unescape Escape View File

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

1
src/views/business/stockOrderNew.vue
Unescape Escape View File

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

1
src/views/business/stockOrderNewSelectProduct.vue
Unescape Escape View File

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

1
src/views/business/stockOrderSearch.vue
Unescape Escape View File

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

1
src/views/business/stockOrderUpload.vue
Unescape Escape View File

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

1
src/views/business/stockOrderWaitCheck.vue
Unescape Escape View File

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

1
src/views/inout/stockOrderChange.vue
Unescape Escape View File

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

2
src/views/purchase/purPlan.vue
Unescape Escape View File

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

4
src/views/purchase/purPlanDetailDialog.vue
Unescape Escape View File

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

2
src/views/purchase/supCertAudit.vue
Unescape Escape View File

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

2
src/views/purchase/supCertificationAdd.vue
Unescape Escape View File

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

2
src/views/purchase/supCompanyAdd.vue
Unescape Escape View File

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

4
src/views/purchase/supCompanyEditDialog.vue
Unescape Escape View File

@ -154,7 +154,7 @@
style="width: 100%"> style="width: 100%">
<el-table-column type="index" label="序号" width="50"></el-table-column> <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="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="vailDate"></el-table-column>
<el-table-column label="失效期" prop="expireDate"></el-table-column> <el-table-column label="失效期" prop="expireDate"></el-table-column>
<el-table-column label="审核状态" prop="auditStatus" width="120"> <el-table-column label="审核状态" prop="auditStatus" width="120">
@ -311,7 +311,7 @@ export default {
required: true, required: true,
}, },
editType: { editType: {
type: Object, type: Number,
required: true, required: true,
} }
}, },

10
src/views/purchase/supManufacturerEditDialog.vue
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save