11.26

src/api/system/user.js

@@ -9,6 +9,13 @@ export function listUser(query) {
     params: query
   })
 }
+export function notHasAddList(query) {
+  return request({
+    url: baseUrl + '/system/user/notHasAddList',
+    method: 'get',
+    params: query
+  })
+}
 export function listTenantUser(query) {
   return request({
     url: baseUrl + '/system/user/tenantList',

src/views/business/dayworkSelect/index.vue

@@ -77,7 +77,7 @@
             <el-table-column label="批次状态" align="center" prop="lotID">
               <template #default="scope">
                 <el-tag v-if="scope.row.isAmend == 1" class="spacing" type="danger">{{ "工艺修改" }}</el-tag>
-                <el-tag v-if="scope.row.isWasteRecycling == 1" class="spacing" type="danger">{{ "废品回用" }}</el-tag>
+                <!-- <el-tag v-if="scope.row.isWasteRecycling == 1" class="spacing" type="danger">{{ "废品回用" }}</el-tag> -->
                 <!-- <el-tag v-if="scope.row.isWasteRecycling == 0 && scope.row.isAmend == 0" class="spacing">{{
                   "正常批次" }}</el-tag> -->
                 <el-tag v-if="scope.row.isSuperaddition == 1" class="warning" type="warning">{{
@@ -138,10 +138,12 @@ import useUserStore from "@/store/modules/user";
 import productionPlanDetailStore from "@/store/modules/productionPlanDetail";
 import { stubArray } from "lodash-es";
 
-const is_identification = ref([{
-  value: '1',
-  label: '废品回用'
-}, {
+const is_identification = ref([
+//   {
+//   value: '1',
+//   label: '废品回用'
+// }, 
+{
   value: '2',
   label: '工艺修改'
 }, {

src/views/business/outsourceInspectionVerify/index.vue

@@ -65,8 +65,10 @@
     }}
             </template>
           </el-table-column>
+          <el-table-column label="发出单号" align="center" prop="outsourcedOrderDetail.formCode" width="120" />
           <el-table-column label="发出量" align="center" prop="outsourcedOrderDetail.productNum" width="120" />
           <el-table-column label="收回日期" align="center" prop="returnReceiptDetail.formDate" width="120" />
+          <el-table-column label="收回单号" align="center" prop="returnReceiptDetail.formCode" width="120" />
           <el-table-column label="收回量" align="center" prop="returnReceiptDetail.auditNum" width="120" />
           <el-table-column label="状态" align="center" prop="auditStatus" width="120">
             <template #default="scope">

src/views/business/packageLine/EmployeeChoiceDialog.vue

@@ -45,7 +45,7 @@
 </template>
 <script setup>
 import { ref } from '@vue/reactivity'
-import { listEmployee } from '@/api/system/user'
+import { notHasAddList } from '@/api/system/user'
 import { listUser, listByLikeNickNameOrUserName, getUsersByDeptId, getUsersItemByDeptId } from '@/api/system/user'
 
 
@@ -118,24 +118,14 @@ function close() {
 function getList() {
   personLoading.value = true
   console.log(identifying.value)
-  //如果identifying为true，则是部门管理添加员工弹窗数据；如果为false，则是在资源分配添加员工弹窗
-  if (identifying.value) {
-    listByLikeNickNameOrUserName(queryParams.value).then(response => {
-      if (response.code == 200) {
-        list.value = response.rows
-        total.value = response.total
-        personLoading.value = false
-      }
-    })
-  } else {
-    listUser(queryParams.value).then((response) => {
+
+  notHasAddList(queryParams.value).then((response) => {
       if (response.code == 200) {
         list.value = response.rows
         total.value = response.total
         personLoading.value = false
       }
     })
-  }
 }
 
 /**
@@ -162,16 +152,7 @@ function handleSearch(type) {
     }
   }
   else {
-    if (identifying.value) {
-      listByLikeNickNameOrUserName(queryParams.value).then(response => {
-        if (response.code == 200) {
-          list.value = response.rows
-          total.value = response.total
-          personLoading.value = false
-        }
-      })
-    } else {
-      listUser(queryParams.value).then((response) => {
+    notHasAddList(queryParams.value).then((response) => {
         if (response.code == 200) {
           list.value = response.rows
           total.value = response.total
@@ -179,7 +160,6 @@ function handleSearch(type) {
         }
       })
     }
-  }
 
 }