修复bug

E-service/serviceBillList/detail.js

@@ -208,11 +208,11 @@ Page({
         label: "转工单"
       },
       提交: {
-        icon: "icon-zhongzhi",
+        icon: "icon-tijiao",
         label: "提交"
       },
       中止: {
-        icon: "icon-zhongzhi",
+        icon: "icon-dibu-zuofei",
         label: "中止"
       },
       退回: {

E-service/serviceBillList/insert.js

@@ -237,6 +237,7 @@ Page({
         "content.sa_serviceorderid": data.sa_serviceorderid
       })
       this.setOrdeForm();
+      this.selectComponent("#Form").confirm()
     }
     this.setOrdeForm();
   },
@@ -277,7 +278,7 @@ Page({
       })
       console.log("创建申请单", res)
       if (res.code == 1) {
-        if (content.sa_serviceorderid) {
+        if (content.sa_serviceorderid != 0) {
           getCurrentPages().find(v => v.__route__ == 'E-service/serviceBillList/detail').getDetail();
           wx.navigateBack({
             success() {

E-service/workOrder/detail.js

@@ -290,7 +290,7 @@ Page({
         label: "启用"
       },
       中止: {
-        icon: "icon-zhongzhi",
+        icon: "icon-dibu-zuofei",
         label: "中止"
       }
     };

packageA/toolBill/modules/selectOrder/index.js

@@ -1,5 +1,9 @@
-const _Http = getApp().globalData.http;
-
+const _Http = getApp().globalData.http,
+    currency = require("../../../../utils/currency"),
+    CNY = num => currency(num, {
+        symbol: "￥",
+        precision: 2
+    }).format();
 Page({
     data: {
         loading: true,
@@ -8,7 +12,7 @@ Page({
         radio: false, //是否为单选
         idname: "sa_orderid", //idkey
         showName: "sonum",
-        list:[]
+        list: []
     },
     onLoad(options) {
         if (options.params) {
@@ -26,7 +30,7 @@ Page({
             idname: options.idname || this.data.idname,
             showName: options.showName || this.data.showName,
         });
-        getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
+        getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
         this.getList()
     },
     getList(init = false) {
@@ -42,7 +46,10 @@ Page({
                 title: res.msg,
                 icon: "none"
             })
-            res.data.forEach(item => item.amount = 0)
+            res.data = res.data.map(v => {
+                v.amount = CNY(v.amount)
+                return v
+            })
             this.setData({
                 'params.content.pageNumber': res.pageNumber + 1,
                 'params.content.pageTotal': res.pageTotal,
@@ -53,14 +60,14 @@ Page({
         })
     },
     /*金额改变 */
-    amountChange (e) {
-      e.currentTarget.dataset.item.amount = e.detail.value
-      let index = this.data.list.findIndex(item => item.sa_accountclassid == e.currentTarget.dataset.item.sa_accountclassid)
-      let list = this.data.list
-      list[index] = e.currentTarget.dataset.item
-      this.setData({
-        list
-      })
+    amountChange(e) {
+        e.currentTarget.dataset.item.amount = e.detail.value
+        let index = this.data.list.findIndex(item => item.sa_accountclassid == e.currentTarget.dataset.item.sa_accountclassid)
+        let list = this.data.list
+        list[index] = e.currentTarget.dataset.item
+        this.setData({
+            list
+        })
     },
     /* 选中 */
     changeResult(e) {
@@ -120,6 +127,6 @@ Page({
     onUnload() {
         //回收数据
         getApp().globalData.handleSelect = null;
-        
+
     }
 })

packageA/toolBill/modules/selectOrder/index.wxml

@@ -8,13 +8,28 @@
 	<navigator class="item" url="#" wx:for="{{list}}" wx:key="{{item.sa_accountclassid}}" data-id="{{item.sa_orderid}}" bindtap="changeResult">
 		<van-checkbox wx:if="{{!radio}}" value="{{ handle.isCheck(item.sa_accountclassid,result) }}" shape="square" icon-size='28rpx' />
 		<view class="main" style="padding-left: {{!radio?'10rpx':''}};">
-			<view class="title line-1">{{language['订单号']||'订单号'}}:{{item.sonum}}</view>
-            <view class="subfield line-1">
-                <text>{{language['订单类型']||'订单类型'}}:{{item.type}}</text>
-            </view>
-            <view class="subfield line-1">
-							{{language['领域']||'领域'}}:{{language[item.tradefield]||item.tradefield}}
-            </view>
+			<view class="title line-1">{{language['订单号']||'订单号'}}：{{item.sonum}}</view>
+			<view class="subfield line-1">
+				<text>{{language['订单类型']||'订单类型'}}：{{language[item.type]||item.type}}</text>
+			</view>
+			<view class="subfield line-1">
+				<text>{{language['项目名称']||'项目名称'}}：{{item.projectname || '--'}}</text>
+			</view>
+			<view class="subfield line-1">
+				{{language['领域']||'领域'}}：{{language[item.tradefield]||item.tradefield}}
+			</view>
+			<view class="subfield line-1">
+				{{language['数量']||'数量'}}：{{item.sumqty}}
+			</view>
+			<view class="subfield line-1">
+				{{language['总金额']||'总金额'}}：{{item.amount}}
+			</view>
+			<view class="subfield line-1">
+				{{language['业务员']||'业务员'}}：{{item.saler_name}}
+			</view>
+			<view class="subfield line-1">
+				{{language['单据时间']||'单据时间'}}：{{item.billdate}}
+			</view>
 		</view>
 	</navigator>
 	<view wx:if="{{!radio}}" style="height: 130rpx;" />