xiaohaizhao 11 月之前
父節點
當前提交
434b6f696b

+ 1 - 1
Eservice/saler/serviceBillDetail/index.js

@@ -59,7 +59,7 @@ Page({
       cancelText: getApp().globalData.Language.getMapText('取消'),
       confirmText: getApp().globalData.Language.getMapText('确定'),
       title: getApp().globalData.Language.getMapText('提示'),
-      content: getApp().globalData.Language.getMapText('是否确定删除FF')+`“${detail.itemname}”`,
+      content: getApp().globalData.Language.getMapText('是否确定删除')+`“${detail.itemname}”`,
       complete: (res) => {
         if (res.confirm) api._post({
           "id": "20230206162003",

+ 3 - 3
Eservice/workOrderDetail/index.wxml

@@ -93,9 +93,9 @@
 <view style="height: 160rpx;" />
 <view class="footer">
   <view wx:if="{{!stopClick}}" class="{{stopClick}}" style="padding:0 10px 10px 10px">
-    <t-button wx:if="{{billData.status === '待接单'}}" theme="dark" variant="primary" data-id="20230210101103" bind:tap="changeBillStatus" block>接单</t-button>
-    <t-button wx:if="{{billData.status === '待开始'}}" theme="dark" variant="primary" data-id="20230209144503" bind:tap="changeBillStatus" block>开始工单</t-button>
-    <t-button wx:if="{{billData.status === '进行中'}}" theme="dark" variant="primary" data-id="20230209144903" bind:tap="changeBillStatus" block>完结工单</t-button>
+    <t-button wx:if="{{billData.status === '待接单'}}" theme="dark" variant="primary" data-id="20230210101103" bind:tap="changeBillStatus" block>{{language['接单']||'接单'}}</t-button>
+    <t-button wx:if="{{billData.status === '待开始'}}" theme="dark" variant="primary" data-id="20230209144503" bind:tap="changeBillStatus" block>{{language['开始工单']||'开始工单'}}</t-button>
+    <t-button wx:if="{{billData.status === '进行中'}}" theme="dark" variant="primary" data-id="20230209144903" bind:tap="changeBillStatus" block>{{language['完结工单']||'完结工单'}}</t-button>
   </view>
 </view>
 

+ 29 - 5
Eservice/workerLeader/editworkOrderDetail/index.js

@@ -48,9 +48,21 @@ Page({
         const dialogConfig = {
             context: this,
             title: getApp().globalData.Language.getMapText('提示'),
-            content: `是否确定${name}当前工单?`,
-            confirmBtn: name,
-            cancelBtn:getApp().globalData.Language.getMapText('取消'),
+            content: getApp().globalData.Language.joint([{
+                t: 1,
+                v: '是否确定',
+            }, {
+                t: 1,
+                v: name,
+                f: "“",
+                r: "”"
+            }, {
+                t: 1,
+                v: '当前工单',
+                r: "?"
+            }]),
+            confirmBtn: getApp().globalData.Language.getMapText(name),
+            cancelBtn: getApp().globalData.Language.getMapText('取消'),
         }
         Dialog.confirm(dialogConfig)
             .then(async () => {
@@ -61,7 +73,19 @@ Page({
                     }
                 })
                 wx.showToast({
-                    title: res.msg == '成功' ? `工单${name}成功` : res.msg,
+                    title: res.msg == '成功' ? getApp().globalData.Language.joint([{
+                        t: 1,
+                        v: '工单',
+                    }, {
+                        t: 1,
+                        v: name,
+                        f: "“",
+                        r: "”"
+                    }, {
+                        t: 1,
+                        v: '成功',
+                        r: "!"
+                    }]) : res.msg,
                     icon: "none",
                     mask: true
                 });
@@ -253,7 +277,7 @@ Page({
         this.setData({
             id: options.id
         })
-        getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
+        getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
     },
     onShow() {
         this.mainData()

+ 6 - 6
Eservice/workerLeader/editworkOrderDetail/index.wxml

@@ -60,7 +60,7 @@
   </card>
 
   <t-tabs defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs">
-    <t-tab-panel label="工单进度" value="0">
+    <t-tab-panel label="{{language['工单进度']||'工单进度'}}" value="0">
 
       <view wx:if="{{billData.actiontype=='非工序模板'}}">
         <view class="panel">
@@ -78,7 +78,7 @@
             <image-view isdelete="{{false}}" wx:if="{{child.attinfos.length > 0}}" list="{{child.attinfos}}"></image-view>
             <view class="small">
               <text class="colorInfo">{{child.finishdate}}</text>
-              <t-tag class="mr-5 mt-5" variant="dark" theme="{{child.status == 0?'danger':child.status == 1?'success':'primary'}}" size="small">{{child.status == 0?'未完成':child.status == 1?'完成':'进行中'}}</t-tag>
+              <t-tag class="mr-5 mt-5" variant="dark" theme="{{child.status == 0?'danger':child.status == 1?'success':'primary'}}" size="small">{{child.status == 0?language['未完成']||'未完成':child.status == 1?language['完成']||'完成':language['进行中']||'进行中'}}</t-tag>
               <t-tag wx:if="{{child.finishby}}" class="mr-5 mt-5" variant="dark" theme="primary" size="small">{{child.finishby}}</t-tag>
             </view>
           </navigator>
@@ -96,9 +96,9 @@
   <view class="footer">
     <view />
     <view class="but-box" bindtap="changeBillStatus">
-      <van-button wx:if="{{billData.status !== '完成'}}" data-name="作废" data-id="20230209144803" custom-class='but abandon' bind:click="submit">作废</van-button>
-      <van-button wx:if="{{billData.status === '进行中'}}" data-name="暂停" data-id="20230209144603" custom-class='but delete' bind:click="deleteItem">暂停</van-button>
-      <van-button wx:if="{{billData.status === '暂停'}}" data-name="启用" data-id="20230209144703" custom-class='but' bind:click="notarize">启用</van-button>
+      <van-button wx:if="{{billData.status !== '完成'}}" data-name="作废" data-id="20230209144803" custom-class='but abandon' bind:click="submit">{{language['作废']||'作废'}}</van-button>
+      <van-button wx:if="{{billData.status === '进行中'}}" data-name="暂停" data-id="20230209144603" custom-class='but delete' bind:click="deleteItem">{{language['暂停']||'暂停'}}</van-button>
+      <van-button wx:if="{{billData.status === '暂停'}}" data-name="启用" data-id="20230209144703" custom-class='but' bind:click="notarize">{{language['启用']||'启用'}}</van-button>
     </view>
   </view>
 </block>
@@ -119,7 +119,7 @@
 <t-dialog visible="{{workLeaderDialog}}" title="{{language['转工单']||'转工单'}}" confirm-btn="{{language['确定']||'确定'}}" cancel-btn="{{language['取消']||'取消'}}" bind:confirm="toWorker" bind:cancel="showWorkerDialog">
   <view slot="content">
     <view class="d-title">
-      选择负责人:
+      {{language['选择负责人']||'选择负责人'}}:
     </view>
     <view>
       <block wx:for="{{workers}}" wx:key="rowindex">