update 新料号标签打印,货位输入框改为下拉框且可以多选

src/api/StockOut/index.ts

@@ -176,3 +176,16 @@ export function CompleteShipRequestStockUp(data: any) {
     data: data,
   });
 }
+
+/**
+ * 临时出库(补过账)-出库过账
+ * @param data
+ * @constructor
+ */
+export function CompleteShipRequestRepairStockOut(data: any) {
+  return request({
+    url: '/api/SaleOut/completeShipRequestRepairStockOut',
+    method: 'post',
+    data: data,
+  });
+}

src/views/Query/StockQuery/StockTransaction/index.vue

@@ -56,7 +56,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
-                        <el-form-item label="目的货位" prop="LOCATIONNAME">
+                        <el-form-item label="货位" prop="LOCATIONNAME">
                             <el-select
                                 size="small"
                                 v-model="queryParams.LOCATIONNAME"

src/views/label/newMaterialSpecLabelPrint/index.vue

@@ -67,6 +67,7 @@
                 v-model="state.queryParams.params.ERPLOCATION"
                 placeholder="选择仓库"
                 clearable
+                @change="getLocationName"
                 style="width: 170px"
               >
                 <el-option
@@ -81,19 +82,18 @@
           <el-col :span="4">
             <el-form-item label="货位" prop="queryParams.params">
               <el-select
-                filterable
                 v-model="state.queryParams.params.LOCATIONNAME"
-                remote
+                multiple filterable
-                :remote-method="handleInput"
-                clearable
                 placeholder="选择库位"
+                :filter-method="getlocDec"
+                default-first-option
                 style="width: 170px"
               >
                 <el-option
-                  v-for="item in state.LocationList"
+                  v-for="item in state.locDecList2"
-                  :key="item.storageName"
+                  :key="item.VALUE"
-                  :label="item.storageName"
+                  :label="item.LABEL"
-                  :value="item.storageName"
+                  :value="item.VALUE"
                 />
               </el-select>
             </el-form-item>
@@ -295,6 +295,7 @@ import { bTableHeight } from '../../../composables/calcTableHeight'
 import { getORG } from '@/api/auth'
 import { cals } from '@/utils/cal'
 import { search } from '@/api/wareHouse'
+import { areAllNotEmpty } from '@/utils/CommonUtil'
 
 const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(280)
 const queryFormRef = ref(ElForm)
