浏览代码

隐藏工序

wangxin 22 小时之前
父节点
当前提交
323e854ce2
共有 2 个文件被更改,包括 97 次插入24 次删除
  1. 1 0
      src/api/business/daywork.js
  2. 96 24
      src/views/business/reviseBath/onceSingleChangeDialog.vue

+ 1 - 0
src/api/business/daywork.js

@@ -48,6 +48,7 @@ export function processesForOutsource(query) {
 		method: 'get',
 		params: query
 	})
+	
 }
 
 export function processesForOutsourceByFirst(query) {

+ 96 - 24
src/views/business/reviseBath/onceSingleChangeDialog.vue

@@ -1,21 +1,58 @@
 <template>
-  <el-dialog title="单批单改" v-model="visible" width="680px" append-to-body draggable @close="cancel">
+  <el-dialog
+    title="单批单改"
+    v-model="visible"
+    width="680px"
+    append-to-body
+    draggable
+    @close="cancel"
+  >
     <el-form class="list-search-container" :inline="true">
       <el-form-item>
-        <el-button type="primary" icon="Plus" :disabled="click" @click="handleAdd">在此工序前添加新工序
+        <el-button
+          type="primary"
+          icon="Plus"
+          :disabled="click"
+          @click="handleAdd"
+          >在此工序前添加新工序
         </el-button>
-        <el-button type="danger" :disabled="click" @click="handleDel" icon="delete">删除
+        <el-button
+          type="danger"
+          :disabled="click"
+          @click="handleDel"
+          icon="delete"
+          >删除
         </el-button>
       </el-form-item>
     </el-form>
     <div class="el-table-inner-container">
-      <el-table ref="processTable" style="height: 500px" v-loading="loading" @selection-change="handleSelectionChange"
-        :data="processList">
-        <el-table-column type="selection" :selectable="checkSelectable" width="50" align="center" />
-        <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
+      <el-table
+        ref="processTable"
+        style="height: 500px"
+        v-loading="loading"
+        @selection-change="handleSelectionChange"
+        :data="processList"
+      >
+        <el-table-column
+          type="selection"
+          :selectable="checkSelectable"
+          width="50"
+          align="center"
+        />
+        <el-table-column
+          type="index"
+          label="序号"
+          width="50"
+          align="center"
+        ></el-table-column>
         <el-table-column label="工序名称" prop="processAlias" align="center" />
 
-        <el-table-column label="工序编号" prop="processStepNumber" width="200" align="center" />
+        <el-table-column
+          label="工序编号"
+          prop="processStepNumber"
+          width="200"
+          align="center"
+        />
       </el-table>
     </div>
     <template #footer>
@@ -26,33 +63,69 @@
     </template>
   </el-dialog>
 
-  <el-dialog title="选择工序" v-model="addProcess" width="800px" append-to-body draggable @close="processClose">
+  <el-dialog
+    title="选择工序"
+    v-model="addProcess"
+    width="800px"
+    append-to-body
+    draggable
+    @close="processClose"
+  >
     <div class="page-container column-container">
       <el-form style="padding: 16px" :inline="true">
         <el-form-item label="工序名称:">
-          <el-input placeholder="请输入工序名称或简称" @keydown.enter.prevent @keyup.enter="handleSelect" clearable
-            v-model="queryParams.keyword" style="width: 200px" />
-          <el-button style="margin-left: 20px" type="primary" @click="handleSelect">搜索
+          <el-input
+            placeholder="请输入工序名称或简称"
+            @keydown.enter.prevent
+            @keyup.enter="handleSelect"
+            clearable
+            v-model="queryParams.keyword"
+            style="width: 200px"
+          />
+          <el-button
+            style="margin-left: 20px"
+            type="primary"
+            @click="handleSelect"
+            >搜索
           </el-button>
         </el-form-item>
       </el-form>
       <div class="el-table-inner-container">
         <el-table height="95%" :data="addProcessList">
-          <el-table-column label="工序编号" prop="processCode" align="center"></el-table-column>
+          <el-table-column
+            label="工序编号"
+            prop="processCode"
+            align="center"
+          ></el-table-column>
 
-          <el-table-column label="工序名称" prop="processAlias" align="center"></el-table-column>
+          <el-table-column
+            label="工序名称"
+            prop="processAlias"
+            align="center"
+          ></el-table-column>
 
           <el-table-column label="操作" width="80" align="center">
             <template #default="scope">
-              <el-button link size="small" type="primary" icon="check" @click="handleProcess(scope.row)">选择
+              <el-button
+                link
+                size="small"
+                type="primary"
+                icon="check"
+                @click="handleProcess(scope.row)"
+                >选择
               </el-button>
             </template>
           </el-table-column>
         </el-table>
       </div>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize" @pagination="handleSelect" />
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="handleSelect"
+      />
     </div>
   </el-dialog>
 </template>
@@ -94,7 +167,7 @@ function open(id) {
     lot.value = res.data.lot;
     dayworkItem.value = res.data.dayworkItem;
     processList.value = res.data.processDetails;
-    console.log(processList.value)
+    console.log(processList.value);
     loading.value = false;
   });
 }
@@ -118,7 +191,6 @@ function handleDel() {
   //查询选中数据
   const delRows = processTable.value.getSelectionRows();
   if (delRows.length > 0) {
-
     proxy.$modal.confirm("是否确认删除该条数据?").then(() => {
       processList.value = processList.value.filter(
         (item) => !delRows.includes(item)
@@ -130,7 +202,7 @@ function handleDel() {
 
 /** 新增工序确认按钮 操作*/
 function handleProcess(row) {
-  console.log(row)
+  console.log(row);
   //查询选中工序位置
   const clickProcess = processTable.value.getSelectionRows();
   let indexNum = processList.value.findIndex((item) =>
@@ -148,6 +220,7 @@ function handleProcess(row) {
   process.processCode = row.processCode;
   process.processId = row.id;
   process.processKey = row.processKey;
+  process.isConceal = row.isConceal;
 
   //插入数据
   processList.value.splice(indexNum, 0, process);
@@ -167,7 +240,7 @@ function handleProcess(row) {
 function checkSelectable(row) {
   //第一道序备料,跳过第一道序
   if (row.processCode == processList.value[0].processCode) {
-    return false
+    return false;
   }
   if (dayworkItem.value && dayworkItem.value.status != 0) {
     return dayworkItem.value.status != 0
@@ -176,8 +249,7 @@ function checkSelectable(row) {
   }
   if (dayworkItem.value && dayworkItem.value.status == 0) {
     return row.processStepNumber >= dayworkItem.value.processStepNumber;
-  }
-  else {
+  } else {
     return true;
   }
 }
@@ -188,7 +260,7 @@ function handleAdd() {
   //   proxy.$modal.msgError("只能修改一次工序数据");
   //   return;
   // }
-  queryParams.value.keyword = ""
+  queryParams.value.keyword = "";
   handleSelect();
   addProcess.value = true;
 }