Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/api/mes/workstation/index.ts

@@ -47,3 +47,40 @@ export const exportWorkstation = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/mes/workstation/get-import-template' })
 }
+// 查询班组列表
+export const getTeamPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/team/senior', data })
+  } else {
+    return await request.get({ url: `/wms/team/page`, params })
+  }
+}
+export const getEquipmentPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/equipment/senior', data })
+  } else {
+    return await request.get({ url: `/mes/equipment/page`, params })
+  }
+}
+export const getProcessPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/process/senior', data })
+  } else {
+    return await request.get({ url: `/wms/process/page`, params })
+  }
+}
+export const getProductionPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/production/senior', data })
+  } else {
+    return await request.get({ url: `/wms/production/page`, params })
+  }
+}

src/components/BasicForm/src/BasicForm.vue

@@ -4,8 +4,9 @@
     v-model="dialogVisible"
     :width="dialogWidth"
     :close-on-click-modal="false"
-    v-loading="formLoading"
+    :vLoading="formLoading"
   >
+  
   <div 
     style="max-height: 60vh;overflow-y: auto;">
     <Form
@@ -106,6 +107,7 @@
     <template #footer>
       <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
     </template>
+  
   </Dialog>
   <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
 </template>

src/components/Dialog/src/Dialog.vue