@@ -326,7 +327,7 @@ const state = reactive({
   remark: '',
   queryParams: {
     queryId: 'GetlabelList',
-    version: 'sdk005',
+    version: 'sdk006',
     listCode: '', // 查询类型
     params: {
       MATERIALSPECNAME: '',
@@ -376,6 +377,7 @@ const state = reactive({
   total: 0,
   loading: false,
   MaterialList: [] as any,
+  locDecListAll: [] as any,
   dialog: {
     title: '新增用户',
     visible: false
@@ -417,7 +419,8 @@ const state = reactive({
   ERPFactoryList: [] as any,
   ERPLocationList: [] as any,
   LocationList: [] as any,
-  AllLocationList: [] as any
+  AllLocationList: [] as any,
+  locDecList2: [] as any,
 })
 
 const materialTableConfig = ref({
@@ -512,7 +515,28 @@ const handleQuery = () => {
     state.queryParams.version = 'sdk005'
   }
   */
-  getQueryPageList(state.queryParams)
+  let locationNameString = ''
+  for (let i = 0; i < state.queryParams.params.LOCATIONNAME.length; i++) {
+    locationNameString = locationNameString + state.queryParams.params.LOCATIONNAME[i] + ','
+  }
+  getQueryPageList({
+    queryId: 'GetlabelList',
+    version: 'sdk006',
+    listCode: '', // 查询类型
+    params: {
+      MATERIALSPECNAME: state.queryParams.params.MATERIALSPECNAME,
+      SITENAME: 'SDK',
+      RECEIVEACTNO: state.queryParams.params.RECEIVEACTNO,
+      RECEIVEREQUESTNAME: state.queryParams.params.RECEIVEREQUESTNAME,
+      CHARGE: state.queryParams.params.CHARGE,
+      ERPFACTORY: state.queryParams.params.ERPFACTORY,
+      ERPLOCATION: state.queryParams.params.ERPLOCATION,
+      LOCATIONNAME: locationNameString,
+      DESC_CN: state.queryParams.params.DESC_CN,
+    },
+    pageNum: 1,
+    pageSize: 10
+  })
     .then((res: any) => {
       if (res.data.list.length == 0) {
         state.MaterialList = []
@@ -559,6 +583,10 @@ function getGetPrintLabelType() {
   state.PRINTLABELLIST = [
     {"LABEINAME":"PET","LABELCODE":"PET标签-电晕.btw","LABELURL":"C:\\inetpub\\wwwroot\\BarTender\\wwwroot\\Templates\\WMS\\WHRePrint\\","SITENAME":"SDK"},
     {"LABEINAME":"SKD2","LABELCODE":"Sdk2.btw","LABELURL":"C:\\inetpub\\wwwroot\\BarTender\\wwwroot\\Templates\\","SITENAME":"SDK"},
+    {"LABEINAME":"SKD2","LABELCODE":"Sdk2.btw","LABELURL":"C:\\inetpub\\wwwroot\\BarTender\\wwwroot\\Templates\\","SITENAME":"SDK"},
+    {"LABEINAME":"SKD2","LABELCODE":"Sdk2.btw","LABELURL":"C:\\inetpub\\wwwroot\\BarTender\\wwwroot\\Templates\\","SITENAME":"SDK"},
+    {"LABEINAME":"SKD2","LABELCODE":"Sdk2.btw","LABELURL":"C:\\inetpub\\wwwroot\\BarTender\\wwwroot\\Templates\\","SITENAME":"SDK"},
+
     {"LABEINAME":"胶水原料","LABELCODE":"胶水原材.btw","LABELURL":"C:\\inetpub\\wwwroot\\BarTender\\wwwroot\\Templates\\","SITENAME":"SDK"},
   ]
 }
@@ -870,6 +898,54 @@ function Queryprinter() {
 const updateList = (col: any) => {
   materialTableConfig.value.column = col
 }
+
+function getLocationName(value: any) {
+  state.queryParams.params.ERPLOCATION = value
+  state.queryParams.params.LOCATIONNAME = ''
+  state.LocationList = []
+  if (!areAllNotEmpty(state.queryParams.params.ERPFACTORY)) {
+    proxy.$ElMessage.warning('当前还未选择组织');
+    return
+  } else {
+    /*let erpLocationString = ''
+    for (let i = 0; i < state.queryParams.params.ERPLOCATION.length; i++) {
+      erpLocationString = erpLocationString + state.queryParams.params.ERPLOCATION[i] + ','
+    }*/
+    getQueryList({
+      queryId: 'GetLocationForCreatePO',
+      version: '00002',
+      params: {
+        ERPLOCATION: state.queryParams.params.ERPLOCATION,
+        SITENAME: 'SDK'
+      }
+    }).then((res: any) => {
+      state.locDecListAll = res.data
+      //getlocDec('')
+    })
+  }
+}
+
+
+function getlocDec(query: any) {
+  if (!areAllNotEmpty(state.queryParams.params.ERPLOCATION)) {
+    proxy.$ElMessage.warning('当前还未选择仓库');
+    state.queryParams.params.LOCATIONNAME = ''
+    state.locDecList2 = []
+    return
+  }
+
+  // console.log(query)
+  //let arr = state.locDecListAll;
+  let arr = state.locDecListAll.filter((item: any) => {
+    return item.LABEL.includes(query) || item.VALUE.includes(query)
+  })
+  // console.log(arr)
+  if (arr.length > 50) {
+    state.locDecList2 = arr.slice(0, 50)
+  } else {
+    state.locDecList2 = arr
+  }
+}
 </script>
 
 <style scoped></style>