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

2024-11-14

java8
fengyuan_yang 1 year ago
parent
39caf4a829
commit
2b2935a579
6 changed files with 34 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      src/views/modules/part/bomManagement.vue
  2. 4
      src/views/modules/part/bom_component_upload.vue
  3. 8
      src/views/modules/qc/FAIResultEntry.vue
  4. 8
      src/views/modules/qc/FQCResultEntry.vue
  5. 8
      src/views/modules/qc/IPQCResultEntry.vue
  6. 6
      src/views/modules/qc/IQCResultEntry.vue

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

@ -127,7 +127,7 @@
<el-input v-model="modalData.partDesc" disabled style="width: 340px"></el-input> <el-input v-model="modalData.partDesc" disabled style="width: 340px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'物料单位'"> <el-form-item :label="'物料单位'">
<el-input v-model="modalData.printUnit" disabled style="width: 100px"></el-input>
<el-input v-model="modalData.printUnitName" disabled style="width: 100px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'制造类型'" prop="bomType"> <el-form-item :label="'制造类型'" prop="bomType">
<el-select v-model="modalData.bomType" @change="bomTypeChange" :disabled="modalDisableFlag" style="width: 130px"> <el-select v-model="modalData.bomType" @change="bomTypeChange" :disabled="modalDisableFlag" style="width: 130px">
@ -466,7 +466,7 @@
<el-input v-model="componentData.componentPartDesc" disabled style="width: 249px"></el-input> <el-input v-model="componentData.componentPartDesc" disabled style="width: 249px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'物料单位'"> <el-form-item :label="'物料单位'">
<el-input v-model="componentData.printUnit" disabled style="width: 110px"></el-input>
<el-input v-model="componentData.printUnitName" disabled style="width: 110px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'消耗项目'" prop="consumptionItem"> <el-form-item :label="'消耗项目'" prop="consumptionItem">
<el-select v-model="componentData.consumptionItem" style="width: 165px"> <el-select v-model="componentData.consumptionItem" style="width: 165px">
@ -999,6 +999,7 @@ import {getSiteAndBuByUserName, getSiteAndBuByUserName2} from "@/api/qc/qc.js"
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
import ChooseList from '@/views/modules/common/Chooselist_eam' import ChooseList from '@/views/modules/common/Chooselist_eam'
import BomComponentUpload from "./bom_component_upload.vue"; import BomComponentUpload from "./bom_component_upload.vue";
import {Decimal} from "decimal.js";
export default { export default {
// 组件 // 组件
@ -1124,6 +1125,7 @@ export default {
updateBy: '', updateBy: '',
printUnit: '', printUnit: '',
printUnitName: '', printUnitName: '',
yieldRate: ''
}, },
detailData: { detailData: {
site: this.$store.state.user.site, site: this.$store.state.user.site,
@ -1705,7 +1707,7 @@ export default {
serialNumber: '601002Table2PrintUnit', serialNumber: '601002Table2PrintUnit',
tableId: '601002Table2', tableId: '601002Table2',
tableName: 'BOM子物料表', tableName: 'BOM子物料表',
columnProp: 'printUnit',
columnProp: 'printUnitName',
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
columnLabel: '物料单位', columnLabel: '物料单位',
@ -2310,6 +2312,7 @@ export default {
createBy: this.$store.state.user.name, createBy: this.$store.state.user.name,
printUnit: '', printUnit: '',
printUnitName: '', printUnitName: '',
yieldRate: ''
} }
this.detailData = { this.detailData = {
site: '', site: '',
@ -2357,7 +2360,8 @@ export default {
updateBy: this.$store.state.user.name, updateBy: this.$store.state.user.name,
printUnit: row.printUnit, printUnit: row.printUnit,
printUnitName: row.printUnitName, printUnitName: row.printUnitName,
alternativeNo: row.alternativeNo
alternativeNo: row.alternativeNo,
yieldRate: row.yieldRate
} }
this.subDetailTable = 'bom_sub_detail' this.subDetailTable = 'bom_sub_detail'
// 查bom明细 // 查bom明细
@ -2500,7 +2504,7 @@ export default {
qtyPerAssembly: 0, qtyPerAssembly: 0,
componentScrap: 0, componentScrap: 0,
issueType: 'Reserve And Backflush', issueType: 'Reserve And Backflush',
shrinkageFactor: 0,
shrinkageFactor: new Decimal(100).sub(new Decimal(this.modalData.yieldRate)).toNumber(),
lineItemNo: '', lineItemNo: '',
operationId: '', operationId: '',
operationNo: '', operationNo: '',
@ -2548,7 +2552,7 @@ export default {
this.batchComponentPartList = [] this.batchComponentPartList = []
} }
}) })
this.batchComponentPartData.shrinkageFactor = 0
this.batchComponentPartData.shrinkageFactor = new Decimal(100).sub(new Decimal(this.modalData.yieldRate)).toNumber()
this.choosePartList = [] this.choosePartList = []
}, },
@ -2562,6 +2566,7 @@ export default {
bomType: this.detailData.bomType, bomType: this.detailData.bomType,
alternativeNo: this.detailData.alternativeNo, alternativeNo: this.detailData.alternativeNo,
createBy: this.$store.state.user.name, createBy: this.$store.state.user.name,
shrinkageFactor: new Decimal(100).sub(new Decimal(this.modalData.yieldRate)).toNumber()
} }
//打开组件 去做新增业务 //打开组件 去做新增业务
this.$nextTick(() => { this.$nextTick(() => {
@ -3416,6 +3421,7 @@ export default {
engRevision: data.rows.modalData.engRevision, engRevision: data.rows.modalData.engRevision,
typeFlag: data.rows.modalData.typeFlag, typeFlag: data.rows.modalData.typeFlag,
netWeight: data.rows.modalData.netWeight, netWeight: data.rows.modalData.netWeight,
yieldRate: data.rows.modalData.yieldRate
} }
this.detailDataList = data.rows.detailDataList this.detailDataList = data.rows.detailDataList
this.detailData = data.rows.detailData this.detailData = data.rows.detailData

4
src/views/modules/part/bom_component_upload.vue
View File

@ -39,7 +39,8 @@ export default {
engChgLevel: '', engChgLevel: '',
bomType: '', bomType: '',
alternativeNo: '', alternativeNo: '',
createBy: ''
createBy: '',
shrinkageFactor: ''
}, },
} }
}, },
@ -95,6 +96,7 @@ export default {
formData.append("engChgLevel", this.pageData.engChgLevel) formData.append("engChgLevel", this.pageData.engChgLevel)
formData.append("bomType", this.pageData.bomType) formData.append("bomType", this.pageData.bomType)
formData.append("alternativeNo", this.pageData.alternativeNo) formData.append("alternativeNo", this.pageData.alternativeNo)
formData.append("shrinkageFactor", this.pageData.shrinkageFactor)
saveBomComponentByExcel(formData).then(({data}) => { saveBomComponentByExcel(formData).then(({data}) => {
if (data.code === 0) { if (data.code === 0) {
this.$message.success(data.msg) this.$message.success(data.msg)

8
src/views/modules/qc/FAIResultEntry.vue
View File

@ -517,8 +517,8 @@
</el-table> </el-table>
</div> </div>
<el-footer style="height:40px;margin-top: 20px;text-align:center"> <el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="Transfer('1')">应用</el-button>
<el-button type="primary" @click="Transfer('2')">保存</el-button>
<el-button v-if="detailData.state === '待检验'" type="primary" @click="Transfer('1')">应用</el-button>
<el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="primary" @click="Transfer('2')">保存</el-button>
<el-button type="primary" @click="detailInformationFlag=false">关闭</el-button> <el-button type="primary" @click="detailInformationFlag=false">关闭</el-button>
</el-footer> </el-footer>
</el-dialog> </el-dialog>
@ -1581,7 +1581,8 @@
operator: '', operator: '',
operatorName: '', operatorName: '',
responsiblePerson: '', responsiblePerson: '',
responsiblePersonName: ''
responsiblePersonName: '',
state: ''
}, },
detailInformationFlag: false, detailInformationFlag: false,
detailList: [], detailList: [],
@ -3520,6 +3521,7 @@
this.detailData.operatorName = row.operatorName this.detailData.operatorName = row.operatorName
this.detailData.responsiblePerson = row.responsiblePerson this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName this.detailData.responsiblePersonName = row.responsiblePersonName
this.detailData.state = row.state
this.getInspectionFormData() this.getInspectionFormData()
this.inspectorSearch() this.inspectorSearch()
// this.acquisitionList = [] // this.acquisitionList = []

8
src/views/modules/qc/FQCResultEntry.vue
View File

@ -501,8 +501,8 @@
</el-table> </el-table>
</div> </div>
<el-footer style="height:40px;margin-top: 20px;text-align:center"> <el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="Transfer('1')">应用</el-button>
<el-button type="primary" @click="Transfer('2')">保存</el-button>
<el-button v-if="detailData.state === '待检验'" type="primary" @click="Transfer('1')">应用</el-button>
<el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="primary" @click="Transfer('2')">保存</el-button>
<el-button type="primary" @click="detailInformationFlag=false">关闭</el-button> <el-button type="primary" @click="detailInformationFlag=false">关闭</el-button>
</el-footer> </el-footer>
</el-dialog> </el-dialog>
@ -1555,7 +1555,8 @@
operator: '', operator: '',
operatorName: '', operatorName: '',
responsiblePerson: '', responsiblePerson: '',
responsiblePersonName: ''
responsiblePersonName: '',
state: ''
}, },
detailInformationFlag: false, detailInformationFlag: false,
detailList: [], detailList: [],
@ -3493,6 +3494,7 @@
this.detailData.operatorName = row.operatorName this.detailData.operatorName = row.operatorName
this.detailData.responsiblePerson = row.responsiblePerson this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName this.detailData.responsiblePersonName = row.responsiblePersonName
this.detailData.state = row.state
this.getInspectionFormData() this.getInspectionFormData()
this.inspectorSearch() this.inspectorSearch()
// this.acquisitionList = [] // this.acquisitionList = []

8
src/views/modules/qc/IPQCResultEntry.vue
View File

@ -515,8 +515,8 @@
</el-table> </el-table>
</div> </div>
<el-footer style="height:40px;margin-top: 20px;text-align:center"> <el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="Transfer('1')">应用</el-button>
<el-button type="primary" @click="Transfer('2')">保存</el-button>
<el-button v-if="detailData.state === '待检验'" type="primary" @click="Transfer('1')">应用</el-button>
<el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="primary" @click="Transfer('2')">保存</el-button>
<el-button type="primary" @click="detailInformationFlag=false">关闭</el-button> <el-button type="primary" @click="detailInformationFlag=false">关闭</el-button>
</el-footer> </el-footer>
</el-dialog> </el-dialog>
@ -1601,7 +1601,8 @@
operator: '', operator: '',
operatorName: '', operatorName: '',
responsiblePerson: '', responsiblePerson: '',
responsiblePersonName: ''
responsiblePersonName: '',
state: ''
}, },
detailInformationFlag: false, detailInformationFlag: false,
detailList: [], detailList: [],
@ -3574,6 +3575,7 @@
this.detailData.operatorName = row.operatorName this.detailData.operatorName = row.operatorName
this.detailData.responsiblePerson = row.responsiblePerson this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName this.detailData.responsiblePersonName = row.responsiblePersonName
this.detailData.state = row.state
this.getInspectionFormData() this.getInspectionFormData()
this.inspectorSearch() this.inspectorSearch()
// this.acquisitionList = [] // this.acquisitionList = []

6
src/views/modules/qc/IQCResultEntry.vue
View File

@ -408,8 +408,8 @@
</el-table> </el-table>
</div> </div>
<el-footer style="height:40px;margin-top: 20px;text-align:center"> <el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="Transfer('1')">应用</el-button>
<el-button type="primary" @click="Transfer('2')">保存</el-button>
<el-button v-if="detailData.state === '待检验'" type="primary" @click="Transfer('1')">应用</el-button>
<el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="primary" @click="Transfer('2')">保存</el-button>
<el-button type="primary" @click="detailInformationFlag=false">关闭</el-button> <el-button type="primary" @click="detailInformationFlag=false">关闭</el-button>
</el-footer> </el-footer>
</el-dialog> </el-dialog>
@ -1622,6 +1622,7 @@
responsiblePerson: '', responsiblePerson: '',
responsiblePersonName: '', responsiblePersonName: '',
invdefinetype: '', invdefinetype: '',
state: ''
}, },
detailInformationFlag: false, detailInformationFlag: false,
detailList: [], detailList: [],
@ -2442,6 +2443,7 @@
this.detailData.responsiblePerson = row.responsiblePerson this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName this.detailData.responsiblePersonName = row.responsiblePersonName
this.detailData.invdefinetype = row.invdefinetype this.detailData.invdefinetype = row.invdefinetype
this.detailData.state = row.state
this.getInspectionFormData() this.getInspectionFormData()
this.inspectorSearch() this.inspectorSearch()
// this.acquisitionList = [] // this.acquisitionList = []

Write Preview
Loading…
Cancel
Save