@@ -11,7 +11,8 @@ const props = defineProps({
   fullscreen: propTypes.bool.def(true),
   width: propTypes.oneOfType([String, Number]).def('40%'),
   scroll: propTypes.bool.def(false), // 是否开启滚动条。如果是的话，按照 maxHeight 设置最大高度
-  maxHeight: propTypes.oneOfType([String, Number]).def('400px')
+  maxHeight: propTypes.oneOfType([String, Number]).def('400px'),
+  vLoading:propTypes.bool.def(false)
 })
 
 const getBindValue = computed(() => {
@@ -50,11 +51,34 @@ watch(
   }
 )
 
+let demo = null
+watch(
+  () => props.vLoading,
+  async (val: boolean) => {
+    await nextTick()
+    if (val) {
+      initDialog()
+    } else {
+      if (demo !== null) demo.close()
+    }
+  },
+  {
+    immediate: true
+  }
+)
+
 const dialogStyle = computed(() => {
   return {
     height: unref(dialogHeight)
   }
 })
+
+
+const initDialog = () => {
+  // 用服务生成一个el-loading实例，包括了自定义svg的指令如何在服务中使用
+  demo = ElLoading.service({ target: '.loading', text: '加载中...', background: 'rgba(246, 246, 246, 0.8)' })
+}
+
 </script>
 
 <template>
@@ -68,6 +92,7 @@ const dialogStyle = computed(() => {
     draggable
     class="com-dialog"
     :show-close="false"
+    custom-class="loading"
   >
     <template #header="{ close }">
       <div class="relative h-54px flex items-center justify-between pl-15px pr-15px">

src/components/workstationBind/index.ts

@@ -1,3 +1,2 @@
-import workstationBind from './src/workstationBind.vue'
 import detail from './src/Detail.vue'
-export { workstationBind,detail }
+export {detail }

src/components/workstationBind/src/workstationBind.vue → src/components/workstationBind/src/Detail.vue

@@ -15,7 +15,6 @@
       <ContentWrap>
         <!-- 默认单表展现 -->
         <Descriptions
-          v-if="isBasic && !tabsExtend"
           :data="detailData"
           :schema="allSchemas.detailSchema"
           :columns="2"
@@ -29,12 +28,12 @@
           <!-- 单表切换tabs 展现table -->
           <Table
             v-if="isBasic && tabsExtend"
-            :columns="detailAllSchemasRef.tableColumns"
+            :columns="teamSchemasRef.tableColumns"
-            :data="tableObjectRef.tableList"
+            :data="teamObjectRef.tableList"
-            :loading="tableObjectRef.loading"
+            :loading="teamObjectRef.loading"
-            :pagination="{ total: tableObjectRef.total }"
+            :pagination="{ total: teamObjectRef.total }"
-            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:pageSize="teamObjectRef.pageSize"
-            v-model:currentPage="tableObjectRef.currentPage"
+            v-model:currentPage="teamObjectRef.currentPage"
           >
             <template>
               <div>1</div>
@@ -42,12 +41,12 @@
           </Table>
           <Table
             v-if="!isBasic && fromeWhere != 'Equipment'"
-            :columns="detailAllSchemasRef.tableColumns"
+            :columns="teamSchemasRef.tableColumns"
-            :data="tableObjectRef.tableList"
+            :data="teamObjectRef.tableList"
-            :loading="tableObjectRef.loading"
+            :loading="teamObjectRef.loading"
-            :pagination="{ total: tableObjectRef.total }"
+            :pagination="{ total: teamObjectRef.total }"
-            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:pageSize="teamObjectRef.pageSize"
-            v-model:currentPage="tableObjectRef.currentPage"
+            v-model:currentPage="teamObjectRef.currentPage"
           >
             <template>
               <div>1</div>
@@ -55,12 +54,12 @@
           </Table>
           <Table
             v-if="!isBasic && fromeWhere != 'Process'"
-            :columns="detailAllSchemasRef.tableColumns"
+            :columns="teamSchemasRef.tableColumns"
-            :data="tableObjectRef.tableList"
+            :data="teamObjectRef.tableList"
-            :loading="tableObjectRef.loading"
+            :loading="teamObjectRef.loading"
-            :pagination="{ total: tableObjectRef.total }"
+            :pagination="{ total: teamObjectRef.total }"
-            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:pageSize="teamObjectRef.pageSize"
-            v-model:currentPage="tableObjectRef.currentPage"
+            v-model:currentPage="teamObjectRef.currentPage"
           >
             <template>
               <div>1</div>
@@ -68,8 +67,8 @@
           </Table>
           <DetailTable
             v-if="!isBasic && fromeWhere == 'Production' && isShowDrawer"
-            :columns="detailAllSchemasRef.tableColumns"
+            :columns="teamSchemasRef.tableColumns"
-            :data="tableObjectRef.tableList"
+            :data="teamObjectRef.tableList"
             :allList="allList"
             :countScopeType="countScopeType"
             :key="updateKey"
@@ -120,7 +119,7 @@ import TableHead from "@/components/TableHead/src/TableHead.vue";
 import ChangeRecord from "@/components/ChangeRecord/src/ChangeRecord.vue";
 import {Team} from "@/utils/disposition/formFields";
 
-defineOptions({ name: 'BindDetail' })
+defineOptions({ name: 'Detail' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -144,6 +143,12 @@ const props = defineProps({
     required: false,
     default: false
   },
+  // 列表 相关信息
+  tableAllSchemas: {
+    type: Array,
+    required: true,
+    default: null
+  },
   // 表单，列表 相关信息
   allSchemas: {
     type: Object,
@@ -265,6 +270,11 @@ const props = defineProps({
     type: Boolean,
     required: false,
     default: true
+  },
+  teamSchemas:{
+    type: Boolean,
+    required: false,
+    default: true
   }
 })
 const isShowDrawer = ref(false)
@@ -364,7 +374,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
     masterParmas.value.masterId = row.id
     masterParmas.value.number = row.number
     masterParmas.value.status = row.status
-    tableObjectRef.value.params = {
+    teamObjectRef.value.params = {
       masterId: row.id
     }
     await getList()
@@ -452,18 +462,19 @@ const remarksSubmitScuess = async (remark) => {
 const getChangeRecordList = async () => {
   changeRecordData.changeRecordList = await RemarkApi.getChangeRecordPage(remarksData.data)
 }
-
-const tableObjectRef = ref()
-const tableMethodsRef = ref()
 const detailAllSchemasRef = ref()
+detailAllSchemasRef.value = props.detailAllSchemas
+const teamObjectRef = ref()
+const teamMethodsRef = ref()
+const teamSchemasRef = ref()
 
 const { tableObject, tableMethods } = useTable({
   getListApi: props.apiPage // 分页接口
 })
 
-tableObjectRef.value = tableObject
+teamObjectRef.value = tableObject
-tableMethodsRef.value = tableMethods
+teamMethodsRef.value = tableMethods
-detailAllSchemasRef.value = props.detailAllSchemas
+teamSchemasRef.value = props.teamSchemas
 
 // 根据状态返回该按钮是否显示
 const isShowMainButton = (row, val) => {
@@ -475,7 +486,7 @@ const isShowMainButton = (row, val) => {
 }
 
 // 获得表格的各种操作
-const { getList } = tableMethodsRef.value
+const { getList } = teamMethodsRef.value
 
 
 // 字段设置 更新主列表字段
@@ -565,9 +576,9 @@ const searchFormClick = async (searchData) => {
       : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
   }
   detailAllSchemasRef.value = props.detailAllSchemas
-  tableObjectRef.value = tableObject
+  teamObjectRef.value = tableObject
-  tableMethodsRef.value = tableMethods
+  teamMethodsRef.value = tableMethods
-  tableObjectRef.value.tableList = []
+  teamObjectRef.value.tableList = []
   const { getList } = tableMethods
   await getList()
   updateKey.value += 1
@@ -623,8 +634,8 @@ watch(
         tableObject.params[item.key] = item.value
       })
     }
-    tableObjectRef.value = tableObject
+    teamObjectRef.value = tableObject
-    tableMethodsRef.value = tableMethods
+    teamMethodsRef.value = tableMethods
     const { getList } = tableMethods
     getList()
   }

src/views/mes/workstation/index.vue

@@ -51,22 +51,34 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="Workstation.allSchemas" />
+  <Detail ref="detailRef"
-  <!-- 绑定 -->
+          :isBasic="false"
-  <BindDetail ref="bindDetailRef" :isBasic="true" :allSchemas="Workstation.allSchemas" />
+          :allSchemas="Workstation.allSchemas"
+          :detailAllSchemas="detailAllSchemas"
+          :detailAllSchemasRules="WorkstationRules"
+          :apiPage="apiPage"
+          :tabs="TabsList"
+          @changeTabs="changeTabs"
+          />
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/mes/workstation/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { Workstation,WorkstationRules } from './workstation.data'
+import {TabsList, Team, Workstation, WorkstationRules} from './workstation.data'
 import * as WorkstationApi from '@/api/mes/workstation'
 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 {
-import BindDetail from '@/components/workstationBind/src/workstationBind.vue'
+  PurchasereceiptRecordDetail,
+  PurchasereceiptRecordDetailRules,
+  PurchasereceiptRecordMain
+} from "@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data";
+import {PurchasereceiptRequestTabsList} from "@/utils/disposition/tabsList";
+import * as PurchasereceiptRecordDetailApi from "@/api/wms/purchasereceiptRecordDetail";
+import {getEquipmentPage, getProcessPage, getProductionPage} from "@/api/mes/workstation";
 defineOptions({ name: 'Workstation' })
 
 const message = useMessage() // 消息弹窗
@@ -136,7 +148,6 @@ const buttonBaseClick = (val, item) => {
 const butttondata = [
   defaultButtons.mainListEditBtn({hasPermi:'wms:workstation:update'}), // 编辑
   defaultButtons.mainListDeleteBtn({hasPermi:'wms:workstation:delete'}), // 删除
-  defaultButtons.mainListBindBtn({hasPermi:'wms:workstation:update'}), // 绑定
 ]
 
 // 列表-操作按钮事件
@@ -145,8 +156,6 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     await handleDelete(row.id)
-  }else if (val == 'bind') { // 绑定
-    openBindDetail(row,row.name,row.code)
   }
 }
 /** 添加/修改操作 */
@@ -179,16 +188,11 @@ const formsSuccess = async (formType,data) => {
   getList()
 }
 
-/** 详情操作 */
+/** 绑定操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue, 'basicWorkstation')
 }
-/** 绑定操作 */
-const bindDetailRef = ref()
-const openBindDetail = (row: any, titleName: any, titleValue: any) => {
-  bindDetailRef.value.openDetail(row, titleName, titleValue, 'basicWorkstation')
-}
 
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
@@ -248,5 +252,31 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await WorkstationApi.importTemplate()
 })
-
+// 子包装数据
+const teamRef = ref()
+const { tableObject: teamData, tableMethods: teamMethods } = useTable({
+  getListApi: WorkstationApi.getTeamPage
+})
+const { getList:teamList } = teamMethods
+const detailAllSchemas = ref(Team.allSchemas)
+const apiPage = ref(WorkstationApi.getTeamPage)
+const tabeKey = ref("workstationDetail");
+// tabs 切换事件
+const changeTabs = (data) =>{
+  if(data.prop == 'Team'){
+    console.log(data)
+    apiPage.value = WorkstationApi.getTeamPage
+    detailAllSchemas.value = Team.allSchemas
+  }else if(data.prop == 'Equipment'){
+    apiPage.value = WorkstationApi.getEquipmentPage
+    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+  }else if(data.prop == 'Process'){
+    apiPage.value = WorkstationApi.getProcessPage
+    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+  }else if(data.prop == 'Production'){
+    apiPage.value = WorkstationApi.getProductionPage
+    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+  }
+  tabeKey.value = data.prop
+}
 </script>

src/views/mes/workstation/workstation.data.ts

@@ -6,7 +6,7 @@ export const WorkstationRules = reactive({
   code: [required]
 })
 export const TabsList = [{
-  label: "工组",
+  label: "班组",
   prop: 'Team',
 },
   {
@@ -104,3 +104,67 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
     }
   }
 ]))
