Merge remote-tracking branch 'origin/main'

src/mmpac/mmpac/pmo/card/btnClicks/printBtnClick2.js

@@ -0,0 +1,45 @@
+/*VqFTX17u5c5T6CGoj9nmVQk8H8yqeKKcRBesbUopmz4=*/
+/*
+ *打印
+ * @Author: fengjinga 
+ * @Date: 2018-07-04 15:06:44 
+ * @Last Modified by: fengjinga
+ * @Last Modified time: 2019-01-18 11:12:04
+ */
+
+import { print, ajax } from 'nc-lightapp-front';
+import { PMO_LIST, PMO_CARD, HEADATTRCODE } from '../../pmoconst';
+
+export default function printClick(props, nodekey) {
+	let appcode = props.getAppCode();
+	// 获取选中行
+	if (!nodekey) {
+		nodekey = PMO_LIST.pnodekey;
+	}
+	let pk = props.form.getFormItemsValue(PMO_CARD.formId, HEADATTRCODE.CPMOHID).value;
+	let pks = [];
+	pks.push(pk);
+	//校验权限
+	let data = { pks: pks, actioncode: 'PmoPrint' }
+	ajax({
+		url: PMO_LIST.checkdatapermissionURL,
+		data: data,
+		success: (res) => {
+			print(
+				'pdf', //支持两类: 'html'为模板打印, 'pdf'为pdf打印
+				PMO_LIST.printURL,
+				{
+					funcode: appcode, //小应用编码
+					nodekey: nodekey, //模板节点标识
+					oids: pks, // 功能节点的数据主键
+					actioncode: 'printprocedure2'
+				}
+			);
+		}
+	});
+
+}
+
+
+
+/*VqFTX17u5c5T6CGoj9nmVQk8H8yqeKKcRBesbUopmz4=*/

src/mmpac/mmpac/pmo/card/viewControl/btnClickController.js

@@ -33,6 +33,7 @@ import commitBtnClick from '../btnClicks/commitBtnClick'; //提交
 import unCommitBtnClick from '../btnClicks/unCommitBtnClick'; //收回
 import linkBtnClick from '../btnClicks/linkBtnClick'; //单据追溯
 import printBtnClick from '../btnClicks/printBtnClick'; //打印
+import printBtnClick2 from '../btnClicks/printBtnClick2'; //打印2
 import outputBtnClick from '../btnClicks/outputBtnClick'; //输出
 import pageInfoClick, {commonShow, setBtnShow} from '../btnClicks/pageInfoClick';
 import printbarCodeBtnClick from '../btnClicks/printbarCodeBtnClick'; //打印条码
