suojin
/
jonhon-mes-web
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

计划模块联调

Browse Source
dev-scheduling
jinna 3 months ago
parent d6c273a60e
commit e69dac6f4e
16 changed files with 442 additions and 320 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. 9
      src/api/orderManagement/moldPlan.js
  2. 2
      src/api/productionManagement/addRequirements.js
  3. 8
      src/api/productionManagement/coatingMaterial.js
  4. 50
      src/views/orderManagement/components/mold/addMoldDailog.vue
  5. 8
      src/views/orderManagement/components/mold/detailsInfoDialog.vue
  6. 13
      src/views/orderManagement/components/mold/moldRecord.vue
  7. 1
      src/views/orderManagement/components/mold/moldRequire.vue
  8. 14
      src/views/productionManagement/components/addDialog.vue
  9. 72
      src/views/productionManagement/components/addQuantity.vue
  10. 44
      src/views/productionManagement/components/coatingAddDialog.vue
  11. 28
      src/views/productionManagement/components/coatingMater/addRequirements.vue
  12. 1
      src/views/productionManagement/components/coatingMater/assayedContent.vue
  13. 1
      src/views/productionManagement/components/coatingMater/assayedContentDialog.vue
  14. 289
      src/views/productionManagement/components/coatingMater/materialRequirements.vue
  15. 216
      src/views/productionManagement/components/materialDetail.vue
  16. 6
      src/views/productionManagement/js/coatingColumnData.js

9
src/api/orderManagement/moldPlan.js
Unescape View File

@ -99,4 +99,11 @@ export const getApplyList = (params) => {
}); });
}; };
// 根据零件ID获取工装列表
export const getMoldList = (params) => {
return request({
url: '/api/blade-desk/dsCraft/getToolsByPartId',
method: 'post',
params
});
};

2
src/api/productionManagement/addRequirements.js
Unescape View File

@ -28,7 +28,7 @@ export const confirmBatch = row => {
return request({ return request({
url: '/blade-desk/order/plateGoodsApply/confirmBatch', url: '/blade-desk/order/plateGoodsApply/confirmBatch',
method: 'post', method: 'post',
data: row, params: row,
}); });
}; };
// 获取详情 // 获取详情

8
src/api/productionManagement/coatingMaterial.js
Unescape View File

@ -28,7 +28,7 @@ export const confirmBatch = row => {
return request({ return request({
url: '/blade-desk/order/plateGoodsRecord/confirmBatch', url: '/blade-desk/order/plateGoodsRecord/confirmBatch',
method: 'post', method: 'post',
data: row, params: row,
}); });
}; };
// 获取详情 // 获取详情
@ -40,11 +40,11 @@ export const getOrderMoldPlanCaDeatils = (params) => {
}); });
}; };
//逻辑删除 //逻辑删除
export const removeByIds = ids => { export const removeByIds = params => {
return request({ return request({
url: '/blade-desk/order/plateGoodsRecord/remove', url: '/blade-desk/order/plateGoodsRecord/remove',
method: 'post', method: 'post',
data: ids, params
}); });
}; };
//批量关闭 //批量关闭
@ -52,7 +52,7 @@ export const closeBatchs = ids => {
return request({ return request({
url: '/blade-desk/order/plateGoodsRecord/closeBatch', url: '/blade-desk/order/plateGoodsRecord/closeBatch',
method: 'post', method: 'post',
data: ids, params: ids,
}); });
}; };

50
src/views/orderManagement/components/mold/addMoldDailog.vue
Unescape View File