+export const Team = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  }
+]))
+export const Equipment = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  }
+]))
+export const Process = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  }
+]))
+export const Production = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  }
+]))

src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts

@@ -109,8 +109,8 @@ export const Customeritem = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '客户包装单位',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
+    // dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {

src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts

@@ -343,8 +343,8 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     label: '包装规格',
     field: 'packUnit',
     sort: 'custom',
-    dictType: DICT_TYPE.PACK_UNIT,
+    // dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    // dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     table: {
       width: 150,
     },

src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts

@@ -352,8 +352,8 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     label: '包装规格',
     field: 'packUnit',
     sort: 'custom',
-    dictType: DICT_TYPE.PACK_UNIT,
+    // dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    // dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     table: {
       width: 150,
     },

src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts

@@ -357,8 +357,8 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装规格',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
+    // dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {

src/views/wms/inventoryManage/package/package.data.ts

@@ -207,11 +207,11 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     label: '包装规格',
     field: 'packUnit',
     sort: 'custom',
-    dictType: DICT_TYPE.PACK_UNIT,
+    // dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    // dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    form: {
+    // form: {
-      component: 'SelectV2'
+    //   component: 'SelectV2'
-    },
+    // },
     table: {
       width: 150,
     },

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

@@ -369,8 +369,8 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装规格',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
+    // dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {

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

