Skip to content

M
mes-ui
Commit cabf68f4 authored by chenzj's avatar chenzj
Browse files
Options

新增倒冲料的字段和新增生产规格书的两个知字段

parent 5d74d88e
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 63 deletions
src/views/mes/pro/allocation/index.vue
View file @ cabf68f4
...@@ -74,6 +74,11 @@ ...@@ -74,6 +74,11 @@
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.windCase" /> <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.windCase" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="领料方式" align="center" prop="materialType">
<template slot-scope="scope">
<dict-tag :options="dict.type.pro_material_from" :value="scope.row.materialType" />
</template>
</el-table-column>
<el-table-column label="需求日期" align="center" prop="startTime" width="180"> <el-table-column label="需求日期" align="center" prop="startTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
...@@ -180,12 +185,12 @@ ...@@ -180,12 +185,12 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<BrandSelect ref="brSelect" :arrangeCode="form.arrangeCode" @onSelected="onBrandSelected"> <BrandSelect ref="brSelect" :arrangeCode="form.arrangeCode" @onSelected="onBrandSelected">
</BrandSelect> </BrandSelect>
<arangeSelect ref="arangeSelect" :arrangeCode="form.arrangeCode" @onSelected="onBrandSelected"> <arangeSelect ref="arangeSelect" :arrangeCode="form.arrangeCode" @onSelected="onBrandSelected">
</arangeSelect> </arangeSelect>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="编排单号" prop="arrangeCode"> <el-form-item label="编排单号" prop="arrangeCode">
<el-input v-model="form.arrangeCode" placeholder="请输入编排单号"> <el-input v-model="form.arrangeCode" placeholder="请输入编排单号">
...@@ -202,14 +207,14 @@ ...@@ -202,14 +207,14 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="需求日期" prop="startTime"> <el-form-item label="需求日期" prop="startTime">
<el-date-picker clearable v-model="form.startTime" type="datetime" <el-date-picker clearable v-model="form.startTime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择需求日期"> value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择需求日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-divider content-position="center">调拨料表体</el-divider> <el-divider content-position="center">调拨料表体</el-divider>
<el-card shadow="always" class="box-card"> <el-card shadow="always" class="box-card">
...@@ -244,7 +249,7 @@ import { ...@@ -244,7 +249,7 @@ import {
export default { export default {
name: "ProAllocationMaterial", name: "ProAllocationMaterial",
components: { ItemSelect, TaskSelect, WorkstationSelect, allocationIndex, BrandSelect, arangeSelect }, components: { ItemSelect, TaskSelect, WorkstationSelect, allocationIndex, BrandSelect, arangeSelect },
dicts: ['sys_yes_no'], dicts: ['sys_yes_no','pro_material_from'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -307,7 +312,7 @@ export default { ...@@ -307,7 +312,7 @@ export default {
/** 查询调拨料申请列表 */ /** 查询调拨料申请列表 */
getList() { getList() {
this.loading = true; this.loading = true;
this.queryParams.params = {}; this.queryParams.params = {};
if (null != this.daterangePurchaseDate && '' != this.daterangePurchaseDate) { if (null != this.daterangePurchaseDate && '' != this.daterangePurchaseDate) {
this.queryParams.params["beginPurchaseDate"] = this.daterangePurchaseDate[0]; this.queryParams.params["beginPurchaseDate"] = this.daterangePurchaseDate[0];
this.queryParams.params["endPurchaseDate"] = this.daterangePurchaseDate[1]; this.queryParams.params["endPurchaseDate"] = this.daterangePurchaseDate[1];
...@@ -404,7 +409,7 @@ export default { ...@@ -404,7 +409,7 @@ export default {
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.getList(); this.getList();
}, },
......
src/views/mes/pro/productionSolution/components/ProogingProcess.vue
View file @ cabf68f4
...@@ -132,12 +132,6 @@ ...@@ -132,12 +132,6 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="加工处理最小厚度" align="center" prop="treatingThicknessMin" />
<el-table-column label="加工处理最大厚度" align="center" prop="treatingThicknessMax" />
<el-table-column label="加工处理最小宽度" align="center" prop="treatingWidthMin" />
<el-table-column label="加工处理最大宽度" align="center" prop="treatingWidthMax" />
<el-table-column label="凹印_胶版油槽数" align="center" prop="dieSunkOffsetOilTankNum" />
<el-table-column label="印刷方式" align="center" prop="printingMethod" />
<el-table-column label="工序备注" prop="processRemark" align="center" /> <el-table-column label="工序备注" prop="processRemark" align="center" />
<el-table-column <el-table-column
v-if="mode != 'info'" v-if="mode != 'info'"
...@@ -304,35 +298,6 @@ ...@@ -304,35 +298,6 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="最小厚度" label-width="120px" prop="treatingThicknessMin">
<el-input v-model="form.treatingThicknessMin" placeholder="请输入最小厚度">
<i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">cm</i>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="最大厚度" label-width="120px" prop="treatingThicknessMax">
<el-input v-model="form.treatingThicknessMax" placeholder="请输入最大厚度">
<i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">cm</i>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="最小宽度" label-width="120px" prop="treatingWidthMin">
<el-input v-model="form.treatingWidthMin" placeholder="请输入最小宽度">
<i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">cm</i>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="最大宽度" label-width="120px" prop="treatingWidthMax">
<el-input v-model="form.treatingWidthMax" placeholder="请输入最大宽度">
<i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">cm</i>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="单位转换比例" prop="unitConvert"> <el-form-item label="单位转换比例" prop="unitConvert">
...@@ -352,11 +317,6 @@ ...@@ -352,11 +317,6 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="印刷方式" label-width="120px" prop="printingMethod">
<el-input v-model="form.printingMethod" placeholder="请输入印刷方式" />
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="加工方式" prop="processingMethod"> <el-form-item label="加工方式" prop="processingMethod">
<el-select <el-select
...@@ -593,12 +553,6 @@ export default { ...@@ -593,12 +553,6 @@ export default {
sacmForThermalSelfFusion: '', sacmForThermalSelfFusion: '',
sacmForMolarTooth: '', sacmForMolarTooth: '',
sacmForSlitting: '', sacmForSlitting: '',
treatingThicknessMin: '',
treatingThicknessMax: '',
treatingWidthMin: '',
treating_WidthMax: '',
dieSunkOffsetOilTankNum: '',
printingMethod: '',
}, },
currentRow: {}, currentRow: {},
currentRowIndex: undefined, currentRowIndex: undefined,
...@@ -719,12 +673,7 @@ export default { ...@@ -719,12 +673,7 @@ export default {
sacmForThermalSelfFusion: '', sacmForThermalSelfFusion: '',
sacmForMolarTooth: '', sacmForMolarTooth: '',
sacmForSlitting: '', sacmForSlitting: '',
treatingThicknessMin: '',
treatingThicknessMax: '',
treatingWidthMin: '',
treating_WidthMax: '',
dieSunkOffsetOilTankNum: '',
printingMethod: '',
}; };
}, },
/**重置组件状态 */ /**重置组件状态 */
......
src/views/mes/pro/productionSolution/components/ProogingSpecificationSheet.vue
View file @ cabf68f4
...@@ -536,7 +536,20 @@ ...@@ -536,7 +536,20 @@
<el-input v-model="form.productMaterial" placeholder /> <el-input v-model="form.productMaterial" placeholder />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="凹印_胶版油槽数" prop="dieSunkOffsetOilTankNum">
<el-input v-model="form.dieSunkOffsetOilTankNum" placeholder >
<i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">个</i>
</el-input>
</el-form-item>
</el-col>
<el-col :lg="6" :md="8" :sm="12" :xs="12">
<el-form-item label="印刷方式" prop="printingMethod">
<el-input v-model="form.printingMethod" placeholder />
</el-form-item>
</el-col>
</el-row> </el-row>
<!-- <el-row> <!-- <el-row>
<el-col :span="23"> <el-col :span="23">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
...@@ -694,6 +707,8 @@ export default { ...@@ -694,6 +707,8 @@ export default {
rowNum: "", rowNum: "",
isCreateSpec: "", isCreateSpec: "",
isNeedShoeImg: "", isNeedShoeImg: "",
dieSunkOffsetOilTankNum: "",
printingMethod: "",
}, },
currentRow: {}, currentRow: {},
currentRowIndex: undefined, currentRowIndex: undefined,
...@@ -769,6 +784,8 @@ export default { ...@@ -769,6 +784,8 @@ export default {
rowNum: "", rowNum: "",
isCreateSpec: "", isCreateSpec: "",
isNeedShoeImg: "", isNeedShoeImg: "",
dieSunkOffsetOilTankNum: "",
printingMethod: "",
}; };
}, },
/**重置组件状态 */ /**重置组件状态 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment