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

src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue

@@ -55,7 +55,6 @@
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/purchaseprice/import" :importTemplateData="importTemplateData" @success="importSuccess" 
-  :mode="2"
    />
 </template>
 

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

@@ -4,6 +4,9 @@ import { dateFormatter } from '@/utils/formatTime'
 import * as CustomerApi from '@/api/wms/customer'
 import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
 
+import * as CustomerDockApi from '@/api/wms/customerdock'
+import { Customerdock } from '@/views/wms/basicDataManage/customerManage/customerdock/customerdock.data'
+
 import * as SaleMainApi from '@/api/wms/saleMain'
 import * as SaleDetailApi from '@/api/wms/saleDetail'
 import { SaleDetail, SaleMain } from '../saleMain/saleMain.data'
@@ -320,7 +323,23 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTableForm: false,
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'code',
+      searchTitle: '物料基础信息',
+      searchAllSchemas: Customerdock.allSchemas,
+      searchPage: CustomerDockApi.getCustomerdockPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'customerCode',
+        value: 'customerCode',
+        isMainValue: true
+    }]
+    },
     isForm: false,
   },
   {
@@ -533,6 +552,9 @@ export const DeliverPlanDetailRules = reactive({
   number: [
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
+  customerDockCode: [
+    { required: true, message: '请选择客户月台代码', trigger: 'blur' }
+  ],
   itemCode: [
     { required: true, message: '请选择物料代码', trigger: 'change' }
   ],

src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

@@ -373,7 +373,8 @@ const submitForm = async (formType, data) => {
       return;
     }
   })
-  if(flag){
+  if(flag.value){
+    formRef.value.formLoading = false
     return
   }
   try {

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

@@ -67,8 +67,8 @@
     :apiUpdate="InventorymoveRequestDetailApi.updateInventorymoveRequestDetail"
     :apiPage="InventorymoveRequestDetailApi.getInventorymoveRequestDetailPage"
     :apiDelete="InventorymoveRequestDetailApi.deleteInventorymoveRequestDetail"
-    :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
+    @detailOpenForm="detailOpenForm"
   />
 
   <!-- 导入 -->
@@ -271,7 +271,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           }
         })
       }
-      // console.log(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')));
       }
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
@@ -292,17 +291,17 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
       setV['uom'] = val[0]['uom']
       if(routeName.value == 'OktoholdRequestMain'){
         setV['toInventoryStatus'] = "HOLD"
-        }else if ( routeName.value == 'HoldtookRequestMain') {
+      }else if ( routeName.value == 'HoldtookRequestMain') {
-          setV['toInventoryStatus'] = "OK"
+        setV['toInventoryStatus'] = "OK"
-        }else if ( routeName.value == 'HoldtoscrapRequestMain') {
+      }else if ( routeName.value == 'HoldtoscrapRequestMain') {
-          setV['toInventoryStatus'] = "SCRAP"
+        setV['toInventoryStatus'] = "SCRAP"
         }else if ( routeName.value == 'OktoscrapRequestMain') {
-          setV['toInventoryStatus'] = "SCRAP"
+        setV['toInventoryStatus'] = "SCRAP"
-        }else if ( routeName.value == 'ScraptoholdRequestMain') {
+      }else if ( routeName.value == 'ScraptoholdRequestMain') {
-          setV['toInventoryStatus'] = "HOLD"
+        setV['toInventoryStatus'] = "HOLD"
-        }else{
+      }else{
-          setV['toInventoryStatus'] = val[0]['inventoryStatus']
+        setV['toInventoryStatus'] = val[0]['inventoryStatus']
-        }
+      }
     } else {
       setV[formField] = val[0][searchField]
     }
@@ -310,10 +309,6 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   })
 }
 
-// 子表新增的时候选择表格之后需要会显得字段
-// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
-const Echo =  []
-
 // 获得表格的各种操作
 const { getList, setSearchParams } = tableMethods
 
@@ -440,9 +435,31 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+/**
+ * 详情 新增/编辑事件
+ */
+const detailOpenForm = (type, row) => {
+    if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
+        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.push({
+          key: 'warehouseCode',
+          value: fromWarehouseCodeMain.value,
+          isMainValue: false
+        })
+      } else {
+        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => {
+          if (item.key == 'warehouseCode') {
+            item.value = fromWarehouseCodeMain.value
+          }
+        })
+      }
+}
+
+const fromWarehouseCodeMain = ref()
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  fromWarehouseCodeMain.value = row.fromWarehouseCode
   detailRef.value.openDetail(row, titleName, titleValue)
 }
 

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

@@ -409,6 +409,9 @@ export const InventorymoveRequestMainRules = reactive({
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
   ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'blur' }
+  ],
   status: [
     { required: true, message: '请选择状态', trigger: 'change' }
   ],

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

@@ -179,22 +179,22 @@
   // 列表-操作按钮事件
   const buttonTableClick = async (val, row) => {
     if (val == 'edit') { // 编辑
-      if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+      // if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
       openForm('update', row)
     } else if (val == 'delete') { // 删除
-      if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+      // if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
       handleDelete(row.id)
     } else if (val == 'mainOrderClo') { // 关闭
-      if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+      // if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
       handleClose(row.id)
     } else if (val == 'mainOrderOpe') { // 打开
-      if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+      // if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
       handleOpen(row.id)
     } else if (val == 'mainOrderPub') { // 发布
-      if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+      // if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
       handlePublish(row.id)
     } else if (val == 'mainOrderWit') { // 下架
-      if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+      // if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
       handleWit(row.id)
     }
   }

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

@@ -242,7 +242,8 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       value: 'TRUE',
       componentProps: {
         inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+        activeValue: 'TRUE',
+        disabled: true
       }
     },
   },