Merge branch 'dev-1.5.4' into test

src/components/createCom/XhServiceMeasure.vue

@@ -7,8 +7,9 @@
 		</view>
 		<u-picker v-model="showPicker" range-key="label" @columnchange="columnchange" :mode="isNotMulti?'selector':'multiSelector'" @confirm="pickerConfirm" :range="settings"></u-picker> -->
     <view class="u-flex u-row-between picker-common">
+      <!-- :mode="isNotMulti ? 'selector' : 'multiSelector'" 多选单选判断注释 -->
       <picker
-        :mode="isNotMulti ? 'selector' : 'multiSelector'"
+        mode="selector"
         :value="index"
         range-key="label"
         :range="settings"
@@ -145,6 +146,7 @@ export default {
               })
             }
             this.settings = result
+            console.log("this.settings", this.settings)
           } else {
             console.log(res.message, '查询措施失败')
           }

src/pages/order/complete.vue

@@ -346,7 +346,7 @@ const formType = new Map([
   ['decimal', ['input', 'digit']],
   ['double', ['input', 'digit']],
   ['integer', ['input', 'digit']],
-  ['string', ['input', 'number']],
+  ['string', ['input', 'text']],
   ['jscode', ['input', 'text']],
   ['multiinput', ['multiinput', 'text']],
   ['select', ['select', 'text']],
@@ -657,7 +657,7 @@ export default {
       const data = Object.create(res.data.config, {})
       const list = data.sort((a, b) => a.order - b.order)
       if (this.readOnly) this.tabIndex = 0
-
+      
       list.forEach((item, index) => {
         if (this.maintainStep === item.panelFieldsName && !this.readOnly) {
           this.tabIndex = index
@@ -668,7 +668,9 @@ export default {
             const formMap = formType.get(type) || formType.get('text')
             d.formType = formMap[0]
             d.inputType = formMap[1]
-            d.required = this.checkFields(d.fieldsName)
+            if (fieldsNameArr.includes(d.fieldsName)) {
+              d.required =  this.checkFields(d.fieldsName)
+            }
 
             if (d.fieldsName === 'pipe' || d.fieldsName === 'pipeUseLength') {
               // 申请费用计算
@@ -825,6 +827,7 @@ export default {
       let pass = true
       let first = true
       const lists = this.tabList
+      console.log("lists", lists)
       lists.forEach((group, groupIndex) => {
         const checkRequired = group.items.some((v) => v.required)
         if (checkRequired) {
@@ -835,6 +838,9 @@ export default {
             pass: true,
           }
           group.items.forEach((ele, eleIndex) => {
+            if (ele.fieldsType == 'PARTS') {
+              console.log("ele", ele)
+            }
             if (ele.required) {
               panelResult.required++
               let value = this.form[ele.fieldsName]