Merge remote-tracking branch 'origin/main'

src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js

@@ -38,6 +38,7 @@ import {getLangByResId} from '../../../../../mmpub/mmpub/pub/tool/multiLangUtil'
 import {pickmBackDeliverWithSet} from '../../../pub/pickmbackdeliverwithset';
 import {toast} from "../../../../../gl/public/components/utils";
 import borrowBtnClick from "../btnClicks/borrowBtnClick";
+import {showWarningDialog} from "../../../../../scmpub/scmpub/pub/tool/messageUtil";
 
 export default async function clickBtn(props, id, text, record, index) {
     let _this = this;
@@ -827,6 +828,59 @@ export default async function clickBtn(props, id, text, record, index) {
         case CARD_BTN.pushrzmes:
             pushrzmsBtnClick.call(this, props);
             break;
+        case  "to_buying"://请购
+            showWarningDialog("是否生成请购单", "", {
+                /* 国际化处理： 确认终止,是否确定将此合同终止*/
+                beSureBtnClick: () => {
+                    hids = [];
+                    cpickmid = props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value;
+                    if (cpickmid) {
+                        hids.push(cpickmid);
+                    }
+                    data = {
+                        cpickmids: hids
+                    }
+                    ajax({
+                        url:'/nccloud/mmpac/pickm/buyingreq.do',
+                        data: data,
+                        success: (res) => {
+                            if(res.success){
+                                toast({ content: "请购单推送成功", color: 'success' });
+                            }
+                        }
+                    });
+                }
+            });
+
+            break;
+        case "to_pmo"://流程生产订单
+            showWarningDialog("是否生成生产订单", "", {
+                /* 国际化处理： 确认终止,是否确定将此合同终止*/
+                beSureBtnClick: () => {
+                    hids = [];
+                    cpickmid = props.form.getFormItemsValue(AREA.formArea, FIELD.hid).value;
+                    if (cpickmid) {
+                        hids.push(cpickmid);
+                    }
+                    data = {
+                        cpickmids: hids
+                    }
+                    data = {
+                        cpickmids: cpickmids
+                    }
+                    ajax({
+                        url: '/nccloud/mmpac/pickm/pom.do',
+                        data: data,
+                        success: (res) => {
+                            if(res.success){
+                                toast({ content: "流程生产订单推送成功", color: 'success' });
+                            }
+                        }
+                    });
+                }
+            });
+
+            break
         default:
             break;
     }

src/mmpac/mmpac/pickm/list/viewController/buttonClickController.js

@@ -31,6 +31,13 @@ import {updateCacheDataForList} from '../../../../../mmpub/mmpub/pub/cache';
 import {ajax, cacheTools, toast} from 'nc-lightapp-front';
 import PickmBorrowDlg from "../../pickmborrow/list";
 import {borrowOkBtnClick} from "../../card/btnClicks";
+import {showWarningDialog} from "../../../../../scmpub/scmpub/pub/tool/messageUtil";
+import {FIELDS} from "../../../../../ct/ct/purdaily/constance";
+import {
+    cardBaseScriptAction,
+    isShowScriptActionDlg,
+    showCardScriptActionDlg
+} from "../../../../../ct/ct/purdaily/utils/baseScriptUtil";
 
 export default function (props, key, text, record, index) {
     let pk = null;
@@ -439,34 +446,39 @@ export default function (props, key, text, record, index) {
             });
             break;
         case  "to_buying"://请购
-            cpickmids = [];
+            showWarningDialog("是否生成请购单", "", {
-            if (record && record.cpickmid) {
+                /* 国际化处理： 确认终止,是否确定将此合同终止*/
-                cpickmids.push(record.cpickmid);
+                beSureBtnClick: () => {
-            } else {
+                    cpickmids = [];
-                let rows = _this.props.table.getCheckedRows(AREA.tableArea);
+                    if (record && record.cpickmid) {
-                // 如果没有选中行，则提示并返回，不进行任何操作
+                        cpickmids.push(record.cpickmid);
-                if (rows.length <= 0) {
+                    } else {
-                    showWarningInfo(getLangByResId(this, '5008Pickm-000086')/* 国际化处理： 请选择需要处理的数据！*//*getLangByResId(this, '4004POORDER-000068')  国际化处理： 请选择需要删除的数据！*/
+                        let rows = _this.props.table.getCheckedRows(AREA.tableArea);
-                    );
+                        // 如果没有选中行，则提示并返回，不进行任何操作
-                    return;
+                        if (rows.length <= 0) {
-                }
+                            showWarningInfo(getLangByResId(this, '5008Pickm-000086')/* 国际化处理： 请选择需要处理的数据！*//*getLangByResId(this, '4004POORDER-000068')  国际化处理： 请选择需要删除的数据！*/
-                rows.forEach((row) => {
+                            );
-                    let pk = row.data.values.cpickmid.value;
+                            return;
-                    if (pk) {
+                        }
-                        cpickmids.push(pk);
+                        rows.forEach((row) => {
+                            let pk = row.data.values.cpickmid.value;
+                            if (pk) {
+                                cpickmids.push(pk);
+                            }
+                        });
                     }
-                });
+                    data = {
-            }
+                        cpickmids: cpickmids
-            data = {
-                cpickmids: cpickmids
-            }
-            ajax({
-                url: '/nccloud/mmpac/pickm/buyingreq.do',
-                data: data,
-                success: (res) => {
-                    if (res.success) {
-                        toast({content: "请购单推送成功", color: 'success'});
                     }
+                    ajax({
+                        url: '/nccloud/mmpac/pickm/buyingreq.do',
+                        data: data,
+                        success: (res) => {
+                            if (res.success) {
+                                toast({content: "请购单推送成功", color: 'success'});
+                            }
+                        }
+                    });
                 }
             });
             break;
@@ -527,36 +539,42 @@ export default function (props, key, text, record, index) {
             });
             break;
         case "to_pmo"://流程生产订单
-            cpickmids = [];
+            showWarningDialog("是否生成生产订单", "", {
-            if (record && record.cpickmid) {
+                /* 国际化处理： 确认终止,是否确定将此合同终止*/
-                cpickmids.push(record.cpickmid);
+                beSureBtnClick: () => {
-            } else {
+                    cpickmids = [];
-                let rows = _this.props.table.getCheckedRows(AREA.tableArea);
+                    if (record && record.cpickmid) {
-                // 如果没有选中行，则提示并返回，不进行任何操作
+                        cpickmids.push(record.cpickmid);
-                if (rows.length <= 0) {
+                    } else {
-                    showWarningInfo(getLangByResId(this, '5008Pickm-000086')/* 国际化处理： 请选择需要处理的数据！*//*getLangByResId(this, '4004POORDER-000068')  国际化处理： 请选择需要删除的数据！*/
+                        let rows = _this.props.table.getCheckedRows(AREA.tableArea);
-                    );
+                        // 如果没有选中行，则提示并返回，不进行任何操作
-                    return;
+                        if (rows.length <= 0) {
-                }
+                            showWarningInfo(getLangByResId(this, '5008Pickm-000086')/* 国际化处理： 请选择需要处理的数据！*//*getLangByResId(this, '4004POORDER-000068')  国际化处理： 请选择需要删除的数据！*/
-                rows.forEach((row) => {
+                            );
-                    let pk = row.data.values.cpickmid.value;
+                            return;
-                    if (pk) {
+                        }
-                        cpickmids.push(pk);
+                        rows.forEach((row) => {
+                            let pk = row.data.values.cpickmid.value;
+                            if (pk) {
+                                cpickmids.push(pk);
+                            }
+                        });
                     }
-                });
+                    data = {
-            }
+                        cpickmids: cpickmids
-            data = {
-                cpickmids: cpickmids
-            }
-            ajax({
-                url: '/nccloud/mmpac/pickm/pom.do',
-                data: data,
-                success: (res) => {
-                    if (res.success) {
-                        toast({content: "流程生产订单推送成功", color: 'success'});
                     }
+                    ajax({
+                        url: '/nccloud/mmpac/pickm/pom.do',
+                        data: data,
+                        success: (res) => {
+                            if (res.success) {
+                                toast({content: "流程生产订单推送成功", color: 'success'});
+                            }
+                        }
+                    });
                 }
             });
+
             break;
         default:
             break;