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

src/api/wms/countRequestMain/index.ts

@@ -105,4 +105,8 @@ export const superviseCount = async (data) => {
 //生成盘点调整申请
 export const generateCountadjustRequest = async (id) => {
   return await request.put({ url: `/wms/count-request-main/generateCountadjustRequest?id=` + id })
+}
+//解冻
+export const thaw = async (id) => {
+  return await request.put({ url: `/wms/count-request-main/thaw?id=` + id })
 }

src/components/BasicForm/src/BasicForm.vue

@@ -90,6 +90,7 @@
         ref="tableFormRef"
         @tableFormChange="tableFormChange"
         @handleAddTable="handleAddTable"
+        @handleDeleteTable="handleDeleteTable"
       />
     </div>
     <template #footer>

src/components/TableFormCountPlan/src/TableFormCountPlan.vue

@@ -168,6 +168,10 @@ const tableFormChange = (field, val, row) => {
 const handleAddTable = () => {
   emit('handleAddTable')
 }
+// 删除数据
+const handleDeleteTable = (row, index) => {
+  emit('handleDeleteTable', row, index)
+}
 // setup 语法糖 抛出方法
 defineExpose({
   TableBaseComponents_Ref,

src/utils/disposition/defaultButtons.ts

@@ -723,6 +723,18 @@ export function mainSuperviseCountBtn(option:any) {
     hasPermi: ''
   })
 }
+// 主列表-解冻
+export function mainThawRequesttBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '解冻',
+    name: 'mainThaw',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
 // 默认按钮规则
 function __defaultBtnOption(option:any,specific:any){
   return {

src/views/wms/countManage/count/countRequestMain/index.vue

@@ -312,7 +312,11 @@ const butttondata = (row) => {
     defaultButtons.mainCountAdjustRequesttBtn({
       hide: isShowGenerateMainButton(row, ['2']),
       hasPermi: 'wms:count-request-main:generate'
-    }) // 生成盘点调整
+    }), // 生成盘点调整
+    defaultButtons.mainThawRequesttBtn({
+      hide: isShowGenerateMainButton(row, ['3']),
+      hasPermi: 'wms:count-request-main:thaw'
+    }) // 解冻
   ]
 }
 
@@ -419,6 +423,17 @@ const buttonTableClick = async (val, row) => {
       .catch((err) => {
         console.log(err)
       })
+  }  else if (val == 'mainThaw') {
+    // 解冻
+    await message.confirm('确认要解冻吗？')
+    CountRequestMainApi.thaw(row.id)
+      .then(() => {
+        message.success(t('解冻成功'))
+        getList()
+      })
+      .catch((err) => {
+        console.log(err)
+      })
   } else if (val == 'edit') {
     // 编辑
     openForm('update', row)

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

@@ -5,6 +5,9 @@ import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain'
 import { DeliverRecordMain } from '../../deliver/deliverRecordMain/deliverRecordMain.data'
 
+import * as CustomerdockApi from '@/api/wms/customerdock'
+import { Customerdock } from '../../../basicDataManage/customerManage/customerdock/customerdock.data'
+
 import * as CarrierApi from '@/api/wms/carrier'
 import { Carrier } from '@/views/wms/basicDataManage/orderManage/carrier/carrier.data'
 
@@ -111,6 +114,22 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    // form: {
+    //   // labelMessage: '信息提示说明！！！',
+    //   componentProps: {
+    //     isSearchList: true, // 开启查询弹窗
+    //     searchListPlaceholder: '请选择客户月台代码', // 输入框占位文本
+    //     searchField: 'customerDockCode', // 查询弹窗赋值字段
+    //     searchTitle: '发货记录信息', // 查询弹窗标题
+    //     searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类
+    //     searchPage: CustomerdockApi.getCustomerdockPage, // 查询弹窗所需分页方法
+    //     searchCondition: [{
+    //       key: 'available',
+    //       value: 'TRUE',
+    //       isMainValue: false
+    //     }]
+    //   }
+    // }
   },
   {
     label: '承运商',
@@ -483,6 +502,12 @@ export const CustomerreturnRequestMainRules = reactive({
   // toAreaCodes: [
   //   { required: true, message: '请选择到库区代码范围', trigger: 'change' }
   // ],
+  deliverRecordNumber: [
+    { required: true, message: '请选择发货记录单号', trigger: 'change' }
+  ],
+  // customerDockCode: [
+  //   { required: true, message: '请选择客户月台代码', trigger: 'change' }
+  // ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
   ],
@@ -744,22 +769,22 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '到库位代码',
+  //   field: 'toLocationCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm: {
+  //     disabled: true
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '库存状态',
     field: 'inventoryStatus',