@zscreate/zhxy-app-component 1.0.277 → 1.0.279

package/components/form-container/form-container.vue

@@ -1001,7 +1001,9 @@ export default {
                               description: item.value
                             })))
                             const operation = this.models[genList[i].model].operation
-                            this.$set(this.models[genList[i].model], 'operationShow', this.selectList[genList[i].model].find(item => item.value === operation)?.label)
+                            const label = this.selectList[genList[i].model].find(item => item.value === operation)?.label
+                            this.$set(this.models[genList[i].model], 'operationShow',label )
+                            this.$set(this.suggestType, genList[i].model, label)
                           }
                         })
                       }
@@ -1220,24 +1222,31 @@ export default {
                 // console.log(promiseArr)
                 // 校验审核表单
                 promiseArr.push(new Promise((resolve, reject) => {
-                    const item = this.models[this.verifyNode]
-                    const widget = this.dataObj.list.find(obj => obj.model === this.verifyNode)
-                    if (item && widget) {
-                      const rules = {
-                          comments: [{ required: widget.options.opinionRequire, message: '请输入审批意见' }]
-                      }
-                      utils.validateField(item, rules , Object.keys(rules), (success, errors) => {
+                    let item = this.models[this.verifyNode]
+                    let widgets = this.dataObj.list.filter(obj => obj.model === this.verifyNode || obj.type === 'hnkj-confirm') || []
+
+                    widgets.forEach( (widget) => {
+                      item = this.models[widget.model]
+                      if (item && widget) {
+                        let rules =  {
+                          comments: widget.type === 'hnkj-confirm' ? [ { required: widget.options.required , message: widget.options.placeholder }] : [{ required: widget.options.opinionRequire, message: '请输入审批意见' }],
+                          operation: widget.type === 'hnkj-confirm' ? [ { required: widget.options.required , message: `请选择${widget.options.operation}` }] : []
+                        }
+                        utils.validateField(item, rules , Object.keys(rules), (success, errors) => {
                           if (success) {
-                          resolve()
+                            resolve()
                           } else {
-                          reject(errors)
+                            reject(errors)
                           }
-                      },{
+                        },{
                           showMessage: true
-                      })
-                    } else {
-                      resolve()
+                        })
+                      }
+                    })
+                    if (!widgets.length) {
+                        resolve()
                     }
+
                 }))
             }
           Promise.all(promiseArr).then((result) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zscreate/zhxy-app-component",
-	"version": "1.0.277",
+	"version": "1.0.279",
 	"private": false,
 	"description": "zhxy-app-component",
 	"main": "index.js",