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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
dev
anthonywj 2 years ago
parent 7bf80d84cd c8e074ffc2
commit a2eab2e14b
8 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File

6
src/layout/components/Navbar.vue
Unescape Escape View File

@ -10,10 +10,10 @@
<div class="inv-hos-title"> <div class="inv-hos-title">
<span <span
style="margin-left:8px;color: #2d8cf0;font-size: 14px;">部门:{{ deptName }}</span> style="margin: 10px;color: #2d8cf0;font-size: 14px;">部门&nbsp:&nbsp{{ deptName }}</span>
<span <span
style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">仓库:{{ inv }}</span> style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">仓库&nbsp:&nbsp{{ inv }}</span>
<span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户:{{ this.companyName }}</span> <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp吴XX{{ this.companyName }}</span>
<span <span
style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px">({{ style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px">({{
this.userName this.userName

2
src/views/basic/corpMaintain/corpMaintain.vue
Unescape Escape View File

@ -108,7 +108,7 @@
<el-table-column label="第三方往来单位名称" prop="thirdName" show-overflow-tooltip></el-table-column> <el-table-column label="第三方往来单位名称" prop="thirdName" show-overflow-tooltip></el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="intentSelect(scope.row)" :disabled="!configParms.basicCorp"> <el-button type="text" size="small" @click.native.stop="intentSelect(scope.row)" :disabled="scope.row.thirdId=='' ||scope.row.thirdId!=null || !configParms.basicCorp">
关联 关联
</el-button> </el-button>
<el-button type="text" size="small" @click.native.stop="removeErp(scope.row)" <el-button type="text" size="small" @click.native.stop="removeErp(scope.row)"

2
src/views/inout/InvoiceRegistrationDetermine.vue
Unescape Escape View File

@ -195,11 +195,11 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
:disabled="!scope.row.licenseUrl"
@click.native.stop="showImgViewer(scope.row)" @click.native.stop="showImgViewer(scope.row)"
>预览 >预览
</el-button </el-button
> >
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

3
src/views/purchase/cert/supCertAudit.vue
Unescape Escape View File

@ -503,6 +503,8 @@ export default {
limit: 20, limit: 20,
}; };
this.getList(); this.getList();
this.manufacturerList = [];
this.registrationList = [];
this.productList = []; this.productList = [];
this.salesmanList = []; this.salesmanList = [];
}, },
@ -586,6 +588,7 @@ export default {
limit: 10, limit: 10,
}; };
this.manufacturerList = []; this.manufacturerList = [];
this.registrationList = [];
this.getManufacturerList(); this.getManufacturerList();
}, },
close() { close() {

3
src/views/purchase/cert/supCertSearch.vue
Unescape Escape View File

@ -391,6 +391,8 @@ export default {
this.getList(); this.getList();
this.productList = []; this.productList = [];
this.salesmanList = []; this.salesmanList = [];
this.manufacturerList = [];
this.registrationList = [];
}, },
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;
@ -469,6 +471,7 @@ export default {
limit: 10, limit: 10,
}; };
this.manufacturerList = []; this.manufacturerList = [];
this.registrationList = [];
this.getManufacturerList(); this.getManufacturerList();
}, },
hideSearch1() { hideSearch1() {

33
src/views/supplier/company/basicCompanyProductsImport.vue
Unescape Escape View File

@ -206,12 +206,12 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12" class="el-col"> <!-- <el-col :span="12" class="el-col">-->
<el-form-item label="包装级别" prop="bzcj"> <!-- <el-form-item label="包装级别" prop="bzcj">-->
<el-input style="width: 90%" size="small" splaceholder="请输入包装级别" v-model="editQuery.bzcj" <!-- <el-input style="width: 90%" size="small" splaceholder="请输入包装级别" v-model="editQuery.bzcj"-->
:disabled="true"></el-input> <!-- :disabled="true"></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="包含下级包装数量" prop="bhxjsl"> <el-form-item label="包含下级包装数量" prop="bhxjsl">
@ -219,6 +219,12 @@
v-model="editQuery.bhxjsl"></el-input> v-model="editQuery.bhxjsl"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col">
<el-form-item label="计量单位" prop="measname">
<el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容"
v-model="editQuery.measname"></el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
@ -270,14 +276,12 @@
<el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.cpms"></el-input> <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.cpms"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col"> <!-- <el-col :span="12" class="el-col">-->
<el-form-item label="计量单位" prop="measname"> <!-- <el-form-item label="计量单位" prop="measname">-->
<el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" <!-- <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容"-->
v-model="editQuery.measname"></el-input> <!-- v-model="editQuery.measname"></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="最小包装单元内包含使用单元数量" prop="zxxsbzbhsydysl"> <el-form-item label="最小包装单元内包含使用单元数量" prop="zxxsbzbhsydysl">
<el-input style="width: 90%" :disabled="!checked" size="small" splaceholder="请输入内容" <el-input style="width: 90%" :disabled="!checked" size="small" splaceholder="请输入内容"
@ -285,6 +289,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-dialog> </el-dialog>

2
src/views/supplier/company/basicCompanyproductDetail.vue
Unescape Escape View File

@ -40,7 +40,7 @@
<el-table-column label="产品最小销售标识" prop="nameCode" show-overflow-tooltip></el-table-column> <el-table-column label="产品最小销售标识" prop="nameCode" show-overflow-tooltip></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column> <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
<el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column> <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
<el-table-column label="包装单位" prop="bzcj" show-overflow-tooltip></el-table-column> <el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
<!-- <el-table-column label="操作" width="180px">--> <!-- <el-table-column label="操作" width="180px">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-button type="text" @click.native.stop="singleDiEdit">编辑</el-button>--> <!-- <el-button type="text" @click.native.stop="singleDiEdit">编辑</el-button>-->

1
src/views/supplier/company/basicCompanyproductEdit.vue
Unescape Escape View File

@ -426,3 +426,4 @@ export default {
<style scoped> <style scoped>
</style> </style>

Write Preview
Loading…
Cancel
Save