修改

E-service/serviceBillList/product/index.wxml

@@ -44,7 +44,7 @@
           </view>
         </block>
         <view class="subfield">
-          <text class="line-1" style="margin-right: 6rpx;">{{language['供应方']||'供应方'}}：{{language[item.spec]||item.spec||' --'}}</text>
+          <text class="line-1" style="margin-right: 6rpx;">{{language['供应方']||'供应方'}}：{{language[item.supplier]||item.supplier||' --'}}</text>
           <text class="line-1" style="margin-right: 6rpx;">{{language['数量']||'数量'}}：{{item.qty}}</text>
         </view>
         <view class="bottom">

E-service/serviceImprovement/detail.js

@@ -40,6 +40,11 @@ Page({
     })
     this.getDetail()
     getApp().globalData.Language.getLanguagePackage(this, '改善单详情');
+    let auth = wx.getStorageSync('auth').wServiceImprovement;
+    console.log("auth",auth)
+    this.setData({
+      isProduct: auth.options.includes("product")
+    })
   },
   getDetail() {
     _Http.basic({
@@ -84,6 +89,9 @@ Page({
       value: res.data.class2
     }, {
       label: "分析负责人",
+      value: res.data.name_analysis
+    }, {
+      label: "方案编辑人",
       value: res.data.name_charge
     }, {
       label: "责任部门",
@@ -285,7 +293,7 @@ Page({
         label: "提交分析"
       },
       撤回分析: {
-        icon: "icon-tijiao",
+        icon: "icon-dibu-chehui",
         label: "撤回分析"
       },
       中止: {
@@ -293,32 +301,47 @@ Page({
         label: "中止"
       },
       发布方案: {
-        icon: "icon-dibu-tuihui",
+        icon: "icon-fabufangan",
         label: "发布方案"
       },
       撤回方案: {
-        icon: "icon-shanchu1",
+        icon: "icon-dibu-chehui",
         label: "撤回方案"
       }
     };
 
     let statusOptions = {
-      新建: ['编辑', '中止'],
-      分析已提交: ['中止'],
-      方案已发布: ['中止'],
+      新建: ['编辑'],
+      分析已提交: [],
+      方案已发布: [],
     }
     if (detail.userid_analysis == userid) {
       //真因分析负责人
       statusOptions.新建.splice(1, 0, '提交分析')
       statusOptions.分析已提交.unshift('撤回分析')
+      statusOptions.新建.push('中止')
+      statusOptions.分析已提交.push('中止')
+      statusOptions.方案已发布.push('中止')
       this.setData({
         user_analysis: true
       })
+    }
 
-    } else if (detail.userid_charge == userid) {
+    if (detail.userid_charge == userid) {
       //改善方案责任人
-      statusOptions.分析已提交.unshift('发布方案')
-      statusOptions.方案已发布.unshift('撤回方案')
+      statusOptions.分析已提交.unshift('发布方案');
+      statusOptions.方案已发布.unshift('撤回方案');
+      if (!statusOptions.新建.includes('中止')) {
+        statusOptions.新建.push('中止')
+        statusOptions.分析已提交.push('中止')
+        statusOptions.方案已发布.push('中止')
+      }
+
+      if (detail.abort_userids.includes(userid) && !statusOptions.新建.includes('中止')) {
+        statusOptions.新建.push('中止')
+        statusOptions.分析已提交.push('中止')
+        statusOptions.方案已发布.push('中止')
+      }
       this.setData({
         user_charge: true
       })

E-service/serviceImprovement/detail.wxml

@@ -20,6 +20,10 @@
 	</view>
 	<view class="row">
 		<view class="label">{{language['分析负责人']||'分析负责人'}}</view>
+		<view class="value">{{language[detail.name_analysis]||detail.name_analysis ||'--'}}</view>
+	</view>
+	<view class="row">
+		<view class="label">{{language['方案编辑人']||'方案编辑人'}}</view>
 		<view class="value">{{language[detail.name_charge]||detail.name_charge ||'--'}}</view>
 	</view>
 	<view class="row">
@@ -41,12 +45,13 @@
 </view>
 <view style="height: 20rpx;" />
 <Yl_FunTabs list='{{tabsList}}' showIcon='{{false}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
-	<Analysis detail='{{detail}}' id="Analysis" slot='真因分析' disabled="{{detail.status != '新建' && !user_analysis}}" />
-	<Scheme id="Scheme" slot='改善方案' disabled="{{detail.status != '分析已发布' && !user_charge}}" departmentid='{{detail.departmentid}}' sa_service_improvementid="{{detail.sa_service_improvementid}}" />
-	<Execute id="Execute" slot='方案执行' disabled="{{detail.status != '分析已提交'}}" departmentid='{{detail.departmentid}}' sa_service_improvementid="{{detail.sa_service_improvementid}}" />
+	<Analysis detail='{{detail}}' id="Analysis" slot='真因分析' disabled="{{!(user_analysis && detail.status == '新建')}}" />
+
+	<Scheme id="Scheme" slot='改善方案' disabled="{{!(user_charge && detail.status == '分析已提交')}}" departmentid='{{detail.departmentid}}' sa_service_improvementid="{{detail.sa_service_improvementid}}" />
+	<Execute id="Execute" slot='方案执行' disabled="{{detail.status != '方案已发布'}}" departmentid='{{detail.departmentid}}' sa_service_improvementid="{{detail.sa_service_improvementid}}" />
 	<Preview slot='改善单信息' list1='{{list1}}' list2='{{list2}}' />
 	<Improvement id="Improvement" slot='关联改善单' />
-	<Product id="Product" slot='影响产品范围' />
+	<Product id="Product" slot='影响产品范围' disabled="{{!isProduct || detail.status == '已完成' || detail.status == '已中止'}}" />
 	<view style="height: 180rpx;" />
 </Yl_FunTabs>
 

E-service/serviceImprovement/edit.js

@@ -5,14 +5,14 @@ Page({
   data: {
     loading: false,
     showAll: false,
-    disabled: false,
+    disabled: true,
     form: [],
     sa_service_improvementid: 0
   },
   onLoad(options) {
     getApp().globalData.Language.getLanguagePackage(this, '编辑');
     let form = [{
-        label: "类别",
+        label: "改善类别",
         error: false,
         errMsg: "",
         hint: "",
@@ -45,7 +45,7 @@ Page({
         "typename": "improvementtype",
       },
     }).then(res => {
-      console.log("应用系统", res)
+      console.log("改善类别", res)
       if (res.code == 1) {
         let item = form.find(v => v.valueName == 'type');
         item.radioList = res.data.map(v => {
@@ -58,6 +58,7 @@ Page({
         this.setData({
           form
         })
+        this.selectComponent("#Form").confirm()
       }
     })
     this.setData({

E-service/serviceImprovement/execute/index.wxml

@@ -13,7 +13,7 @@
       </navigator>
 
       <view style="flex:1;" />
-      <navigator wx:if="{{!disabled && item.status!='已完成' && (userid==item.userid_charge)}}" url="#" class="confime" data-item="{{item}}" bind:tap="onConfime"><text class="iconfont icon-dibu-chengjiao" />{{language['任务完成']||'任务完成'}}</navigator>
+      <navigator wx:if="{{!disabled && item.status!='已完成' && (userid==item.userid_charge)}}" url="#" class="confime" data-item="{{item}}" bind:tap="onConfime"><text class="iconfont icon-dibu-chengjiao" />{{language['完成任务']||'完成任务'}}</navigator>
       <navigator wx:if="{{!disabled && item.status!='已完成' && (userid==item.userid_charge)}}" url="#" class="add" data-item="{{item}}" bind:tap="add">
         <van-icon name="plus" />
         {{language['新增记录']||'新增记录'}}

E-service/serviceImprovement/improvement/index.scss

@@ -47,7 +47,7 @@
 	box-sizing: border-box;
 	margin: 20rpx auto 0;
 
-	.head1 {
+	.head2 {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;

E-service/serviceImprovement/improvement/index.wxml

@@ -10,7 +10,7 @@
   </view>
 </view>
 <navigator class="item" url="/E-service/serviceImprovement/detail?id={{item.sa_service_improvementid}}" wx:for="{{list}}" wx:key="sa_serviceorderid">
-  <view class="head1">
+  <view class="head2">
     <view class="tabs">
       <view class="tab" wx:if="{{item.type}}">
         {{language[item.type]||item.type}}

E-service/serviceImprovement/index.wxml

@@ -17,10 +17,11 @@
 		</view>
 		<view class="address">{{language['改善单号']||'改善单号'}}：{{item.billno}}</view>
 		<view class="row">{{language['客诉大类']||'客诉大类'}}：{{language[item.class2]||item.class2 || '--'}}</view>
-		<view class="row">{{language['分析负责人']||'分析负责人'}}：{{item.name_charge || '--'}}</view>
+		<view class="row">{{language['分析负责人']||'分析负责人'}}：{{item.name_analysis || '--'}}</view>
+		<view class="row">{{language['方案编辑人']||'方案编辑人'}}：{{item.name_charge || '--'}}</view>
 		<view class="row">{{language['负责部门']||'负责部门'}}：{{language[item.depname_charge]||item.depname_charge||'--'}}</view>
 		<view class="row">{{language['改善计划周期']||'改善计划周期'}}：{{item.planned_days}}{{language['天']||'天'}}</view>
-		<view class="row">{{language['改善方案进度']||'改善方案进度'}}：{{item.progress}}%</view>
+		<view class="row">{{language['改善方案进度']||'改善方案进度'}}：{{item.progress * 100}}%</view>
 	</navigator>
 	<Yl_Empty wx:if="{{list.length==0}}" />
 </Yl_ListBox>

E-service/serviceImprovement/product/index.wxml

@@ -44,7 +44,7 @@
           </view>
         </block>
         <view class="subfield">
-          {{language['供应方']||'供应方'}}：{{item.spec}}
+          {{language['供应方']||'供应方'}}：{{item.supplier}}
         </view>
       </view>
       <navigator wx:if="{{!disabled}}" url="#" class="iconfont-box" data-item="{{item}}" bind:tap="deleteItem">

E-service/workOrder/detail.js

@@ -85,6 +85,9 @@ Page({
       this.partialRenewal()
     })
   },
+  areaInput(e) {
+    this.data.reason[e.currentTarget.dataset.name] = e.detail.value;
+  },
   addConfirmBill() {
     let page = this.selectComponent("#NotarizeBill");
     page.setData({
@@ -333,7 +336,7 @@ Page({
         label: "中止"
       }
     };
-    if (!isLeader && !isqQuery) await _Http.basic({
+    if (!isqQuery) await _Http.basic({
       "id": 2025062416033402,
       "content": {
         "userid": wx.getStorageSync('userMsg').userid,
@@ -360,7 +363,7 @@ Page({
 
     if (statusOptions[status]) {
       if (!isLeader) statusOptions[status] = [];
-      if (isworkleader && status == '待接单') {
+      if ((isworkleader || isLeader) && status == '待接单') {
         statusOptions[status] = statusOptions[status] = ['确认信息', '转工单'].concat(statusOptions[status])
       }
       if (isLeader || isworkleader) {

E-service/workOrder/detail.wxml

@@ -48,10 +48,10 @@
 		<view class="value">{{detail.enddate}}</view>
 	</view>
 	<view class="buts">
-		<navigator wx:if="{{isworkleader || isLeader}}" 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}}">
 			{{language['查看工单确认信息']||'查看工单确认信息'}}
 		</navigator>
-		<navigator class="start but" bind:tap="addConfirmBill">
+		<navigator wx:if="{{detail.status == '进行中'}}" class="start but" bind:tap="addConfirmBill">
 			{{language['发起服务确认单']||'发起服务确认单'}}
 		</navigator>
 	</view>

E-service/workOrder/index.wxml

@@ -1,6 +1,6 @@
 <Yl_Head2 tabs="{{[{title:'待接单'},{title:'待开始'},{title:'进行中'},{title:'暂停'},{title:'已确认'},{title:'已完成'},{title:'已中止'}]}}" bind:onSearch='onSearch' bind:onChangeTab='onChangeTab' />
 <view class="global-total">
-	{{language['总共']||'总共'}} {{content.total}} {{language['个']||'个'}}
+	{{language['总共']||'总共'}} {{list[0].address?content.total:0}} {{language['个']||'个'}}
 </view>
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
 	<block wx:if="{{list[0].address}}">

E-service/workOrder/material/index.wxml

@@ -41,7 +41,7 @@
           </view>
         </block>
         <view class="subfield">
-          {{language['供应方']||'供应方'}}：{{language[item.spec]||item.spec||' --'}}
+          {{language['供应方']||'供应方'}}：{{language[item.supplier]||item.supplier||' --'}}
         </view>
       </view>
     </view>

E-service/workOrder/notarizeBill/index.js

@@ -98,6 +98,7 @@ Component({
     },
     toConfirmBill(data) {
       let class1 = this.data.billData.status != '进行中' ? '&class=stopClick' : ''
+      console.log("class1",class1)
       if (this.data.billData.actiontype === "非工序模板") {
         wx.navigateTo({
           url: '/Eservice/materielConfirmBill/index?id=' + data.currentTarget.dataset.item.sa_workorder_confirmationid + '&class=' + class1,

E-service/workOrder/product/index.scss

@@ -135,7 +135,7 @@
 				.bottom {
 					display: flex;
 					align-items: center;
-					height: 58rpx;
+					min-height: 58rpx;
 					font-family: PingFang SC, PingFang SC;
 					font-size: 24rpx;
 					color: #333333;

E-service/workOrder/product/index.wxml

@@ -41,7 +41,7 @@
           </view>
         </block>
         <view class="subfield">
-          {{language['供应方']||'供应方'}}：{{language[item.spec]||item.spec||' --'}}
+          {{language['供应方']||'供应方'}}：{{language[item.supplier]||item.supplier||' --'}}
         </view>
         <view class="bottom">
           <text style="color: #666;">{{language['处理数量']||'处理数量'}}：</text>

Eservice/components/signName/index.js

@@ -20,13 +20,6 @@ Component({
    */
   data: {
 
-  },
-  lifetimes: {
-    attached() {
-      setTimeout(() => {
-        this.fileData()
-      }, 1000);
-    }
   },
   /**
    * 组件的方法列表
@@ -45,6 +38,8 @@ Component({
           originFiles: res.data,
           showBut: res.data.length == 0
         })
+      } else {
+        this.fileData()
       }
     },
     async deleteFile(data) {

Eservice/installConfirmBill/index.js

@@ -48,6 +48,7 @@ Page({
             isSign: res.data.attinfos.some(v => v.usetype == 'signature')
         })
         this.setInputData()
+        this.selectComponent("#signName").fileData()
     },
     setInputData() {
         let that = this
@@ -254,5 +255,6 @@ Page({
             isSign: res.data.attinfos.some(v => v.usetype == 'signature')
         })
         this.setInputData()
+        this.selectComponent("#signName").fileData()
     },
 })

Eservice/installConfirmBill/index.wxml

@@ -56,7 +56,7 @@
     <card>
         <view style="flex:1" slot="content">
             <!-- <upload id="upload"></upload> -->
-            <sign-name wx:if="{{SignName}}" bindData="{{bindSignNameData}}"></sign-name>
+            <sign-name id='signName' wx:if="{{SignName}}" bindData="{{bindSignNameData}}"></sign-name>
         </view>
     </card>
 </view>
@@ -64,19 +64,19 @@
 <view class="footer" wx:if="{{!disabled}}">
     <view class="count"></view>
     <view class="but-box">
-        <van-button custom-class='but' open-type='share' wx:if="{{mainData.status == '新建'}}">
+        <van-button custom-class='but' open-type='share' wx:if="{{mainData.status == '新建' && !stopClick}}">
             {{language['转发客户']||'转发客户'}}
         </van-button>
-        <van-button custom-class='but' wx:if="{{mainData.status == '新建'}}" bind:click="createImage">
+        <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>
-        <van-button custom-class='but delete' wx:if="{{mainData.status == '新建'}}" bind:click="delete">
+        <van-button custom-class='but delete' wx:if="{{mainData.status == '新建' && !stopClick}}" bind:click="delete">
             {{language['删除']||'删 除'}}
         </van-button>
-        <van-button custom-class='but' wx:if="{{mainData.status == '新建'}}" bind:click="submit">
+        <van-button custom-class='but' wx:if="{{mainData.status == '新建' && !stopClick}}" bind:click="submit">
             {{language['提交']||'提 交'}}
         </van-button>
     </view>

Eservice/materielConfirmBill/index.js

@@ -90,6 +90,7 @@ Page({
       isSign: res.data.attinfos.some(v => v.usetype == 'signature')
     })
     this.setInputData()
+    this.selectComponent("#signName").fileData()
   },
   setInputData() {
     let that = this
@@ -215,6 +216,7 @@ Page({
     })
     this.updateBill()
     this.setInputData()
+    this.selectComponent("#signName").fileData()
   },
   createImage(active = false) {
     let token = wx.getStorageSync('userMsg').token
@@ -282,5 +284,6 @@ Page({
       isSign: res.data.attinfos.some(v => v.usetype == 'signature')
     })
     this.setInputData()
+    this.selectComponent("#signName").fileData()
   },
 })

Eservice/materielConfirmBill/index.wxml

@@ -39,7 +39,7 @@
   <card>
     <view style="flex:1" slot="content">
       <!-- <upload id="upload"></upload> -->
-      <sign-name wx:if="{{SignName}}" bindData="{{bindSignNameData}}"></sign-name>
+      <sign-name id='signName' wx:if="{{SignName}}" bindData="{{bindSignNameData}}"></sign-name>
     </view>
   </card>
 </view>
@@ -47,19 +47,19 @@
 <view class="footer" wx:if="{{!disabled}}">
   <view class="count"></view>
   <view class="but-box">
-    <van-button custom-class='but' open-type='share' wx:if="{{mainData.status == '新建'}}">
+    <van-button custom-class='but' open-type='share' wx:if="{{mainData.status == '新建' && !stopClick}}">
       {{language['转发客户']||'转发客户'}}
     </van-button>
-    <van-button custom-class='but' wx:if="{{mainData.status == '新建'}}" bind:click="createImage">
+    <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>
-    <van-button custom-class='but delete' wx:if="{{mainData.status == '新建'}}" bind:click="delete">
+    <van-button custom-class='but delete' wx:if="{{mainData.status == '新建' && !stopClick}}" bind:click="delete">
       {{language['删除']||'删 除'}}
     </van-button>
-    <van-button custom-class='but' wx:if="{{mainData.status == '新建'}}" bind:click="submit">
+    <van-button custom-class='but' wx:if="{{mainData.status == '新建' && !stopClick}}" bind:click="submit">
       {{language['提交']||'提 交'}}
     </van-button>
   </view>

Eservice/nodeDetail/index.js

@@ -52,6 +52,7 @@ Page({
       titems: res.data[0].titems
     })
     this.setDefaultData()
+    this.selectComponent("#signName").fileData()
   },
   // 是否确认
   confirmValue(data) {
@@ -113,6 +114,7 @@ Page({
     } else {
       this.nodeDetail()
     }
+    this.selectComponent("#signName").fileData()
   },
   // 获取输入的数据
   setDefaultData() {

Eservice/nodeDetail/index.wxml

@@ -109,7 +109,7 @@
     <card>
       <view style="flex:1" slot="content">
         <!-- <upload id="upload"></upload> -->
-        <sign-name bindData="{{bindSignNameData}}"></sign-name>
+        <sign-name id='signName' bindData="{{bindSignNameData}}"></sign-name>
       </view>
     </card>
   </view>

Eservice/serviceConfirmBill/index.js

@@ -88,6 +88,7 @@ Page({
       isSign: res.data.attinfos.some(v => v.usetype == 'signature')
     })
     this.setInputData()
+    this.selectComponent("#signName").fileData()
   },
   setInputData() {
     let that = this
@@ -201,6 +202,7 @@ Page({
     })
     this.updateBill()
     this.setInputData()
+    this.selectComponent("#signName").fileData()
   },
   /* 查看单据 */
   checkImage() {
@@ -277,5 +279,6 @@ Page({
       isSign: res.data.attinfos.some(v => v.usetype == 'signature')
     })
     this.setInputData()
+    this.selectComponent("#signName").fileData()
   },
 })

Eservice/serviceConfirmBill/index.wxml

@@ -55,7 +55,7 @@
   </view>
   <card>
     <view style="flex:1" slot="content">
-      <sign-name wx:if="{{SignName}}" showBut="{{!isSign}}" bindData="{{bindSignNameData}}"></sign-name>
+      <sign-name id='signName' wx:if="{{SignName}}" showBut="{{!isSign}}" bindData="{{bindSignNameData}}"></sign-name>
     </view>
   </card>
 </view>
@@ -65,11 +65,11 @@
   <view class="count">
   </view>
   <view class="but-box">
-    <van-button custom-class='but' open-type='share' wx:if="{{mainData.status == '新建'}}">{{language['转发客户']||'转发客户'}}</van-button>
+    <van-button custom-class='but' open-type='share' wx:if="{{mainData.status == '新建' && !stopClick}}">{{language['转发客户']||'转发客户'}}</van-button>
     <van-button custom-class='but' wx:if="{{mainData.status == '新建'}}" bind:click="createImage">{{language['单据预览']||'单据预览'}}</van-button>
     <van-button custom-class='but' wx:else bind:click="checkImage">{{language['查看单据']||'查看单据'}}</van-button>
-    <van-button custom-class='but delete' wx:if="{{mainData.status == '新建'}}" bind:click="delete">{{language['删除']||'删 除'}}</van-button>
-    <van-button custom-class='but' wx:if="{{mainData.status == '新建'}}" bind:click="submit">{{language['提交']||'提 交'}}</van-button>
+    <van-button custom-class='but delete' wx:if="{{mainData.status == '新建' && !stopClick}}" bind:click="delete">{{language['删除']||'删 除'}}</van-button>
+    <van-button custom-class='but' wx:if="{{mainData.status == '新建' && !stopClick}}" bind:click="submit">{{language['提交']||'提 交'}}</van-button>
   </view>
 </view>
 

Eservice/trainConfirmBill/index.js

@@ -51,6 +51,7 @@ Page({
             isSign: res.data.attinfos.some(v => v.usetype == 'signature')
         })
         this.setInputData()
+        this.selectComponent("#signName").fileData()
     },
     setInputData() {
         this.data.mainData.confirmationcontent.forEach(e => {
@@ -293,5 +294,6 @@ Page({
             isSign: res.data.attinfos.some(v => v.usetype == 'signature')
         })
         this.setInputData()
+        this.selectComponent("#signName").fileData()
     },
 })

Eservice/trainConfirmBill/index.wxml

@@ -60,7 +60,7 @@
   <card>
     <view style="flex:1" slot="content">
       <!-- <upload id="upload"></upload> -->
-      <sign-name wx:if="{{SignName}}" bindData="{{bindSignNameData}}"></sign-name>
+      <sign-name id='signName' wx:if="{{SignName}}" bindData="{{bindSignNameData}}"></sign-name>
     </view>
   </card>
 </view>
@@ -68,7 +68,7 @@
 <view class="footer" wx:if="{{!disabled}}">
   <view class="count"></view>
   <view class="but-box">
-    <van-button custom-class='but' open-type='share' wx:if="{{mainData.status == '新建'}}">
+    <van-button custom-class='but' open-type='share' wx:if="{{mainData.status == '新建' && !stopClick}}">
       {{language['转发客户']||'转发客户'}}
     </van-button>
     <van-button custom-class='but' wx:if="{{mainData.status == '新建'}}" bind:click="createImage">
@@ -77,10 +77,10 @@
     <van-button custom-class='but' wx:else bind:click="checkImage">
       {{language['查看单据']||'查看单据'}}
     </van-button>
-    <van-button custom-class='but delete' wx:if="{{mainData.status == '新建'}}" bind:click="delete">
+    <van-button custom-class='but delete' wx:if="{{mainData.status == '新建' && !stopClick}}" bind:click="delete">
       {{language['删除']||'删 除'}}
     </van-button>
-    <van-button custom-class='but' wx:if="{{mainData.status == '新建'}}" bind:click="submit">
+    <van-button custom-class='but' wx:if="{{mainData.status == '新建' && !stopClick}}" bind:click="submit">
       {{language['提交']||'提 交'}}
     </van-button>
   </view>

components/Yl_Tabbar/index.wxml

@@ -4,7 +4,7 @@
             <text class="{{item.classnames}}" />
         </view>
         <view wx:else class="num line-1">{{item.num}}</view>
-        <view class="label line-1">{{language[item.label]||item.label}}</view>
+        <view class="label11 line-1">{{language[item.label]||item.label}}</view>
     </navigator>
 </view>
 <van-popup show="{{ show }}" position="bottom" bind:close="onClose" round>
@@ -14,7 +14,7 @@
                 <text class="iconfont {{item.icon}}" />
             </view>
             <view wx:else class="num line-1">{{item.num}}</view>
-            <view class="label line-1">{{language[item.label]||item.label}}</view>
+            <view class="label11 line-1">{{language[item.label]||item.label}}</view>
         </navigator>
     </view>
     <view style="height: 110rpx;" />

components/Yl_Tabbar/index.wxss

@@ -48,7 +48,7 @@
     color: #333333;
 }
 
-.tabbar-item .label {
+.tabbar-item .label11 {
     height: 34rpx;
     font-size: 24rpx;
     font-family: PingFang SC-Regular, PingFang SC;

project.private.config.json

@@ -24,12 +24,19 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "E-service/workOrder/detail",
+          "pathName": "E-service/workOrder/detail",
+          "query": "id=1385",
+          "scene": null,
+          "launchMode": "default"
+        },
         {
           "name": "E-service/serviceImprovement/detail",
           "pathName": "E-service/serviceImprovement/detail",
           "query": "id=3",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         },
         {
           "name": "改善单详情",

static/font-icon.wxss

@@ -1,12 +1,11 @@
  @import "/utils/work/work-icon.wxss";
 /*@import "./iconfont-weapp-icon.wxss";
-@import "./stylesheet.wxss"; */
-@font-face {
+@import "./stylesheet.wxss"; */@font-face {
   font-family: "iconfont"; /* Project id 3376421 */
-  src: url('//at.alicdn.com/t/c/font_3376421_m4qdpo68o1i.woff2?t=1770446665917') format('woff2'),
-       url('//at.alicdn.com/t/c/font_3376421_m4qdpo68o1i.woff?t=1770446665917') format('woff'),
-       url('//at.alicdn.com/t/c/font_3376421_m4qdpo68o1i.ttf?t=1770446665917') format('truetype'),
-       url('//at.alicdn.com/t/c/font_3376421_m4qdpo68o1i.svg?t=1770446665917#iconfont') format('svg');
+  src: url('//at.alicdn.com/t/c/font_3376421_ma93yhgbg1d.woff2?t=1770942510526') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3376421_ma93yhgbg1d.woff?t=1770942510526') format('woff'),
+       url('//at.alicdn.com/t/c/font_3376421_ma93yhgbg1d.ttf?t=1770942510526') format('truetype'),
+       url('//at.alicdn.com/t/c/font_3376421_ma93yhgbg1d.svg?t=1770942510526#iconfont') format('svg');
 }
 
 .iconfont {
@@ -17,6 +16,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-fabufangan:before {
+  content: "\e729";
+}
+
 .icon-shaixuan_xianxing:before {
   content: "\e728";
 }