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

src/api/wms/productputawayJobMain/index.ts

@@ -130,3 +130,8 @@ export const closeProductputawayMain = async (id) => {
 export const executeProductputawayMain = async (data) => {
   return await request.put({ url: `/wms/productputaway-job-main/execute`, data})
 }
+
+// 更新任务配置
+export const updateProductputawayJobConfig = () => {
+  return request.put({ url: '/wms/productputaway-job-main/updateProductputawayJobConfig'})
+}

src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue

@@ -138,6 +138,7 @@ const getSwitchStatus = async ()=>{
 const HeadButttondata = computed(()=>{
   return [
   defaultButtons.defaultExportBtn({hasPermi:'wms:productputaway-job-main:export'}), // 导出
+  defaultButtons.defaultUpdateTaskSettingBtn(null), // 更新任务设置
   {
       label: '待处理状态全部打印',
       name: 'printAllPending',
@@ -157,7 +158,19 @@ const HeadButttondata = computed(()=>{
 const buttonBaseClick = (val, item) => {
   if (val == 'export') { // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if(val == 'updateTaskSetting'){
+    // 更新任务设置
+      try {
+      // loading开始
+      loadStart()
+      ProductputawayJobMainApi.updateProductputawayJobConfig()
+      buttonBaseClick('refresh',null)
+      message.success(t('更新成功'))
+    } catch {
+    } finally {
+      loadDone()
+    }
+  }else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({
         filters: tableObject.params.filters