@zscreate/zhxy-app-component 1.0.384 → 1.0.385-test.2

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

@@ -489,6 +489,15 @@ export default {
             this.$set(this.suggestType, this.verifyNode, this.models[this.verifyNode].operation)
               this.fillVerifySignSeal(item)
             }
+            if (item
+                && !this.models[this.verifyNode].operation
+                && item.options.confirmOperationChooseFirst) {
+            this.models[this.verifyNode].operation  = this.suggest[0]
+                ? this.suggest[0].value
+                : "";
+            this.$set(this.suggestType, this.verifyNode, this.models[this.verifyNode].operation)
+              this.fillVerifySignSeal(item)
+            }
         },
         tableData: {
           handler(val) {
@@ -1230,7 +1239,7 @@ export default {
             })
       },
         /***初始化models***/
-        generateModle(genList) {
+        async generateModle(genList) {
           if (!genList || genList.length === 0) return;
             this.handleLinkAge()
             for (let i = 0; i < genList.length; i++) {
@@ -1324,11 +1333,10 @@ export default {
                           this.$set(this.selectShow, genList[i].model, false)
                           if (genList[i].options.isConfirmComponent && !this.warpVerifyDisable(genList[i])) {
                             const dictName = genList[i].options.dictName
-                            if (dictName) cacheHttp.get( `/sys/dict/getDictItems/${dictName}`).then( res => {
+                            if (dictName) var res = await cacheHttp.get( `/sys/dict/getDictItems/${dictName}`)
                               if (res.success) {
                                 this.$set(this.selectList ,genList[i].model, res.result?.map(item => ({ label: item.title, value: item.value, description: item.value})))
                               }
-                            })
                             const userInfo = uni.getStorageSync('userinfo')
                             this.$set(
                                 this.models,
@@ -1342,6 +1350,16 @@ export default {
                                   userSign: ''
                                 }
                             )
+                              // 确认组件==确认操作默认选中第一项
+                              if (genList[i]
+                                  && !this.models[genList[i].model].operation
+                                  && genList[i].options.confirmOperationChooseFirst) {
+                              this.models[genList[i].model].operation  = this.selectList[genList[i].model][0]
+                                  ? this.selectList[genList[i].model][0].value
+                                  : "";
+                              this.$set(this.suggestType, genList[i].model, this.models[genList[i].model].operation)
+                              this.fillVerifySignSeal(genList[i])
+                            }
                           }
                         } else if (genList[i].type === "blank") {
                             this.$set(
@@ -1462,12 +1480,12 @@ export default {
                 }
             })
             // 子表单有必填校验 判断有没有添加行， 没有添加行需要手动添加行， 让它触发校验
-            //tables.forEach(table => {
-            //    const model = this.models[table.model]
-            //    if ( !model || ( Array.isArray(model) && model.length === 0 )) {
-            //        this.addToTableData(table, table.model, 'addModel')
-            //    }
-            //})
+            tables.forEach(table => {
+                const model = this.models[table.model]
+                if ( !model || ( Array.isArray(model) && model.length === 0 )) {
+                    this.addToTableData(table, table.model, 'addModel')
+                }
+            })
         },
         /**
          * @param {回调函数} fn 成功的回调函数
@@ -1541,7 +1559,7 @@ export default {
                       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: '请输入审批意见' }],
+                          comments: widget.type === 'hnkj-confirm' ? widget.options.isConfirmComponent?[{ required: widget.options.confirmOpinionRequire, message: '请输入确认意见' }]:[ { 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) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zscreate/zhxy-app-component",
-	"version": "1.0.384",
+	"version": "1.0.385-test.2",
 	"private": false,
 	"description": "zhxy-app-component",
 	"main": "index.js",