弹框逻辑修改

src/pages/order/complete.vue

@@ -117,7 +117,7 @@
 
     // 表单类型map
     const formType = new Map([
-        ['text', ['textarea','input']],
+        ['text', ['input','textarea']],
         ['password', ['password','input']],
         ['textarea', ['input','digit']],
         ['number', ['input','digit']],
@@ -168,7 +168,7 @@
             noPerfectSubmit: {
                 confirmText: '去完善',
                 action: 'handerProgrom',
-                cancelText: '直接提交',
+                cancelText: '部分提交',
                 cancelAction: 'appointment'
             },
             submit: {
@@ -182,7 +182,7 @@
         }
         if (name === 'partnerInspectItem') { // 勘察
             if (!pass) return handerProgrom.perfect
-            return type === '01' ? handerProgrom.next : handerProgrom.appointment
+            return type ? (type === '01' ? handerProgrom.next : handerProgrom.appointment) : handerProgrom.perfect
         } else if (name === 'partnerInstallItem') { // 安装
             let hander = ''
             switch (type){
@@ -195,6 +195,9 @@
                 case '03': //不安装
                     hander = handerProgrom.confirm
                     break;
+                default:
+                    hander = handerProgrom.perfect
+                    break;
             }
             return hander
         } else { // 基础信息
@@ -524,11 +527,8 @@
                 this.completeCheck.status = true
                 this.completeCheck.confirmText = result.confirmText
                 this.completeCheck.action = result.action
-                if (result.cancelText) {
-                    this.completeCheck.cancelText = result.cancelText
-                    this.completeCheck.cancelAction = result.cancelAction
-                }
-                
+                this.completeCheck.cancelText = result.cancelText || ''
+                this.completeCheck.cancelAction = result.cancelAction || ''
             },
             // 下一步数据保存
             nextStepSaveData() {
@@ -650,7 +650,7 @@
                 }else{
 					this.$set(this.form,innerItem.fieldsName,data.value)
                 }
-                console.log("innerItem", innerItem)
+
                 if (innerItem.fieldsId === 199) { // 选不需要收款的时候，收款金额修改为非必选
                     const row = groupItem.items.find(v => v.fieldsId === 200)
                     row.required = data.value !='03'