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

src/components/TableForm/src/TableForm.vue

@@ -97,7 +97,7 @@
               :type="headerItem?.tableForm?.inputType"
               :placeholder="
                 t(
-                  `ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}`
+                  `ts.${headerItem?.tableForm?.isPlaceholder === false ? '' :( headerItem?.tableForm?.placeholder || '请输入' + headerItem.label)}`
                 ).replace('ts.', '')
               "
               :disabled="itemIsDisabled(headerItem, row)"

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

@@ -43,6 +43,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     label: '标签模板',
     field: 'template',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 180
     }
@@ -51,6 +52,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     label: '标签状态',
     field: 'status',
     sort: 'custom',
+    isTable:false,
     isSearch: true,
     dictType: DICT_TYPE.LABEL_STATUS,
     dictClass: 'string',

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

@@ -95,6 +95,7 @@ import * as LocationApi  from '@/api/wms/location'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import * as ruleApi  from '@/api/wms/rule/index'
+import { formatTime } from '@/utils/index'
 const { loadStart, loadDone } = usePageLoading()
 // 库存转移申请
 // 只有库存转移申请在使用的
@@ -327,6 +328,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['uom'] = item['uom']
           newRow['qty'] = item['qty']
           newRow['toInventoryStatus'] = item['inventoryStatus']//库存移动申请
+          newRow['toBatch'] = formatTime(new Date(), 'yyyyMMdd')
           tableData.value.push(newRow)
         })
       }else if (formField == 'toLocationCode') {

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts

@@ -588,22 +588,27 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
   },
-  // {
-  //   label: '到批次',
-  //   field: 'toBatch',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   isTableForm: true,
-  //   isForm: false,
-  //   tableForm: {
-  //     disabled: true,
-  //     placeholder: '请选择从批次',
-  //     valueFormat: 'YYYYMMDD',
-  //     format: 'YYYYMMDD',
-  //   },
-  // },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: false,
+      type:'FormDate',
+      placeholder: '请选择到批次',
+      valueFormat: 'YYYYMMDD',
+      format: 'YYYYMMDD',
+    },
+    form: {
+      componentProps: {
+        disabled: false,
+        valueFormat: 'YYYYMMDD',
+      }
+    }
+  },
   {
     label: '从包装号',
     field: 'fromPackingNumber',

src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue

@@ -253,7 +253,7 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3']),hasPermi:'wms:purchase-barter-request-main:close'}), // 关闭
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','8']),hasPermi:'wms:purchase-barter-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:purchase-barter-request-main:reAdd'}), // 重新添加
         defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-barter-request-main:submit'}), // 提交审批
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchase-barter-request-main:refused'}), // 驳回

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

@@ -203,7 +203,7 @@ const { loadStart, loadDone } = usePageLoading()
         val.forEach(item=>{
           if(tableData.value.find(item1=>item1['id'] == item['id'])) return
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row}))
-          
+
           newRow[formField] = item[searchField]
           newRow['itemCode'] = item['code']
           newRow['poNumber'] = item['number']
@@ -232,6 +232,16 @@ const { loadStart, loadDone } = usePageLoading()
         setV['itemCode'] = val[0]['code']
         setV['poNumber'] = val[0]['number']
         setV['poLine'] = val[0]['lineNumber']
+        setV['receivedNumber'] = val[0]['receivedNumber']
+        console.log(PurchasePlanDetail.allSchemas.tableFormColumns);
+        
+        PurchasePlanDetail.allSchemas.tableFormColumns.forEach(item =>{
+        if(item.value == ''){
+          if(item.field == 'receivedNumber'){
+            item.tableForm.placeholder = ''
+          }
+        }
+      })
         
         if(formField == 'supplierCode'){
           setV['supplierCode'] = val[0]['code']

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

@@ -653,6 +653,18 @@ export const PurchasePlanDetail = useCrudSchemas(
     //     }
     //   }
     // },
+    {
+      label: '便次',
+      field: 'deliNo',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 3,
+      isTableForm: false,
+      isForm: false,
+      isTable: true,
+      isDetail:false
+    },
     {
       label: '订单行',
       field: 'poLine',
@@ -849,8 +861,9 @@ export const PurchasePlanDetail = useCrudSchemas(
         }
       },
       tableForm: {
-        type: 'Select',
-        disabled: true
+        // type: 'Select',
+        disabled: true,
+        isPlaceholder:false
       }
     },
     {