wilson
/
krd-srm-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix(srmPart): 更新产品基本信息表单字段为只读状态 

- 将产品编码、NPC货号、产品分类、计量单位字段设置为disabled状态
- 将产品名称、产品规格字段设置为disabled状态
- 将采购员、sourcing专员、属性模板字段设置为disabled状态
- 备注字段也设置为disabled状态
- 更新状态字段显示文本，将启用/停用改为在用/禁用
- 修正供应商模块中的货币汇率字段类型从数字输入改为普通输入
- 隐藏供应商共享模块中的Share标签页
- 更新产品审批列表中的状态列标签为是否在用
master
qiankanghui 4 weeks ago
parent
348c1cd7d1
commit
6c09342ae2
6 changed files with 212 additions and 205 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      src/views/modules/srmPart/com_part_BasicInfo.vue
  2. 94
      src/views/modules/srmPart/com_part_Suppliers.vue
  3. 11
      src/views/modules/srmPart/partApprovalList.vue
  4. 18
      src/views/modules/srmPart/partInfoList.vue
  5. 12
      src/views/modules/srmSupplier/supplierShare.vue
  6. 6
      src/views/modules/supplier/purHeaderList.vue

30
src/views/modules/srmPart/com_part_BasicInfo.vue
View File

@ -16,22 +16,22 @@
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="产品编码" prop="partNo">
<el-input v-model="currentpart.partNo" ></el-input>
<el-input v-model="currentpart.partNo" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="NPC货号" prop="npc">
<el-input v-model="currentpart.npc"></el-input>
<el-input v-model="currentpart.npc" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品分类" prop="category">
<el-input v-model="currentpart.category"></el-input>
<el-input v-model="currentpart.category" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="计量单位" prop="unit">
<el-input v-model="currentpart.unit"></el-input>
<el-input v-model="currentpart.unit" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
@ -39,12 +39,12 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="产品名称" prop="partDesc">
<el-input v-model="currentpart.partDesc"></el-input>
<el-input v-model="currentpart.partDesc" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产品规格" prop="partSpec">
<el-input v-model="currentpart.partSpec"></el-input>
<el-input v-model="currentpart.partSpec" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
@ -54,25 +54,22 @@
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="采购员" prop="buyerName">
<el-input v-model="currentpart.buyerName"></el-input>
<el-input v-model="currentpart.buyerName" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="sourcing专员" prop="sourcingName">
<el-input v-model="currentpart.sourcingName"></el-input>
<el-input v-model="currentpart.sourcingName" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="属性模板" prop="codeNo">
<el-input v-model="currentpart.codeNo"></el-input>
<el-input v-model="currentpart.codeNo" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="状态">
<el-select v-model="currentpart.status" placeholder="请选择" style="width: 100%">
<el-option label="启用" value="N"></el-option>
<el-option label="停用" value="Y"></el-option>
</el-select>
<el-form-item label="是否在用">
<el-input v-model="statusText" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
@ -84,6 +81,7 @@
<el-form-item label="备注">
<el-input
v-model="currentpart.remark"
disabled
type="textarea"
:rows="2"
resize="none"
@ -131,8 +129,8 @@ export default {
computed: {
// 状态显示转换
statusText() {
return this.currentpart.status === 'N' ? '启用' :
this.currentpart.status === 'Y' ? '停用' : ''
return this.currentpart.status === 'Y' ? '在用' :
this.currentpart.status === 'N' ? '禁用' : ''
}
},
methods: {

94
src/views/modules/srmPart/com_part_Suppliers.vue
View File

@ -46,7 +46,7 @@
</template>
</el-table-column>
</el-table>
<el-dialog title="part Suppliers" :close-on-click-modal="false" v-drag :visible.sync="contractModelFlag" width="600px">
<el-dialog title="Part Suppliers" :close-on-click-modal="false" v-drag :visible.sync="contractModelFlag" width="600px">
<div class="dialog-content">
<el-form label-position="top" style="margin-top: -5px;">
<el-row :gutter="20">
@ -80,16 +80,16 @@
<el-input v-model="partSuppliersData.deliveryTime" ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="'二级供应商编码'" >
<el-input v-model="partSuppliersData.secondarySupplierCode" ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="'二级供应商名称'" >
<el-input v-model="partSuppliersData.secondarySupplierName" ></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item :label="'二级供应商编码'" >-->
<!-- <el-input v-model="partSuppliersData.secondarySupplierCode" ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item :label="'二级供应商名称'" >-->
<!-- <el-input v-model="partSuppliersData.secondarySupplierName" ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="24">
<el-form-item :label="'备注'">
<el-input type="textarea" :rows="3" v-model="partSuppliersData.remark" style=""></el-input>
@ -242,42 +242,42 @@ export default {
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 811001,
serialNumber: '811001Table5SecondarySupplierCode',
tableId: '811001Table5',
tableName: '供应商合同',
columnProp: 'secondarySupplierCode',
headerAlign: 'center',
align: 'left',
columnLabel: '二级供应商编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150
},
{
userId: this.$store.state.user.name,
functionId: 811001,
serialNumber: '811001Table5SecondarySupplierName',
tableId: '811001Table5',
tableName: '供应商合同',
columnProp: 'secondarySupplierName',
headerAlign: 'center',
align: 'left',
columnLabel: '二级供应商名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150
},
// {
// userId: this.$store.state.user.name,
// functionId: 811001,
// serialNumber: '811001Table5SecondarySupplierCode',
// tableId: '811001Table5',
// tableName: '供应商合同',
// columnProp: 'secondarySupplierCode',
// headerAlign: 'center',
// align: 'left',
// columnLabel: '二级供应商编码',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 150
// },
// {
// userId: this.$store.state.user.name,
// functionId: 811001,
// serialNumber: '811001Table5SecondarySupplierName',
// tableId: '811001Table5',
// tableName: '供应商合同',
// columnProp: 'secondarySupplierName',
// headerAlign: 'center',
// align: 'left',
// columnLabel: '二级供应商名称',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 150
// },
{
userId: this.$store.state.user.name,
functionId: 811001,

11
src/views/modules/srmPart/partApprovalList.vue
View File

@ -74,7 +74,11 @@
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
<span v-if="!item.columnHidden">{{
item.columnProp === 'status'
? (scope.row.status === 'Y' ? '在用' : scope.row.status === 'N' ? '禁用' : scope.row.status)
: scope.row[item.columnProp]
}}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 100px"/></span>
</template>
@ -157,7 +161,7 @@
</el-col>
</el-row> -->
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="6">
<el-form-item label="是否特殊放行">
<el-select v-model="approveData.specialRelease" style="width: 100%">
<el-option label="否" value="N"></el-option>
@ -397,7 +401,7 @@ export default {
columnProp: 'status',
headerAlign: 'center',
align: 'center',
columnLabel: '状态',
columnLabel: '是否在用',
columnWidth: '80',
columnHidden: false,
columnImage: false,
@ -682,6 +686,7 @@ export default {
flowCode: row.flowCode,
flowVersion: row.flowVersion,
nodeCode: row.nodeCode,
specialRelease: 'N',
comment: ''
}

18
src/views/modules/srmPart/partInfoList.vue
View File

@ -42,7 +42,11 @@
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
<span v-if="!item.columnHidden">{{
item.columnProp === 'status'
? (scope.row.status === 'Y' ? '在用' : scope.row.status === 'N' ? '禁用' : scope.row.status)
: scope.row[item.columnProp]
}}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 100px"/></span>
</template>
@ -162,10 +166,10 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="状态">
<el-form-item label="是否在用">
<el-select v-model="currentpart.status" placeholder="请选择" >
<el-option label="启用" value="N"></el-option>
<el-option label="停用" value="Y"></el-option>
<el-option label="在用" value="Y"></el-option>
<el-option label="禁用" value="N"></el-option>
</el-select>
</el-form-item>
</el-col>
@ -466,7 +470,7 @@ export default {
columnProp: 'status',
headerAlign: 'center',
align: 'center',
columnLabel: '状态',
columnLabel: '是否在用',
columnWidth: '80',
columnHidden: false,
columnImage: false,
@ -579,7 +583,7 @@ export default {
sourcingName: '',
category: '',
unit: '',
status: 'N',
status: 'Y',
codeNo: '',
createBy: '',
remark: '',
@ -837,7 +841,7 @@ export default {
sourcingName: '',
category: '',
unit: '',
status: 'N',
status: 'Y',
codeNo: '',
createBy: this.$store.state.user.name,
remark: '',

12
src/views/modules/srmSupplier/supplierShare.vue
View File

@ -83,9 +83,9 @@
<el-tab-pane label="Approved Vendor List" name="vendorList" style="">
<vendorList ref="vendorList"></vendorList>
</el-tab-pane>
<el-tab-pane label="Share" name="share" style="">
<!-- <el-tab-pane label="Share" name="share" style="">
<share ref="share"></share>
</el-tab-pane>
</el-tab-pane> -->
</el-tabs>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
@ -127,7 +127,7 @@ export default {
tagNo:'',
mainDataList:[],
dataListLoading: false,
activeName: 'share',
activeName: 'vendorList',
columnArray1: [
{
userId: this.$store.state.user.name,
@ -244,9 +244,9 @@ export default {
if(this.currentRow===''||this.currentRow===null){
this.currentRow={site:'',supplierNo:''}
}
if(this.activeName==='share'){
this.refreshShareTable();
}
// if(this.activeName==='share'){
// this.refreshShareTable();
// }
if(this.activeName==='vendorList'){
this.refreshVendorListTable();
}

6
src/views/modules/supplier/purHeaderList.vue
View File

@ -122,7 +122,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="供应商名称" :required="true">
<el-input v-model="form.supplierName"/>
<el-input v-model="form.supplierName" readonly/>
</el-form-item>
</el-col>
</el-row>
@ -141,7 +141,7 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="货币汇率">
<el-input-number v-model="form.currencyRate" :precision="4" :step="0.1" style="width:100%" />
<el-input v-model="form.currencyRate" style="width:100%" />
</el-form-item>
</el-col>
<el-col :span="6">
@ -831,7 +831,7 @@ export default {
supplierId: '',
supplierName: '',
orderDate: today,
wantReplyDate: today,
wantReplyDate: '',
userName: this.$store.state.user.name,
buyer: '',
paymentTerm: '',

Write Preview
Loading…
Cancel
Save