Browse Source

”工单完成”时,工单不可以编辑只能查看

XWookey 1 year ago
parent
commit
54eca95cca

+ 2 - 2
app.js

@@ -5,10 +5,10 @@ App({
   globalData: {
    // postHeadAgreement: 'http://127.0.0.1:10301',
     // 测试
-    postHeadAgreement: 'https://jqcs.pjnes.com/cloud/chargapi',
+    // postHeadAgreement: 'https://jqcs.pjnes.com/cloud/chargapi',
 
     // 正式
-    // postHeadAgreement: 'https://cdglyy.pjnes.com/cloud/chargapi',
+    postHeadAgreement: 'https://cdglyy.pjnes.com/cloud/chargapi',
     helpPhoneNum: '4009608068',
     version:'2.0'
   },

+ 43 - 33
pages/order/order.js

@@ -86,40 +86,50 @@ Page({
                         //userId,
                         orderid: order.orderid
                       });
-                      wx.request({
-                        url: getApp().globalData.postHeadAgreement +'/restapi/pileLog/wechatpayback',
-                        data: {
-                          //chargPileId,
-                          //userId,
-                          orderid: order.orderid
-                        },
-                        method: 'POST',
-                        success(res3) {
-                          wx.hideLoading();
-                          let {
-                            data
-                          } = res3;
-                          log.info('[订单支付]', '[微信支付成功回调服务端]', '[响应]', data);
-                          if (data && data.code == 200) {
-                            that.setData({
-                              orderFlag:true 
-                            });
-                            wx.showModal({
-                              showCancel: false,
-                              content: '支付订单成功',
-                              confirmColor:'#00AADD',
-                            });
-                            log.info('[订单支付]', '[微信支付成功回调服务端]', '[成功]');
-                          } else {
-                            wx.showModal({
-                              showCancel: false,
-                              content: '支付订单失败',
-                              confirmColor:'#00AADD',
-                            });
-                            log.info('[订单支付]', '[微信支付成功回调服务端]', '[失败data null||data.code<>200]', data);
-                          }
-                        }
+                      wx.hideLoading();
+                      wx.showModal({
+                        showCancel: false,
+                        content: '支付订单成功',
+                        confirmColor:'#00AADD',
+                      });
+
+                      that.setData({
+                        orderFlag:true 
                       });
+                      // wx.request({
+                      //   url: getApp().globalData.postHeadAgreement +'/restapi/pileLog/wechatpayback',
+                      //   data: {
+                      //     //chargPileId,
+                      //     //userId,
+                      //     orderid: order.orderid
+                      //   },
+                      //   method: 'POST',
+                      //   success(res3) {
+                      //     wx.hideLoading();
+                      //     let {
+                      //       data
+                      //     } = res3;
+                      //     log.info('[订单支付]', '[微信支付成功回调服务端]', '[响应]', data);
+                      //     if (data && data.code == 200) {
+                      //       that.setData({
+                      //         orderFlag:true 
+                      //       });
+                      //       wx.showModal({
+                      //         showCancel: false,
+                      //         content: '支付订单成功',
+                      //         confirmColor:'#00AADD',
+                      //       });
+                      //       log.info('[订单支付]', '[微信支付成功回调服务端]', '[成功]');
+                      //     } else {
+                      //       wx.showModal({
+                      //         showCancel: false,
+                      //         content: '支付订单失败',
+                      //         confirmColor:'#00AADD',
+                      //       });
+                      //       log.info('[订单支付]', '[微信支付成功回调服务端]', '[失败data null||data.code<>200]', data);
+                      //     }
+                      //   }
+                      // });
                     },
                     fail(res3) {
                       wx.hideLoading();

+ 3 - 3
pages/ucenter/myworksheet/myworksheet.wxml

@@ -14,12 +14,12 @@
       </view>
       <text wx:if="{{item.workStatus==null}}">工作状态:未知</text>
       <text wx:if="{{item.workStatus==1}}">工作状态:新建</text>
-      <text wx:if="{{item.workStatus==2}}">工作状态:人员指派</text>
+      <text wx:if="{{item.workStatus==2}}">工作状态:指派人员</text>
       <text wx:if="{{item.workStatus==3}}">工作状态:指派确认</text>
       <text wx:if="{{item.workStatus==4}}">工作状态:施工前安全准备</text>
       <text wx:if="{{item.workStatus==5}}">工作状态:进行中</text>
-      <text wx:if="{{item.workStatus==6}}">工作状态:完成</text>
-      <text wx:if="{{item.workStatus==7}}">工作状态:完成确认</text>
+      <text wx:if="{{item.workStatus==6}}">工作状态:完成工作内容</text>
+      <text wx:if="{{item.workStatus==7}}">工作状态:完成工单</text>
       <text wx:if="{{item.workBigclass==null}}">工单大类:未知</text>
       <text wx:if="{{item.workBigclass==1}}">工单大类:售后服务</text>
       <text wx:if="{{item.workBigclass==2}}">工单大类:工程实施</text>

+ 26 - 15
pages/worksheetinfo/addworksheetinfo.js

@@ -17,7 +17,7 @@ Page({
       text: '新建'
     }, {
       value: 2,
-      text: '人员指派'
+      text: '指派人员'
     }, {
       value: 3,
       text: '指派确认'
@@ -28,16 +28,15 @@ Page({
       value: 5,
       text: '进行中'
     }
-    // , {
-    //   value: 6,
-    //   text: '完成'
-    // }
+    , {
+      value: 6,
+      text: '完成工作内容'
+    }
     , {
       value: 7,
-      text: '完成确认'
+      text: '完成工单'
     }],
     workstatusindex: 1,
-    
     workBigclass: [{
       value: 1,
       text: '售后服务'
@@ -94,7 +93,7 @@ Page({
       endDateTime: '2040-01-01 00:00',
       pText: Util.formatTimePicker(new Date()) //'2022-04-30 00:00'
     },
-    finishparams:{
+    workEndtimeParams:{
       placeholder: '请选择时间', 
       startDateTime: '2020-01-01 00:00',
       endDateTime: '2040-01-01 00:00',
@@ -171,7 +170,7 @@ Page({
   },
 
   bindAccendantChange: function(e) {
-    let accendant = this.data.worksheetinfo.accendant;
+    let chargstationid = this.data.worksheetinfo.chargStationId==null?0:this.data.worksheetinfo.chargStationId;
     let chargStationId = this.data.worksheetinfo.chargStationId;
     let url = `/pages/worksheetinfo/accendant?chargstationid=${chargStationId}&accendant=${accendant}`;
     wx.navigateTo({
@@ -229,7 +228,7 @@ Page({
     // // if (this.data.finishdate && this.data.finishtime){
     //   worksheetinfo.finishTime = this.data.finishdate + " " + this.data.finishtime + ":00";
     // }
-    worksheetinfo.workEndtime = this.data.finishparams.pText + ":00";
+    worksheetinfo.workEndtime = this.data.workEndtimeParams.pText == '0000-00-00 00:00'? null : this.data.workEndtimeParams.pText + ":00";
 
     console.info(worksheetinfo.exceptTime + ":00")
     console.info(worksheetinfo.finishTime + ":00")
@@ -264,7 +263,12 @@ Page({
         confirmColor:'#00AADD',
       });
       return;
+    
     }
+
+    
+    worksheetinfo.chargStationId = (worksheetinfo.chargStationId==0?null:worksheetinfo.chargStationId)
+
     let signs = this.data.signs;
     console.log(signs.length == 0);
 
@@ -478,13 +482,13 @@ Page({
       chargStationNameClearFlag: true
     });
   },
-  bindFinishparamsChange(e){
-    let finishparams =  this.data.finishparams;
-    finishparams.pText = e.detail
+  bindworkEndtimeParamsChange(e){
+    let workEndtimeParams =  this.data.workEndtimeParams;
+    workEndtimeParams.pText = e.detail
     this.setData({
-      finishparams:finishparams
+      workEndtimeParams:workEndtimeParams
     })
-    console.info("finishparams " + finishparams.pText)
+    console.info("workEndtimeParams " + workEndtimeParams.pText)
   },
 
   bindExceptparamsChange(e){
@@ -509,6 +513,13 @@ Page({
     // this.setData({
     //   worksheetinfo
     // });
+
+    console.info('sdfsdf')
+    this.setData({
+      'exceptparams.pText' : Util.formatTimePicker(new Date()),
+      // 'finishparams.pText' : Util.formatTimePicker(new Date()),
+    })
+
     let worksheetinfo = {
       workStatus: 1,
       workBigclass: 1,

+ 1 - 1
pages/worksheetinfo/addworksheetinfo.wxml

@@ -77,7 +77,7 @@
     <picker class="picker2" disabled="{{worksheetinfo.workStatus==6}}" mode="time" value="{{finishtime}}" bindchange="bindFinishtimeChange">
       <text>{{finishtime==null?'00:00':finishtime}}:00</text>
     </picker> -->
-    <datepicker params="{{finishparams}}"  bind:getDateString="bindFinishparamsChange" style="width: 100%;"/>
+    <datepicker params="{{workEndtimeParams}}"  bind:getDateString="bindworkEndtimeParamsChange" style="width: 100%;"/>
     <!-- <input class='input' type='text' value='{{worksheetinfo.finishTime}}'></input> -->
   </view>
   

+ 74 - 8
pages/worksheetinfo/worksheetinfo.js

@@ -18,7 +18,7 @@ Page({
       text: '新建'
     }, {
       value: 2,
-      text: '人员指派'
+      text: '指派人员'
     }, {
       value: 3,
       text: '指派确认'
@@ -29,15 +29,16 @@ Page({
       value: 5,
       text: '进行中'
     }
-    // , {
-    //   value: 6,
-    //   text: '完成'
-    // }
+    , {
+      value: 6,
+      text: '完成工作内容'
+    }
     , {
       value: 7,
-      text: '完成确认'
+      text: '完成工单'
     }],
     workstatusindex: 0,
+    workstatusFinished: false,
     workBigclass: [{
       value: 1,
       text: '售后服务'
@@ -102,6 +103,13 @@ Page({
       endDateTime: '2040-01-01 00:00',
       pText: Util.formatTimePicker(new Date()) //'2022-04-30 00:00'
     },
+    workEndtimeParams:{
+      placeholder: '请选择时间', 
+      startDateTime: '2020-01-01 00:00',
+      endDateTime: '2040-01-01 00:00',
+      // pText: Util.formatTimePicker(new Date()) //'2022-04-30 00:00'
+      pText: '0000-00-00 00:00' //'2022-04-30 00:00'
+    },
     accendantids: [],
     userNames:[],
     chargStationName:'',
@@ -171,7 +179,7 @@ Page({
     });
   },
   bindAccendantChange: function(e) {
-    let chargstationid = this.data.worksheetinfo.chargStationId;
+    let chargstationid = this.data.worksheetinfo.chargStationId==null?0:this.data.worksheetinfo.chargStationId;
     let accendant = this.data.worksheetinfo.accendant;
     let url = `/pages/worksheetinfo/accendant?chargstationid=${chargstationid}&accendant=${accendant}`;
     wx.navigateTo({
@@ -216,6 +224,8 @@ Page({
   },
   bindWorkSheetSubmit(e) {
     let worksheetinfo = this.data.worksheetinfo;
+
+
     worksheetinfo.operatorName = this.data.userNames.length>0?this.data.userNames[0]:"";
     worksheetinfo.pams = this.data.accendantids;
     worksheetinfo.accendant = null;
@@ -226,7 +236,10 @@ Page({
     // if (this.data.finishdate && this.data.finishtime){
     //   worksheetinfo.finishTime = this.data.finishdate + " " + this.data.finishtime + ":00";
     // }
-    worksheetinfo.finishTime = this.data.finishparams.pText + ":00";
+    worksheetinfo.finishTime = this.data.finishparams.pText=='0000-00-00 00:00'?null:this.data.finishparams.pText + ":00";
+
+    worksheetinfo.workEndtime = this.data.workEndtimeParams.pText == '0000-00-00 00:00'? null : this.data.workEndtimeParams.pText + ":00";
+
     let images = this.data.images;
     var imgString = [];
     
@@ -258,6 +271,12 @@ Page({
       });
       return;
     }
+
+    // worksheetinfo.chargStationId = (worksheetinfo.chargStationId==0?null:worksheetinfo.chargStationId)
+
+    worksheetinfo.chargStationId = (worksheetinfo.chargStationId==0?null:worksheetinfo.chargStationId)
+
+    
     let signs = this.data.signs;
     console.log(signs.length == 0);
     var signString = [];
@@ -468,6 +487,15 @@ Page({
       chargStationNameClearFlag: true
     });
   },
+  bindworkEndtimeParamsChange(e){
+    let workEndtimeParams =  this.data.workEndtimeParams;
+    workEndtimeParams.pText = e.detail
+    this.setData({
+      workEndtimeParams:workEndtimeParams
+    })
+    console.info("workEndtimeParams " + workEndtimeParams.pText)
+  },
+
   bindFinishparamsChange(e){
     let finishparams =  this.data.finishparams;
     finishparams.pText = e.detail
@@ -489,12 +517,17 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
+
     //console.log(options);
     let {
       worksheet
     } = options;
     //console.log(worksheet);
     let worksheetinfo = JSON.parse(worksheet);
+
+
+
+    
     //worksheetinfo.breakdownType = 2;
     this.setData({
       worksheetinfo
@@ -533,6 +566,23 @@ Page({
         exceptparams: exceptparams
       });
     }
+    if (worksheetinfo.workEndtime) {
+      let workEndtimeParams = this.data.workEndtimeParams;
+      workEndtimeParams['pText'] = worksheetinfo.workEndtime.substr(0,16)
+      console.info(workEndtimeParams['pText'])
+      this.setData({
+        workEndtimeParams: workEndtimeParams
+      });
+    }else{
+      let workEndtimeParams = this.data.workEndtimeParams;
+      workEndtimeParams['pText'] = '0000-00-00 00:00'
+      console.info(workEndtimeParams['pText'])
+      this.setData({
+        workEndtimeParams: workEndtimeParams
+      });
+    }
+
+
     if (worksheetinfo.finishTime) {
       // let datetime = worksheetinfo.finishTime.split(" ");
       // this.setData({
@@ -545,7 +595,17 @@ Page({
       this.setData({
         finishparams: finishparams
       });
+    }else{
+      let finishparams = this.data.finishparams;
+      finishparams['pText'] = '0000-00-00 00:00'
+      console.info(finishparams['pText'])
+      this.setData({
+        finishparams: finishparams
+      });
     }
+
+
+
     this.data.breakdownType.forEach((item, index) => {
       if (item.value == worksheetinfo.breakdownType) {
         this.setData({
@@ -571,6 +631,12 @@ Page({
     }
     //console.log(worksheetinfo);
 
+    if(worksheetinfo.workStatus==7){
+      this.setData({
+        workstatusFinished: true
+      })
+    }
+
     let userInfo = wx.getStorageSync('userInfo');
     let isLogin = wx.getStorageSync('isLogin');
     let that = this;

+ 37 - 24
pages/worksheetinfo/worksheetinfo.wxml

@@ -4,83 +4,96 @@
     <text>场站</text>
     <view class='input' type='text'>
     <!-- 有清除按钮 -->
-    <view class="span_withclear" bindtap='chargStationNameSelect' wx:if="{{!chargStationNameClearFlag}}">{{chargStationName}}</view>
-    <image class='img_clear' bindtap='clear_chargStationName' src="/images/clear.png"  wx:if="{{!chargStationNameClearFlag}}"></image>
+    <view disabled="{{workstatusFinished}}" class="span_withclear" bindtap='{{workstatusFinished?"":"chargStationNameSelect"}}' wx:if="{{!chargStationNameClearFlag}}">{{chargStationName}}</view>
+    <image class='img_clear'  bindtap='{{workstatusFinished?"":"clear_chargStationName"}}' src="/images/clear.png"  wx:if="{{!chargStationNameClearFlag}}"></image>
     <!-- 木有清除按钮 -->
-    <view class="span_withoutclear" bindtap='chargStationNameSelect' wx:if="{{chargStationNameClearFlag}}">请选择</view>
+    <view class="span_withoutclear" bindtap='{{workstatusFinished?"":"chargStationNameSelect"}}' wx:if="{{chargStationNameClearFlag}}">请选择</view>
     </view>
-    <!-- <picker class="picker" disabled="{{worksheetinfo.workStatus==6}}" bindchange="bindChargstationsChange" value="{{chargstationsindex}}" range-key="chargStationName" range="{{chargstations}}">
+    <!-- <picker class="picker" disabled="{{workstatusFinished}}" bindchange="bindChargstationsChange" value="{{chargstationsindex}}" range-key="chargStationName" range="{{chargstations}}">
       <text>{{chargstations[chargstationsindex].chargStationName}}</text>
     </picker> -->
   </view>
   <view class="context">
     <text>地址</text>
-    <input class='input' disabled="{{worksheetinfo.workStatus==6}}" bindinput='bindMainLocationInput' type='text' value='{{worksheetinfo.mainLocation}}'></input>
+    <input class='input' disabled="{{workstatusFinished}}" bindinput='bindMainLocationInput' type='text' value='{{worksheetinfo.mainLocation}}'></input>
   </view>
   <view class="context">
     <text>工单状态</text>
-    <picker class="picker" wx:if="{{worksheetinfo.workStatus!=6}}" bindchange="bindWorkstatusChange" value="{{workstatusindex}}" range-key="text" range="{{workstatus}}">
+    <picker class="picker" disabled="{{workstatusFinished}}" bindchange="bindWorkstatusChange" value="{{workstatusindex}}" range-key="text" range="{{workstatus}}">
       <text>{{workstatus[workstatusindex].text}}</text>
     </picker>
-    <picker wx:if="{{worksheetinfo.workStatus==6}}" disabled="true" class="picker"  range-key="text" >
+    <!-- <picker wx:if="{{workstatusFinished}}" disabled="true" class="picker"  range-key="text" >
       <text>已完成</text>
-    </picker>
+    </picker> -->
   </view>
   <view class="context">
     <text>工单大类</text>
-    <picker class="picker" disabled="{{worksheetinfo.workStatus==6}}" bindchange="bindWorkBigclassChange" value="{{workBigclassindex}}" range-key="text" range="{{workBigclass}}">
+    <picker class="picker" disabled="{{workstatusFinished}}" bindchange="bindWorkBigclassChange" value="{{workBigclassindex}}" range-key="text" range="{{workBigclass}}">
       <text>{{workBigclass[workBigclassindex].text}}</text>
     </picker>
   </view>
   <view class="context">
     <text>工单小类</text>
-    <picker class="picker" disabled="{{worksheetinfo.workStatus==6}}" bindchange="bindwokSmallclassChange" value="{{wokSmallclassindex}}" range-key="text" range="{{wokSmallclass}}">
+    <picker class="picker" disabled="{{workstatusFinished}}" bindchange="bindwokSmallclassChange" value="{{wokSmallclassindex}}" range-key="text" range="{{wokSmallclass}}">
       <text>{{wokSmallclass[wokSmallclassindex].text}}</text>
     </picker>
   </view>
   <!-- <view class="context">
     <text>工单类型</text>
-    <picker class="picker" disabled="{{worksheetinfo.workStatus==6}}" bindchange="bindWorkBigclassChange" value="{{workBigclassindex}}" range-key="text" range="{{workBigclass}}">
+    <picker class="picker" disabled="{{workstatusFinished}}" bindchange="bindWorkBigclassChange" value="{{workBigclassindex}}" range-key="text" range="{{workBigclass}}">
       <text>{{workBigclass[workBigclassindex].text}}</text>
     </picker>
   </view> -->
   <!-- breakdownType故障原因:1车辆导致,2桩体导致,3人为导致,4基础设施问题,5其他 -->
   <view class="context">
     <text>故障原因</text>
-    <picker class="picker" disabled="{{worksheetinfo.workStatus==6}}" bindchange="bindBreakdownType" value="{{breakdownTypeindex}}" range-key="text" range="{{breakdownType}}">
+    <picker class="picker" disabled="{{workstatusFinished}}" bindchange="bindBreakdownType" value="{{breakdownTypeindex}}" range-key="text" range="{{breakdownType}}">
       <text>{{breakdownTypeindex==null?'请选择':breakdownType[breakdownTypeindex].text}}</text>
     </picker>
   </view>
   <view class="context">
     <text>维修人员</text>
-    <input disabled="{{worksheetinfo.workStatus==6}}" bindtap='{{worksheetinfo.workStatus==6?"":"bindAccendantChange"}}' class='input' type='text' value='{{worksheetinfo.accendant}}'></input>
+    <input disabled="{{workstatusFinished}}" bindtap='{{workstatusFinished?"":"bindAccendantChange"}}' class='input' type='text' value='{{worksheetinfo.accendant}}'></input>
   </view>
   <view class="context">
     <text>工作内容</text>
-    <input class='input' disabled="{{worksheetinfo.workStatus==6}}"  bindinput='bindContentInput'  type='text' value='{{worksheetinfo.content}}'></input>
+    <input class='input' disabled="{{workstatusFinished}}"  bindinput='bindContentInput'  type='text' value='{{worksheetinfo.content}}'></input>
   </view>
+ 
   <view class="context">
     <text>预计完成时间</text>
-    <!-- <picker class="picker1" disabled="{{worksheetinfo.workStatus==6}}" mode="date" value="{{exceptdate}}" bindchange="bindExceptdateChange">
+    <!-- <picker class="picker1" disabled="{{workstatusFinished}}" mode="date" value="{{exceptdate}}" bindchange="bindExceptdateChange">
       <text>{{exceptdate==null?'0000-00-00':exceptdate}}</text>
     </picker>
-    <picker class="picker2" disabled="{{worksheetinfo.workStatus==6}}" mode="time" value="{{excepttime}}" bindchange="bindExcepttimeChange">
+    <picker class="picker2" disabled="{{workstatusFinished}}" mode="time" value="{{excepttime}}" bindchange="bindExcepttimeChange">
       <text>{{excepttime==null?'00:00':excepttime}}:00</text>
     </picker> -->
-    <datepicker params="{{exceptparams}}" bind:getDateString="bindExceptparamsChange" style="width: 100%;"/>
-    <!-- <input class='input' type='text' value='{{worksheetinfo.exceptTime}}'></input> -->
+    <datepicker wx:if="{{!workstatusFinished}}" params="{{exceptparams}}"  bind:getDateString="bindExceptparamsChange" style="width: 100%;"/>
+    <input  wx:if="{{workstatusFinished}}"  class='input' type='text' value='{{exceptparams.pText}}' disabled="{{workstatusFinished}}"></input>
   </view>
   <view class="context">
-    <text>实际完成时间</text>
+    <text>工作完成截止时间</text>
     <!-- <picker class="picker1" disabled="{{worksheetinfo.workStatus==6}}" mode="date" value="{{finishdate}}" bindchange="bindFinishdateChange">
       <text>{{finishdate==null?'0000-00-00':finishdate}}</text>
     </picker>
     <picker class="picker2" disabled="{{worksheetinfo.workStatus==6}}" mode="time" value="{{finishtime}}" bindchange="bindFinishtimeChange">
       <text>{{finishtime==null?'00:00':finishtime}}:00</text>
     </picker> -->
-    <datepicker params="{{finishparams}}" bind:getDateString="bindFinishparamsChange" style="width: 100%;"/>
+    <datepicker wx:if="{{!workstatusFinished}}" params="{{workEndtimeParams}}"  bind:getDateString="bindworkEndtimeParamsChange" style="width: 100%;"/>
+    <input  wx:if="{{workstatusFinished}}"  class='input' type='text' value='{{workEndtimeParams.pText}}' disabled="{{workstatusFinished}}"></input>
     <!-- <input class='input' type='text' value='{{worksheetinfo.finishTime}}'></input> -->
   </view>
+  <view class="context">
+    <text>实际完成时间</text>
+    <!-- <picker class="picker1" disabled="{{workstatusFinished}}" mode="date" value="{{finishdate}}" bindchange="bindFinishdateChange">
+      <text>{{finishdate==null?'0000-00-00':finishdate}}</text>
+    </picker>
+    <picker class="picker2" disabled="{{workstatusFinished}}" mode="time" value="{{finishtime}}" bindchange="bindFinishtimeChange">
+      <text>{{finishtime==null?'00:00':finishtime}}:00</text>
+    </picker> -->
+    <datepicker wx:if="{{!workstatusFinished}}" params="{{finishparams}}" bind:getDateString="bindFinishparamsChange" style="width: 100%;"/>
+    <input  wx:if="{{workstatusFinished}}"  class='input' type='text' value='{{finishparams.pText}}' disabled="{{workstatusFinished}}"></input>
+  </view>
   
    <view wx:if="{{pcitures.length!=0}}" class="question-images">
     <block wx:for="{{pcitures}}" wx:key="*this">
@@ -89,7 +102,7 @@
         <!-- 图片缩略图  -->
         <image wx:if="{{!item.flag}}" class="q-image" src="{{item.url}}" mode="aspectFill" data-idx="{{index}}"></image>
         <!-- <image wx:if="{{!item.flag}}" class="q-image" src="https://cdgl.pjnes.com/profile/station/{{item.src}}" mode="aspectFill" data-idx="{{index}}"></image> -->
-        <view wx:if="{{worksheetinfo.workStatus!=6}}" class="q-image-remover" data-idx="{{index}}" bindtap="removePciture">删除</view>
+        <view wx:if="{{!workstatusFinished}}" class="q-image-remover" data-idx="{{index}}" bindtap="removePciture">删除</view>
       </view>
     </block>
   </view>
@@ -104,7 +117,7 @@
       </view>
     </block>
   </view>
-  <view class="context_image" wx:if="{{worksheetinfo.workStatus!=6}}">
+  <view class="context_image" wx:if="{{!workstatusFinished}}">
     <text>添加照片</text>
     <view class="add" bindtap='openImage' hover-class='active'>
       <text>+</text>
@@ -120,7 +133,7 @@
       </view>
     </block>
   </view>
-  <view class="context_image" wx:if="{{worksheetinfo.workStatus!=6}}">
+  <view class="context_image" wx:if="{{!workstatusFinished}}">
     <text>签名</text>
     <view class="add" bindtap='openSign' hover-class='active'>
       <text>+</text>
@@ -128,4 +141,4 @@
   </view>
 </scroll-view>
 
-<button wx:if="{{worksheetinfo.workStatus!=6}}" bindtap='bindWorkSheetSubmit' class='submitbutton'>提交</button>
+<button wx:if="{{!workstatusFinished}}" bindtap='bindWorkSheetSubmit' class='submitbutton'>提交</button>