代码提交

Eservice/agent/editServiceBill/formData.js

@@ -91,7 +91,7 @@ const formLayout = {
           return ''
         }
       },
-      force: true,//是否必输入
+      force: false,//是否必输入
     },
     {
       label: '联系人',//标题

Eservice/agent/editServiceBill/index.js

@@ -64,7 +64,18 @@ Page({
 
     that.data.form = Object.assign({},this.data.form,obj)
     Object.keys(that.data.form).map((key,index)=>{
+      // console.log(key)
+
       that.data.data.formLayout.formInfo.forEach(e=>{
+        if (e.id === 'servicetype') {
+          if (e.inputValue === '售前' || e.inputValue === '历史售后') {
+            console.log(e)
+            if (e.id === 'sa_orderid') {
+              console.log(e)
+              // e.force = false
+            }
+          }
+        }
         if (e.id === key) {
           e.inputValue = obj[key]
         }

Eservice/api/http.js

@@ -1,7 +1,7 @@
 var app = getApp(); //引入全局app.js，我们可以在globalData中定义一些公用的数据，比如baseUrl、token
 
 const request = function (url = "", options) {
-//   const baseUrl = "http://61.164.207.46:8000/yos/rest/index" + url;
+  // const baseUrl = "http://61.164.207.46:8000/yos/rest/index" + url;
   const baseUrl = "http://122.226.136.204:8082/yos/rest/index" + url;
   console.log(baseUrl)
   options.data.accesstoken = wx.getStorageSync('userMsg').token

Eservice/components/form/form.js

@@ -10,7 +10,12 @@ Component({
     options: {
         multipleSlots: true // 复数插槽: 是
     },
+    
     properties: {
+        hideBtn:{
+            value:false,
+            type:Boolean
+        },
         formLayoutData: {
             value: {},
             type: Object
@@ -145,7 +150,7 @@ Component({
             let arr = this.data.formLayoutData.formInfo.map((e, index) => {
                 // console.log(e)
                 if (!e.force) return e
-                console.log(e)
+                // console.log(e)
                 if (e.label === '关联订单') {
                     console.log(e.force && e.inputValue !== '')
                 }
@@ -169,9 +174,9 @@ Component({
                 }
                 return e
             })
-
+            console.log(arr)
             let isValidate = !arr.some(item => item.errorMsg && item.errorMsg !== '')
-
+            console.log(isValidate,'--')
             fn(isValidate)
 
         },

Eservice/components/form/form.wxml

@@ -6,6 +6,7 @@
     arr.forEach(function(e){
       hide.forEach(function(h){
         if (e.id === h.id) {
+          e.force = false
           h.value.forEach(function(v){
             if (e.inputValue === v) {
               rs = false
@@ -85,8 +86,8 @@
     </t-cell>
 
   </view>
-  <view style="padding:30px">
-    <t-button theme="primary" size="medium" disabled="{{disabledStatus}}" bind:tap="formSubmit"  block>提 交</t-button>
+  <view wx:if="{{!hideBtn}}" style="padding:30px">
+    <t-button  theme="primary" size="medium" disabled="{{disabledStatus}}" bind:tap="formSubmit"  block>提 交</t-button>
   </view>
   <t-picker
     visible="{{pickerVisible}}"

Eservice/nodeDetail/index.js

@@ -97,7 +97,7 @@ Page({
     this.updateNode()
   },
   // 更新节点
-  async updateNode () {
+  async updateNode (e) {
     this.data.form.traintitem  = this.data.titems
     this.data.form.sa_workorderid = this.data.sa_workorderid
     this.data.form.sa_workorder_nodeid = this.data.sa_workorder_nodeid
@@ -105,7 +105,11 @@ Page({
       "id": "20230209094203",
       "content":this.data.form
     })
-    this.nodeDetail()
+    if (e && e.currentTarget.dataset.info === 'needBack') {
+      wx.navigateBack()
+    } else {
+      this.nodeDetail()
+    }
   },
   // 获取输入的数据
   setDefaultData () {

Eservice/nodeDetail/index.wxml

@@ -12,7 +12,7 @@
   <view style="margin-bottom: 5px;" class="small"><text class="label">工序说明</text></view>
   <card>
     <view slot="content">
-      {{mainData.workpresetjson.remarks}}
+      {{mainData.workpresetjson.remarks?mainData.workpresetjson.remarks:'暂无说明'}}
     </view>
   </card>
   <view style="margin-bottom: 5px;" class="small"><text class="label">参与人</text></view>
@@ -137,6 +137,7 @@
       </view>
     </card>
   </view>
+  <t-button style="margin-bottom:10px" wx:if="{{stopClick}}" theme="primary" size="large" bind:tap="confirmBill" block>确认完成</t-button>
+  <t-button wx:if="{{stopClick}}" theme="primary" size="large" bind:tap="updateNode" data-info="needBack" block>保存</t-button>
 
-  <t-button wx:if="{{!stopClick}}"  theme="primary" size="large" bind:tap="confirmBill" block>确认完成</t-button>
 </view>

Eservice/workBillConfirmInfo/formData.js

@@ -5,7 +5,7 @@ const formLayout = {
     {
       label: '申请人',//标题
       type: 'cell', //表单类型 text,upload,picker,time
-      id: 'abbreviation',   //表单id
+      id: 'enterprisename',   //表单id
       placeholder: '选择服务类型',//设置文本框默认提示
       inputValue:'',
       data: [

Eservice/workBillConfirmInfo/index.js

@@ -10,7 +10,8 @@ Page({
     data,
     form:{
       projectlearders:[]
-    }
+    },
+    hideBtn:false
   },
   async onClick (data) {
     this.data.form = Object.assign({},this.data.form,data.detail)
@@ -35,17 +36,28 @@ Page({
       duration: 3000,
       icon: 'none',
     })
+    this.callBack()
     wx.navigateBack({
       delta:0
     })
   },
+  async callBack () {
+    const res = await api._post({
+      "id": '20230209144503',
+      "content": {
+        "sa_workorderid":this.data.form.sa_workorderid
+      }
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
     let that = this
     let obj = getApp().globalData.handelSelect.data.billData
-
+    this.setData({
+      hideBtn:obj.status === '待开始'?false:true
+    })
     that.data.form = Object.assign({},this.data.form,obj)
     Object.keys(that.data.form).map((key,index)=>{
       that.data.data.formLayout.formInfo.forEach(e=>{
@@ -60,7 +72,7 @@ Page({
     that.setData({
       form:this.data.form,
       data:that.data.data,
-      linkStopClick:options.class
+      linkStopClick:options.class,
     })
   },
 

Eservice/workBillConfirmInfo/index.wxml

@@ -1,4 +1,4 @@
 <!--pages/workBillConfirmInfo/index.wxml-->
-<t-form id="form" class="{{linkStopClick}}" formLayoutData="{{data.formLayout}}" bind:click="onClick">
+<t-form id="form" class="{{linkStopClick}}" hideBtn="{{hideBtn}}" formLayoutData="{{data.formLayout}}" bind:click="onClick">
   <image-view list="{{form.attinfos}}" slot="attinfos"></image-view>
 </t-form>

Eservice/workOrder/index.wxml

@@ -26,7 +26,10 @@
         <view class="colorInfo small">
           指派日期:{{item.createdate}}
         </view>
-        <view class="colorInfo small">
+        <view wx:if="{{item.status === '待接单'}}" class="colorInfo small">
+          {{item.status}}
+        </view>
+        <view wx:if="{{item.status !== '待接单'}}" class="colorInfo small">
           当前工序:{{item.now}}
         </view>
       </view>

Eservice/workOrderDetail/index.js

@@ -20,6 +20,15 @@ Page({
     this.setData({
       billData:res.data
     })
+    setTimeout(() => {
+      if (this.data.billData.status === '待开始') {
+        getApp().globalData.handelSelect = this
+        wx.navigateTo({
+          url: '/Eservice/workBillConfirmInfo/index',
+        })
+      }
+    }, 1000);
+    
   },
   changeBillStatus(data) {
     let id = data.currentTarget.dataset.id

Eservice/workOrderDetail/index.wxml

@@ -55,6 +55,9 @@
       </view>
     </t-tab-panel>
     <t-tab-panel label="确认单" value="1">
+      <view style="padding:10px;text-align:center;color:#999" wx:if="{{confirmBills.length === 0}}">
+        暂无更多服务确认单
+      </view>
       <t-cell wx:for="{{confirmBills}}" wx:key="sa_workorder_confirmationid" note="{{item.status}}" title="{{item.confirmationno}}" data-item="{{item}}" hover arrow bind:click="toConfirmBill"></t-cell>
     </t-tab-panel>
   </t-tabs>