@@ -529,8 +529,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '包装规格',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
+    // dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {

src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts

@@ -25,8 +25,12 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '从仓库代码',
+    label: '状态',
-    field: 'fromWarehouseCode',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -100,46 +104,6 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '最后更新者',
-    field: 'update',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '优先级',
     field: 'priority',
@@ -149,7 +113,8 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
-    }
+    },
+    isTable:false
   },
   {
     label: '优先级增量',
@@ -160,71 +125,42 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'InputNumber',
-    }
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
     },
+    isTable:false
   },
   {
-    label: '承接人用户名',
+    label: '业务类型',
-    field: 'acceptUserId',
+    field: 'businessType',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '承接时间',
+    label: '备注',
-    field: 'acceptTime',
+    field: 'remark',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
     },
   },
   {
-    label: '完成人用户名',
+    label: '从仓库代码',
-    field: 'completeUserId',
+    field: 'fromWarehouseCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false
   },
   {
-    label: '完成时间',
+    label: '到仓库代码',
-    field: 'completeTime',
+    field: 'toWarehouseCode',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
     },
+    isTable: false
   },
   {
     label: '从库区类型范围',
@@ -232,7 +168,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -243,59 +179,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到仓库代码',
-    field: 'toWarehouseCode',
     sort: 'custom',
     table: {
       width: 150
@@ -308,6 +192,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '到库区代码范围',
@@ -316,13 +201,14 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '自动完成',
     field: 'autoComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -341,7 +227,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -360,7 +246,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -379,7 +265,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowBiggerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -398,7 +284,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowSmallerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -417,7 +303,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyInventoryStatus',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -436,7 +322,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowContinuousScanning',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -455,7 +341,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowPartialComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -474,7 +360,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyBatch',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -493,7 +379,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyPackingNumber',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -507,6 +393,126 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人用户名',
+    field: 'acceptUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人用户名',
+    field: 'completeUserId',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'update',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
   // {
   //   label: '操作',
   //   field: 'action',

src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts

@@ -697,8 +697,8 @@ export const ProductdismantleJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装规格',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
+    // dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {

src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts

@@ -779,8 +779,8 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
   {
     label: '包装规格',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
+    // dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {

src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts

@@ -729,8 +729,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装规格',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
+    // dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {

src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts

@@ -498,8 +498,8 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '包装规格',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
+    // dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue

@@ -579,6 +579,9 @@ const searchFormClick = (searchData) => {
 const submitFormLabel = async (formType, data) => {
   try {
     detatableData.tableList.forEach(async (item) => {
+      // 创建标签 要物料库区配置表中 入库包装规格
+      item.packUnit = null
+      item.inOfOut = 'in'
       await PackageApi.createPackageLabel(item).then(res => {
         isCreateLabel.value = true
         message.success('创建标签成功')
@@ -643,10 +646,10 @@ const handlePoint = async (row) => {
   // 判断是采购还是制造
   if (isCreateLabel.value) {
     if (labelType.value == 'cg') {
-      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
       window.open(src.value+'&request_number='+row.number)
     } else {
-      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
       window.open(src.value+'&request_number='+row.number)
     }
   } else {

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts

@@ -675,8 +675,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '包装规格',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
+    // dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
+    // dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {

src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts

@@ -513,8 +513,8 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装规格',
     field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
+    // dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
+    // dictClass: 'string',
     isTable: true,
     table: {
       width: 150

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

@@ -462,6 +462,7 @@
       })
     }
     if(flag){
+      formRef.value.formLoading = false
       return;
     }
     if (data.subList.length == tableData.value.length) {

src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts

@@ -211,11 +211,11 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     label: '包装规格',
     field: 'packUnit',
     sort: 'custom',
-    dictType: DICT_TYPE.PACK_UNIT,
+    // dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    // dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    form: {
+    // form: {
-      component: 'SelectV2'
+    //   component: 'SelectV2'
-    },
+    // },
     table: {
       width: 150,
     },