Merge branch 'dev'

src/components/createCom/XhInput.vue

@@ -70,7 +70,7 @@
 				return this.textarea ? 'transparent' : '#F4F5F7'
 			},
 			isDisabled() {
-				return this.item.fieldsId === 254 || this.disabled ? true : false
+				return this.item.fieldsName === 'pipeAmount' || this.disabled ? true : false
 			}
 		},
 		watch: {},

src/pages/order/complete.vue

@@ -12,7 +12,7 @@
                                     <view class="title">{{groupItem.name}}</view>
                                     <view class="class-bd">
                                         <u-form-item v-for="(item,itemIndex) in groupItem.items" :key="itemIndex" label-position="top"
-                                        :prop="item.fieldsName" :border-bottom="false" v-show="item.fieldsId != 200 || show200" :id="`item${item.fieldsId}`"> 
+                                        :prop="item.fieldsName" :border-bottom="false" v-show="item.fieldsName != 'actualPaid' || show200" :id="`item${item.fieldsId}`"> 
                                             <view class="label" v-if="item.formType!=='location'&&item.formType!=='form'&&item.formType!=='label'">
                                                 <image class="item-image" :src="mixingImage" v-if="item.required"></image>
                                                 {{item.fieldsTitle}}
@@ -371,10 +371,10 @@
 							const formMap = formType.get(type) || formType.get('text')
 							d.formType = formMap[0]
 							d.inputType = formMap[1]
-							if (d.fieldsId == 200 && res.data.value) {
+							if (d.fieldsName === 'actualPaid' && res.data.value) {
 								d.required = res.data.value['paymentMethodsType'] ? res.data.value['paymentMethodsType'] != '03' : false
 							}
-                            if (d.fieldsId === 252 || d.fieldsId === 253) { // 申请费用计算
+                            if (d.fieldsName === 'pipe' || d.fieldsName === 'pipeUseLength') { // 申请费用计算
                                 this.calcMoney()
                             }
                         })
@@ -653,12 +653,12 @@
 					this.$set(this.form,innerItem.fieldsName,data.value)
                 }
 
-                if (innerItem.fieldsId === 199) { // 选不需要收款的时候，收款金额修改为非必选
-                    const row = groupItem.items.find(v => v.fieldsId === 200)
-                    row.required = data.value !='03'
+                if (innerItem.fieldsName === 'paymentMethodsType') { // 选不需要收款的时候，收款金额修改为非必选
+                    const row = groupItem.items.find(v => v.fieldsName === 'actualPaid')
+                    row.required = data.value != '03'
                 } 
 
-                if (innerItem.fieldsId === 252 || innerItem.fieldsId === 253) { // 申请费用计算
+                if (innerItem.fieldsName === 'pipe' || innerItem.fieldsName === 'pipeUseLength') { // 申请费用计算
                     this.calcMoney()
                 }