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

2024-09-23 

RFQ 功能优化
java8
fengyuan_yang 1 year ago
parent
afbb70a739
commit
92a5463549
3 changed files with 35 additions and 23 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. 19
      src/views/modules/part/bomManagement.vue
  2. 11
      src/views/modules/part/partInformation.vue
  3. 28
      src/views/modules/part/routingManagement.vue

19
src/views/modules/part/bomManagement.vue
View File

@ -188,11 +188,11 @@
<el-form label-position="top" style="margin-top: -10px">
<el-form-item>
<el-button type="primary" @click="saveBomDetail" style="margin-left: 7px">新增</el-button>
<el-button type="primary" @click="deleteBomDetail">删除</el-button>
<el-button type="primary" @click="updateBomDetail">编辑</el-button>
<el-button v-if="modalData.flag === '2'" type="primary" @click="copyBomAlternative">Copy</el-button>
<el-button v-if="detailData.status === 'Tentative' || detailData.status === 'Obsolete'" type="primary" @click="updateStatusToBuildable">Build</el-button>
<el-button v-if="detailData.status === 'Buildable' && (modalData.effPhaseOutDate == null || modalData.effPhaseOutDate === '')" type="primary" @click="updateStatusToObsolete">Retire</el-button>
<el-button type="primary" :loading="alternativeLoading" @click="deleteBomDetail">删除</el-button>
<el-button type="primary" :loading="alternativeLoading" @click="updateBomDetail">编辑</el-button>
<el-button v-if="modalData.flag === '2'" type="primary" :loading="alternativeLoading" @click="copyBomAlternative">Copy</el-button>
<el-button v-if="detailData.status === 'Tentative' || detailData.status === 'Obsolete'" type="primary" :loading="alternativeLoading" @click="updateStatusToBuildable">Build</el-button>
<el-button v-if="detailData.status === 'Buildable' && (modalData.effPhaseOutDate == null || modalData.effPhaseOutDate === '')" type="primary" :loading="alternativeLoading" @click="updateStatusToObsolete">Retire</el-button>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="detailData" :rules="rules" style="margin-left: 7px">
@ -229,8 +229,8 @@
<el-tab-pane label="Components" name="bom_sub_detail">
<el-form label-position="top" style="margin-top: 5px">
<el-form-item>
<el-button type="primary" @click="saveComponentModal" style="margin-left: 7px">新增</el-button>
<el-button type="primary" @click="deleteComponentPart">删除</el-button>
<el-button type="primary" :loading="alternativeLoading" @click="saveComponentModal" style="margin-left: 7px">新增</el-button>
<el-button type="primary" :loading="alternativeLoading" @click="deleteComponentPart">删除</el-button>
</el-form-item>
</el-form>
<el-table
@ -870,6 +870,7 @@ export default {
saveDetailLoading: false,
saveAllLoading: false,
copyLoading: false,
alternativeLoading: false,
// 初始页签
detailTable: 'bom_detail',
subDetailTable: 'bom_sub_detail',
@ -3538,6 +3539,7 @@ export default {
* 替代改变事件
*/
alternativeChange () {
this.alternativeLoading = true
queryBomComponent(this.detailData).then(({data}) => {
if (data && data.code === 0) {
this.detailDataList = data.rows.detailDataList
@ -3548,6 +3550,9 @@ export default {
confirmButtonText: '确定'
})
}
this.alternativeLoading = false
}).catch(()=>{
this.alternativeLoading = false
})
},

11
src/views/modules/part/partInformation.vue
View File

@ -309,7 +309,12 @@
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</div>
<div v-else>
{{scope.row.textValue?scope.row.textValue:scope.row.numValue}}
<template v-if="item.columnProp==='textValue' && scope.row.valueTypeDb==='T'">
{{ scope.row['textValue'] }}
</template>
<template v-else-if="item.columnProp==='textValue' && scope.row.valueTypeDb==='N'">
{{ scope.row['numValue'] }}
</template>
</div>
</template>
</el-table-column>
@ -338,11 +343,11 @@
</div>
<div v-else>
<div v-if="scope.row.valueChooseFlag !== 'Y'">
<el-input-number v-model="scope.row.numValue" style="padding: 0;width: 100%" v-if="scope.row.valueType === 'num'" :controls="false"></el-input-number>
<el-input-number v-model="scope.row.numValue" style="padding: 0;width: 100%" v-if="scope.row.valueTypeDb === 'N'" :controls="false"></el-input-number>
<el-input v-model="scope.row.textValue" v-else></el-input>
</div>
<div v-else>
<el-select style="width: 100%;" v-if="scope.row.valueType === 'text'" v-model="scope.row.textValue">
<el-select style="width: 100%;" v-if="scope.row.valueTypeDb === 'T'" v-model="scope.row.textValue">
<el-option :value="i.availableValue" :label="i.availableValue" v-for="(i,key) in scope.row.availableValueList" :key="key"></el-option>
</el-select>
<el-select style="width: 100%;" v-else v-model="scope.row.numValue">

28
src/views/modules/part/routingManagement.vue
View File

@ -174,12 +174,12 @@
<el-form label-position="top" style="margin-top: -10px">
<el-form-item>
<el-button type="primary" @click="saveRoutingDetail" style="margin-left: 7px">新增</el-button>
<el-button type="primary" @click="deleteRoutingDetail">删除</el-button>
<el-button type="primary" @click="updateRoutingDetail">编辑</el-button>
<el-button v-if="modalData.flag === '2'" type="primary" @click="copyRoutingAlternative">Copy</el-button>
<el-button v-if="detailData.status === 'Tentative' || detailData.status === 'Obsolete'" type="primary" @click="updateStatusToBuildable">Build</el-button>
<el-button v-if="detailData.status === 'Buildable' && (modalData.effPhaseOutDate == null || modalData.effPhaseOutDate === '')" type="primary" @click="updateStatusToObsolete">Retire</el-button>
<el-button type="primary" @click="createByStandardOperation">基于标准工序快速创建</el-button>
<el-button type="primary" :loading="alternativeLoading" @click="deleteRoutingDetail">删除</el-button>
<el-button type="primary" :loading="alternativeLoading" @click="updateRoutingDetail">编辑</el-button>
<el-button v-if="modalData.flag === '2'" type="primary" :loading="alternativeLoading" @click="copyRoutingAlternative">Copy</el-button>
<el-button v-if="detailData.status === 'Tentative' || detailData.status === 'Obsolete'" type="primary" :loading="alternativeLoading" @click="updateStatusToBuildable">Build</el-button>
<el-button v-if="detailData.status === 'Buildable' && (modalData.effPhaseOutDate == null || modalData.effPhaseOutDate === '')" type="primary" :loading="alternativeLoading" @click="updateStatusToObsolete">Retire</el-button>
<el-button type="primary" :loading="alternativeLoading" @click="createByStandardOperation">基于标准工序快速创建</el-button>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="detailData" :rules="rules" style="margin-left: 7px">
@ -212,8 +212,8 @@
<el-tab-pane label="Operations" name="routing_sub_detail">
<el-form label-position="top" style="margin-top: 5px">
<el-form-item>
<el-button type="primary" @click="saveComponentModal" style="margin-left: 7px">新增</el-button>
<el-button type="primary" @click="deleteComponentPart">删除</el-button>
<el-button type="primary" :loading="alternativeLoading" @click="saveComponentModal" style="margin-left: 7px">新增</el-button>
<el-button type="primary" :loading="alternativeLoading" @click="deleteComponentPart">删除</el-button>
</el-form-item>
</el-form>
<el-table
@ -399,10 +399,10 @@
</el-form>
<el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px">
<el-form-item :label="'机器单位产出'" prop="machRunFactor">
<el-input-number :controls="false" :step="0" v-model="componentData.machRunFactor" @change="changeMachRunFactor" style="width: 221px"></el-input-number>
<el-input-number :controls="false" :step="0" :precision="4" v-model="componentData.machRunFactor" @change="changeMachRunFactor" style="width: 221px"></el-input-number>
</el-form-item>
<el-form-item :label="'人工单位产出'" prop="laborRunFactor">
<el-input-number :controls="false" :step="0" v-model="componentData.laborRunFactor" style="width: 221px"></el-input-number>
<el-input-number :controls="false" :step="0" :precision="4" v-model="componentData.laborRunFactor" style="width: 221px"></el-input-number>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px">
@ -797,6 +797,7 @@ export default {
saveDetailLoading: false,
saveAllLoading: false,
copyLoading: false,
alternativeLoading: false,
// 初始页签
detailTable: 'routing_detail',
subDetailTable: 'routing_sub_detail',
@ -3284,7 +3285,6 @@ export default {
})
}
})
}).catch(() => {
})
},
@ -3314,7 +3314,6 @@ export default {
this.alternativeChange()
}
})
}).catch(() => {
})
},
/**
@ -3343,7 +3342,6 @@ export default {
this.alternativeChange()
}
})
}).catch(() => {
})
},
@ -3351,6 +3349,7 @@ export default {
* 替代改变事件
*/
alternativeChange () {
this.alternativeLoading = true
queryRoutingComponent(this.detailData).then(({data}) => {
if (data && data.code === 0) {
this.detailDataList = data.rows.detailDataList
@ -3361,6 +3360,9 @@ export default {
confirmButtonText: '确定'
})
}
this.alternativeLoading = false
}).catch(()=>{
this.alternativeLoading = false
})
},

Write Preview
Loading…
Cancel
Save