BUG修改

Eservice/components/form/form.js

@@ -166,16 +166,13 @@ Component({
             fn(isValidate)
         },
         setErrorMsg(msg, index) {
-
             this.data.formLayoutData.formInfo[index].errorMsg = msg
-
             this.setData({
                 formLayoutData: this.data.formLayoutData
             })
         },
         async getarealist() {
             const res = await api.arealist()
-
             this.setData({
                 options: util.createMenu(res.data)
             })

Eservice/installConfirmBill/index.js

@@ -23,7 +23,6 @@ Page({
         "sa_workorder_confirmationid": this.data.id
       }
     })
-    console.log("123123", res.data)
     this.setData({
       mainData: res.data,
       sa_serviceorderid: res.data.workorder.sa_serviceorderid,
@@ -35,7 +34,6 @@ Page({
   setInputData() {
     let that = this
     that.data.mainData.confirmationcontent.forEach(e => {
-
       Object.keys(e).map((key, index) => {
         that.setData({
           paidServiceAmount: that.data.paidServiceAmount + e[key].amount
@@ -160,7 +158,6 @@ Page({
     this.data.mainData.confirmationcontent.forEach(e => {
       Object.keys(e).map((key, index) => {
         if (key.includes(keyValue)) {
-          console.log(e)
           e[key].confirm_value = data.detail.value
         }
       })

Eservice/nodeDetail/index.wxml

@@ -42,7 +42,7 @@
   <wxs src="../../utils/wxmlQueryPer.wxs" module="wqp" />
 
   <!-- 是否确认 -->
-  <view wx:if="{{mainData.workpresetjson.confirm !== 0}}">
+  <view wx:if="{{mainData.workpresetjson.confirm_options !== 0}}">
     <view style="margin-bottom: 5px;" class="small">
       <text class="label">是否确认</text>
       <text wx:if="{{mainData.workpresetjson.confirm == 11}}" style="color:#e34d59">*</text>
@@ -152,9 +152,8 @@
       </view>
     </card>
   </view>
-  <view wx:if="{{stopClick === 'undefined'}}">
+  <view wx:if="{{mainData.status != 1}}">
     <t-button style="margin-bottom:10px" theme="primary" size="large" bind:tap="confirmBill" block>确认完成</t-button>
     <t-button theme="primary" size="large" bind:tap="updateNode" data-info="needBack" block>保存</t-button>
   </view>
-
 </view>

Eservice/workOrderDetail/index.js

@@ -108,7 +108,7 @@ Page({
   },
   changeBillStatus(data) {
     let id = data.currentTarget.dataset.id;
-    if (id == 20230209144903 && this.data.billData.titems.length == 0) return wx.showToast({
+    if (id == 20230209144903 && this.data.billData.titems.length == 0 && this.data.billData.type == '维修') return wx.showToast({
       title: '还未添加产品，不可完结',
       icon: "none",
       mask: true

Eservice/workerLeader/editServiceBill/formData.js

@@ -136,9 +136,7 @@ const formLayout = {
         type: 'reg',
         formatter:(v)=>{
           let reg = /^1[3-9]\d{9}$/
-
           if (!reg.test(v)) return '手机号输入有误'
-
           return ''
         }
       },