update:修改退料管理加字段

src/views/mes/cal/calendar/team.vue

@@ -15,14 +15,19 @@
                               <template slot="dateCell" slot-scope="{date, data }">
                               <div>
                                     <el-row>
-                                          <el-col :span="6">
+                                          <el-col :span="18">
                                                 <div class="solar">
-                                                      {{ data.day.split('-')[2] }}
+                                                      {{ data.day.split('-')[1]+'-'+data.day.split('-')[2] }}
                                                 </div>
                                           </el-col>
-                                          <el-col :span="12">
+                                          <!-- <el-col :span="6">
+                                                <div class="solar">
+                                                      {{ data.day.split('-')[2] }}
+                                                </div>
+                                          </el-col> -->
+                                          <!-- <el-col :span="12">
                                                 <div class="lunar" :class="{ festival : isFestival(date, data) }">{{ solarDate2lunar(data.day) }}</div>
-                                          </el-col>
+                                          </el-col> -->
                                           <el-col :span="6">
                                               <el-tag v-if="workdayList.indexOf(data.day)> -1" effect="dark">班</el-tag>
                                               <el-tag v-else-if="holidayList.indexOf(data.day) > -1" effect="dark" type="success">休</el-tag>
@@ -101,6 +106,9 @@ export default {
                   this.holidayList =[];
                   this.workdayList =[];
                   let that = this;
+                  if (this.teamShiftQueryParams.workunitName) {
+                    this.queryParams.workunitName = this.teamShiftQueryParams.workunitName
+                  }
                   listCalholiday(this.queryParams).then(response => {
                   if(response.data !=null){
                         response.data.forEach(theDay => {
@@ -123,6 +131,7 @@ export default {
                         this.calendarDayList = response.data;
                         this.loading = false;
                   });
+                  this.getList()
             },
             isFestival(slotDate, slotData) {
                   let solarDayArr = slotData.day.split('-');

src/views/mes/pro/return/index.vue

@@ -123,12 +123,15 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="产品编码" align="center" prop="itemCode" />
       <el-table-column label="产品名称" align="center" prop="itemName" />
-      <el-table-column label="工单号" align="center" prop="workorderCode" />
+      <el-table-column label="申请单编码" align="center" prop="applyNo" />
+      <el-table-column label="工作单元编码" align="center" prop="workunitCode" />
+      <el-table-column label="工作单元名称" align="center" prop="workunitName" />
+      <el-table-column label="生产工单号" align="center" prop="workorderCode" />
       <el-table-column label="批次号" align="center" prop="batchNo" />
       <el-table-column label="卷号" align="center" prop="packNo" />
       <el-table-column label="退料数量" align="center" prop="backNum" />
        <el-table-column label="创建人" align="center" prop="createBy" />
-       <el-table-column label="创建时间" align="center" prop="createTime" />
+       <el-table-column label="创建时间" width="170" align="center" prop="createTime" />
        <el-table-column label="是否合格" align="center" prop="isQualified">
         <template slot-scope="scope">
           <dict-tag