Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-CLI

src/api/label/index.ts

@@ -131,4 +131,15 @@ export function printStorage(data: any) {
     method: 'post',
     data: data,
   });
+}
+
+/**
+ * 
+ * @returns 获取用户信息
+ */
+export function getUserInfo() {
+  return request({
+    url: '/api/CostCenter/getUserInfo',
+    method: 'get',
+  })
 }

src/views/stocked/NoOrMoveLibrary/index.vue

@@ -636,9 +636,9 @@ function changeFac(e: any) {
   state.queryParams.params.destinationErpFactory = e
   state.spcERPFactoryList = [] as any
   ERPLocationQuery()
-  if(e == "1010" || e == "1020") {
+  if(e == "1010" || e == "1020" || e == "1200") {
     state.spcERPFactoryList =  state.ERPFactoryList.filter((item: any) => 
-      (item.ERPFACTORY === "1010" || item.ERPFACTORY === "1020")
+      (item.ERPFACTORY === "1010" || item.ERPFACTORY === "1020" || item.ERPFACTORY === "1200")
     )
   }else {
     state.spcERPFactoryList =  state.ERPFactoryList.filter((item: any) =>
@@ -673,9 +673,9 @@ function ERPFactoryQuery() {
       state.ERPFactoryList.unshift({
         ERPFACTORY: ''
       })
-      if(state.queryParams.params.ERPFACTORY == "1010" || state.queryParams.params.ERPFACTORY == "1020") {
+      if(state.queryParams.params.ERPFACTORY == "1010" || state.queryParams.params.ERPFACTORY == "1020" || state.queryParams.params.ERPFACTORY == "1200") {
         state.spcERPFactoryList =  state.ERPFactoryList.filter((item: any) =>
-          (item.ERPFACTORY === "1010" || item.ERPFACTORY === "1020")
+          (item.ERPFACTORY === "1010" || item.ERPFACTORY === "1020" || item.ERPFACTORY === "1200")
         )
       }else {
         state.spcERPFactoryList =  state.ERPFactoryList.filter((item: any) =>

src/views/stocked/careerAssistanceInquiry/index.vue

@@ -156,16 +156,30 @@
                 <!--            </el-form-item>-->
                 <!--          </el-col>-->
                 <!--        </el-row>-->
-                <el-row :gutter="22">
+                <el-row :gutter="24" class="page-search" justify="space-between" align="bottom">
-                    <el-form ref="formDataRef" :model="state.CAREER_ASSISTANCE" :rules="rules" label-position="top"  >
+                    <el-form ref="formDataRef" :model="state.CAREER_ASSISTANCE" :rules="rules" label-position="left" >
                         <el-form-item label="" prop="CAREER_ASSISTANCE">
-                            <el-col :span="9">
+                            <el-col :span="6">
+                              <el-form-item label="借用人">
                                 <!--                <el-Input @input="inputCareer" v-model="state.CAREER_ASSISTANCE" placeholder="业助" :rules="rules"/>-->
-                                <el-Input v-model="state.CAREER_ASSISTANCE" placeholder="业助" :rules="rules"/>
+                                <!-- <el-Input v-model="state.CAREER_ASSISTANCE" placeholder="业助" :rules="rules"/> -->
+                                <el-select filterable v-model="state.CAREER_ASSISTANCE" placeholder="下拉选择业助" size="small">
+                                    <el-option v-for="item in state.userList" :key="item.USERNAME"
+                                        :label="item.USERNAME" :value="item.USERNAME" />
+                                </el-select>
+                              </el-form-item>
                             </el-col>
-                            <el-col :span="9">
+                            <el-col :span="6">
+                                <el-form-item label="新销售订单">
                                 <!--                <el-Input @input="inputCareer" v-model="state.CAREER_ASSISTANCE" placeholder="业助" :rules="rules"/>-->
-                                <el-Input v-model="state.COUSTOMNO" placeholder="客户" :rules="rules"/>
+                                <el-Input v-model="state.SALESHIPREQUESTNAME" placeholder="单号" :rules="rules"/>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="新销售订单行号">
+                                <!--                <el-Input @input="inputCareer" v-model="state.CAREER_ASSISTANCE" placeholder="业助" :rules="rules"/>-->
+                                <el-Input v-model="state.SALESHIPREQUESTDETAILNAME" placeholder="行号" :rules="rules"/>
+                                </el-form-item>
                             </el-col>
                             <el-col :span="6">
                                 <el-button type="primary" @click="modifiedRemark" :disabled="state.CAREER_ASSISTANCEDrawer"  v-loading="state.loadings">更新</el-button>
@@ -207,10 +221,11 @@
     import router from "@/router";
     import exportDataToExcel from "@/utils/export-excel";
     import { localStorage } from '@/utils/storage'
-    import { updateCareerAssistance, updateRemark } from '@/api/label'
+    import { updateCareerAssistance, updateRemark, getUserInfo } from '@/api/label'
     import { bTableHeight } from "../../../composables/calcTableHeight";
     import { getORG } from '@/api/auth';
     import { search } from '@/api/wareHouse'
+import { log } from "node:console";
 
 const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(310);
     
@@ -234,6 +249,9 @@ const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableH
             CAREER_ASSISTANCE : '',
             CHARGE : '',
         } ,
+        userList: [],
+        SALESHIPREQUESTNAME: '',
+        SALESHIPREQUESTDETAILNAME: '',
         boxDrawer :false,
         PhaseList: [{ label: '全部', Value: '' }, { label: 'C', Value: 'C' }, { label: 'D', Value: 'D' }, { label: 'S', Value: 'S' }] as any,
         ChangeERPLocation: [],
@@ -260,7 +278,9 @@ const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableH
                 FROMDATE: '',
                 TODATE: '',
                 CAREER_ASSISTANCE :'',
-                DESC_CN:''
+                DESC_CN:'',
+                OQARESULTSTATE: '',
+                PACKINGGRADE: '',
             },
             pageNum: 1,
             pageSize: 10
@@ -431,7 +451,7 @@ const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableH
         handleQuery();
         ERPFactoryQuery();
         // ERPLocationQuery();
-        
+        getUser();
         updateTableHeight();
         window.addEventListener('resize', handleResize);
     });
@@ -489,6 +509,12 @@ const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableH
         }
     }
 
+    function getUser() {
+        getUserInfo().then((res: any) => {
+            state.userList = res.data;
+        })
+    }
+
     function modifiedRemark() {
         if ( state.multipleSelection.length == 0) {
             ElMessageBox.alert('列表为空', {
@@ -496,6 +522,8 @@ const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableH
             })
             return
         }
+        console.log(state.multipleSelection);
+        // return
         let boxLists =  []
         for (var i = 0 ; i < state.multipleSelection.length; ++ i) {
             state.multipleSelection[i].key = {
@@ -514,15 +542,19 @@ const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableH
             boxList : boxLists,
             USER : localStorage.get('userId'),
             remark: state.CAREER_ASSISTANCE,
-            CUSTOMNO : state.COUSTOMNO
+            // CUSTOMNO : state.COUSTOMNO,
+            SALESHIPREQUESTNAME: state.SALESHIPREQUESTNAME, // 销售订单
+            SALESHIPREQUESTDETAILNAME: state.SALESHIPREQUESTDETAILNAME,// 销售订单行号
         }
         // console.log(PRINT)
         // return;
         updateCareerAssistance(PRINT).then((res: any) => {
             console.log(res.success)
-            state.CAREER_ASSISTANCE = ''
+            // state.COUSTOMNO = ''
-            state.COUSTOMNO = ''
             if (res.success) {
+                state.SALESHIPREQUESTNAME = '';
+                state.SALESHIPREQUESTDETAILNAME = '';
+                state.CAREER_ASSISTANCE = '';
                 // proxy.$ElMessage.success('备注更新成功');
                 ElMessageBox.alert('业助更新成功', '提醒框', {
                     confirmButtonText: 'OK',