服务负责人

E-service/serviceBillList/detail.js

@@ -106,6 +106,7 @@ Page({
     })
   },
   getWorkDetail(id) {
+    if (!id) return;
     return new Promise((resolve) => {
       _Http.basic({
         "id": 20230208140103,

E-service/serviceBillList/detail.wxml

@@ -62,7 +62,7 @@
 
 	<!-- 工单 -->
 	<WorkOrderPview id='WorkOrderPview' slot='工单信息' tabColorS='{{tabColorS}}' />
-	<view slot='工序详情' wx:if="{{workDetail.nodes.length == 0}}" style="padding: 20rpx; background-color: #fff;">
+	<view slot='工序详情' wx:if="{{workDetail.nodes.length == 0}}" style="padding: 20rpx; background-color: #fff;margin-top: 20rpx;">
 		<WorkOrderNodes id='WorkOrderNodes' wx:if="{{workDetail.nodes}}" nodes='{{workDetail.nodes}}' sa_workorderid='{{workDetail.sa_workorderid}}' status="已完结" />
 	</view>
 	<Yl_Empty wx:else slot='工序详情' />

E-service/serviceImprovement/detail.js

@@ -93,6 +93,7 @@ Page({
     })
   },
   getServiceDetail(id) {
+    if (!id) return;
     return new Promise((resolve) => {
       _Http.basic({
         "id": 20230206091603,
@@ -134,6 +135,7 @@ Page({
 
   },
   getWorkDetail(id) {
+    if (!id) return;
     return new Promise((resolve) => {
       _Http.basic({
         "id": 20230208140103,

E-service/serviceImprovement/detail.wxml

@@ -60,7 +60,7 @@
 
 	<!-- 工单 -->
 	<WorkOrderPview id='WorkOrderPview' slot='工单信息' tabColorS='{{tabColorS}}' />
-	<view slot='工序详情' wx:if="{{workDetail.nodes.length == 0}}" style="padding: 20rpx; background-color: #fff;">
+	<view slot='工序详情' wx:if="{{workDetail.nodes.length == 0}}" style="padding: 20rpx; background-color: #fff;margin-top: 20rpx;">
 		<WorkOrderNodes id='WorkOrderNodes' wx:if="{{workDetail.nodes}}" nodes='{{workDetail.nodes}}' sa_workorderid='{{workDetail.sa_workorderid}}' status="已完结" />
 	</view>
 	<Yl_Empty wx:else slot='工序详情' />

E-service/workOrder/confirm.js

@@ -1,5 +1,4 @@
-const _Http = getApp().globalData.http,
-  getTime = require("../../utils/getTime");
+const _Http = getApp().globalData.http;
 
 Page({
   data: {
@@ -74,20 +73,28 @@ Page({
     sa_workorderid: 0
   },
   onLoad(options) {
+    console.log("options", options)
     getApp().globalData.Language.getLanguagePackage(this, '确认信息');
     let form = this.data.form,
       data = getCurrentPages().find(v => v.__route__ == 'E-service/workOrder/detail').data.detail;
+    // 判断是否可编辑（仅待接单和待开始状态可编辑）
+    const isEditable = options.status === '待接单' || options.status === '待开始';
+    
     form = form.map(v => {
       switch (v.valueName) {
         default:
           v.value = data[v.valueName]
           break;
       }
+      // 设置字段禁用状态
+      v.disabled = !isEditable;
       return v
     })
     this.setData({
       form,
-      sa_workorderid: data.sa_workorderid
+      sa_workorderid: data.sa_workorderid,
+      status: options.status,
+      disabled: !isEditable // 控制提交按钮禁用状态
     })
     if (data.attinfos.length) this.selectComponent("#Yl_Files").handleFiles(data.attinfos);
   },

E-service/workOrder/confirm.wxml

@@ -4,12 +4,12 @@
     <view class="content">
         <view class="upload">
             <view class="title">{{language['附件']||'附件'}}</view>
-            <Yl_Upload accept='media' binduploadCallback="insertImgEdit" bindchangeState='changeState'>
+            <Yl_Upload accept='media' binduploadCallback="insertImgEdit" bindchangeState='changeState' disabled="{{disabled}}">
                 <navigator url="#">
                     <text class="iconfont icon-a-tonggaofujian" />
                 </navigator>
             </Yl_Upload>
-            <Yl_Upload accept='file' binduploadCallback="insertImgEdit" bindchangeState='changeState'>
+            <Yl_Upload accept='file' binduploadCallback="insertImgEdit" bindchangeState='changeState' disabled="{{disabled}}">
                 <navigator url="#">
                     <text class="iconfont icon-a-biaoqianlanzhiku" />
                 </navigator>

E-service/workOrder/detail.js

@@ -65,6 +65,7 @@ Page({
     }
   },
   onLoad(options) {
+    console.log("options",options)
     getApp().globalData.Language.getLanguagePackage(this, '工单详情');
     this.setData({
       sa_workorderid: options.id
@@ -124,6 +125,7 @@ Page({
     })
   },
   getServiceDetail(id) {
+    if (!id) return;
     return new Promise((resolve) => {
       _Http.basic({
         "id": 20230206091603,

E-service/workOrder/detail.wxml

@@ -43,6 +43,10 @@
 		<view class="label">{{language['业务员']||'业务员'}}</view>
 		<view class="value">{{detail.saler_name}}<text wx:if="{{detail.salerphonenumber}}" bind:tap="callPhone" data-number="{{detail.salerphonenumber}}" style="color: #3874F6;margin-left: 10rpx;">{{detail.salerphonenumber}}</text></view>
 	</view>
+	<view class="row">
+		<view class="label">{{language['服务负责人']||'服务负责人'}}</view>
+		<view class="value">{{detail.projectleader}}</view>
+	</view>
 	<view class="row">
 		<view class="label">{{language['服务开始时间']||'服务开始时间'}}</view>
 		<view class="value">{{detail.begdate}}</view>
@@ -52,7 +56,7 @@
 		<view class="value">{{detail.enddate}}</view>
 	</view>
 	<view class="buts">
-		<navigator wx:if="{{(isworkleader || isLeader && ['待接单','待开始'].includes(detail.status))}}" class="confirm but" url="/E-service/workOrder/confirm?id={{sa_workorderid}}">
+		<navigator wx:if="{{(isworkleader || isLeader && ['待接单','待开始'].includes(detail.status))}}" class="confirm but" url="/E-service/workOrder/confirm?id={{sa_workorderid}}&status={{detail.status}}">
 			{{language['查看工单确认信息']||'查看工单确认信息'}}
 		</navigator>
 		<navigator wx:if="{{detail.status == '进行中'}}" class="start but" bind:tap="addConfirmBill">
@@ -63,7 +67,7 @@
 <view style="height: 20rpx;" />
 <Yl_FunTabs mode='flat' list='{{tabsList}}' showIcon='{{false}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
 	<WorkOrderPview id='WorkOrderPview' slot='工单信息' tabColorS='{{tabColorS}}' />
-	<view slot='工序详情' style="padding: 20rpx; background-color: #fff;">
+	<view slot='工序详情' style="padding: 20rpx; background-color: #fff;margin-top: 20rpx;">
 		<WorkOrderNodes id='WorkOrderNodes' wx:if="{{detail}}" nodes='{{detail.nodes}}' sa_workorderid='{{detail.sa_workorderid}}' status="{{detail.status}}" />
 	</view>
 	<WorkOrderTeam slot='服务团队' list='{{detail.team}}' projectleader='{{detail.projectleader}}' sa_workorderid='{{detail.sa_workorderid}}' disabled="{{detail.status != '进行中' || (detail.status == '进行中' && !isLeader && !isworkleader)}}" />

E-service/workOrder/index.wxml

@@ -33,6 +33,7 @@
 				<text style="margin-right: 20rpx;">{{item.scenecontactphonenumber}}</text>
 			</view>
 			<view class="row">{{language['客诉大类']||'客诉大类'}}：{{language[item.class2]||item.class2 || '--'}}</view>
+			<view class="row">{{language['服务负责人']||'服务负责人'}}：{{item.projectleader || '--'}}</view>
 			<view class="row">{{language['服务时间']||'服务时间'}}：{{item.begdate}} {{language['至']||'至'}} {{item.enddate}}</view>
 		</navigator>
 	</block>

Eservice/materielConfirmBill/index.js

@@ -145,6 +145,9 @@ Page({
       urls: [this.data.mainData.attinfos[index].url],
     })
   },
+  checkImage1() {
+    this.createImage(true);
+  },
   // 改变评分
   onChange(e) {
     this.data.mainData[e.currentTarget.dataset.name] = e.detail.value

Eservice/materielConfirmBill/index.wxml

@@ -53,9 +53,14 @@
     <van-button custom-class='but' wx:if="{{mainData.status == '新建' && !stopClick}}" bind:click="createImage">
       {{language['单据预览']||'单据预览'}}
     </van-button>
-    <van-button custom-class='but' wx:else bind:click="checkImage">
-      {{language['查看单据']||'查看单据'}}
-    </van-button>
+    <block wx:else>
+      <van-button custom-class='but' bind:click="checkImage1">
+        {{language['单据未显示签名']||'单据未显示签名'}}
+      </van-button>
+      <van-button custom-class='but' bind:click="checkImage">
+        {{language['查看单据']||'查看单据'}}
+      </van-button>
+    </block>
     <van-button custom-class='but delete' wx:if="{{mainData.status == '新建' && !stopClick}}" bind:click="delete">
       {{language['删除']||'删 除'}}
     </van-button>

components/Yl_Field/index.wxml

@@ -107,7 +107,7 @@
             </view>
             <view style="position: relative;">
                 <view class="content">
-                    <van-radio-group value="{{ item.value }}" data-item="{{item}}" bind:change="radioChange">
+                    <van-radio-group value="{{ item.value }}" disabled="{{item.disabled}}" data-item="{{item}}" bind:change="radioChange">
                         <view class="radio-group">
                             <van-radio icon-size="16" wx:for="{{item.radioList}}" wx:for-item="it" wx:for-index="i" wx:key="it.name" custom-class="radio" name="{{it.id}}">{{language[it.name]||it.name}}</van-radio>
                         </view>

components/Yl_Upload/index.js

@@ -25,6 +25,11 @@ Component({
         },
         changeState: {
             type: Function
+        },
+        /* 是否禁用上传 */
+        disabled: {
+            type: Boolean,
+            value: false
         }
     },
 

components/Yl_Upload/index.wxml

@@ -1,3 +1,3 @@
-<van-uploader bind:after-read="afterRead" accept='{{accept}}' max-count="{{maxCount}}" preview-image='{{false}}' multiple>
+<van-uploader bind:after-read="afterRead" accept='{{accept}}' max-count="{{maxCount}}" preview-image='{{false}}' multiple disabled="{{disabled}}">
     <slot />
 </van-uploader>