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

@@ -46,4 +46,4 @@ export const exportWorkstation = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/mes/workstation/get-import-template' })
-}
+}

src/components/BasicForm/src/BasicForm.vue

@@ -252,7 +252,7 @@ const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 const dialogWidth = ref()
 if (props.basicFormWidth) {
-  dialogWidth.value = props.basicFormWidth
+  dialogWidth.value = props.basicFormWidth + '%'
 } else {
   dialogWidth.value = props.isBusiness ? '60%' : '40%'
 }

src/views/mes/workstation/index.vue

@@ -65,7 +65,6 @@ 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 {mainBindBtn} from "@/utils/disposition/defaultButtons";
 
 defineOptions({ name: 'Workstation' })
 
@@ -136,7 +135,7 @@ const buttonBaseClick = (val, item) => {
 const butttondata = [
   defaultButtons.mainListEditBtn({hasPermi:'wms:workstation:update'}), // 编辑
   defaultButtons.mainListDeleteBtn({hasPermi:'wms:workstation:delete'}), // 删除
-  defaultButtons.mainListBindBtn({hasPermi:'wms:workstation:update'}), // 删除
+  defaultButtons.mainListBindBtn({hasPermi:'wms:workstation:update'}), // 绑定
 ]
 
 // 列表-操作按钮事件
@@ -144,9 +143,9 @@ const buttonTableClick = async (val, row) => {
   if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    await handleDelete(row.id)
-  }else if (val == 'bind') { // 绑定
+  }else if (val == 'bind') { // 删除
-    detailRef.value.openDetail(row, row.name, "绑定", 'mesWorkstation')
+    await detailRef.value.openDetail(row, '绑定', row.name, 'mesWorkstation')
   }
 }
 

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

@@ -1,12 +1,13 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+
 // 表单校验
 export const WorkstationRules = reactive({
-  code: [required],
+  code: [required]
-  name: [required]
 })
 
 export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
+
   {
     label: '代码',
     field: 'code',

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

@@ -39,14 +39,7 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
+  
-    label: '描述',
-    field: 'description',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '可用物料类型范围',
     field: 'itemTypes',
@@ -291,6 +284,14 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false, 
     isForm: false,
   },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   { 
     label: '备注',
     field: 'remark',

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

@@ -52,10 +52,11 @@
     :apiCreate="BusinesstypeApi.createBusinesstype"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
+    :basicFormWidth="75"
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="Businesstype.allSchemas" />
+  <Detail ref="detailRef" :isBasic="true"   :allSchemas="Businesstype.allSchemas" />
 
   <!-- 导入 -->
   <ImportForm

src/views/wms/basicDataManage/itemManage/itemarea/index.vue

@@ -56,6 +56,7 @@
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
     :isShowButton = isShowButton
+    :basicFormWidth="75"
   />
 
   <!-- 详情 -->
@@ -114,18 +115,22 @@ const updataTableColumns = (val) => {
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
     if (type == 'tableForm') {
-      if(formField == 'locationGroupCode') {
+      if(formField == 'locationCode') {
-        row['locationGroupCode'] = val[0]['code']
-      }else if(formField == 'locationCode') {
         row['locationCode'] = val[0]['code']
       }else{ 
         row[formField] = val[0][searchField]
       }
+    }else{
+      const setV = {}
+      if(formField == 'areaCode') {
+        console.log(val[0]);
+        setV['areaCode'] = val[0]['code']
+        setV['areaType'] = val[0]['type']
+      }else{ 
+        setV[formField] = setV[0][searchField]
+      }
+      formRef.setValues(setV)
     }
-    const setV = {}
-    setV[formField] = val[0][searchField]
-    formRef.setValues(setV)
-    
   })
 }
 // 查询页面返回——详情

src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts

@@ -68,6 +68,23 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '库区类型',
+    field: 'areaType',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '入库包装规格',
     field: 'inPackUnit',
@@ -118,6 +135,19 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '管理精度',
+    field: 'manageMode',
+    sort: 'custom',
+    isSearch: false,
+    dictType: DICT_TYPE.MANAGEMENT_MODE,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '最高库存数量',
     field: 'maxQty',
@@ -223,19 +253,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
+ 
-    label: '管理精度',
-    field: 'manageMode',
-    sort: 'custom',
-    isSearch: false,
-    dictType: DICT_TYPE.MANAGEMENT_MODE,
-    dictClass: 'string',
-    // colorType: 'danger',
-    isTable: true,
-    table: {
-      width: 150
-    },
-  },
   {
     label: '入库自动转为出库包装规格',
     field: 'newlyToOutpackunit',
@@ -255,6 +273,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     },
+    isTable:false
   },
   {
     label: '出库自动转为出库包装规格',
@@ -275,6 +294,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     },
+    isTable:false
   },
   {
     label: '需要接收确认',
@@ -331,6 +351,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     },
+    isTable:false
   },
   {
     label: '超过高储是否允许叫料',
@@ -346,6 +367,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     },
+    isTable:false
   },
   {
     label: '优先空库位',

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@@ -801,6 +801,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm: {
+      type: 'Select',
       disabled: true
     },
     form: {

src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts

@@ -19,12 +19,6 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isForm: false,
   },
-  {
-    label: '发货计划单号',
-    field: 'deliverPlanNumber',
-    sort: 'custom',
-    isForm: false,
-  },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',

src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts

@@ -34,15 +34,6 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
   },
-  {
-    label: '发货计划单号',
-    field: 'deliverPlanNumber',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 180
-    },
-  },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',

src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue

@@ -89,7 +89,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 * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail'
 // 备货申请
 defineOptions({ name: 'StockupMainRequest' })
 
@@ -124,9 +124,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['inventoryStatus'] = val[0]['inventoryStatus']
         row['itemCode'] = val[0]['itemCode']
         row['uom'] = val[0]['uom']
-      } else if(formField == 'toLocationCode'){
+      }
-        console.log(row,111);
+      if(formField == 'toLocationCode'){
-        
         row['toLocationCode'] = val[0]['code']
       }else{
         row[formField] = val[0][searchField]

src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts

@@ -4,9 +4,6 @@ import { TableColumn } from '@/types/table'
 import { dateFormatter } from '@/utils/formatTime'
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
-import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain'
-import { DeliverPlanMain } from '../../deliverplan/deliverPlanMain/deliverPlanMain.data'
-
 import * as BalanceApi  from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
@@ -51,35 +48,6 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
-  {
-    label: '发货计划单号',
-    field: 'deliverPlanNumber',
-    sort: 'custom',
-    table: {
-      width: 140
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择发货计划单号', // 输入框占位文本
-        searchField: 'number', // 查询弹窗赋值字段
-        searchTitle: '发货计划信息', // 查询弹窗标题
-        searchAllSchemas: DeliverPlanMain.allSchemas, // 查询弹窗所需类
-        searchPage: DeliverPlanMainApi.getDeliverPlanMainPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        },
-        {
-          key: 'status',
-          value: '6',
-          isMainValue: false
-        }]
-      }
-    }
-  },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@@ -597,6 +597,8 @@ const submitForm = async (formType, data) => {
   let isExist = false
   tableData.value.forEach(item => {
    let rs =  tableData.value.filter(filterItem => (filterItem.packingNumber == item.packingNumber))
+   console.log(rs);
+   
    if(rs.length > 1) isExist = true
   })
   if (isExist) {