diff --git a/public/components/property/purchaseApprovers/purchaseApprovers.html b/public/components/property/purchaseApprovers/purchaseApprovers.html new file mode 100644 index 000000000..130ed04cf --- /dev/null +++ b/public/components/property/purchaseApprovers/purchaseApprovers.html @@ -0,0 +1,38 @@ +
+
+
+
+
审批人信息
+
+ +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
\ No newline at end of file diff --git a/public/components/property/purchaseApprovers/purchaseApprovers.js b/public/components/property/purchaseApprovers/purchaseApprovers.js new file mode 100644 index 000000000..7dcd4a50c --- /dev/null +++ b/public/components/property/purchaseApprovers/purchaseApprovers.js @@ -0,0 +1,70 @@ +(function (vc) { + + vc.extends({ + propTypes: { + callBackListener: vc.propTypes.string, //父组件名称 + callBackFunction: vc.propTypes.string //父组件监听方法 + }, + data: { + purchaseApproversInfo: { + flowComponent: 'purchaseApprovers', + staffId: '', + staffName: '', + } + }, + watch: { + purchaseApproversInfo: { + deep: true, + handler: function () { + vc.component.savePurchaseApprovers(); + } + } + }, + _initMethod: function () { + + }, + _initEvent: function () { + vc.on("purchaseApprovers", "notify", function (_param) { + if (_param.hasOwnProperty("staffId")) { + vc.component.purchaseApproversInfo.staffId = _param.staffId; + vc.component.purchaseApproversInfo.staffName = _param.staffName; + } + }); + }, + methods: { + purchaseApproversValidate: function () { + return vc.validate.validate({ + purchaseApproversInfo: vc.component.purchaseApproversInfo + }, { + 'purchaseApproversInfo.staffId': [ + { + limit: "required", + param: "", + errInfo: "员工不能为空" + }, + { + limit: "num", + param: "", + errInfo: "员工信息不正确" + }, + ], + 'purchaseApproversInfo.staffName': [ + { + limit: "required", + param: "", + errInfo: "员工名称不能为空" + } + ] + }); + }, + savePurchaseApprovers: function () { + if (vc.component.purchaseApproversValidate()) { + //侦听回传 + vc.emit($props.callBackListener, $props.callBackFunction, vc.component.purchaseApproversInfo); + return; + } + } + } + }); + +})(window.vc); \ No newline at end of file diff --git a/public/pages/common/addPurchaseApplyStep/addPurchaseApplyStep.html b/public/pages/common/addPurchaseApplyStep/addPurchaseApplyStep.html index 725097a15..7d0757391 100644 --- a/public/pages/common/addPurchaseApplyStep/addPurchaseApplyStep.html +++ b/public/pages/common/addPurchaseApplyStep/addPurchaseApplyStep.html @@ -19,10 +19,10 @@ > -
- +
diff --git a/public/pages/common/addPurchaseApplyStep/addPurchaseApplyStep.js b/public/pages/common/addPurchaseApplyStep/addPurchaseApplyStep.js index fc41c3d80..e1607b327 100644 --- a/public/pages/common/addPurchaseApplyStep/addPurchaseApplyStep.js +++ b/public/pages/common/addPurchaseApplyStep/addPurchaseApplyStep.js @@ -14,7 +14,9 @@ endUserName:'', endUserTel:'', file:'', - resOrderType:'' + resOrderType:'', + staffId:'', + staffName:'' } } }, @@ -27,12 +29,19 @@ _initEvent: function () { vc.on("addPurchaseApplyStep", "notify", function (viewResourceStoreInfo2) { vc.component.addPurchaseApplyStepInfo.purchaseApply.resourceStores = viewResourceStoreInfo2.resourceStores; + vc.component.addPurchaseApplyStepInfo.infos[0] = viewResourceStoreInfo2.resourceStores; }); vc.on("addPurchaseApplyStep", "notify2", function (info) { vc.component.addPurchaseApplyStepInfo.purchaseApply.description = info.description; vc.component.addPurchaseApplyStepInfo.purchaseApply.endUserName = info.endUserName; vc.component.addPurchaseApplyStepInfo.purchaseApply.endUserTel = info.endUserTel; + vc.component.addPurchaseApplyStepInfo.infos[1] = info; + }); + vc.on("addPurchaseApplyStep", "notify3", function (info) { + vc.component.addPurchaseApplyStepInfo.purchaseApply.staffId = info.staffId; + vc.component.addPurchaseApplyStepInfo.purchaseApply.staffName = info.staffName; + vc.component.addPurchaseApplyStepInfo.infos[2] = info; }); }, @@ -56,9 +65,9 @@ }, _nextStep: function () { vc.emit('viewResourceStoreInfo2', 'getSelectResourceStores', null); - var _resourceStores = vc.component.addPurchaseApplyStepInfo.purchaseApply.resourceStores; - if (_resourceStores.length == 0) { - vc.toast("请完善物品信息"); + var _currentData = vc.component.addPurchaseApplyStepInfo.infos[vc.component.addPurchaseApplyStepInfo.index]; + if (_currentData == null || _currentData == undefined) { + vc.toast("请选择或填写必选信息"); return; } for( var i = 0; i < _resourceStores.length; i++){ @@ -83,9 +92,9 @@ }, _finishStep: function () { vc.emit('addPurchaseApplyViewInfo', 'setPurchaseApplyInfo', null); - var _description = vc.component.addPurchaseApplyStepInfo.purchaseApply.description; - if (_description == null || _description == '') { - vc.toast("请填写申请说明"); + var _currentData = vc.component.addPurchaseApplyStepInfo.infos[vc.component.addPurchaseApplyStepInfo.index]; + if (_currentData == null || _currentData == undefined) { + vc.toast("请选择或填写必选信息"); return; } vc.http.post(