Merge remote-tracking branch 'origin/master'
| | |
| | | return getDataTable(list); |
| | | } |
| | | |
| | | @PreAuthorize("@ss.hasPermi('bs:orderScheduling:list')") |
| | | @GetMapping("/list2") |
| | | public TableDataInfo list2(BsOrderScheduling bsOrderScheduling) |
| | | { |
| | | // startPage(); |
| | | List<BsOrderScheduling> list = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling); |
| | | return getDataTable(list); |
| | | } |
| | | |
| | | /** |
| | | * 导出订单排产列表 |
| | | */ |
| | |
| | | import com.jcdm.common.annotation.Excel; |
| | | import com.jcdm.common.core.domain.BaseEntity; |
| | | |
| | | import java.util.Date; |
| | | |
| | | /** |
| | | * 订单排产对象 bs_order_scheduling |
| | | * |
| | |
| | | |
| | | private String endTime; |
| | | |
| | | /** 合箱上线时间 */ |
| | | @Excel(name = "合箱上线时间") |
| | | private Date boxClosingOnlineTime; |
| | | |
| | | /** 合箱下线时间 */ |
| | | @Excel(name = "合箱下线时间") |
| | | private Date closingBoxOfflineTime; |
| | | |
| | | /** 总装上线时间 */ |
| | | @Excel(name = "总装上线时间") |
| | | private Date finalAssemblyLaunchTime; |
| | | |
| | | /** 总装下线时间 */ |
| | | @Excel(name = "总装下线时间") |
| | | private Date finalAssemblyOfflineTime; |
| | | |
| | | /** CVT上线时间 */ |
| | | @Excel(name = "CVT上线时间") |
| | | private Date cvtLaunchTime; |
| | | |
| | | /** CVT下线时间 */ |
| | | @Excel(name = "CVT下线时间") |
| | | private Date cvtOfflineTime; |
| | | |
| | | public Date getBoxClosingOnlineTime() { |
| | | return boxClosingOnlineTime; |
| | | } |
| | | |
| | | public void setBoxClosingOnlineTime(Date boxClosingOnlineTime) { |
| | | this.boxClosingOnlineTime = boxClosingOnlineTime; |
| | | } |
| | | |
| | | public Date getClosingBoxOfflineTime() { |
| | | return closingBoxOfflineTime; |
| | | } |
| | | |
| | | public void setClosingBoxOfflineTime(Date closingBoxOfflineTime) { |
| | | this.closingBoxOfflineTime = closingBoxOfflineTime; |
| | | } |
| | | |
| | | public Date getFinalAssemblyLaunchTime() { |
| | | return finalAssemblyLaunchTime; |
| | | } |
| | | |
| | | public void setFinalAssemblyLaunchTime(Date finalAssemblyLaunchTime) { |
| | | this.finalAssemblyLaunchTime = finalAssemblyLaunchTime; |
| | | } |
| | | |
| | | public Date getFinalAssemblyOfflineTime() { |
| | | return finalAssemblyOfflineTime; |
| | | } |
| | | |
| | | public void setFinalAssemblyOfflineTime(Date finalAssemblyOfflineTime) { |
| | | this.finalAssemblyOfflineTime = finalAssemblyOfflineTime; |
| | | } |
| | | |
| | | public Date getCvtLaunchTime() { |
| | | return cvtLaunchTime; |
| | | } |
| | | |
| | | public void setCvtLaunchTime(Date cvtLaunchTime) { |
| | | this.cvtLaunchTime = cvtLaunchTime; |
| | | } |
| | | |
| | | public Date getCvtOfflineTime() { |
| | | return cvtOfflineTime; |
| | | } |
| | | |
| | | public void setCvtOfflineTime(Date cvtOfflineTime) { |
| | | this.cvtOfflineTime = cvtOfflineTime; |
| | | } |
| | | |
| | | public String[] getDateConditions() { |
| | | return dateConditions; |
| | | } |
| | |
| | | import com.jcdm.main.da.opcuaconfig.domain.NodeEntity; |
| | | import com.jcdm.main.da.opcuaconfig.init.BeanUtils; |
| | | import com.jcdm.main.da.paramCollection.domain.DaParamCollection; |
| | | import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService; |
| | | import lombok.extern.slf4j.Slf4j; |
| | | import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue; |
| | | import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId; |
| | |
| | | @Slf4j |
| | | public class MethodName { |
| | | private IDaCollectionParamConfService collectionParamConfService = BeanUtils.getBean(IDaCollectionParamConfService.class); |
| | | private IDaParamCollectionService daParamCollectionService = BeanUtils.getBean(IDaParamCollectionService.class); |
| | | private List<DataValue> s=null; |
| | | public void getSn(String Node, String value) throws Exception { |
| | | log.info(Node+":"+value); |
| | | String[] parts = Node.split("[.]"); |
| | |
| | | DaCollectionParamConf daCollectionParamConf=new DaCollectionParamConf(); |
| | | daCollectionParamConf.setCollectParameterId(parts[0]+"."+parts[1]); |
| | | b=collectionParamConfService.selectDaCollectionParamConfList(daCollectionParamConf); |
| | | List<String> ids = b.stream().map(e -> e.getCollectParameterId()).collect(Collectors.toList()); |
| | | Set<String> de=ListToSet(ids); |
| | | List<DataValue> s=readValues(de); |
| | | // s.forEach(element->{ |
| | | // DaParamCollection Config=new DaParamCollection(); |
| | | // String[] q = element.getIdentifier().split("[.]"); |
| | | // Config.setParamCode(q[2]); |
| | | // Config.setLocationCode(q[1]); |
| | | // Config.setParamValue(element.getValue().toString()); |
| | | // daParamCollectionService.insertDaParamCollection(Config); |
| | | // }); |
| | | |
| | | List<NodeId> nodeId = b.stream().map(info -> { |
| | | NodeId nodeid = new NodeId(2,info.getCollectParameterId()); |
| | | return nodeid; |
| | | }).collect(Collectors.toList()); |
| | | List<DataValue> s=readValues(nodeId); |
| | | |
| | | for(int i=0;i<nodeId.size();i++) |
| | | { |
| | | DaParamCollection Config=new DaParamCollection(); |
| | | Config.setParamCode(nodeId.get(i).getIdentifier().toString().split("[.]")[2]); |
| | | Config.setLocationCode(nodeId.get(i).getIdentifier().toString().split("[.]")[1]); |
| | | Config.setParamValue(s.get(i).getValue().getValue().toString()); |
| | | daParamCollectionService.insertDaParamCollection(Config); |
| | | } |
| | | NodeEntity node2= NodeEntity.builder().index(2).identifier(parts[0]+"."+parts[1]+".RecordDataDone").value("21").type("short").build(); |
| | | Boolean out2=clientHandler.write(node2); |
| | | log.info("节点:{},响应结果:{}", node2.getIdentifier(),out2); |
| | |
| | | default: |
| | | break; |
| | | } |
| | | } |
| | | |
| | | public Set<String> ListToSet(List<String> list) { |
| | | Object[] objects = list.toArray();// 返回Object数组 |
| | | String[] strings1 = new String[list.size()]; |
| | | list.toArray(strings1);// 将转化后的数组放入已经创建好的对象中 |
| | | String[] strings2 = list.toArray(new String[0]);// 将转化后的数组赋给新对象 |
| | | Set<String> set = new HashSet<String>(Arrays.asList(strings2)); |
| | | return set; |
| | | } |
| | | } |
| | |
| | | * @return {@link List<DataValue>} |
| | | * @throws |
| | | */ |
| | | public static List<DataValue> readValues(Set<String> keys){ |
| | | List<NodeId> nodeIdList=new ArrayList<>(500); |
| | | keys.forEach(e->{ |
| | | NodeId nodeId = new NodeId(2, e); |
| | | nodeIdList.add(nodeId); |
| | | }); |
| | | // public static List<DataValue> readValues2(Set<String> keys){ |
| | | // List<NodeId> nodeIdList=new ArrayList<>(500); |
| | | // keys.forEach(e->{ |
| | | // NodeId nodeId = new NodeId(2, e); |
| | | // nodeIdList.add(nodeId); |
| | | // }); |
| | | // try { |
| | | // List<DataValue> dataValues=client.readValues(0.0, TimestampsToReturn.Both,nodeIdList).get(); |
| | | // return dataValues; |
| | | // } catch (InterruptedException | ExecutionException e) { |
| | | // e.printStackTrace(); |
| | | // } |
| | | // return null; |
| | | // } |
| | | |
| | | |
| | | /** |
| | | * 方法描述: 读取多个点位的值 |
| | | * |
| | | * @param nodeIdList 点位集合 |
| | | * @return {@link List<DataValue>} |
| | | * @throws |
| | | */ |
| | | public static List<DataValue> readValues(List<NodeId> nodeIdList){ |
| | | try { |
| | | List<DataValue> dataValues=client.readValues(0.0, TimestampsToReturn.Both,nodeIdList).get(); |
| | | return dataValues; |
| | |
| | | <result property="updateTime" column="update_time" /> |
| | | <result property="remarks" column="remarks" /> |
| | | <result property="report30" column="report_30" /> |
| | | <result property="boxClosingOnlineTime" column="box_closing_online_time" /> |
| | | <result property="closingBoxOfflineTime" column="closing_box_offline_time" /> |
| | | <result property="finalAssemblyLaunchTime" column="final_assembly_launch_time" /> |
| | | <result property="finalAssemblyOfflineTime" column="final_assembly_offline_time" /> |
| | | <result property="cvtLaunchTime" column="cvt_launch_time" /> |
| | | <result property="cvtOfflineTime" column="cvt_offline_time" /> |
| | | |
| | | </resultMap> |
| | | |
| | | <sql id="selectBsOrderSchedulingVo"> |
| | | select id, order_no, engine_no, product_type, model, production_status, working_hours, current_workstation, quality_status, whether_or_print, report_10, report_20, combined_box_time, final_assembly_time, operator, operate_time, status, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks, report_30 from bs_order_scheduling |
| | | select id, order_no, engine_no, product_type, model, production_status, working_hours, current_workstation, quality_status, whether_or_print, report_10, report_20, combined_box_time, final_assembly_time, operator, operate_time, status, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks, report_30, box_closing_online_time, closing_box_offline_time, final_assembly_launch_time, final_assembly_offline_time, cvt_launch_time, cvt_offline_time from bs_order_scheduling |
| | | </sql> |
| | | |
| | | <select id="selectBsOrderSchedulingList" parameterType="BsOrderScheduling" resultMap="BsOrderSchedulingResult"> |
| | |
| | | <if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if> |
| | | <if test="report30 != null and report30 != ''"> and report_30 = #{report30}</if> |
| | | <if test="dateConditions != null and dateConditions != ''"> and operate_time BETWEEN #{startTime} AND #{endTime}</if> |
| | | <if test="boxClosingOnlineTime != null and boxClosingOnlineTime != ''"> and box_closing_online_time = #{boxClosingOnlineTime}</if> |
| | | <if test="closingBoxOfflineTime != null and closingBoxOfflineTime != ''"> and closing_box_offline_time = #{closingBoxOfflineTime}</if> |
| | | <if test="finalAssemblyLaunchTime != null and finalAssemblyLaunchTime != ''"> and final_assembly_launch_time = #{finalAssemblyLaunchTime}</if> |
| | | <if test="finalAssemblyOfflineTime != null and finalAssemblyOfflineTime != ''"> and final_assembly_offline_time = #{finalAssemblyOfflineTime}</if> |
| | | <if test="cvtLaunchTime != null and cvtLaunchTime != ''"> and cvt_launch_time = #{cvtLaunchTime}</if> |
| | | <if test="cvtOfflineTime != null and cvtOfflineTime != ''"> and cvt_offline_time = #{cvtOfflineTime}</if> |
| | | |
| | | |
| | | </where> |
| | |
| | | <if test="updateTime != null">update_time,</if> |
| | | <if test="remarks != null">remarks,</if> |
| | | <if test="report30 != null">report_30,</if> |
| | | <if test="boxClosingOnlineTime != null">box_closing_online_time,</if> |
| | | <if test="closingBoxOfflineTime != null">closing_box_offline_time,</if> |
| | | <if test="finalAssemblyLaunchTime != null">final_assembly_launch_time,</if> |
| | | <if test="finalAssemblyOfflineTime != null">final_assembly_offline_time,</if> |
| | | <if test="cvtLaunchTime != null">cvt_launch_time,</if> |
| | | <if test="cvtOfflineTime != null">cvt_offline_time,</if> |
| | | </trim> |
| | | <trim prefix="values (" suffix=")" suffixOverrides=","> |
| | | <if test="orderNo != null">#{orderNo},</if> |
| | |
| | | <if test="updateTime != null">#{updateTime},</if> |
| | | <if test="remarks != null">#{remarks},</if> |
| | | <if test="report30 != null">#{report30},</if> |
| | | <if test="boxClosingOnlineTime != null">#{boxClosingOnlineTime},</if> |
| | | <if test="closingBoxOfflineTime != null">#{closingBoxOfflineTime},</if> |
| | | <if test="finalAssemblyLaunchTime != null">#{finalAssemblyLaunchTime},</if> |
| | | <if test="finalAssemblyOfflineTime != null">#{finalAssemblyOfflineTime},</if> |
| | | <if test="cvtLaunchTime != null">#{cvtLaunchTime},</if> |
| | | <if test="cvtOfflineTime != null">#{cvtOfflineTime},</if> |
| | | |
| | | </trim> |
| | | </insert> |
| | |
| | | <if test="updateTime != null">update_time = #{updateTime},</if> |
| | | <if test="remarks != null">remarks = #{remarks},</if> |
| | | <if test="report30 != null">report_30 = #{report30},</if> |
| | | <if test="boxClosingOnlineTime != null">box_closing_online_time = #{boxClosingOnlineTime},</if> |
| | | <if test="closingBoxOfflineTime != null">closing_box_offline_time = #{closingBoxOfflineTime},</if> |
| | | <if test="finalAssemblyLaunchTime != null">final_assembly_launch_time = #{finalAssemblyLaunchTime},</if> |
| | | <if test="finalAssemblyOfflineTime != null">final_assembly_offline_time = #{finalAssemblyOfflineTime},</if> |
| | | <if test="cvtLaunchTime != null">cvt_launch_time = #{cvtLaunchTime},</if> |
| | | <if test="cvtOfflineTime != null">cvt_offline_time = #{cvtOfflineTime},</if> |
| | | |
| | | </trim> |
| | | where id = #{id} |
| | |
| | | "vue-count-to": "1.0.13", |
| | | "vue-cropper": "0.5.5", |
| | | "vue-meta": "2.4.0", |
| | | "vue-qr": "^4.0.9", |
| | | "vue-router": "3.4.9", |
| | | "vuedraggable": "2.24.3", |
| | | "vuex": "3.6.0" |
| | |
| | | params: query |
| | | }) |
| | | } |
| | | |
| | | export function listOrderScheduling2(query) { |
| | | return request({ |
| | | url: '/bs/orderScheduling/list2', |
| | | method: 'get', |
| | | params: query |
| | | }) |
| | | } |
| | | // 查询订单排产详细 |
| | | export function getOrderScheduling(id) { |
| | | return request({ |
| | |
| | | <el-table-column label="CVT报工" align="center" prop="report30"> |
| | | |
| | | </el-table-column> |
| | | <el-table-column label="合箱上线" align="center" prop="combinedBoxTime"> |
| | | |
| | | <el-table-column label="合箱上线时间" align="center" prop="boxClosingOnlineTime" width="160"> |
| | | </el-table-column> |
| | | <el-table-column label="总装下线" align="center" prop="finalAssemblyTime"> |
| | | |
| | | <el-table-column label="合箱下线时间" align="center" prop="closingBoxOfflineTime" width="160"> |
| | | </el-table-column> |
| | | <el-table-column label="总装上线时间" align="center" prop="finalAssemblyLaunchTime" width="160"> |
| | | </el-table-column> |
| | | <el-table-column label="总装下线时间" align="center" prop="finalAssemblyOfflineTime" width="160"> |
| | | </el-table-column> |
| | | <el-table-column label="CVT上线时间" align="center" prop="cvtLaunchTime" width="160"> |
| | | </el-table-column> |
| | | <el-table-column label="CVT下线时间" align="center" prop="cvtOfflineTime" width="160"> |
| | | </el-table-column> |
| | | <!-- <el-table-column label="合箱上线" align="center" prop="combinedBoxTime">--> |
| | | |
| | | <!-- </el-table-column>--> |
| | | <!-- <el-table-column label="总装下线" align="center" prop="finalAssemblyTime">--> |
| | | |
| | | <!-- </el-table-column>--> |
| | | <el-table-column label="操作人" align="center" prop="operator"> |
| | | |
| | | </el-table-column> |
| | |
| | | updateUser: null, |
| | | updateTime: null, |
| | | remarks: null, |
| | | report30: null |
| | | report30: null, |
| | | boxClosingOnlineTime: null, |
| | | closingBoxOfflineTime: null, |
| | | finalAssemblyLaunchTime: null, |
| | | finalAssemblyOfflineTime: null, |
| | | cvtLaunchTime: null, |
| | | cvtOfflineTime: null |
| | | }; |
| | | this.resetForm("form"); |
| | | }, |
| | |
| | | handleQuery() { |
| | | this.queryParams.pageNum = 1; |
| | | this.getList(); |
| | | this.$modal.msgSuccess(this.queryParams.operateTime); |
| | | }, |
| | | /** 重置按钮操作 */ |
| | | resetQuery() { |
| | |
| | | </template> |
| | | </el-card> |
| | | <el-row :gutter="5" style="margin-top: 10px"> |
| | | <el-col :span="10" > |
| | | <el-col :span="10" style=" height:600px;width:800px" > |
| | | <el-card class="bottom-card"> |
| | | <el-descriptions :column="1" > |
| | | <el-descriptions-item> |
| | |
| | | </el-card> |
| | | </el-col> |
| | | |
| | | <el-col :span="14" inline style="height:600px;width:850px "> |
| | | <el-col :span="14" inline style="height:600px;width:600px "> |
| | | <el-tabs type="border-card" > |
| | | <el-card> |
| | | <el-col :span="14"style="height: 270px;width:800px "> |
| | |
| | | else{ |
| | | this.reset(); |
| | | this.buttondisabled = true |
| | | this.$modal.msgError('输入的发动机号有误'); |
| | | } |
| | | // this.$modal.msgError('输入的发动机号有误'); |
| | | const h = this.$createElement; |
| | | this.$message({ |
| | | message: h('p',null, [ |
| | | h('span', null, '警告 '), |
| | | h('i', { style: 'color: black' }, '输入的发动机号有误'), |
| | | h()]), |
| | | type: 'error', |
| | | center: true, |
| | | offset:300 |
| | | }); |
| | | } |
| | | }); |
| | | let PassingStationCollectionParam = {sfcCode: null} |
| | | PassingStationCollectionParam.sfcCode = this.form.engineNo; |
| | |
| | | <style scoped> |
| | | ::v-deep .el-input__inner{ |
| | | height: 50px; |
| | | width: 450px; |
| | | } |
| | | ::v-deep .el-form-item__label { |
| | | line-height: 50px; |
| | | } |
| | | |
| | | /*.my-custom-modal .el-dialog__wrapper {*/ |
| | | /* width: 400px; !* 设置宽度 *!*/ |
| | | /* height: 200px; !* 设置高度 *!*/ |
| | | /* top: 50px; !* 设置距离页面顶部的位置 *!*/ |
| | | /* left: 50px; !* 设置距离页面左侧的位置 *!*/ |
| | | /*}*/ |
| | | </style> |
| | |
| | | <template> |
| | | <div class="app-container"> |
| | | <el-card class="box-card"> |
| | | <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px"> |
| | | <el-form-item label-width="120" label="工艺流程编码" prop="routeCode"> |
| | | <el-card class="box-card" > |
| | | <el-form :model="queryParams.orderNo" ref="queryForm" :inline="true" label-width="68px" > |
| | | <el-form-item label-width="120" label="工单编号:" prop="orderNo"> |
| | | <el-input |
| | | v-model="queryParams.routeCode" |
| | | placeholder="请输入工艺流程编码" |
| | | v-model="queryParams.orderNo" |
| | | placeholder="请输入工单编号" |
| | | clearable |
| | | @keyup.enter.native="handleQuery" |
| | | /> |
| | | </el-form-item> |
| | | <el-form-item style="float: right"> |
| | | <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> |
| | | <el-form-item style="margin-left: 20px"> |
| | | <el-button type="primary" icon="el-icon-refresh" @click="handleQuery">查询</el-button> |
| | | </el-form-item> |
| | | <el-form-item style="margin-left: 360px"> |
| | | <el-checkbox-group v-model="queryParams.isRepairFlag"> |
| | | <el-checkbox @change="cleanFlag" name="type"></el-checkbox> |
| | | </el-checkbox-group> |
| | | </el-form-item> |
| | | <el-form-item label-width="120" label="返修发动机号:" prop="repairEngineNo" style="margin-left: 5px"> |
| | | |
| | | <el-input |
| | | :disabled="!queryParams.isRepairFlag" |
| | | v-model="queryParams.repairEngineNo" |
| | | clearable |
| | | @keyup.enter.native="handleQuery" |
| | | /> |
| | | </el-form-item> |
| | | |
| | | |
| | | </el-form> |
| | | </el-card> |
| | | <el-card style="margin-top: 10px" class="box-card"> |
| | | <el-table border v-loading="loading" :data="dataList" v-if="dataList.length > 0"> |
| | | <el-table-column type="selection" width="55" align="center" /> |
| | | <el-table-column :show-overflow-tooltip='true' label="工单编号" width="130" align="center"> |
| | | <template slot-scope="scope"> |
| | | <router-link :to="{path: '/main/route-data/index/', query: {routeCode: scope.row.routeCode,routeId: scope.row.id} }" class="link-type"> |
| | | <span>{{ scope.row.routeCode }}</span> |
| | | </router-link> |
| | | </template> |
| | | </el-table-column> |
| | | <el-table-column :show-overflow-tooltip='true' label="产品小系列" width="130" align="center" prop="routeName"> |
| | | </el-table-column> |
| | | <el-table-column label="SN流水号" width="130" align="center" prop="productCode"> |
| | | </el-table-column> |
| | | <el-table-column label="状态" width="160" align="center" prop="productName"> |
| | | </el-table-column> |
| | | <el-table-column label="是否打印" align="center" prop="version"> |
| | | </el-table-column> |
| | | <el-table-column label="打印时间" align="center" prop="status"> |
| | | <template slot-scope="scope"> |
| | | <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/> |
| | | </template> |
| | | </el-table-column> |
| | | </el-table> |
| | | <el-empty v-else> |
| | | <span slot="description">暂无数据</span> |
| | | </el-empty> |
| | | </el-card> |
| | | <el-row :gutter="0"> |
| | | <el-col :span="20"> |
| | | <div style="height: 490px;"> |
| | | <el-card style="margin-top: 10px; height: 490px; " class="box-card"> |
| | | <el-table border v-loading="loading" :data="dataList" height="460" |
| | | style="width: 100%" v-if="dataList.length > 0"> |
| | | |
| | | <el-table-column :show-overflow-tooltip='true' label="工单编号" width="230" align="center" prop="orderNo"> |
| | | </el-table-column> |
| | | <el-table-column :show-overflow-tooltip='true' label="产品小系列" width="230" align="center" prop="model"> |
| | | </el-table-column> |
| | | <el-table-column :show-overflow-tooltip='true' label="SN流水号" width="230" align="center" prop="engineNo"> |
| | | </el-table-column> |
| | | <el-table-column label="状态" width="80" align="center" prop="productionStatus"> |
| | | <!-- <template slot-scope="scope">--> |
| | | <!-- <span v-if="scope.row.productionStatus === '1'">是</span>--> |
| | | <!-- <span v-if="scope.row.productionStatus === '0'">否</span>--> |
| | | <!-- </template>--> |
| | | <template slot-scope="scope"> |
| | | <dict-tag :options="dict.type.order_scheduling_produce_status" :value="scope.row.productionStatus"/> |
| | | </template> |
| | | </el-table-column> |
| | | <el-table-column label="是否打印" width="80" align="center" prop="whetherOrPrint"> |
| | | |
| | | <template slot-scope="scope"> |
| | | <dict-tag :options="dict.type.print_status" :value="scope.row.whetherOrPrint"/> |
| | | </template> |
| | | |
| | | </el-table-column> |
| | | <el-table-column label="打印时间" align="center" prop="null"> |
| | | </el-table-column> |
| | | </el-table> |
| | | <el-empty v-else> |
| | | <span slot="description">暂无数据</span> |
| | | </el-empty> |
| | | </el-card> |
| | | </div> |
| | | |
| | | </el-col> |
| | | <el-col :span="4"> |
| | | <el-card style="margin-top: 10px; min-height: 490px" class="box-card"> |
| | | <div style="min-width: 180px;min-height: 185px"> |
| | | <vue-qr |
| | | v-if="qrCode !==''" |
| | | ref="qrCode" |
| | | :text="qrCode" |
| | | width="180" |
| | | height="180" |
| | | ></vue-qr> |
| | | </div> |
| | | |
| | | <el-button type="success" style="margin-top: 190px; margin-left: 50px; width: 100px">系统设置</el-button> |
| | | </el-card> |
| | | </el-col> |
| | | </el-row> |
| | | |
| | | |
| | | </div> |
| | | </template> |
| | | |
| | | <script> |
| | | import {listOrderScheduling2} from "@/api/main/bs/orderScheduling/orderScheduling"; |
| | | import VueQr from 'vue-qr' |
| | | export default { |
| | | name: "index", |
| | | dicts: ['sys_normal_disable'], |
| | | dicts: ['sys_normal_disable','order_scheduling_produce_status','print_status'], |
| | | components: { |
| | | VueQr, |
| | | }, |
| | | data(){ |
| | | return{ |
| | | qrCode: '', |
| | | // 查询参数 |
| | | queryParams: { |
| | | pageNum: 1, |
| | | pageSize: 10, |
| | | routeCode: null, |
| | | routeName: null, |
| | | productCode: null, |
| | | productName: null, |
| | | status: null, |
| | | dataSource: null, |
| | | orderNo: '', |
| | | isRepairFlag: '', |
| | | repairEngineNo: '' |
| | | }, |
| | | dataList: [] |
| | | } |
| | |
| | | methods:{ |
| | | /** 搜索按钮操作 */ |
| | | handleQuery() { |
| | | this.queryParams.pageNum = 1; |
| | | this.getList(); |
| | | }, |
| | | getList(){ |
| | | listOrderScheduling2(this.queryParams).then(response => { |
| | | console.log("--------------------"+response.rows) |
| | | this.dataList = response.rows |
| | | if (this.queryParams.orderNo === '' || this.queryParams.orderNo === null){ |
| | | this.qrCode = '' |
| | | }else { |
| | | if (this.dataList.length > 0){ |
| | | this.qrCode = this.queryParams.orderNo |
| | | }else { |
| | | this.qrCode = '' |
| | | } |
| | | } |
| | | console.log("qrcode",this.qrCode) |
| | | |
| | | }); |
| | | }, |
| | | filterTag(value, row) { |
| | | return row.tag === value; |
| | | }, |
| | | cleanFlag(){ |
| | | if (this.queryParams.isRepairFlag === false){ |
| | | this.queryParams.repairEngineNo = '' |
| | | } |
| | | }, |
| | | filterHandler(value, row, column) { |
| | | const property = column['property']; |
| | | return row[property] === value; |
| | | }, |
| | | |
| | | }, |
| | | mounted() { |
| | | this.getList() |
| | | } |
| | | } |
| | | </script> |
| | | |
| | | <style scoped> |
| | | |
| | | ::v-deep .el-form-item__label{ |
| | | font-size: large; |
| | | } |
| | | ::v-deep .el-card__body{ |
| | | padding: 15px 20px 0px 20px; |
| | | } |
| | | </style> |