update:修改节假日设置和排班计划

src/views/mes/cal/holiday/index.vue

@@ -46,11 +46,11 @@
                 <el-button @click="cancel">取 消</el-button>
             </div>
         </el-dialog> -->
-        <el-dialog :title="title" :visible.sync="open" width="1300px" append-to-body>
+        <el-dialog :title="title" :visible.sync="open" width="1400px" append-to-body>
             <item-index ref="itemIndex" v-if="open" optType="add" :theDay="theDay"></item-index>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" v-hasPermi="['mes:cal:calholiday:edit']" @click="submitForm(2)">放 假</el-button>
-                <el-button type="primary" v-hasPermi="['mes:cal:calholiday:edit']" @click="submitForm(1)">加 班</el-button>
+                <!-- <el-button type="primary" v-hasPermi="['mes:cal:calholiday:edit']" @click="submitForm(1)">加 班</el-button> -->
                 <el-button @click="cancel">取 消</el-button>
             </div>
         </el-dialog>

src/views/mes/cal/holiday/itemIndex.vue

@@ -10,20 +10,19 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-       <el-form-item label="工作状态" prop="isWork">
+       <el-form-item label="班次" prop="shiftName">
         <el-select
-          v-model="queryParams.isWork"
-          placeholder="请选择工作状态"
+          v-model="queryParams.shiftName"
           clearable
+          placeholder="请选择班次"
         >
           <el-option
-            label="工作"
-            value="1"
-          />
-          <el-option
-            label="休息"
-            value="2"
-          />
+            v-for="dict in dict.type.SHIFT_TYPE"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.label"
+          >
+          </el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -36,6 +35,7 @@
       <el-table-column label="工作单元ID" align="center" prop="workunitId" />
       <el-table-column label="工作单元编码" align="center" prop="workunitCode" />
       <el-table-column label="工作单元名称" align="center" prop="workunitName" />
+      <el-table-column label="班次" align="center" prop="shiftName" />
       <el-table-column label="工作状态" align="center" prop="isWork" >
         <template slot-scope="scope">
           {{ scope.row.isWork == '1'? '工作': '休息' }}
@@ -62,6 +62,7 @@
 import { listItem } from "@/api/mes/cal/calholiday";
 
 export default {
+  dicts: ['SHIFT_TYPE'],
   name: "TmToolRequestItem",
   components: {},
   props:{
@@ -91,8 +92,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        workunitId: null,
-        isWork: null,
+        shiftName: null,
+        isWork: 1,
         theDay: this.theDay
       },
       // 表单参数
@@ -130,14 +131,14 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        toolRequestItemId: null,        toolRequestId: null,        itemId: null,        allQuantity: null,        nextMaintenPeriod: null,        createBy: null,        createTime: null,        updateBy: null,        updateTime: null      };
-      this.resetForm("form");
+      // this.reset();
     },
+    // // 表单重置
+    // reset() {
+    //   this.form = {
+    //     toolRequestItemId: null,        toolRequestId: null,        itemId: null,        allQuantity: null,        nextMaintenPeriod: null,        createBy: null,        createTime: null,        updateBy: null,        updateTime: null      };
+    //   this.resetForm("form");
+    // },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;

src/views/mes/cal/plan/index.vue

@@ -195,7 +195,8 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="轮班方式">
-              <el-radio-group v-model="form.shiftType">
+              <el-radio-group v-model="form.shiftType"
+                    :disabled="optType === 'view'">
                 <el-radio
                   v-for="dict in dict.type.mes_shift_type"
                   :key="dict.value"
