Merge remote-tracking branch 'origin/master_hella' into master_hella

.env.prod

@@ -41,3 +41,7 @@ VITE_TENANT='["长春1379","成都1397","长春2379"]'
 
 # 查看质检报告环境
 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'
+
+# 登录系统升级的提示
+VITE_SYSTERM_UPDATE_ALERT = true
+VITE_SYSTERM_UPDATE_URL = 'https://scptest.faway-hella.com/'

README.md

@@ -1,5 +1,9 @@
 ## dev发布2024-06-01-002
 **xxxx.data.ts 文件配置说明**
+dictType: DICT_TYPE.INVENTORY_STATUS,
+dictClass: 'string',
+dictAllOption:true,// true 字典中--下拉框中展示全选按钮
+dictAllValue:'全选', // 全选按钮的value值
 **form表单查询弹窗配置**
 form: {
     labelMessage: '信息提示说明！！！',

public/systemConfig.js

@@ -10,5 +10,7 @@ let systemConfig = {
   // 查看质检报告环境
   reportUrl: 'https://scp.faway-hella.com',
   // 租户配置
-  tenant: '["成都"]'
+  tenant: '["成都"]',
+  systermUpdateAlert: true,
+  systermUpdateUrl: 'https://scptest.faway-hella.com/'
 }

src/api/qms/inspectionRecord/inspectionRecordMain/index.ts

@@ -46,6 +46,10 @@ export const createInspectionRecordMain = async (data: InspectionRecordMainVO) =
 
 // 修改检验申请
 export const updateInspectionRecordMain = async (data: InspectionRecordMainVO) => {
+  return await request.put({ url: `/qms/inspection-record-main/update`, data })
+}
+// 首件检验保存
+export const updateInspectionRecordFirstMain = async (data: InspectionRecordMainVO) => {
   return await request.put({ url: `/qms/inspection-record-main/firstInspectionUpdate`, data })
 }
 

src/api/qms/inspectionScheme/index.ts

@@ -1,21 +1,21 @@
 import request from '@/config/axios'
 // 新增
 export const InspectionSchemeCreat = async (data) => {
-  return await request.post({ url: `/qms/inspection-scheme/create`,data})
+  return await request.post({ url: `/qms/inspection-scheme/create`, data })
 }
 // 编辑
 export const InspectionSchemeUpdate = async (data) => {
-  return await request.put({ url: `/qms/inspection-scheme/update`,data})
+  return await request.put({ url: `/qms/inspection-scheme/update`, data })
 }
 // 删除
 export const InspectionSchemeDelete = async (id) => {
-  return await request.delete({ url: `/qms/inspection-scheme/delete?id=`+id})
+  return await request.delete({ url: `/qms/inspection-scheme/delete?id=` + id })
 }
 // 列表
 export const InspectionSchemePage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
-    const data = {...params}
+    const data = { ...params }
     return request.post({ url: '/qms/inspection-scheme/senior', data })
   } else {
     return await request.get({ url: `/qms/inspection-scheme/page`, params })
@@ -31,6 +31,11 @@ export const disableInspectionScheme = async (id: number) => {
   return await request.disable({ url: `/qms/inspection-scheme/disable?id=` + id })
 }
 
+// 导出检验阶段 Excel
+export const exportInspectionScheme = async (params) => {
+  return await request.download({ url: `/qms/inspection-scheme/export-excel`, params })
+}
+
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/qms/inspection-scheme/get-import-template' })

src/api/qms/inspectionTemplate/index.ts

@@ -1,28 +1,26 @@
 import request from '@/config/axios'
 
-
-
 // 列表
 export const getListByTempleteCode = async (code) => {
-  return await request.get({ url: `/qms/inspection-process/getListByTempleteCode?code=`+code})
+  return await request.get({ url: `/qms/inspection-process/getListByTempleteCode?code=` + code })
 }
 // 新增
 export const inspectionTemplateCreat = async (data) => {
-  return await request.post({ url: `/qms/programme-template/create`,data})
+  return await request.post({ url: `/qms/programme-template/create`, data })
 }
 // 编辑
 export const inspectionTemplateUpdate = async (data) => {
-  return await request.put({ url: `/qms/programme-template/update`,data})
+  return await request.put({ url: `/qms/programme-template/update`, data })
 }
 // 删除
 export const inspectionTemplateDelete = async (id) => {
-  return await request.delete({ url: `/qms/programme-template/delete?id=`+id})
+  return await request.delete({ url: `/qms/programme-template/delete?id=` + id })
 }
 // 列表
 export const inspectionTemplatePage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
-    const data = {...params}
+    const data = { ...params }
     return request.post({ url: '/qms/programme-template/senior', data })
   } else {
     return await request.get({ url: `/qms/programme-template/page`, params })
@@ -38,6 +36,11 @@ export const disableInspectionTemplate = async (id: number) => {
   return await request.disable({ url: `/qms/programme-template/disable?id=` + id })
 }
 
+// 导出检验模版 Excel
+export const exportInspectionTemplate = async (params) => {
+  return await request.download({ url: `/qms/programme-template/export-excel`, params })
+}
+
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/qms/programme-template/get-import-template' })

src/components/Descriptions/src/Descriptions.vue

@@ -149,7 +149,7 @@ const showAll = () =>{
                 <div v-if="data[item.field]&&Array.isArray(data[item.field])" >
                   <DictTag :type="item.dictType" :value="cur" v-for="(cur,key) in data[item.field]" :key="key" style="margin-right: 6px;margin-bottom: 6px;"/>
                 </div>
-                <DictTag :type="item.dictType" :value="data[item.field] + ''" v-if="data[item.field]&&!Array.isArray(data[item.field])"/>
+                <DictTag :type="item.dictType" :value="data[item.field] + ''" v-if="(data[item.field]||data[item.field]==0)&&!Array.isArray(data[item.field])"/>
               </slot>
               <slot v-else :name="item.field" :row="data">{{ data[item.field] }}</slot>
             </template>

src/hooks/web/useCrudSchemas.ts

@@ -264,6 +264,10 @@ const filterFormSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): For
             options.push(dict)
           })
         } else {
+          if(schemaItem.dictAllOption){
+            const allOptions: ComponentOptions = { label: '全选', value: schemaItem.dictAllValue||'' }
+            options.push(allOptions)
+          }
           getDictOptions(schemaItem.dictType).forEach((dict) => {
             options.push(dict)
           })

src/utils/systemParam.ts

@@ -4,6 +4,9 @@ const interfaceUrl = ref(import.meta.env.VITE_INTERFACE_URL)
 const jmreportBaseUrl = ref(import.meta.env.VITE_JMREPORT_BASE_URL)
 const reportUrl = ref(import.meta.env.VITE_REPORT_URL)
 const tenant = ref(import.meta.env.VITE_TENANT)
+const systermUpdateAlert = ref(import.meta.env.VITE_SYSTERM_UPDATE_ALERT)
+const systermUpdateUrl = ref(import.meta.env.VITE_SYSTERM_UPDATE_URL)
+
 const mode = ref(import.meta.env.MODE)
 // 获取baseUrl
 export const getBaseUrl = () => {
@@ -53,3 +56,23 @@ export const getTenant = () => {
     return tenant.value
   }
 }
+
+
+// 获取系统升级是否弹出alert
+export const getSystermUpdateAlert = () => {
+  if(mode.value === 'prod') {
+    return systemConfig.systermUpdateAlert
+  } else {
+    return systermUpdateAlert.value
+  }
+}
+
+// 获取系统升级是否弹出alert地址
+export const getSystermUpdateUrl = () => {
+  if(mode.value === 'prod') {
+    return systemConfig.systermUpdateUrl
+  } else {
+    return systermUpdateUrl.value
+  }
+}
+

src/views/login/components/LoginForm.vue

@@ -96,6 +96,7 @@
   import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
   import * as DeptApi from '@/api/system/dept'
   import { getTenant } from '@/utils/systemParam'
+  import { getSystermUpdateAlert,getSystermUpdateUrl } from '@/utils/systemParam'
 
   defineOptions({ name: 'LoginForm' })
 
@@ -211,6 +212,16 @@
   // 登录
   const handleLogin = async (params) => {
     console.log('登录-185')
+    if(getSystermUpdateAlert()){
+      await ElMessageBox.alert(
+        '<strong>系统迁移，请移步至</strong>' +
+        `<a href=${getSystermUpdateUrl()} target="_blank">${getSystermUpdateUrl()}</a>`,
+        '重要提示',
+        {
+          dangerouslyUseHTMLString: true,
+        }
+      )
+    }
     loginLoading.value = true
     try {
       await getTenantId()

src/views/qms/inspectionQ2/inspectionQ2.data.ts

@@ -50,7 +50,7 @@ export const Q2 = useCrudSchemas(
       }
     },
     {
-      label: 'q1通知单号',
+      label: 'Q1通知单号',
       field: 'q1Number',
       sort: 'custom',
       table: {

src/views/qms/inspectionQ3/inspectionQ3.data.ts

@@ -44,7 +44,7 @@ export const Q3 = useCrudSchemas(
       }
     },
     {
-      label: 'q1通知单号',
+      label: 'Q1通知单号',
       field: 'q1Number',
       sort: 'custom',
       table: {

src/views/qms/inspectionRecordFirst/index.vue

@@ -135,7 +135,7 @@ const buttonBaseClick = (val, item) => {
   // 列表-操作按钮
   const butttondata = (row) => {
     return [
-    defaultButtons.mainListEditBtn({hasPermi: 'wms:inspection-recode-first-main:update' }), // 编辑
+    defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, 'publish'),hasPermi: 'wms:inspection-recode-first-main:update' }), // 编辑
       defaultButtons.mainListDeleteBtn({hasPermi: 'wms:inspection-recode-first-main:delete' }), // 删除
       defaultButtons.mainListOrderPubBtn({ hide: isShowMainButton(row, 'publish'), hasPermi:'qms:inspection-recode-first-main:pub'}), // 发布
     ]
@@ -228,7 +228,7 @@ const buttonBaseClick = (val, item) => {
         await InspectionRecordMainApi.createInspectionRecordMain(data)
         message.success(t('common.createSuccess'))
       }else {
-        await InspectionRecordMainApi.updateInspectionRecordMain(data)
+        await InspectionRecordMainApi.updateInspectionRecordFirstMain(data)
         message.success(t('common.updateSuccess'))
       }
       basicFormRef.value.dialogVisible = false

src/views/qms/inspectionScheme/index.vue

@@ -59,6 +59,7 @@
 </template>
 
 <script setup lang="ts">
+import download from '@/utils/download'
 import {InspectionSchemeMain } from './inspectionScheme.data'
 import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from '../inspectionTemplate/inspectionTemplate.data'
 
@@ -96,7 +97,7 @@ const { getList, setSearchParams } = tableMethods
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'qms:inspection-scheme:create'}), // 新增
   defaultButtons.defaultImportBtn({hasPermi:'qms:inspection-scheme:import'}), // 导入
-  // defaultButtons.defaultExportBtn({hasPermi:'wms:agv-locationrelation:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'qms:inspection-scheme:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -244,6 +245,22 @@ const handleDisable = async (id: number) => {
   } catch {}
 }
 
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await InspectionSchemeApi.exportInspectionScheme(tableObject.params)
+    download.excel(data, '检验方案.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {

src/views/qms/inspectionTemplate/index.vue

@@ -103,7 +103,7 @@ const { getList, setSearchParams } = tableMethods
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'qms:programme-template:create'}), // 新增
   defaultButtons.defaultImportBtn({hasPermi:'qms:programme-template:import'}), // 导入