@ -50,33 +50,33 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="moCode" label="工装号" align="center"> <el-table-column prop="toolCode" label="工装号" align="center">
<template #header> <template #header>
<span><i style="color: red">*</i>工装号</span> <span><i style="color: red">*</i>工装号</span>
</template> </template>
<template #default="scope"> <template #default="scope">
<el-form-item :prop="`moldPlan[${scope.$index}].moCode`" :rules="formRules.moCode"> <el-form-item :prop="`moldPlan[${scope.$index}].toolCode`" :rules="formRules.toolCode">
<el-select <el-select
v-model="scope.row.moCode" v-model="scope.row.toolCode"
:filterable="true" :filterable="true"
:disabled="scope.row.disabled" :disabled="scope.row.disabled"
allow-create allow-create
@change="frockChange(scope.row.moCode, scope.$index)" @change="frockChange(scope.row.toolCode, scope.$index)"
> >
<el-option <el-option
v-for="(item, index) in moCodeList" v-for="(item, index) in scope.row.modeArray"
:key="index" :key="index"
:label="item.label" :label="item.name"
:value="item.value" :value="item.code"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="moName" label="工装名称" align="center"> <el-table-column prop="toolName" label="工装名称" align="center">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.moName }}</span> <span>{{ scope.row.toolName }}</span>
</template> </template>
</el-table-column> </el-table-column>
@ -97,13 +97,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="planType" label="计划类型" align="center"> <el-table-column prop="mafType" label="计划类型" align="center">
<template #header> <template #header>
<span><i style="color: red">*</i>计划类型</span> <span><i style="color: red">*</i>计划类型</span>
</template> </template>
<template #default="scope"> <template #default="scope">
<el-form-item :prop="`moldPlan[${scope.$index}].planType`" :rules="formRules.planType"> <el-form-item :prop="`moldPlan[${scope.$index}].mafType`" :rules="formRules.mafType">
<el-select v-model="scope.row.planType" :filterable="true" allow-create> <el-select v-model="scope.row.mafType" :filterable="true" allow-create>
<!-- ，，2、仓库 --> <!-- ，，2、仓库 -->
<el-option label="热表/烧结" :value="12001" /> <el-option label="热表/烧结" :value="12001" />
<el-option label="仓库" :value="12002" /> <el-option label="仓库" :value="12002" />
@ -189,7 +189,7 @@
</template> </template>
<script> <script>
import { add,getPartList,getProdIdentList,getUserByRoleAlias } from '@/api/orderManagement/moldPlan'; import { add,getPartList,getProdIdentList,getUserByRoleAlias,getMoldList } from '@/api/orderManagement/moldPlan';
import { index } from '@/views/plugin/workflow/api/statistics'; import { index } from '@/views/plugin/workflow/api/statistics';
export default { export default {
@ -209,13 +209,7 @@ export default {
}, },
data() { data() {
return { return {
moCodeList: [ moCodeList: [],
{ label: '工装一', value: 1 },
{
label: '工装二',
value: 2,
},
],
partCodeList: [], partCodeList: [],
quaLevelList:[], quaLevelList:[],
keeperList:[], keeperList:[],
@ -244,12 +238,12 @@ export default {
}, },
], ],
partCode: [{ required: true, message: '请选择零件编码', trigger: ['change', 'submit'] }], partCode: [{ required: true, message: '请选择零件编码', trigger: ['change', 'submit'] }],
// moCode: [{ required: true, message: '请选择工装号', trigger: ['change', 'submit'] }], toolCode: [{ required: true, message: '请选择工装号', trigger: ['change', 'submit'] }],
quantity: [ quantity: [
{ required: true, message: '请输入数量', trigger: ['change', 'submit'] }, { required: true, message: '请输入数量', trigger: ['change', 'submit'] },
{ type: 'number', min: 1, message: '数量不能小于1', trigger: ['change', 'submit'] }, { type: 'number', min: 1, message: '数量不能小于1', trigger: ['change', 'submit'] },
], ],
planType: [{ required: true, message: '请选择计划类型', trigger: ['change', 'submit'] }], mafType: [{ required: true, message: '请选择计划类型', trigger: ['change', 'submit'] }],
needDate: [{ required: true, message: '请选择需求日期', trigger: ['change', 'submit'] }], needDate: [{ required: true, message: '请选择需求日期', trigger: ['change', 'submit'] }],
quaLevel: [{ required: true, message: '请输入生产标识', trigger: ['blur', 'submit'] }], quaLevel: [{ required: true, message: '请输入生产标识', trigger: ['blur', 'submit'] }],
keeper: [{ required: true, message: '请选择保管员', trigger: ['change', 'submit'] }], keeper: [{ required: true, message: '请选择保管员', trigger: ['change', 'submit'] }],
@ -310,10 +304,10 @@ export default {
_select: false, _select: false,
partCode: '', partCode: '',
partName: '', partName: '',
moCode: '', toolCode: '',
moName: '', toolName: '',
quantity: 1, quantity: 1,
planType: '', mafType: '',
needDate: '', needDate: '',
quaLevel: '', quaLevel: '',
userName: '', userName: '',
@ -330,10 +324,14 @@ export default {
partCodeChange(val, i) { partCodeChange(val, i) {
this.form.moldPlan[i].partName = this.form.moldPlan[i].partName =
this.partCodeList.find(item => item.partCode === val)?.partName || ''; this.partCodeList.find(item => item.partCode === val)?.partName || '';
getMoldList({partId:this.partCodeList.find(item => item.partCode === val)?.id}).then(res =>{
console.log('res-----------',res)
this.form.moldPlan[i].modeArray = res.data.data
})
}, },
frockChange(val, i) { frockChange(val, i) {
// 保留原逻辑，可根据实际需求完善 // 保留原逻辑，可根据实际需求完善
this.form.moldPlan[i].moName = this.moCodeList.find(item => item.value === val)?.label || ''; this.form.moldPlan[i].toolName = this.form.moldPlan[i].modeArray.find(item => item.code === val)?.name || '';
}, },
handleChange() { handleChange() {
// 数量变化处理 // 数量变化处理

8
src/views/orderManagement/components/mold/detailsInfoDialog.vue
Unescape View File

@ -28,9 +28,9 @@
<el-table-column prop="ypCode" label="计划单号" align="center"> </el-table-column> <el-table-column prop="ypCode" label="计划单号" align="center"> </el-table-column>
<el-table-column prop="partCode" label="零件号" align="center"> </el-table-column> <el-table-column prop="partCode" label="零件号" align="center"> </el-table-column>
<el-table-column prop="partName" label="产品名称" align="center"> </el-table-column> <el-table-column prop="partName" label="产品名称" align="center"> </el-table-column>
<el-table-column prop="quantity" label="零件数量" align="center"> </el-table-column> <el-table-column prop="ypQty" label="零件数量" align="center"> </el-table-column>
<el-table-column prop="demandDate" label="需求交期" align="center"> </el-table-column> <el-table-column prop="demandDate" label="需求交期" align="center"> </el-table-column>
<el-table-column prop="shuliang" label="工装需求数量" align="center"> </el-table-column> <el-table-column prop="toolsDemand" label="工装需求数量" align="center"> </el-table-column>
<el-table-column prop="shuliang" label="已交付数量" align="center"> </el-table-column> <el-table-column prop="shuliang" label="已交付数量" align="center"> </el-table-column>
<el-table-column prop="shuliang" label="未交付数量" align="center"> </el-table-column> <el-table-column prop="shuliang" label="未交付数量" align="center"> </el-table-column>
<el-table-column prop="releaseDate" label="计划下达时间" align="center"> </el-table-column> <el-table-column prop="releaseDate" label="计划下达时间" align="center"> </el-table-column>
@ -50,8 +50,8 @@
<el-table-column prop="mafTypeName" label="计划类型" align="center"></el-table-column> <el-table-column prop="mafTypeName" label="计划类型" align="center"></el-table-column>
<el-table-column prop="needDate" label="需求日期" align="center"></el-table-column> <el-table-column prop="needDate" label="需求日期" align="center"></el-table-column>
<el-table-column prop="quaLevel" label="生产标识" align="center"></el-table-column> <el-table-column prop="quaLevel" label="生产标识" align="center"></el-table-column>
<el-table-column prop="keeper" label="保管员" align="center"></el-table-column> <el-table-column prop="keeperName" label="保管员" align="center"></el-table-column>
<el-table-column prop="releaser" label="下达人" align="center"></el-table-column> <el-table-column prop="releaserName" label="下达人" align="center"></el-table-column>
<el-table-column prop="createTime" label="建立时间" align="center"></el-table-column> <el-table-column prop="createTime" label="建立时间" align="center"></el-table-column>
<el-table-column prop="createUserName" label="建立人员" align="center"></el-table-column> <el-table-column prop="createUserName" label="建立人员" align="center"></el-table-column>
<el-table-column prop="memo" label="备注" align="center"></el-table-column> <el-table-column prop="memo" label="备注" align="center"></el-table-column>

13
src/views/orderManagement/components/mold/moldRecord.vue
Unescape View File

@ -1,5 +1,6 @@
<template> <template>
<avue-crud <avue-crud
:height="460"
:option="option" :option="option"
:table-loading="loading" :table-loading="loading"
:data="data" :data="data"
@ -127,7 +128,7 @@ export default {
}, },
{ {
label: '对应工装号', label: '对应工装号',
prop: 'moCode', prop: 'toolCode',
search: true, search: true,
sortable: true, sortable: true,
span: 12, span: 12,
@ -138,7 +139,7 @@ export default {
}, },
{ {
label: '工装名称', label: '工装名称',
prop: 'moName', prop: 'toolName',
search: false, search: false,
sortable: true, sortable: true,
span: 12, span: 12,
@ -158,7 +159,7 @@ export default {
}, },
{ {
label: '计划类型', label: '计划类型',
prop: 'planTypeName', prop: 'mafTypeName',
search: false, search: false,
sortable: true, sortable: true,
span: 12, span: 12,
@ -189,7 +190,7 @@ export default {
}, },
{ {
label: '保管员', label: '保管员',
prop: 'keeper', prop: 'keeperName',
search: false, search: false,
sortable: true, sortable: true,
span: 12, span: 12,
@ -199,7 +200,7 @@ export default {
}, },
{ {
label: '下达人', label: '下达人',
prop: 'releaser', prop: 'releaserName',
search: false, search: false,
sortable: true, sortable: true,
span: 12, span: 12,
@ -239,7 +240,7 @@ export default {
}, },
{ {
label: '状态', label: '状态',
prop: 'mafStatusName', prop: 'statusName',
search: false, search: false,
sortable: true, sortable: true,
span: 12, span: 12,

1
src/views/orderManagement/components/mold/moldRequire.vue
Unescape View File

@ -1,5 +1,6 @@
<template> <template>
<avue-crud <avue-crud
:height="460"
:option="option" :option="option"
:table-loading="loading" :table-loading="loading"
:data="data" :data="data"

14
src/views/productionManagement/components/addDialog.vue
Unescape View File

@ -9,12 +9,12 @@
> >
<el-descriptions :column="4" border title="物料需求信息" :label-width="150"> <el-descriptions :column="4" border title="物料需求信息" :label-width="150">
<el-descriptions-item label="作业中心">{{ <el-descriptions-item label="作业中心">{{
addForm.bsWorkCenter?.wcName addForm.wcName
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="建立人员">{{ addForm.createUser }}</el-descriptions-item> <el-descriptions-item label="建立人员">{{ addForm.createUserName }}</el-descriptions-item>
<el-descriptions-item label="建立时间">{{ addForm.createTime }}</el-descriptions-item> <el-descriptions-item label="建立时间">{{ addForm.createTime }}</el-descriptions-item>
<el-descriptions-item label="物料编码">{{ addForm.goodsCode }}</el-descriptions-item> <el-descriptions-item label="物料编码">{{ addForm.plateGoodsCode }}</el-descriptions-item>
<el-descriptions-item label="班组实际消耗(克)">{{ <el-descriptions-item label="班组实际消耗(克)">{{
addForm.teamActualConsumption addForm.teamActualConsumption
}}</el-descriptions-item> }}</el-descriptions-item>
@ -50,7 +50,7 @@
item.approvalTime item.approvalTime
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="审批结果">{{ <el-descriptions-item label="审批结果">{{
item.approvalStatus item.statusName
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="审批意见">{{ <el-descriptions-item label="审批意见">{{
item.approvalMemo item.approvalMemo
@ -59,12 +59,12 @@
</el-descriptions> </el-descriptions>
<el-descriptions class="margin-top" :column="4" border title="订单信息"> </el-descriptions> <el-descriptions class="margin-top" :column="4" border title="订单信息"> </el-descriptions>
<el-table :data="tableData"> <el-table :data="tableData">
<el-table-column label="槽号" prop="slot" align="center"></el-table-column> <el-table-column label="槽号" prop="slotName" align="center"></el-table-column>
<el-table-column label="化验值" prop="testVal" align="center"></el-table-column> <el-table-column label="化验值" prop="testVal" align="center"></el-table-column>
<el-table-column label="申报添加金钾(克)" prop="saveGoldVal" align="center"></el-table-column> <el-table-column label="申报添加金钾(克)" prop="goodsDemand" align="center"></el-table-column>
<el-table-column <el-table-column
label="申报添加银钾(克)" label="申报添加银钾(克)"
prop="saveSilverVal" prop="goodsDemand"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column label="理论值" prop="saveBoardVal" align="center"></el-table-column> <el-table-column label="理论值" prop="saveBoardVal" align="center"></el-table-column>

72
src/views/productionManagement/components/addQuantity.vue
Unescape View File

@ -45,23 +45,26 @@
<el-descriptions class="margin-top" :column="4" border title="镀层物料需求"></el-descriptions> <el-descriptions class="margin-top" :column="4" border title="镀层物料需求"></el-descriptions>
<el-table :data="tableData" :summary-method="getSummaries" show-summary> <el-table :data="tableData" :summary-method="getSummaries" show-summary>
<el-table-column type="index" width="70" label="序号"></el-table-column> <el-table-column type="index" width="70" label="序号"></el-table-column>
<el-table-column label="需求单号" prop="slot" align="center"></el-table-column> <el-table-column label="需求单号" prop="demandCode" align="center"></el-table-column>
<el-table-column label="物料编码" prop="testVal" align="center"></el-table-column> <el-table-column label="物料编码" prop="plateGoodsCode" align="center"></el-table-column>
<el-table-column label="物料名称" prop="addValue" align="center" width="150"> <el-table-column label="物料名称" prop="addValue" align="center" >
</el-table-column> </el-table-column>
<el-table-column label="镀层物料需求(克)" prop="addValue" align="center" width="150"> <el-table-column label="镀层物料需求(克)" prop="goodsDemand" align="center" >
</el-table-column> </el-table-column>
<el-table-column label="银钾系数" prop="addValue" align="center" width="150"> <el-table-column label="银钾系数" prop="coefficient" align="center" >
</el-table-column> </el-table-column>
<el-table-column label="申报量(克)" prop="addValue" align="center" width="150"> <el-table-column label="申报量(克)" prop="addValue" align="center" >
</el-table-column> </el-table-column>
<el-table-column label="使用量(克)" prop="addValue" align="center" width="150"> <el-table-column label="使用量(克)" prop="useValue" align="center" >
<template #default="scope">
{{scope.row.goodsDemand - scope.row.surplus}}
</template>
</el-table-column> </el-table-column>
<el-table-column label="剩余量(克)" prop="addValue" align="center" width="150"> <el-table-column label="剩余量(克)" prop="surplus" align="center" >
</el-table-column> </el-table-column>
<el-table-column label="创建人" prop="addValue" align="center" width="150"> <el-table-column label="创建人" prop="createUserName" align="center" >
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="addValue" align="center" width="150"> <el-table-column label="创建时间" prop="createTime" align="center" >
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -137,6 +140,10 @@ export default {
sums[index] = '合计'; sums[index] = '合计';
return; return;
} }
if (index === 1) {
sums[index] = '-';
return;
}
const values = data.map(item => Number(item[column.property])); const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value))) { if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => { sums[index] = values.reduce((prev, curr) => {
@ -156,49 +163,11 @@ export default {
return sums; return sums;
}, },
workChange() { workChange() {
if (this.ruleForm.zuoyezhongxin == '1') {
this.materialNeedsData.push(
{
testVal: '11111',
addValue: '',
zuoyecao: '#1'
}
)
this.tableData = [
{ slot: '#46 镀金', testVal: '3.1', actualVal: 'XX', testProject: '氧化亚金钾', testUser: '张珊', value: 'XX', testTime: '2023-12-22 07:15:22', addValue: '' },
]
}
if (this.ruleForm.zuoyezhongxin == '2') {
this.materialNeedsData.push(
{
testVal: '11111',
addValue: '',
zuoyecao: '#23'
}
)
this.tableData = [
{ slot: '#46 镀金', testVal: '3.1', actualVal: 'XX', testProject: '氧化亚金钾', testUser: '张珊', value: 'XX', testTime: '2023-12-22 07:15:22', addValue: '' },
{ slot: '#47 镀金', testVal: '3.1', actualVal: 'XX', testProject: '氧化亚金钾', testUser: '张珊', value: 'XX', testTime: '2023-12-22 07:15:22', addValue: '' },
{ slot: '#48 镀金', testVal: '3.1', actualVal: 'XX', testProject: '氧化亚金钾', testUser: '张珊', value: 'XX', testTime: '2023-12-22 07:15:22', addValue: '' },
{ slot: '#49 镀金', testVal: '3.1', actualVal: 'XX', testProject: '氧化亚金钾', testUser: '张珊', value: 'XX', testTime: '2023-12-22 07:15:22', addValue: '' },
]
}
}, },
open() { open() {
this.addForm = { this.addForm = {}
workCenter: '镀金小批量作业中心', this.tableData = []
requiredCode: "XQ-220245431,XQ-22245431",
goldRequired: '109.6',
goldUsageAmount: '39.6',
goldDemandResidue: '39.6'
}
this.tableData = [
{ slot: '#46 镀金', testVal: '3.1', actualVal: 'XX', testProject: '氧化亚金钾', testUser: '张珊', value: 'XX', testTime: '2023-12-22 07:15:22', addValue: '' },
{ slot: '#47 镀金', testVal: '3.1', actualVal: 'XX', testProject: '氧化亚金钾', testUser: '张珊', value: 'XX', testTime: '2023-12-22 07:15:22', addValue: '' },
{ slot: '#48 镀金', testVal: '3.1', actualVal: 'XX', testProject: '氧化亚金钾', testUser: '张珊', value: 'XX', testTime: '2023-12-22 07:15:22', addValue: '' },
{ slot: '#49 镀金', testVal: '3.1', actualVal: 'XX', testProject: '氧化亚金钾', testUser: '张珊', value: 'XX', testTime: '2023-12-22 07:15:22', addValue: '' },
]
}, },
closeDialog(val) { closeDialog(val) {
this.$emit('closeDialog',val); this.$emit('closeDialog',val);
@ -208,6 +177,7 @@ export default {
assayContentDetailList:this.materialNeedsData, assayContentDetailList:this.materialNeedsData,
recordIdList:this.tableData.map(item => item.id) recordIdList:this.tableData.map(item => item.id)
} }
console.log('params------------',params)
add(params).then(res => { add(params).then(res => {
if(res.data.code == 200) { if(res.data.code == 200) {
this.$message.success('新增成功') this.$message.success('新增成功')

44
src/views/productionManagement/components/coatingAddDialog.vue
Unescape View File

@ -16,7 +16,7 @@
<el-input placeholder="请输入需求量" v-model="submitForm.goodsQuantity"></el-input> <el-input placeholder="请输入需求量" v-model="submitForm.goodsQuantity"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="银钾需求量" prop="saveBoardVal" v-if="searchForm.materalType == 2"> <el-form-item label="银钾需求量" prop="saveBoardVal" v-if="searchForm.materalType == 2">
<el-input placeholder="请输入银钾需求量" v-model="submitForm.saveBoardVal"></el-input> <el-input placeholder="请输入银钾需求量" v-model="submitForm.goodsQuantity"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item> <!-- <el-form-item>
<el-button type="primary" @click="onSubmit">提 交</el-button> <el-button type="primary" @click="onSubmit">提 交</el-button>
@ -79,7 +79,7 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="物料需求量(克)" label="物料需求量(克)"
prop="plateSingleQuotaTotal" prop="goodsDemand"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column label="计划下达时间" prop="releaseDate" align="center"></el-table-column> <el-table-column label="计划下达时间" prop="releaseDate" align="center"></el-table-column>
@ -180,12 +180,12 @@ export default {
console.log('lisy-------------', this.selectionList); console.log('lisy-------------', this.selectionList);
var strarr = []; var strarr = [];
for (let i in this.selectionList) { for (let i in this.selectionList) {
strarr.push(Number(this.selectionList[i]['plateSingleQuotaTotal'])); strarr.push(Number(this.selectionList[i]['goodsDemand']));
} }
var total = eval(strarr.join('+')); var total = eval(strarr.join('+'));
this.totalNum = total ? total : 0; this.totalNum = total ? total.toFixed(2) : 0;
console.log('total-----------',total) console.log('total-----------',total)
this.submitForm.goodsQuantity = total ? total : 0; this.submitForm.goodsQuantity = total ? total.toFixed(2) : 0;
}, },
closeDialog(val) { closeDialog(val) {
this.$emit('closeDialog',val); this.$emit('closeDialog',val);
@ -198,19 +198,39 @@ export default {
// list: this.selectionList, // list: this.selectionList,
// }; // };
// console.log(form); // console.log(form);
let plateCodeArr = this.selectionList.map(item => item.plateGoodsCode)
let plateCode = [...new Set(plateCodeArr)].join(',')
let params = { let params = {
assayContent:{}, assayContent:{
wcId:this.searchForm.wcId,
plateGoodsCode:plateCode,
goodsDemand:this.totalNum,
// coefficient: this.searchForm.materalType == 2 && this.searchForm.coefficient ? this.searchForm.coefficient : 0
},
detailList:this.selectionList.map(item =>{ detailList:this.selectionList.map(item =>{
return {yoId :item.id} return {yoId :item.id}
}) })
} }
if(this.searchForm.materalType != 2){
// const { coefficient, ...validData } = params;
console.log('params------------',params) console.log('params------------',params)
add(params).then(res =>{ add(params).then(res =>{
if(res.data.code == 200){ if(res.data.code == 200){
this.$message.success('新增成功') this.$message.success('新增成功')
this.closeDialog(true) this.closeDialog(true)
} }
}) })
}else{
params.assayContent.coefficient = this.searchForm.coefficient ? this.searchForm.coefficient : 0
add(params).then(res =>{
if(res.data.code == 200){
this.$message.success('新增成功')
this.closeDialog(true)
}
})
}
}, },
}, },
}; };

28
src/views/productionManagement/components/coatingMater/addRequirements.vue
Unescape View File

@ -2,6 +2,7 @@
<div> <div>
<!-- 表格数据 --> <!-- 表格数据 -->
<avue-crud <avue-crud
:height="460"
:option="option" :option="option"
:table-loading="loading" :table-loading="loading"
:data="data" :data="data"
@ -23,7 +24,7 @@
<el-button type="primary" @click="handleApprove">批量审核</el-button> <el-button type="primary" @click="handleApprove">批量审核</el-button>
</template> </template>
<template #menu-right> <template #menu-right>
<el-button type="warning" @click="pendingReviewFn()" :loading="loading">待审核</el-button> <el-button type="warning" @click="pendingReviewFn()" >待审核</el-button>
</template> </template>
<template #menu="{ row }"> <template #menu="{ row }">
<el-button type="text" @click="handleView(row)">详情</el-button> <el-button type="text" @click="handleView(row)">详情</el-button>
@ -33,14 +34,14 @@
<add-dialog :add-dialog="addDialog" @closeDialog="closeDialog" :id="id"></add-dialog> <add-dialog :add-dialog="addDialog" @closeDialog="closeDialog" :id="id"></add-dialog>
<el-dialog append-to-body width="550px" title="审批" v-model="approveDialog"> <el-dialog append-to-body width="550px" title="审批" v-model="approveDialog">
<el-form ref="approveForm" :model="approveForm" :rules="approveRules"> <el-form ref="approveForm" :model="approveForm" :rules="approveRules">
<el-form-item label="审批结果" prop="approveREsult"> <el-form-item label="审批结果" prop="approvalStatus">
<el-radio-group v-model="approveForm.approveREsult" @input="changeType"> <el-radio-group v-model="approveForm.approvalStatus" @input="changeType">
<el-radio :label="1">审批通过</el-radio> <el-radio :label="10001">审批通过</el-radio>
<el-radio :label="0">审批不通过</el-radio> <el-radio :label="10005">审批不通过</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="审批意见" prop="approvalOpinion"> <el-form-item label="审批意见" prop="approvalMemo">
<el-input type="textarea" v-model="approveForm.approvalOpinion"></el-input> <el-input type="textarea" v-model="approveForm.approvalMemo"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
@ -119,7 +120,8 @@ export default {
column: [], column: [],
}, },
approveRules: { approveRules: {
approveREsult: [{ required: true, message: '请选择审批结果', trigger: 'blur' }], approvalStatus: [{ required: true, message: '请选择审批结果', trigger: 'blur' }],
approvalMemo: [{ required: true, message: '请输入审核意见', trigger: 'blur' }],
}, },
approveDialog: false, approveDialog: false,
page: { page: {
@ -128,6 +130,7 @@ export default {
total: 0, total: 0,
}, },
selectionList: [], selectionList: [],
query:{}
}; };
}, },
mounted() { mounted() {
@ -136,7 +139,9 @@ export default {
methods: { methods: {
// 待审核搜索 // 待审核搜索
pendingReviewFn() { pendingReviewFn() {
this.onLoad(this.page, { type: '2' }); this.query.status = 10000
this.onLoad()
// this.onLoad(this.page, { type: '2' });
}, },
searchReset() { searchReset() {
this.query = {}; this.query = {};
@ -211,8 +216,11 @@ export default {
if (valid) { if (valid) {
const ids = this.selectionList.map(item => item.id).join(','); const ids = this.selectionList.map(item => item.id).join(',');
confirmBatch({ ...{ ids }, ...this.approveForm }).then(res => { confirmBatch({ ...{ ids }, ...this.approveForm }).then(res => {
if (res.code === 200) { if (res.data.code === 200) {
this.$message.success('审核成功'); this.$message.success('审核成功');
this.approveDialog = false;
this.$refs.crud.toggleSelection();
this.onLoad();
} }
}); });
this.approveDialog = false; this.approveDialog = false;

1
src/views/productionManagement/components/coatingMater/assayedContent.vue
Unescape View File

@ -2,6 +2,7 @@
<div> <div>
<!-- 表格数据 --> <!-- 表格数据 -->
<avue-crud <avue-crud
:height="460"
:option="option" :option="option"
:table-loading="loading" :table-loading="loading"
:data="data" :data="data"

1
src/views/productionManagement/components/coatingMater/assayedContentDialog.vue
Unescape View File

@ -124,6 +124,7 @@ export default {
}) })
}, },
changeWork(value){ changeWork(value){
this.ruleForm.tableData = []
getTank({ workstationId: value }).then(res =>{ getTank({ workstationId: value }).then(res =>{
res.data.data.map(item =>{ res.data.data.map(item =>{
this.ruleForm.tableData.push({ this.ruleForm.tableData.push({

289
src/views/productionManagement/components/coatingMater/materialRequirements.vue
Unescape View File

@ -18,6 +18,9 @@
@refresh-change="refreshChange" @refresh-change="refreshChange"
@on-load="onLoad" @on-load="onLoad"
> >
<template #usageAmount="{row}">
{{row.goodsDemand - row.surplus}}
</template>
<template #menu-left="row"> <template #menu-left="row">
<el-button type="primary" @click="handleAdd">需求申报</el-button> <el-button type="primary" @click="handleAdd">需求申报</el-button>
<el-button type="primary" @click="handleApprove">批量审核</el-button> <el-button type="primary" @click="handleApprove">批量审核</el-button>
@ -28,7 +31,7 @@
<template #menu="{ row }"> <template #menu="{ row }">
<el-button type="text" @click="handleView(row)">详情</el-button> <el-button type="text" @click="handleView(row)">详情</el-button>
<el-button type="text" @click="closeRow(row)" v-show="row.status != 10006 && (row.status == 10000 || row.status == 10005)">关闭</el-button> <el-button type="text" @click="closeRow(row)" v-show="row.status != 10006 && (row.status == 10000 || row.status == 10005)">关闭</el-button>
<el-button type="text" v-show="row.status == 10006 || row.status == 10000 || row.status == 10005" @click="deleteRow">删除</el-button> <el-button type="text" v-show="row.status == 10006 || row.status == 10000 || row.status == 10005" @click="deleteRow(row)">删除</el-button>
<el-button type="text" v-show="row.status == 10000" @click="approveRow(row)">审核</el-button> <el-button type="text" v-show="row.status == 10000" @click="approveRow(row)">审核</el-button>
</template> </template>
</avue-crud> </avue-crud>
@ -41,8 +44,8 @@
<el-form ref="approveForm" :model="approveForm" :rules="approveRules"> <el-form ref="approveForm" :model="approveForm" :rules="approveRules">
<el-form-item label="审核结果" prop="approvalStatus"> <el-form-item label="审核结果" prop="approvalStatus">
<el-radio-group v-model="approveForm.approvalStatus" @input="changeType"> <el-radio-group v-model="approveForm.approvalStatus" @input="changeType">
<el-radio :label="1">审批通过</el-radio> <el-radio :label="10001">审批通过</el-radio>
<el-radio :label="0">审批不通过</el-radio> <el-radio :label="10005">审批不通过</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="审核意见" prop="approvalMemo"> <el-form-item label="审核意见" prop="approvalMemo">
@ -113,7 +116,7 @@ export default {
labelWidth: 120, labelWidth: 120,
searchLabelWidth: 120, searchLabelWidth: 120,
menu: true, menu: true,
menuWidth: 180, menuWidth: 200,
dialogWidth: 600, dialogWidth: 600,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -130,7 +133,270 @@ export default {
gridBtn: false, gridBtn: false,
searchMenuPosition: 'right', searchMenuPosition: 'right',
align: 'center', align: 'center',
column: [], column: [
{
label: '需求单号',
prop: 'demandCode',
span: 24,
width: 150,
overflow: true,
search: true,
headerAlign: 'center',
align: 'center',
searchLabelWidth: 80,
rules: [
{
required: true,
message: '请输入需求单号',
trigger: 'blur',
},
],
},
{
label: '作业中心',
prop: 'wcId',
span: 24,
type: 'select',
width: 150,
overflow: true,
search: true,
headerAlign: 'center',
align: 'center',
searchLabelWidth: 80,
rules: [
{
required: true,
message: '请输入作业中心',
trigger: 'blur',
},
],
dicUrl: '/blade-desk/bsWorkCenter/getList',
props: {
label: 'wcName',
value: 'id',
},
},
{
label: '物料编号',
prop: 'plateGoodsCode',
span: 24,
width: 150,
overflow: true,
search: false,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入物料编号',
trigger: 'blur',
},
],
},
{
label: '物料名称',
prop: 'goodsName',
span: 24,
width: 150,
overflow: true,
search: false,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入物料名称',
trigger: 'blur',
},
],
},
// {
// label: '金钾（克）',
// prop: 'goldPotassium',
// span: 24,
// width: 150,
// overflow: true,
// search: false,
// headerAlign: 'center',
// align: 'center',
// rules: [
// {
// required: true,
// message: '请输入金钾（克）',
// trigger: 'blur',
// },
// ],
// },
// {
// label: '银钾(克)',
// prop: 'silverPotassium',
// span: 24,
// width: 150,
// overflow: true,
// search: false,
// headerAlign: 'center',
// align: 'center',
// rules: [
// {
// required: true,
// message: '请输入银钾(克)',
// trigger: 'blur',
// },
// ],
// },
{
label: '物料需求量(克)',
prop: 'goodsDemand',
span: 24,
width: 150,
overflow: true,
search: false,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入银钾(克)',
trigger: 'blur',
},
],
},
{
label: '银钾系数',
prop: 'coefficient',
span: 24,
width: 150,
overflow: true,
search: false,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入银钾系数',
trigger: 'blur',
},
],
},
{
label: '使用量(克)',
prop: 'usageAmount',
span: 24,
width: 150,
overflow: true,
search: false,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入使用量(克)',
trigger: 'blur',
},
],
},
{
label: '剩余量(克)',
prop: 'surplus',
span: 24,
width: 150,
overflow: true,
search: false,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入剩余量(克)',
trigger: 'blur',
},
],
},
{
label: '状态',
prop: 'status',
span: 24,
width: 150,
overflow: true,
search: true,
type: 'select',
headerAlign: 'center',
align: 'center',
searchLabelWidth: 50,
rules: [
{
required: true,
message: '请输入状态',
trigger: 'blur',
},
],
dicData: [
// { label: '待审核', value: '1' },
// { label: '审核不通过', value: '2' },
// { label: '已关闭', value: '3' },
// { label: '审核通过', value: '4' },
// { label: '已过期', value: '5' },
{ label: '待审核', value: 10000 },
{ label: '审核通过', value: 10001 },
{ label: "使用中", value:10002},
{ label: '审核不通过', value: 10005 },
{ label: '已完成',value:10004},
{ label: '已超期', value: 10003 },
{ label: '已关闭', value: 10006 },
]
},
{
label: '关联订单数',
prop: 'detailOrderNum',
span: 24,
width: 150,
overflow: true,
search: false,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入关联订单数',
trigger: 'blur',
},
],
},
{
label: '创建人',
prop: 'createUserName',
span: 24,
width: 150,
overflow: true,
search: false,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入创建人',
trigger: 'blur',
},
],
},
{
label: '创建时间',
prop: 'createTime',
span: 24,
width: 200,
overflow: true,
search: false,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入创建时间',
trigger: 'blur',
},
],
},
],
}, },
approveRules: { approveRules: {
approvalStatus: [{ required: true, message: '请选择审核结果', trigger: 'blur' }], approvalStatus: [{ required: true, message: '请选择审核结果', trigger: 'blur' }],
@ -144,15 +410,18 @@ export default {
}, },
selectionList: [], selectionList: [],
confirmBatchId: null, confirmBatchId: null,
query:{}
}; };
}, },
mounted() { mounted() {
this.option.column = coatingColumnData[this.tabPosition]; // this.option.column = coatingColumnData[this.tabPosition];
}, },
methods: { methods: {
// 待审核搜索 // 待审核搜索
pendingReviewFn() { pendingReviewFn() {
this.onLoad(this.page, { type: '2' }); this.query.status = 10000
this.onLoad()
// this.onLoad(this.page, { status: 10000 });
}, },
searchReset() { searchReset() {
this.query = {}; this.query = {};
@ -182,8 +451,8 @@ export default {
type: 'warning', type: 'warning',
}).then(() => { }).then(() => {
const ids = row.id; const ids = row.id;
removeByIds({ ids }).then(res => { removeByIds({ ids:ids }).then(res => {
if (res.code === 200) { if (res.data.code === 200) {
this.$message.success('删除成功'); this.$message.success('删除成功');
this.$refs.crud.toggleSelection(); this.$refs.crud.toggleSelection();
this.onLoad(this.page); this.onLoad(this.page);
@ -199,7 +468,7 @@ export default {
}).then(() => { }).then(() => {
const ids = row.id; const ids = row.id;
closeBatchs({ ids }).then(res => { closeBatchs({ ids }).then(res => {
if (res.code === 200) { if (res.data.code === 200) {
this.$message.success('关闭成功'); this.$message.success('关闭成功');
this.$refs.crud.toggleSelection(); this.$refs.crud.toggleSelection();
this.onLoad(this.page); this.onLoad(this.page);

216
src/views/productionManagement/components/materialDetail.vue
Unescape View File

@ -17,16 +17,16 @@
detailForm.plateGoodsCode detailForm.plateGoodsCode
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item style="width: 25%" label="物料名称:">{{ <el-descriptions-item style="width: 25%" label="物料名称:">{{
detailForm.goodsName detailForm.plateGoodsName
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item style="width: 25%" label="相关订单数:">{{ <el-descriptions-item style="width: 25%" label="相关订单数:">{{
detailForm.ordersNumber detailForm.detailOrderNum
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item style="width: 25%" label="物料需求量(克):">{{ <el-descriptions-item style="width: 25%" label="物料需求量(克):">{{
detailForm.goodsDemand detailForm.goodsDemand
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item style="width: 25%" label="物料使用量(克):">{{ <el-descriptions-item style="width: 25%" label="物料使用量(克):">{{
detailForm.usageAmount detailForm.goodsDemand - detailForm.surplus
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item style="width: 25%" label="物料剩余量(克):">{{ <el-descriptions-item style="width: 25%" label="物料剩余量(克):">{{
detailForm.surplus detailForm.surplus
@ -41,13 +41,13 @@
detailForm.silverPotassiumResidue detailForm.silverPotassiumResidue
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item style="width: 25%" label="提报人:">{{ <el-descriptions-item style="width: 25%" label="提报人:">{{
detailForm.createUser detailForm.createUserName
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item style="width: 25%" label="提报时间:">{{ <el-descriptions-item style="width: 25%" label="提报时间:">{{
detailForm.createTime detailForm.createTime
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item style="width: 25%" label="需求状态:">{{ <el-descriptions-item style="width: 25%" label="需求状态:">{{
detailForm.statusTitle detailForm.statusName
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item style="width: 25%" label="审批意见:">{{ <el-descriptions-item style="width: 25%" label="审批意见:">{{
detailForm.approvalMemo detailForm.approvalMemo
@ -68,40 +68,40 @@
> >
<el-table-column <el-table-column
label="计划单号" label="计划单号"
prop="pjYieldOrder.poCode" prop="ypCode"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column label="车间订单号" prop="orderWoCode" align="center"></el-table-column> <el-table-column label="车间订单号" prop="orderWoCode" align="center"></el-table-column>
<el-table-column <el-table-column
label="零件号" label="零件号"
prop="pjYieldOrder.partCode" prop="partCode"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="零件名称" label="零件名称"
prop="pjYieldOrder.partName" prop="partName"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column label="物料编码" prop="plateGoodsCode" align="center"></el-table-column> <el-table-column label="物料编码" prop="plateGoodsCode" align="center"></el-table-column>
<el-table-column <el-table-column
label="计划下达时间" label="计划下达时间"
prop="createTime" prop="releaseDate"
align="center" align="center"
width="170" width="170"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="生产标识" label="生产标识"
prop="pjYieldOrder.prodIdent" prop="productIdent"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="生产数量" label="生产数量"
prop="pjYieldOrder.poQty" prop="ypQty"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="物料需求量(克)" label="物料需求量(克)"
prop="plateSingleQuotaTotal" prop="goodsDemand"
align="center" align="center"
></el-table-column> ></el-table-column>
</el-table> </el-table>
@ -126,189 +126,35 @@ export default {
return { return {
detailForm: {}, detailForm: {},
tableData: [], tableData: [],
isOpen:false
}; };
}, },
mounted() {}, mounted() {
console.log('materialDialog-----------',this.materialDialog)
// if(this.materialDialog){
// this.getDetail()
// }
},
methods: { methods: {
// async getDetail(){
// const ref = await getOrderMoldPlanCaDeatils({ id: this.id });
// if (ref.data.code == 200) {
// this.detailForm = ref.data.data;
// this.tableData = ref.data.data.yieldOrderList;
// this.isOpen = true
// }
// },
async open() { async open() {
// this.detailForm = {
// // 基础主键与编码
// id: 1,
// demandCode: 'DMD-0001',
// pgrCode: 'PGR-001',
// // 作业中心 & 物料信息
// wcId: 100,
// plateGoodsCode: 'PLATE-001',
// goodsBoId: 456,
// coefficientBoId: 789,
// // 需求与剩余
// goodsDemand: 445.32,
// declaredQuota: 200.32,
// declaredSilver: 50.0,
// declaredStatus: 2,
// surplus: 245.0,
// silverPotassiumResidue: 10.0,
// // 银钾相关
// silverPotassium: 30.0,
// coefficient: 0.54,
// declaredSilver: 50.0,
// // 审批相关
// approvalMan: 123,
// approvalUser: '审批人姓名',
// approvalTime: '2023-05-22 12:21:32',
// approvalStatus: 1,
// approvalMemo: '审批通过',
// approvalOpinion: '审批通过',
// // 兼容旧字段（保留以免模板其他地方使用）
// requiredCode: '001',
// workCenter: 1,
// goodsCode: 'wl_001',
// goodsName: '物料名称',
// ordersNumber: 15,
// createUser: 'XXX',
// createTime: '2025-10-20 11:20:32',
// plateSingleQuotaTotal: '445.32',
// };
// this.tableData = [
// {
// id: 1001,
// demandCode: 'DMD-0001',
// pgrCode: 'PGR-001',
// wcId: 100,
// plateGoodsCode: 'PLATE-001',
// goodsBoId: 456,
// coefficientBoId: 789,
// goodsDemand: 120.0,
// declaredQuota: 50.0,
// declaredSilver: 10.0,
// declaredStatus: 1,
// surplus: 20.0,
// silverPotassium: 5.0,
// silverPotassiumResidue: 2.0,
// coefficient: 0.12,
// approvalMan: 123,
// approvalTime: '2023-05-18 09:00:00',
// approvalStatus: 1,
// approvalMemo: '通过',
// pjYieldOrder: {
// poCode: 'WO-220245431',
// partCode: '21E8-950-1378-H1',
// partName: 'XXX',
// prodIdent: 'JII',
// poQty: 50,
// },
// orderWoCode: 'WO-220245431',
// createTime: '2023-05-17 10:50:08',
// plateSingleQuotaTotal: '120.00',
// },
// {
// id: 1002,
// demandCode: 'DMD-0002',
// pgrCode: 'PGR-002',
// wcId: 101,
// plateGoodsCode: 'PLATE-002',
// goodsBoId: 457,
// coefficientBoId: 790,
// goodsDemand: 25.32,
// declaredQuota: 10.0,
// declaredSilver: 2.5,
// declaredStatus: 2,
// surplus: 5.0,
// silverPotassium: 1.2,
// silverPotassiumResidue: 0.8,
// coefficient: 0.08,
// approvalMan: 124,
// approvalTime: '2023-05-19 10:00:00',
// approvalStatus: 0,
// approvalMemo: '待审',
// pjYieldOrder: {
// poCode: 'WO-220245432',
// partCode: '21E8-950-1378-H1',
// partName: 'XXX',
// prodIdent: 'JII',
// poQty: 50,
// },
// orderWoCode: 'WO-220245432',
// createTime: '2023-05-17 10:50:08',
// plateSingleQuotaTotal: '25.32',
// },
// {
// id: 1003,
// demandCode: 'DMD-0003',
// pgrCode: 'PGR-003',
// wcId: 102,
// plateGoodsCode: 'PLATE-003',
// goodsBoId: 458,
// coefficientBoId: 791,
// goodsDemand: 100.0,
// declaredQuota: 40.0,
// declaredSilver: 8.0,
// declaredStatus: 1,
// surplus: 30.0,
// silverPotassium: 3.5,
// silverPotassiumResidue: 1.5,
// coefficient: 0.15,
// approvalMan: 125,
// approvalTime: '2023-05-20 11:00:00',
// approvalStatus: 1,
// approvalMemo: '通过',
// pjYieldOrder: {
// poCode: 'WO-220245433',
// partCode: '21E8-950-1378-H1',
// partName: 'XXX',
// prodIdent: 'JII',
// poQty: 50,
// },
// orderWoCode: 'WO-220245433',
// createTime: '2023-05-17 10:50:08',
// plateSingleQuotaTotal: '100.00',
// },
// {
// id: 1004,
// demandCode: 'DMD-0004',
// pgrCode: 'PGR-004',
// wcId: 103,
// plateGoodsCode: 'PLATE-004',
// goodsBoId: 459,
// coefficientBoId: 792,
// goodsDemand: 200.0,
// declaredQuota: 150.0,
// declaredSilver: 25.0,
// declaredStatus: 3,
// surplus: 50.0,
// silverPotassium: 6.0,
// silverPotassiumResidue: 4.0,
// coefficient: 0.2,
// approvalMan: 126,
// approvalTime: '2023-05-21 12:00:00',
// approvalStatus: 2,
// approvalMemo: '拒绝',
// pjYieldOrder: {
// poCode: 'WO-220245434',
// partCode: '21E8-950-1378-H1',
// partName: 'XXX',
// prodIdent: 'JII',
// poQty: 50,
// },
// orderWoCode: 'WO-220245434',
// createTime: '2023-05-17 10:50:08',
// plateSingleQuotaTotal: '200.00',
// },
// ];
try { try {
const ref = await getOrderMoldPlanCaDeatils({ id: this.id }); const ref = await getOrderMoldPlanCaDeatils({ id: this.id });
if (res.data.code == 200) { if (ref.data.code == 200) {
this.detailForm = res.data.data.detailForm; this.detailForm = ref.data.data;
this.tableData = res.data.data.list; this.tableData = ref.data.data.yieldOrderList;
} }
} catch (err) {console.log(err)} } catch (err) {console.log(err)}
}, },
closeDialog() { closeDialog() {
this.isOpen = false
this.$emit('closeDialog'); this.$emit('closeDialog');
}, },
}, },

6
src/views/productionManagement/js/coatingColumnData.js
Unescape View File

@ -213,7 +213,7 @@ export default {
}, },
{ {
label: '关联订单数', label: '关联订单数',
prop: 'ordersNumber', prop: 'detailOrderNum',
span: 24, span: 24,
width: 150, width: 150,
overflow: true, overflow: true,
@ -230,7 +230,7 @@ export default {
}, },
{ {
label: '创建人', label: '创建人',
prop: 'createMan', prop: 'createUserName',
span: 24, span: 24,
width: 150, width: 150,
overflow: true, overflow: true,
@ -249,7 +249,7 @@ export default {
label: '创建时间', label: '创建时间',
prop: 'createTime', prop: 'createTime',
span: 24, span: 24,
width: 150, width: 200,
overflow: true, overflow: true,
search: false, search: false,
headerAlign: 'center', headerAlign: 'center',

Write Preview
Loading…
Cancel
Save