@@ -340,10 +341,8 @@ export default {
         calendarType:null,
         startDate: null,
         endDate: null,
-        shiftType: 'SHIFT_TWO',
-        shiftMethod: 'MONTH',
-        shiftCount: 1,
-        status: "PREPARE",
+        shiftType: '',
+        status: "",
         remark: null,
         saturday: null,
         sunday: null,
@@ -369,6 +368,8 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.form.shiftType = 'SHIFT_TWO'
+      this.form.status = "PREPARE",
       this.open = true;
       this.title = "添加排班计划";
       this.handleAutoGenChange()

src/views/mes/cal/plan/shift.vue

@@ -41,7 +41,19 @@
             </el-col> -->
             <el-col :span="12">
                 <el-form-item label="班次名称" prop="shiftName">
-                    <el-input v-model="form.shiftName" placeholder="请输入班次名称" />
+                  <el-select
+                    v-model="form.shiftName"
+                    clearable
+                    placeholder="请选择班次"
+                  >
+                    <el-option
+                      v-for="dict in dict.type.SHIFT_TYPE"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.label"
+                    >
+                    </el-option>
+                  </el-select>
                 </el-form-item>
             </el-col>
           </el-row>
@@ -110,6 +122,7 @@ import { listShift, listEditShift } from "@/api/mes/cal/shift";
 
 export default {
   name: "Shift",
+  dicts: ['SHIFT_TYPE'],
   props: {
       shiftType: null,
       planId: null,
@@ -119,17 +132,23 @@ export default {
     // 根据名称筛选分类树
     shiftType: {
       handler (newName, oldName) {
-        if (newName&&this.optType === 'add'&& !this.plan) {
-          this.getList();
-          console.log(889999)
+        console.log(newName, 'shiftType')
+        if (newName) {
+          if (this.planId&&!this.editShiftType) {
+            this.getEditList();
+          } else if ((this.optType === 'view' || this.optType === 'edit')&&(this.editShiftType && this.editShiftType === newName)) {
+            this.getEditList();
+          } else {
+              this.getList();
+          }
         }
       },
       immediate: true
     },
     planId: {
       handler (newName, oldName) {
-        if (newName&&this.optType === 'edit') {
-          this.getEditList();
+        if (newName) {
+          this.editShiftType = this.shiftType
         }
       },
       immediate: true
@@ -137,6 +156,7 @@ export default {
   },
   data() {
     return {
+      editShiftType: null,
       currentIndex: null,
       currentRow: {},
       // 遮罩层
@@ -182,6 +202,7 @@ export default {
     /** 查询计划班次列表 */
     getList() {
       this.loading = true;
+      this.queryParams.shiftType = this.shiftType
       listShift(this.queryParams).then(response => {
         this.shiftList = response.data;
         this.loading = false;

src/views/mes/pro/workorder/components/ProogingProcess.vue

@@ -5,7 +5,7 @@
       <el-table-column label="工序名称" prop="processName" align="center" />
       <el-table-column label="工序编码" prop="processCode" align="center" />
       <el-table-column label="工作站" prop="workstationName" align="center" />
-      <el-table-column label="工作单元名称" prop="workunitName" align="center" />
+      <el-table-column v-if="mode === 'make'" label="工作单元名称" prop="workunitName" align="center" />
       <el-table-column label="标准工时" prop="stdWorkingTime" align="center" />
       <el-table-column label="换型时间" prop="lineBreakTime" align="center" />
       <el-table-column label="工序总数量" prop="quantity" align="center" />
@@ -18,8 +18,30 @@
         </template>
       </el-table-column>
       <el-table-column label="标准文本代码" prop="x" align="center" />
-      <el-table-column label="开始时间" align="center" prop="startTime" />
-      <el-table-column label="结束时间" align="center" prop="endTime" />
+      <el-table-column width="220" v-if="mode === 'make'" label="开始时间" align="center" prop="startTime" >
+        <template slot-scope="scope">
+          <el-date-picker
+            v-model="scope.row.startTime"
+            type="datetime"
+            style="width:200px;"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择开始时间"
+          >
+          </el-date-picker>
+        </template>
+      </el-table-column>
+      <el-table-column width="220" v-if="mode === 'make'" label="结束时间" align="center" prop="endTime" >
+        <template slot-scope="scope">
+          <el-date-picker
+            v-model="scope.row.endTime"
+            type="datetime"
+            style="width:200px;"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择结束时间"
+          >
+          </el-date-picker>
+        </template>
+      </el-table-column>
       <el-table-column
          v-if="!(mode === 'info'|| mode === 'make')"
         label="操作"