From 61c17454c5ddf112a48c241ac88bbb1e37ab6d91 Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Fri, 15 Jul 2022 19:34:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProduceshiftorderServiceImpl.java | 24 ++- qd/src/api/acs/order/order.js | 1 + qd/src/views/acs/order/AddDialog.vue | 139 ++++++++++++++++-- qd/src/views/acs/order/index.vue | 50 ++++++- 4 files changed, 194 insertions(+), 20 deletions(-) diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java index f22e65f..caac2c7 100644 --- a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java @@ -107,6 +107,9 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A new_jo.put("lettering_icon", orderDteail_jo.getString("lettering_icon")); new_jo.put("lettering_message", orderDteail_jo.getString("lettering_message")); new_jo.put("lettering_message2", orderDteail_jo.getString("lettering_message2")); + new_jo.put("strap_number", orderDteail_jo.getString("strap_number")); + new_jo.put("labeling_template", orderDteail_jo.getString("labeling_template")); + new_jo.put("color_type", orderDteail_jo.getString("color_type")); new_jo.put("type", "orderDteail"); new_jo.put("is_flag", "0"); children.add(new_jo); @@ -216,6 +219,14 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A String temper = MapUtil.getStr(whereJson, "temper"); String length = MapUtil.getStr(whereJson, "length"); + String is_strapping = MapUtil.getStr(whereJson, "is_strapping"); + String is_risking = MapUtil.getStr(whereJson, "is_risking"); + String is_labeling = MapUtil.getStr(whereJson, "is_labeling"); + String is_coating = MapUtil.getStr(whereJson, "is_coating"); + String is_lettering = MapUtil.getStr(whereJson, "is_lettering"); + String feeding_mouth = MapUtil.getStr(whereJson, "feeding_mouth"); + + String qty = MapUtil.getStr(whereJson, "qty"); if(StrUtil.isEmpty(material_code)){ @@ -248,13 +259,12 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A orderDto.setOrder_status("00"); orderDto.setIs_deleted("0"); orderDto.setCreate_by(currentUsername); - orderDto.setIs_coating("1"); - orderDto.setIs_labeling("1"); - orderDto.setIs_lettering("1"); - orderDto.setIs_risking("1"); - orderDto.setIs_strapping("1"); - orderDto.setIs_unbundling("1"); - orderDto.setFeeding_mouth("3"); + orderDto.setIs_coating(is_coating); + orderDto.setIs_labeling(is_labeling); + orderDto.setIs_lettering(is_lettering); + orderDto.setIs_risking(is_risking); + orderDto.setIs_strapping(is_strapping); + orderDto.setFeeding_mouth(feeding_mouth); orderDto.setAlloy(alloy); orderDto.setTemper(temper); for(int i=0; i<tableData.size(); i++){ diff --git a/qd/src/api/acs/order/order.js b/qd/src/api/acs/order/order.js index 0cbd50b..cba2a00 100644 --- a/qd/src/api/acs/order/order.js +++ b/qd/src/api/acs/order/order.js @@ -1,6 +1,7 @@ import request from '@/utils/request' export function add(data) { + debugger return request({ url: 'api/produceshiftorder', method: 'post', diff --git a/qd/src/views/acs/order/AddDialog.vue b/qd/src/views/acs/order/AddDialog.vue index f3db7d8..6e9ea55 100644 --- a/qd/src/views/acs/order/AddDialog.vue +++ b/qd/src/views/acs/order/AddDialog.vue @@ -60,6 +60,78 @@ <label slot="label">明 细 数:</label> <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" /> </el-form-item> + <el-form-item label="是否刻字"> + <el-select + v-model="form.is_lettering" + clearable + size="small" + placeholder="请选择" + class="filter-item" + style="width: 190px" + > + <el-option v-for="item in ifType" :key="item.label" :label="item.label" :value="item.value" /> + </el-select> + </el-form-item> + <el-form-item label="是否套冒"> + <el-select + v-model="form.is_risking" + clearable + size="small" + placeholder="请选择" + class="filter-item" + style="width: 190px" + > + <el-option v-for="item in ifType" :key="item.label" :label="item.label" :value="item.value" /> + </el-select> + </el-form-item> + <el-form-item label="是否裹膜"> + <el-select + v-model="form.is_coating" + clearable + size="small" + placeholder="请选择" + class="filter-item" + style="width: 190px" + > + <el-option v-for="item in ifType" :key="item.label" :label="item.label" :value="item.value" /> + </el-select> + </el-form-item> + <el-form-item label="是否捆扎"> + <el-select + v-model="form.is_strapping" + clearable + size="small" + placeholder="请选择" + class="filter-item" + style="width: 190px" + > + <el-option v-for="item in ifType" :key="item.label" :label="item.label" :value="item.value" /> + </el-select> + </el-form-item> + <el-form-item label="是否贴标"> + <el-select + v-model="form.is_labeling" + clearable + size="small" + placeholder="请选择" + class="filter-item" + style="width: 190px" + > + <el-option v-for="item in ifType" :key="item.label" :label="item.label" :value="item.value" /> + </el-select> + </el-form-item> + <el-form-item label="上料口"> + <el-select + v-model="form.feeding_mouth" + clearable + size="small" + placeholder="请选择" + class="filter-item" + style="width: 190px" + > + <el-option v-for="item in feeding_mouthType" :key="item.label" :label="item.label" :value="item.value" /> + </el-select> + </el-form-item> <el-form-item label="备注" prop="remark"> <label slot="label">备 注:</label> <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" /> @@ -217,13 +289,13 @@ <!-- <span v-show="scope.row.edit">{{ scope.row.priority }}</span>--> <!-- </template>--> <!-- </el-table-column>--> - <el-table-column prop="template_id" label="上传模板" align="center" width="200px"> - <template scope="scope"> - <el-input v-model="scope.row.template_id" size="mini" style="width: 140px" disabled> - <el-button slot="append" icon="el-icon-plus" @click="openDialog(scope)" /> - </el-input> - </template> - </el-table-column> +<!-- <el-table-column prop="template_id" label="上传模板" align="center" width="200px">--> +<!-- <template scope="scope">--> +<!-- <el-input v-model="scope.row.template_id" size="mini" style="width: 140px" disabled>--> +<!-- <el-button slot="append" icon="el-icon-plus" @click="openDialog(scope)" />--> +<!-- </el-input>--> +<!-- </template>--> +<!-- </el-table-column>--> <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right"> <template scope="scope"> @@ -310,8 +382,15 @@ import { mapGetters } from 'vuex' import CustomerDtl from '@/views/acs/order/CustomerDialog' import CRUD, { crud, form } from '@crud/crud' import { get } from '@/api/system/dictDetail' -const defaultForm = { tableData: [], order_code: null, material_code: null, material_spec: null, - outer_diameter: null, wall_thickness: null, detail_count: 0 } +const defaultForm = { + tableData: [], order_code: null, material_code: null, material_spec: null, + outer_diameter: null, wall_thickness: null, detail_count: 0, is_strapping: '1', + is_risking: '1', + is_labeling: '1', + is_coating: '1', + is_lettering: '1', + feeding_mouth: '3' +} export default { name: 'AddDialog', @@ -363,6 +442,35 @@ export default { value: '2' } ], + ifType: [ + { + label: '否', + value: '0' + }, + { + label: '是', + value: '1' + } + ], + feeding_mouthType: [ + { + label: 'A侧', + value: '1' + }, + { + label: 'B侧', + value: '2' + }, + { + label: '两侧', + value: '3' + } + ], + is_strapping: '1', + is_risking: '1', + is_labeling: '1', + is_coating: '1', + is_lettering: '1', billtypelist: [], rules: { material_code: [ @@ -402,7 +510,7 @@ export default { debugger crudProduceshiftorder.selectTemplateList().then(data => { this.templateList = data - }), + }) // 获取区域类型 get('color_type').then(data => { this.colortypeList = data.content @@ -421,6 +529,15 @@ export default { this.form.length = null this.form.detail_count = null this.form.qty = null + this.form.is_risking = null + this.form.is_strapping = null + this.form.is_labeling = null + this.form.is_coating = null + this.form.is_lettering = null + this.form.outer_diameter = null + this.form.alloy = null + this.form.temper = null + this.form.wall_thickness = null this.$emit('AddChanged') }, tableChanged2(row) { @@ -433,7 +550,6 @@ export default { this.form.length = row.length }, tableChanged3(row) { - debugger this.nowrow.cust_code = row.cust_code this.nowrow.cust_id = row.cust_id this.nowrow.cust_name = row.cust_name @@ -517,7 +633,6 @@ export default { this.loading = false }, handleSuccess(files, fileList) { - debugger this.dtlJson.template_id = files.id const arr = this.form.tableData for (let i = 0; i < arr.length; i++) { diff --git a/qd/src/views/acs/order/index.vue b/qd/src/views/acs/order/index.vue index 648e67a..d9efb64 100644 --- a/qd/src/views/acs/order/index.vue +++ b/qd/src/views/acs/order/index.vue @@ -107,10 +107,58 @@ <el-table-column prop="material_name" label="物料名称" /> <el-table-column prop="outer_diameter" label="外径" /> <el-table-column prop="wall_thickness" label="壁厚" /> - <el-table-column prop="length" label="长度" /> + <el-table-column prop="length" label="长度(mm)" /> + <el-table-column prop="is_lettering" label="是否刻字"> + <template slot-scope="scope"> + <span v-if="scope.row.is_lettering==='0' ">否</span> + <span v-if="scope.row.is_lettering==='1' ">是</span> + </template> + </el-table-column> + <el-table-column prop="is_risking" label="是否套冒" > + <template slot-scope="scope"> + <span v-if="scope.row.is_risking==='0' ">否</span> + <span v-if="scope.row.is_risking==='1' ">是</span> + </template> + </el-table-column> + <el-table-column prop="is_coating" label="是否裹膜" > + <template slot-scope="scope"> + <span v-if="scope.row.is_coating==='0' ">否</span> + <span v-if="scope.row.is_coating==='1' ">是</span> + </template> + </el-table-column> + <el-table-column prop="is_strapping" label="是否捆扎" > + <template slot-scope="scope"> + <span v-if="scope.row.is_strapping==='0' ">否</span> + <span v-if="scope.row.is_strapping==='1' ">是</span> + </template> + </el-table-column> + <el-table-column prop="is_labeling" label="是否贴标" > + <template slot-scope="scope"> + <span v-if="scope.row.is_labeling==='0' ">否</span> + <span v-if="scope.row.is_labeling==='1' ">是</span> + </template> + </el-table-column> + <el-table-column prop="feeding_mouth" label="上料口" > + <template slot-scope="scope"> + <span v-if="scope.row.feeding_mouth==='1' ">A侧</span> + <span v-if="scope.row.feeding_mouth==='2' ">B侧</span> + <span v-if="scope.row.feeding_mouth==='3' ">两侧</span> + </template> + </el-table-column> <el-table-column prop="qty" label="下料数量" /> <el-table-column prop="cust_code" label="客户编码" /> <el-table-column prop="cust_name" label="客户名称" /> + <el-table-column prop="lettering_message" label="图标前刻字信息" /> + <el-table-column prop="lettering_icon" label="刻字图标" > + <template slot-scope="scope"> + <span v-if="scope.row.lettering_icon==='1' ">普通</span> + <span v-if="scope.row.lettering_icon==='2' ">香港</span> + </template> + </el-table-column> + <el-table-column prop="lettering_message2" label="图标后刻字信息" /> + <el-table-column prop="color_type" label="套冒颜色" > + <el-table-column prop="strap_number" label="捆扎每包数量" /> + <el-table-column prop="labeling_template" label="贴标模板" /> <el-table-column prop="create_by" label="创建者" /> <el-table-column prop="create_time" label="创建时间" /> <!-- <el-table-column label="操作" width="200px" align="center" fixed="right">-->