-  // defaultButtons.defaultExportBtn({hasPermi:'wms:agv-locationrelation:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'qms:programme-template:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -133,6 +133,22 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await InspectionProcessPageApi.exportInspectionTemplate(tableObject.params)
+    download.excel(data, '检验模板.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
 const isShowMainButton = (row,val) => {
   if (val.indexOf(row.available) > -1) {
     return false

src/views/qms/selectedSet/index.vue

@@ -147,7 +147,7 @@ const { getList, setSearchParams } = tableMethods
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'qms:selected-set:query'}), // 新增
   defaultButtons.defaultImportBtn({hasPermi:'qms:selected-set:import'}), // 导入
-  // defaultButtons.defaultExportBtn({hasPermi:'qms:selected-set:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'qms:selected-set:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置

src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts

@@ -45,6 +45,8 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'itemTypes',
     dictType: DICT_TYPE.ITEM_TYPE,
     dictClass: 'string',
+    dictAllOption:true,// 全选按钮
+    dictAllValue:'全选',
     isTable: true,
     sort: 'custom',
     table: {
@@ -57,6 +59,7 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
       },
     }
   },
+  
   {
     label: '可用物料状态范围',
     field: 'itemStatuses',
@@ -73,6 +76,8 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'outAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
+    dictAllOption:true,// 全选按钮
+    dictAllValue:'全选',
     isTable: true,
     sort: 'custom',
     table: {
@@ -90,6 +95,8 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'inAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
+    dictAllOption:true,// 全选按钮
+    dictAllValue:'全选',
     isTable: true,
     sort: 'custom',
     table: {
@@ -163,6 +170,8 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'outInventoryStatuses',
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
+    dictAllOption:true,// 全选按钮
+    dictAllValue:'全选',
     isTable: true,
     sort: 'custom',
     table: {
@@ -180,6 +189,8 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'inInventoryStatuses',
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
+    dictAllOption:true,// 全选按钮
+    dictAllValue:'全选',
     isTable: true,
     sort: 'custom',
     table: {

src/views/wms/basicDataManage/documentSetting/businesstype/index.vue

@@ -53,6 +53,7 @@
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
     :basicFormWidth="75"
+    @onChange="onChange"
   />
 
   <!-- 详情 -->
@@ -76,6 +77,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 
 // 业务类型
 defineOptions({ name: 'Businesstype' })
@@ -157,11 +159,44 @@ const buttonTableClick = async (val, row) => {
   if (val == 'edit') {
     // 编辑
     const rowSplit = JSON.parse(JSON.stringify(row))
-    rowSplit.itemTypes = rowSplit.itemTypes.split(',')
-    rowSplit.outAreaTypes = rowSplit.outAreaTypes.split(',')
-    rowSplit.inAreaTypes = rowSplit.inAreaTypes.split(',')
-    rowSplit.outInventoryStatuses = rowSplit.outInventoryStatuses.split(',')
-    rowSplit.inInventoryStatuses = rowSplit.inInventoryStatuses.split(',')
+    // rowSplit.itemTypes = rowSplit.itemTypes.split(',')
+    // 可用物料类型范围
+    const allItemTypesValue = getStrDictOptions(DICT_TYPE.ITEM_TYPE).map(item=>(item.value))
+    if(rowSplit.itemTypes == allItemTypesValue){
+      rowSplit.itemTypes = ['全选']
+    }else{
+      rowSplit.itemTypes = rowSplit.itemTypes.split(',')
+    }
+
+    // 出库库区类型范围 入库库区类型范围
+    const allValue = getStrDictOptions(DICT_TYPE.AREA_TYPE).map(item=>(item.value))
+    if(rowSplit.outAreaTypes == allValue){
+      rowSplit.outAreaTypes = ['全选']
+    }else{
+      rowSplit.outAreaTypes = rowSplit.outAreaTypes.split(',')
+    }
+
+    if(rowSplit.inAreaTypes == allValue){
+      rowSplit.inAreaTypes = ['全选']
+    }else{
+      rowSplit.inAreaTypes = rowSplit.inAreaTypes.split(',')
+    }
+    // rowSplit.outAreaTypes = rowSplit.outAreaTypes.split(',')
+    // rowSplit.inAreaTypes = rowSplit.inAreaTypes.split(',')
+
+    const allInventoryStatusesValue = getStrDictOptions(DICT_TYPE.INVENTORY_STATUS).map(item=>(item.value))
+    if(rowSplit.outInventoryStatuses == allInventoryStatusesValue){
+      rowSplit.outInventoryStatuses = ['全选']
+    }else{
+      rowSplit.outInventoryStatuses = rowSplit.outInventoryStatuses.split(',')
+    }
+    if(rowSplit.inInventoryStatuses == allInventoryStatusesValue){
+      rowSplit.inInventoryStatuses = ['全选']
+    }else{
+      rowSplit.inInventoryStatuses = rowSplit.inInventoryStatuses.split(',')
+    }
+    // rowSplit.outInventoryStatuses = rowSplit.outInventoryStatuses.split(',')
+    // rowSplit.inInventoryStatuses = rowSplit.inInventoryStatuses.split(',')
     openForm('update', rowSplit)
   } else if (val == 'delete') {
     // 删除
@@ -176,7 +211,8 @@ const openForm = (type: string, row?: any) => {
 }
 
 // form表单提交
-const formsSuccess = async (formType, data) => {
+const formsSuccess = async (formType, submitData) => {
+  let data = {...submitData}
   var isHave = Businesstype.allSchemas.formSchema.some(function (item) {
     return item.field === 'activeTime' || item.field === 'expireTime'
   })
@@ -188,11 +224,47 @@ const formsSuccess = async (formType, data) => {
   }
   if (data.activeTime == 0) data.activeTime = null
   if (data.expireTime == 0) data.expireTime = null
-  data.itemTypes = data.itemTypes.join(',')
-  data.outAreaTypes = data.outAreaTypes.join(',')
-  data.inAreaTypes = data.inAreaTypes.join(',')
-  data.outInventoryStatuses = data.outInventoryStatuses.join(',')
-  data.inInventoryStatuses = data.inInventoryStatuses.join(',')
+  // data.itemTypes = data.itemTypes.join(',')
+  const allItemTypesValue = getStrDictOptions(DICT_TYPE.ITEM_TYPE).map(item=>(item.value))
+  if(data.itemTypes[data.itemTypes.length-1]=='全选'){
+    data.itemTypes = allItemTypesValue.join(',')
+  }else{
+    data.itemTypes = data.itemTypes.join(',')
+  }
+
+  // data.outAreaTypes = data.outAreaTypes.join(',')
+  // data.inAreaTypes = data.inAreaTypes.join(',')
+  //全选的值
+  const allValue = getStrDictOptions(DICT_TYPE.AREA_TYPE).map(item=>(item.value))
+  if(data.outAreaTypes[data.outAreaTypes.length-1]=='全选'){
+    data.outAreaTypes = allValue.join(',')
+  }else{
+    data.outAreaTypes = data.outAreaTypes.join(',')
+  }
+
+  if(data.inAreaTypes[data.inAreaTypes.length-1]=='全选'){
+    data.inAreaTypes = allValue.join(',')
+  }else{
+    data.inAreaTypes = data.inAreaTypes.join(',')
+  }
+
+
+  // 出库库存状态范围 入库库存状态范围
+  // data.outInventoryStatuses = data.outInventoryStatuses.join(',')
+  // data.inInventoryStatuses = data.inInventoryStatuses.join(',')
+  const allInventoryStatusesValue = getStrDictOptions(DICT_TYPE.INVENTORY_STATUS).map(item=>(item.value))
+  if(data.outInventoryStatuses[data.outInventoryStatuses.length-1]=='全选'){
+    data.outInventoryStatuses = allInventoryStatusesValue.join(',')
+  }else{
+    data.outInventoryStatuses = data.outInventoryStatuses.join(',')
+  }
+  if(data.inInventoryStatuses[data.inInventoryStatuses.length-1]=='全选'){
+    data.inInventoryStatuses = allInventoryStatusesValue.join(',')
+  }else{
+    data.inInventoryStatuses = data.inInventoryStatuses.join(',')
+  }
+
+  
   if (formType === 'create') {
     await BusinesstypeApi.createBusinesstype(data)
       .then(async () => {
@@ -224,6 +296,24 @@ const formsSuccess = async (formType, data) => {
   }
 }
 
+const onChange = (field, value)=>{
+  console.log('onChange',field,value)
+  if(field=='outAreaTypes'||field=='inAreaTypes'||field=='itemTypes'||field=='outInventoryStatuses'||field=='inInventoryStatuses'){
+    //出库区类型范围 入库区类型范围  可用物料类型范围  出库库存状态范围 入库库存状态范围
+    if(value.length>0){
+      if(value[value.length-1]=='全选'){
+        //全选
+        basicFormRef.value.formRef.setValues({
+          [field]:['全选']
+        })
+      }else{
+        basicFormRef.value.formRef.setValues({
+          [field]:value.filter(item=>item!='全选')
+        })
+      }
+    }
+  }
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts

@@ -473,14 +473,14 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isTableForm: false,
     isForm: false
   },
-  // {
-  //   label: '批次',
-  //   field: 'batch',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   // {
   //   label: '包装号',
   //   field: 'packingNumber',
@@ -816,6 +816,9 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'packUnit',
     isTable: true,
     sort: 'custom',
+    table: {
+      width: 150
+    },
     form: {
       componentProps: {
         enterSearch: true,
@@ -901,6 +904,9 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'secondPackUnit',
     isTable: true,
     sort: 'custom',
+    table: {
+      width: 150
+    },
     form: {
       componentProps: {
         enterSearch: true,
@@ -986,8 +992,10 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     label: '入库存包装规格',
     field: 'balancePackUnit',
     sort: 'custom',
+    table: {
+      width: 150
+    },
     form: {
-      width: 150,
       componentProps: {
         enterSearch: true,
         disabled: true,

src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue

@@ -128,6 +128,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
             tableData.value.push(newRow)
           })
         }else{
+          row['toLocationCode'] = val[0]['rawLocationCode']
           row[formField] = val[0][searchField]
         }
         

src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts

@@ -558,7 +558,6 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
     sortTableDefault: 1004,
-    hiddenInMain:true,
     isForm:false,
     tableForm:{
       type:'InputNumber',

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@@ -10,7 +10,7 @@
     :allSchemas="PurchasePlanMain.allSchemas" :detailAllSchemas="PurchasePlanDetail.allSchemas">
     <template #rightBtn_left>
       <div style="display:flex;justify-content: center;align-items: center">
-        <span>计划数量包含0</span>
+        <span style="color:var(--el-text-color-regular)">计划数量包含0</span>
         <el-switch v-model="isZero" style="margin:0 5px" @change="zeroChange"/>
       </div>
     </template>

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

@@ -22,10 +22,9 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
       width: 180,
-      fixed: 'left'
     },
     sortSearchDefault:1,
-    sortTableDefault:1,
+    sortTableDefault:99999,
     isSearch: true
   },
   {