| src/api/plan/productionschedul.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/plan/productionschedul/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/quality/rawMaterial/rawMaterial-form.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| vue.config.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/api/plan/productionschedul.js
@@ -10,7 +10,7 @@ export function fetchScheduleById(id) { return request({ url: '/mes/productionSchedul/'+id, url: '/mes/productionSchedul/selTime/'+id, method: 'get', }) } src/views/plan/productionschedul/index.vue
@@ -7,8 +7,11 @@ <el-col :span="24"> <div style="height:40vh;padding: 0px 10px;"> <span style="position: relative;top:40px;">未完成</span> <span style="position: relative;top:30px;left:73%;z-index: 11"> <span style="position: relative;top:30px;left:60%;z-index: 11"> <el-button @click="tagFinished" size="mini" round type="primary">标记已完成</el-button> <el-button size="mini" round type="primary" v-if="permissions.plan_productionschedul_edit_line" @click="openEditDialog">编辑时间线</el-button> </span> <avue-crud :data="tableData" @@ -42,7 +45,7 @@ <el-row> <el-col :span="24"> <div style="height:40vh;padding: 0px 10px;"> <span style="position: relative;top:40px;">已完成</span> <span style="position: relative;top:40px">已完成</span> <avue-crud :data="finishedTableData" ref="finished" @@ -52,7 +55,7 @@ @current-change="handleCurrentChange" @size-change="handleSizeChange" :page="finishedPage" @selection-change="selectionRow"> @selection-change="selectionFinishedRow"> <!-- <template #menu="{ row, index }"> <el-button v-if="permissions.plan_productionschedul_del" @@ -71,7 +74,6 @@ <el-card> <div slot="header" class="clearfix"> <span>调度时间线</span> <el-button v-if="permissions.plan_productionschedul_edit_line && scheduleList.length>0" @click="openEditDialog" style="float: right; padding: 3px 0" type="text">编辑</el-button> </div> <div style="height:70vh;overflow-y: scroll;"> <el-timeline> @@ -541,6 +543,10 @@ } }, openEditDialog(){ if(this.multipleSelection.length<1){ this.$message.error("请至少选择一条数据") return } this.scheduleEditList = JSON.parse(JSON.stringify(this.scheduleList)) this.dialogVisible = true }, @@ -642,6 +648,17 @@ this.multipleSelection = val // this.getScheduleById(val[0].id) }, selectionFinishedRow(val){ console.log(val); if (val.length > 1) { const preVal = val.shift(); this.$refs.finished.toggleRowSelection(preVal, false); } else{ this.scheduleList=[] } this.getScheduleById(val[0].mid) }, formatDate(row, cellValue){ if (cellValue) { const dutyDateList = /\d{4}-\d{1,2}-\d{1,2}/g.exec(cellValue) src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -106,20 +106,17 @@ </el-row> </el-form> </div> <div class="rawMaterial-detail"> <el-row style="width:100%;z-index: 10;height:50px;"> <el-col :span="18">检验项目</el-col> <el-col :span="2"> <el-button style="width:90%" v-if="dataForm.id==null" size="small" @click="clickAddLine()">添加检验项目</el-button> <el-col :xs="12" :lg="15">检验项目</el-col> <el-col :xs="4" :lg="3" style="text-align: right;"> <el-button v-if="dataForm.id==null" size="small" @click="clickAddLine()">添加检验项目</el-button> </el-col> <el-col :span="2"> <el-button style="width:90%" v-if="resultVal==null || dataForm.id==null" size="small" @click="addTeatValueColumn()">添加检测值列</el-button> <el-col :xs="4" :lg="3" style="text-align: right;"> <el-button class="pad-addcol-btn" v-if="resultVal==null || dataForm.id==null" size="small" @click="addTeatValueColumn()">添加检测值列</el-button> </el-col> <el-col :span="2"> <el-button style="width:90%" v-if="resultVal==null || dataForm.id==null" size="small" @click="delTeatValueColumn()">删除检测值列</el-button> <el-col :xs="4" :lg="3" style="text-align: right;"> <el-button v-if="resultVal==null || dataForm.id==null" size="small" @click="delTeatValueColumn()">删除检测值列</el-button> </el-col> </el-row> <el-row style="width:100%;"> @@ -1006,4 +1003,9 @@ border: 1px solid #e4e7ed; border-bottom: none; } @media (max-width: 767px) { .pad-addcol-btn{ font-size:12px; } } </style> vue.config.js
@@ -4,10 +4,10 @@ */ const url = 'http://192.168.2.7:9999' // const url = 'http://192.168.2.7:9999' // const url = 'http://192.168.32.45:9999' // const url = 'http://localhost:9999' const url = 'http://localhost:9999' const localUrl = 'http://localhost:8089'