@@ -171,6 +172,10 @@ export default function clickBtn(props, id, text, record, index) {
         case PMO_CARD_BUTTON.printprocedure:
             let print4procedure = printBtnClick.bind(this);
             return print4procedure(props, PMO_LIST.nodekey4procedure);
+			//打印工序计划
+		case PMO_CARD_BUTTON.printprocedure2:
+			let print4procedure2 = printBtnClick2.bind(this);
+			return print4procedure2(props, PMO_LIST.nodekey4procedure);
         //输出
         case PMO_CARD_BUTTON.output:
             let output = outputBtnClick.bind(this, props);

src/mmpac/mmpac/pmo/list/btnclicks/buttonClick.js

@@ -60,6 +60,7 @@ const { getDefData, setDefData } = cardCache;
 import linkBtnClick from './linkBtnClick'; //单据追溯
 import pscplanBtnClick from './pscplanBtnClick'; //工序委外计划
 import printBtnClick from './printBtnClick'; //打印
+import printBtnClick2 from './printBtnClick2'; //打印 sunfj2
 import outputBtnClick from './outputBtnClick'; //输出
 import fileBtnClick from './fileBtnClick'; //附件管理
 import exportTemClick from './exportTemClick'; //导出
@@ -225,6 +226,10 @@ export default function clickBtn(props, id, text, record, index) {
 		case PMO_LIST_BUTTON.printprocedure:
 			let print4procedure = printBtnClick.bind(this);
 			return print4procedure(props, PMO_LIST.nodekey4procedure);
+		//打印工序备料计划
+		case PMO_LIST_BUTTON.printprocedure2:
+			let print4procedure2 = printBtnClick2.bind(this);
+			return print4procedure2(props, PMO_LIST.nodekey4procedure);
 		//输出
 		case PMO_LIST_BUTTON.output:
 			let output = outputBtnClick.bind(this);

src/mmpac/mmpac/pmo/list/btnclicks/printBtnClick2.js

@@ -0,0 +1,51 @@
+/*
+ * 打印
+ * @Author: sunfj2
+ * @Date: 2018-07-04 15:06:44 
+ * @Last Modified by: fengjinga
+ * @note: 工序计划批量打印带出备料计划
+ */
+
+import { toast, print, ajax } from 'nc-lightapp-front';
+import { getLangByResId } from '../../../../../mmpub/mmpub/pub/tool/multiLangUtil';
+import { PMO_LIST, HEADATTRCODE } from '../../pmoconst';
+
+export default function buttonClick(props, nodekey) {
+	let appcode = props.getAppCode();
+	// 获取选中行
+	if (!nodekey) {
+		nodekey = PMO_LIST.pnodekey;
+	}
+	let seldatas = props.table.getCheckedRows(PMO_LIST.tableId);
+	// 如果没有选中行，则提示并返回，不进行任何操作
+	if (seldatas.length <= 0) {
+		toast({
+			color: 'warning',
+			content: getLangByResId(this, '50080000-000090')/* 国际化处理： 请选择要打印的订单！*/
+		});
+		return;
+	}
+	let pks = [];
+	seldatas.map((item) => {
+		pks.push(item.data.values[HEADATTRCODE.CPMOHID].value);
+	});
+	let data = { pks: pks, actioncode: 'PmoPrint' };
+	debugger;
+	ajax({
+		url: PMO_LIST.checkdatapermissionURL,
+		data: data,
+		success: (res) => {
+			print(
+				'pdf', //支持两类: 'html'为模板打印, 'pdf'为pdf打印
+				PMO_LIST.printURL,//修改为自己开发的打印逻辑action sunfj2
+				{
+					funcode: PMO_LIST.appcode, //小应用编码
+					nodekey: nodekey, //模板节点标识
+					oids: pks, // 功能节点的数据主键
+					actioncode: 'printprocedure2'
+				}
+			);
+		}
+	});
+
+}

src/mmpac/mmpac/pmo/list/viewControl/buttonController.js

@@ -141,6 +141,8 @@ function setListButtonVisiable(props, tabCode) {
 	let PrintPlanOut = trueFlag;
 	//打印工序计划
 	let PrintProcedure = trueFlag;
+	//打印工序备料计划 sunfj2
+	let PrintProcedure2 = trueFlag;
 	//直接打印条码
 	let PMOBCDirectPrint = trueFlag;
 	//打印条码
@@ -251,6 +253,7 @@ function setListButtonVisiable(props, tabCode) {
 		Output = false;
 		PrintPlanOut = false;
 		PrintProcedure = false;
+		PrintProcedure2 = false;
 		pmosn = false;
 		ApproveInfo = false;
 		PMOresolve = false;
@@ -303,6 +306,7 @@ function setListButtonVisiable(props, tabCode) {
 		[PMO_LIST_BUTTON.output]: Output, //输出
 		[PMO_LIST_BUTTON.printplanout]: PrintPlanOut, //打印联副产品
 		[PMO_LIST_BUTTON.printprocedure]: PrintProcedure, //打印工序计划
+		[PMO_LIST_BUTTON.printprocedure2]: PrintProcedure2, //打印工序备料计划 sunfj2
 		[PMO_LIST_BUTTON.pmobcprint]: PMOBCPrint, //打印条码
 		[PMO_LIST_BUTTON.pmobcdirectprint]: PMOBCDirectPrint, //直接打印条码
 		[PMO_LIST_BUTTON.Refresh]: Refresh //刷新

src/mmpac/mmpac/pmo/pmoconst/pmoconst.js

@@ -172,6 +172,7 @@ const PMO_LIST_BUTTON = {
 	output: 'OutPut', //输出
 	printplanout: 'PrintPlanOut', //打印联副产品
 	printprocedure: 'PrintProcedure', //打印工序计划
+	printprocedure2: 'PrintProcedure2', //打印工序备料计划 sunfj2
 	pmobcdirectprint: 'PMOBCDirectPrint', //直接打印条码
 	pmobcprint: 'PMOBCPrint', //打印条码
 	Import: 'Import', //导入
@@ -252,6 +253,7 @@ const PMO_CARD_BUTTON = {
 	output: 'OutPut', //输出
 	printplanout: 'PrintPlanOut', //打印联副产品
 	printprocedure: 'PrintProcedure', //打印工序计划
+	printprocedure2: 'PrintProcedure2', //打印工序备料计划 sunfj2
 	pmobcdirectprint: 'PMOBCDirectPrint', //直接打印条码
 	pmobcprint: 'PMOBCPrint', //打印条码