特殊报工

src/api/business/planDetailSubDetail.js

@@ -42,6 +42,15 @@ export function getDeptList() {
   })
 }
 
+export function specialGetDeptList() {
+  return request({
+    url: baseUrl + '/business/planDetailSubDetail/specialGetDeptList',
+    method: 'get'
+  })
+}
+
+
+
 export function getDeptListByUserId() {
   return request({
     url: baseUrl + '/business/planDetailSubDetail/getDeptListByUserId',

src/views/business/specialDaywork/form.vue

@@ -173,7 +173,6 @@
                 style="width: 100px"
                 placeholder="计划单号"
                 clearable
-                @keyup.enter="handleQuery"
               />
             </el-form-item>
             <el-form-item
@@ -187,7 +186,6 @@
                 placeholder="产品描述"
                 disabled="true"
                 clearable
-                @keyup.enter="handleQuery"
               />
             </el-form-item>
             <el-form-item
@@ -201,7 +199,6 @@
                 :disabled="lotClick"
                 style="width: 150px"
                 clearable
-                @keyup.enter="handleQuery"
               />
             </el-form-item>
 
@@ -490,7 +487,6 @@
                 style="width: 100px"
                 placeholder="计划单号"
                 clearable
-                @keyup.enter="handleQuery"
               />
             </el-form-item>
             <el-form-item
@@ -504,7 +500,6 @@
                 placeholder="产品描述"
                 disabled="true"
                 clearable
-                @keyup.enter="handleQuery"
               />
             </el-form-item>
             <el-form-item
@@ -518,7 +513,6 @@
                 disabled="true"
                 style="width: 150px"
                 clearable
-                @keyup.enter="handleQuery"
               />
             </el-form-item>
           </el-form>
@@ -802,7 +796,6 @@
                 :precision="0"
                 controls-position="right"
                 clearable
-                @keyup.enter="handleQuery"
               />
               <span v-show="daywork.itemStatus >= 4">
                 {{ scope.row.qualifiedNum }}

src/views/business/specialDaywork/index.vue

@@ -51,8 +51,23 @@
         </el-select>
       </el-form-item>
       <el-form-item class="section-title" label="请选择工段：">
+        <!-- <el-select
+          v-model="queryParams.deptId"
+          clearable
+          placeholder="请选择工段"
+          style="width: 120px"
+          @change="handleDeptChange"
+        >
+          <el-option
+            v-for="dict in deptList"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select> -->
         <el-select-v2
           v-model="queryParams.deptId"
+          filterable
           :options="deptList"
           placeholder="请选择工段"
           style="width: 100px"
@@ -118,7 +133,7 @@
         type="info"
         icon="Close"
         :disabled="ids.length == 0"
-        v-hasPermi="['business:specialDaywork:turnaround']"
+        v-hasPermi="['business:specialDaywork:cancelTurnaround']"
         @click="handleNoTurnoverInfo"
       >
         取消周转
@@ -290,7 +305,7 @@
                 link
                 type="danger"
                 icon="close"
-                v-hasPermi="['business:specialDaywork:edit']"
+                v-hasPermi="['business:specialDaywork:cancelTurnaround']"
                 @click="handleNoTurnoverInfo(scope.row)"
               >
                 取消周转
@@ -332,7 +347,7 @@ import {
   cancelSpecialDaywork,
   carrierFinishedCheck,
 } from "@/api/business/specialDaywork";
-import { getDept } from "@/api/business/planDetailSubDetail.js";
+import { specialGetDeptList } from "@/api/business/planDetailSubDetail.js";
 import turnoverInfoDialog from "./turnoverInfoDialog";
 import specialForm from "./form";
 const { proxy } = getCurrentInstance();
@@ -356,24 +371,29 @@ const queryParams = ref({
 });
 
 /***********************  方法区  ****************************/
-function getList() {
+function init() {
   loading.value = true;
-  getDept().then((response) => {
+  specialGetDeptList().then((response) => {
     deptList.value = response.data;
     console.log("deptId", deptList.value);
+    queryParams.value.deptId = deptList.value[0].value;
+    queryParams.value.deptName = deptList.value[0].label;
     if (deptList.value.length > 0) {
-      queryParams.value.deptId = deptList.value[0].value;
-      queryParams.value.deptName = deptList.value[0].label;
-      listSpecialDaywork(queryParams.value).then((response) => {
-        if ((response.code = 200)) {
-          dataList.value = response.rows;
-          total.value = response.total;
-        }
-        loading.value = false;
-      });
+      getList();
     } else {
-      dataList.value = [];
+      loading.value = false;
+    }
+  });
+}
+
+function getList() {
+  loading.value = true;
+  listSpecialDaywork(queryParams.value).then((response) => {
+    if ((response.code = 200)) {
+      dataList.value = response.rows;
+      total.value = response.total;
     }
+    loading.value = false;
   });
 }
 
@@ -424,9 +444,11 @@ function handleNoTurnoverInfo(row) {
 }
 
 function handleDeptChange(arg) {
-  const dept = deptList.value.filter.filter((v) => (v.value = arg));
-  queryParams.value.deptName = dept.label;
-  queryParams.value.deptId = dept.value;
+  console.log("arg", arg);
+  // const dept = deptList.value.filter((v) => (v.value = arg));
+  // queryParams.value.deptName = dept.label;
+  // queryParams.value.deptId = dept.value;
+  console.log("queryParams", queryParams.value);
 }
 
 /**复选框选中数据 */
@@ -546,5 +568,5 @@ function areProductionPlanDetailIdsConsistent(cancelRows) {
   return true;
 }
 
-getList();
+init();
 </script>