Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev

src/views/ebiz/sale/NotifyingMessage.vue

@@ -44,28 +44,24 @@
                   <van-radio name="0" class="mr150 ml70">是</van-radio>
                   <van-radio name="1">否</van-radio>
                 </van-radio-group>
-                <!-- {{ item.show }} -->
-                <div v-if="item.impartCode == '14a'">
                 <van-cell-group v-for="(it, ind) in item.questions" :key="ind">
-                    <div v-if="it.questionType == '0'">
+                  <div v-if="it.extra">
                     <van-field v-model="it.answer" placeholder="请输入" :label="it.questionContent" clearable v-validate="'required'" data-vv-name="答案" />
                   </div>
                 </van-cell-group>
-                </div>
                 <div v-if="item.show">
-                  <div v-if="item.impartCode == '14a'">
                   <van-cell-group v-for="(it, ind) in item.questions" :key="ind">
-                      <div v-if="it.questionType != '0'">
+                    <van-field
-                        <van-field v-model="it.answer" placeholder="请输入" :label="it.questionContent" clearable v-validate="'required'" data-vv-name="答案" />
+                      v-model="it.answer"
-                      </div>
+                      placeholder="请输入"
+                      :label="it.questionContent"
+                      clearable
+                      v-validate="'required'"
+                      data-vv-name="答案"
+                      v-if="!it.extra"
+                    />
                   </van-cell-group>
                 </div>
-                  <div v-else>
-                    <van-cell-group v-for="(it, ind) in item.questions" :key="ind">
-                      <van-field v-model="it.answer" placeholder="请输入" :label="it.questionContent" clearable v-validate="'required'" data-vv-name="答案" />
-                    </van-cell-group>
-                  </div>
-                </div>
               </div>
             </van-collapse-item>
           </van-collapse>
@@ -120,7 +116,7 @@ export default {
         this.saleInsuredPersonInfo = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo'))
         // 获取告知消息
         this.information()
-        //投被同人取到年纪性别去判断是是否显示内容
+        //投被同人取到年纪和性别去判断是是否显示内容
         this.saleInsuredAge = utilsAge.getAge(this.saleInsuredInfo.birthday, new Date())
         this.saleInsuredSex = this.saleInsuredInfo.sex
         //投被不同人取到年纪和性别去判断是是否显示内容
@@ -246,16 +242,6 @@ export default {
         // console.log(res)
         if (res.result == '0') {
           res.productImpartLstDTO.impartDTOS.map(item => {
-            // that.impartItemDTOS = item.impartItemDTOS
-            // console.log(item)
-            // if (item.impartType == '0' || item.impartType == '1') {
-            //   item.impartItemDTOS.map(items => {
-            //     if (items.impartCode == '14a') {
-            //       // console.log('111111111111')
-            //       items.show = true
-            //     }
-            //   })
-            // }
             item.impartItemDTOS.map(im => {
               // debugger
               im.impartAnswer = ''
@@ -271,21 +257,15 @@ export default {
           })
           if (this.relationToAppnt == '1') {
             res.productImpartLstDTO.impartDTOS.map((item, index, array) => {
-              // console.log(index)
-              // gai
               if (item.impartType == '1') {
                 array.splice(index, 1)
               }
             })
             res.productImpartLstDTO.impartDTOS.map((item, index, array) => {
-              // console.log(index)
-              // gai
               if (item.impartType == '3') {
                 array.splice(index, 1)
               }
             })
-            // debugger
-
             that.impartDTOS = res.productImpartLstDTO.impartDTOS
             that.isShowList()
             //投被同人时候判断
@@ -296,7 +276,6 @@ export default {
             //投被不同人时候判断
             this.activeNames.push(res.productImpartLstDTO.impartDTOS.length)
           }
-          // that.impartDTOS = res.productImpartLstDTO.impartDTOS
         }
       })
     },
@@ -316,11 +295,6 @@ export default {
               item.impartItemDTOS.map(i => {
                 delete i.extra2
                 delete i.show
-                if (i.impartCode == '14a') {
-                  i.questions.map(items => {
-                    items.questionType = '4'
-                  })
-                }
               })
               obj = item
               return obj
@@ -338,11 +312,11 @@ export default {
               item.impartItemDTOS.map(i => {
                 delete i.extra2
                 delete i.show
-                if (i.impartCode == '14a') {
+                // if (i.impartCode == '14a') {
-                  i.questions.map(items => {
+                //   i.questions.map(items => {
-                    items.questionType = '4'
+                //     items.questionType = '4'
-                  })
+                //   })
-                }
+                // }
               })
               objInsured = item
               return objInsured

src/views/ebiz/sale/test.vue

@@ -136,7 +136,7 @@ export default {
         orderDTO: {
           orderInfoDTO: {
             // orderNo: window.localStorage.getItem('orderNo')
-            orderNo: '8186270000001106'
+            orderNo: '8186270000001169'
           },
           ebizSignDTOS: [
             {
@@ -144,7 +144,7 @@ export default {
               // signId: that.appntSign.signId,
               signId: '245',
               // orderNo: window.localStorage.getItem('orderNo'),
-              orderNo: '8186270000001106',
+              orderNo: '8186270000001169',
               documentStatus: '3',
               signType: '1',
               baseEncryp: that.base64,