bug修改

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

@@ -243,25 +243,25 @@
           <span>{{ parseTime(scope.row.requestDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         label="生产状态"
         align="center"
         prop="status"
         width="120"
-      />
-      <el-table-column label="备注" align="center" prop="remark" width="120" />
+      /> -->
       <el-table-column
         label="操作"
         width="150px"
         align="center"
         class-name="small-padding fixed-width"
+        fixed="right"
       >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.status == 'NORMARL'"
+            v-if="scope.row.status == 'PREPARE'"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:pro:protask:edit']"
             >排产</el-button
@@ -395,25 +395,25 @@
         <el-button
           type="primary"
           @click="cancel"
-          v-if="optType == 'view' || form.status != 'NORMARL'"
+          v-if="optType == 'view' || form.status != 'PREPARE'"
           >返回</el-button
         >
         <el-button
           type="primary"
           @click="submitForm"
-          v-if="form.status == 'NORMARL' && optType != 'view'"
+          v-if="form.status == 'PREPARE' && optType != 'view'"
           >确 定</el-button
         >
-        <el-button
+        <!-- <el-button
           type="success"
           @click="handleFinish"
           v-if="
-            form.status == 'NORMARL' &&
+            form.status == 'PREPARE' &&
             optType != 'view' &&
             form.workorderId != null
           "
           >完成</el-button
-        >
+        > -->
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -523,7 +523,7 @@ export default {
         colorCode: null,
         requestDate: null,
         remark: null,
-        status: "NORMARL",
+        status: "PREPARE",
         workunitName: null,
         workunitId: null,
       },

src/views/mes/pro/workorder/indexApply.vue

@@ -623,7 +623,6 @@
 </template>
 
 <script>
-<<<<<<< HEAD
 import {
   listWorkorder,
   getWorkorder,
@@ -633,9 +632,6 @@ import {
   dofinish,
 } from "@/api/mes/pro/workorder";
 import { addProtaskList } from "@/api/mes/pro/protask";
-=======
-import { listWorkorder, getWorkorder, delWorkorder, addWorkorder, updateWorkorder ,dofinish,confirmedWorkorder} from "@/api/mes/pro/workorder";
->>>>>>> feature/jzc/brand/0.0.2
 import Workorderbom from "./bom/bom.vue";
 import WorkorderItemList from "./items/item.vue";
 import ItemSelect from "@/components/itemSelect/single.vue";

src/views/mes/wm/issue/index.vue

@@ -50,7 +50,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -59,8 +59,8 @@
           @click="handleAdd"
           v-hasPermi="['mes:wm:issueheader:add']"
         >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
+      </el-col> -->
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -70,7 +70,7 @@
           @click="handleUpdate"
           v-hasPermi="['mes:wm:issueheader:edit']"
         >修改</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -130,14 +130,14 @@
             @click="handleExecute(scope.row)"
             v-hasPermi="['mes:wm:issueheader:edit']"
           >执行领出</el-button>
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             v-if="scope.row.status =='PREPARE'"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:wm:issueheader:edit']"
-          >修改</el-button>
+          >修改</el-button> -->
           <el-button
             size="mini"
             type="text"