xiaohaizhao 2 mesi fa
parent
commit
0fbd787f39

+ 37 - 31
E-service/serviceBillList/detail.js

@@ -84,40 +84,46 @@ Page({
   },
   // 中止
   onSuspend() {
-    let abortreason = this.data.reason.abortreason;
-    if (abortreason == '') return wx.showToast({
-      title: getApp().globalData.Language.getMapText("请说明中止原因"),
-      icon: "none"
-    })
-    _Http.basic({
-      "content": {
-        "sa_serviceorderid": this.data.detail.sa_serviceorderid,
-        abortreason
-      },
-      "id": 2026012414051502,
-    }).then(res => {
-      getApp().globalData.Language.showToast(res.code == '1' ? "中止成功" : res.msg)
-      if (res.code == 1) this.getDetail();
-    })
+    let that = this;
+    setTimeout(() => {
+      let abortreason = that.data.reason.abortreason;
+      if (abortreason == '') return wx.showToast({
+        title: getApp().globalData.Language.getMapText("请说明中止原因"),
+        icon: "none"
+      })
+      _Http.basic({
+        "content": {
+          "sa_serviceorderid": that.data.detail.sa_serviceorderid,
+          abortreason
+        },
+        "id": 2026012414051502,
+      }).then(res => {
+        getApp().globalData.Language.showToast(res.code == '1' ? "中止成功" : res.msg)
+        if (res.code == 1) that.getDetail();
+      })
+    });
   },
   // 退回
   onBack() {
-    let backreason = this.data.reason.backreason;
-    if (backreason == '') return wx.showToast({
-      title: getApp().globalData.Language.getMapText("请说明退回原因"),
-      icon: "none"
-    })
-    _Http.basic({
-      "content": {
-        "sa_serviceorderid": this.data.detail.sa_serviceorderid,
-        "issumbit": 0,
-        backreason
-      },
-      "id": "20230206101403",
-    }).then(res => {
-      getApp().globalData.Language.showToast(res.code == '1' ? "退回成功" : res.msg)
-      if (res.code == 1) this.getDetail();
-    })
+    let that = this;
+    setTimeout(() => {
+      let backreason = that.data.reason.backreason;
+      if (backreason == '') return wx.showToast({
+        title: getApp().globalData.Language.getMapText("请说明退回原因"),
+        icon: "none"
+      })
+      _Http.basic({
+        "content": {
+          "sa_serviceorderid": that.data.detail.sa_serviceorderid,
+          "issumbit": 0,
+          backreason
+        },
+        "id": "20230206101403",
+      }).then(res => {
+        getApp().globalData.Language.showToast(res.code == '1' ? "退回成功" : res.msg)
+        if (res.code == 1) that.getDetail();
+      })
+    });
   },
   areaInput(e) {
     this.data.reason[e.currentTarget.dataset.name] = e.detail.value;

+ 1 - 1
E-service/serviceBillList/index.scss

@@ -4,7 +4,7 @@
 	border-radius: 8rpx;
 	padding: 20rpx;
 	box-sizing: border-box;
-	margin: 20rpx auto 0;
+	margin: 0 auto 20rpx;
 
 	.head {
 		display: flex;

+ 3 - 0
E-service/serviceBillList/index.wxml

@@ -1,4 +1,7 @@
 <Yl_Head2 tabs="{{[{title:'新建'},{title:'已提交'},{title:'已受理'},{title:'已中止'}]}}" bind:onSearch='onSearch' bind:onChangeTab='onChangeTab' />
+<view class="global-total">
+	{{language['总共']||'总共'}} {{content.total}} {{language['个']||'个'}}
+</view>
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
 	<navigator class="item" url="/E-service/serviceBillList/detail?id={{item.sa_serviceorderid}}&type={{type}}" wx:for="{{list}}" wx:key="sa_serviceorderid">
 		<view class="head">

+ 1 - 1
E-service/serviceBillList/product/index.wxml

@@ -49,7 +49,7 @@
         </view>
         <view class="bottom">
           <text style="color: #666;">{{language['问题描述']||'问题描述'}}:</text>
-          <textarea auto-focus placeholder-style='line-height:58rpx;' value='{{item.reason}}' placeholder="{{language['问题描述']||'问题描述'}}" disabled="{{disabled}}" data-item="{{item}}" bindblur="onBlur" />
+          <textarea placeholder-style='line-height:58rpx;' value='{{item.reason}}' placeholder="{{language['问题描述']||'问题描述'}}" disabled="{{disabled}}" data-item="{{item}}" bindblur="onBlur" />
         </view>
       </view>
       <navigator wx:if="{{!disabled}}" url="#" class="iconfont-box" data-item="{{item}}" bind:tap="deleteItem">

+ 29 - 16
E-service/serviceImprovement/detail.js

@@ -20,7 +20,8 @@ Page({
       label: "改善方案",
       model: "#Scheme"
     }, {
-      label: "方案执行"
+      label: "方案执行",
+      model: "#Execute"
     }, {
       label: "影响产品范围",
       model: "#Product"
@@ -30,6 +31,8 @@ Page({
       label: "关联改善单",
       model: "#Improvement"
     }],
+    user_analysis: false,
+    user_charge: false,
   },
   onLoad(options) {
     this.setData({
@@ -144,21 +147,24 @@ Page({
   },
   // 中止
   onSuspend() {
-    let abortreason = this.data.reason.abortreason;
-    if (abortreason == '') return wx.showToast({
-      title: getApp().globalData.Language.getMapText("请说明中止原因"),
-      icon: "none"
-    })
-    _Http.basic({
-      "content": {
-        "sa_service_improvementid": this.data.detail.sa_service_improvementid,
-        abortreason
-      },
-      "id": 2026013111262102,
-    }).then(res => {
-      getApp().globalData.Language.showToast(res.code == '1' ? "中止成功" : res.msg)
-      if (res.code == 1) this.getDetail();
-    })
+    let that = this;
+    setTimeout(() => {
+      let abortreason = that.data.reason.abortreason;
+      if (abortreason == '') return wx.showToast({
+        title: getApp().globalData.Language.getMapText("请说明中止原因"),
+        icon: "none"
+      })
+      _Http.basic({
+        "content": {
+          "sa_service_improvementid": that.data.detail.sa_service_improvementid,
+          abortreason
+        },
+        "id": 2026013111262102,
+      }).then(res => {
+        getApp().globalData.Language.showToast(res.code == '1' ? "中止成功" : res.msg)
+        if (res.code == 1) that.getDetail();
+      })
+    });
   },
   areaInput(e) {
     this.data.reason[e.currentTarget.dataset.name] = e.detail.value;
@@ -305,10 +311,17 @@ Page({
       //真因分析负责人
       statusOptions.新建.splice(1, 0, '提交分析')
       statusOptions.分析已提交.unshift('撤回分析')
+      this.setData({
+        user_analysis: true
+      })
+
     } else if (detail.userid_charge == userid) {
       //改善方案责任人
       statusOptions.分析已提交.unshift('发布方案')
       statusOptions.方案已发布.unshift('撤回方案')
+      this.setData({
+        user_charge: true
+      })
     }
 
     if (statusOptions[status]) {

+ 1 - 0
E-service/serviceImprovement/detail.json

@@ -4,6 +4,7 @@
     "Improvement": "./improvement/index",
     "Product": "./product/index",
     "Scheme": "./scheme/index",
+    "Execute": "./execute/index",
     "Analysis": "./analysis/index"
   }
 }

+ 3 - 2
E-service/serviceImprovement/detail.wxml

@@ -41,11 +41,12 @@
 </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}}" />
 	<Preview slot='改善单信息' list1='{{list1}}' list2='{{list2}}' />
 	<Improvement id="Improvement" slot='关联改善单' />
 	<Product id="Product" slot='影响产品范围' />
-	<Analysis detail='{{detail}}' id="Analysis" slot='真因分析' disabled="{{detail.status != '新建'}}" />
-	<Scheme id="Scheme" slot='改善方案' departmentid='{{detail.departmentid}}' sa_service_improvementid="{{detail.sa_service_improvementid}}" />
 	<view style="height: 180rpx;" />
 </Yl_FunTabs>
 

+ 194 - 0
E-service/serviceImprovement/execute/index.js

@@ -0,0 +1,194 @@
+const _Http = getApp().globalData.http;
+
+Component({
+  properties: {
+    disabled: {
+      type: Boolean,
+      value: false
+    },
+    departmentid: {
+      type: [String, Number]
+    },
+    sa_service_improvementid: {
+      type: [String, Number]
+    }
+  },
+  options: {
+    addGlobalClass: true
+  },
+  lifetimes: {
+    attached: function () {
+      getApp().globalData.Language.getLanguagePackage(this)
+      this.setData({
+        userid: wx.getStorageSync("userMsg").userid
+      })
+    }
+  },
+  data: {
+    content: {
+      nocache: true,
+      pageNumber: 1,
+      pageSize: 10,
+      pageTotal: 1,
+      total: null,
+      where: {
+        condition: ""
+      }
+    },
+    list: [],
+    record: "",
+    "sa_service_improvement_planid": 0,
+    "sa_service_improvement_recordid": 0,
+    unfolds: []
+  },
+  methods: {
+    changeUndold(e) {
+      let {
+        id
+      } = e.currentTarget.dataset,
+        unfolds = this.data.unfolds;
+      if (unfolds.includes(id)) {
+        unfolds = unfolds.filter(v => v != id)
+      } else {
+        unfolds.push(id)
+      }
+      this.setData({
+        unfolds
+      })
+    },
+    areaInput(e) {
+      this.setData({
+        record: e.detail.value
+      })
+    },
+    onRecord(e) {
+      let that = this;
+      setTimeout(() => {
+        let record = that.data.record;
+        if (record == '') return wx.showToast({
+          title: getApp().globalData.Language.getMapText("请填写改善记录"),
+          icon: "none"
+        })
+        _Http.basic({
+          "content": {
+            "sa_service_improvementid": that.data.sa_service_improvementid,
+            "sa_service_improvement_planid": that.data.sa_service_improvement_planid,
+            "sa_service_improvement_recordid": that.data.sa_service_improvement_recordid,
+            record
+          },
+          "id": 2026020210270102,
+        }).then(res => {
+          getApp().globalData.Language.showToast(res.code == '1' ? "保存成功" : res.msg)
+          if (res.code == 1) that.getList('', true);
+        })
+      });
+
+    },
+    onCancel() {
+      this.setData({
+        sa_service_improvement_planid: 0
+      })
+    },
+    add(e) {
+      const {
+        item
+      } = e.currentTarget.dataset;
+      this.setData({
+        sa_service_improvement_planid: item.sa_service_improvement_planid,
+        sa_service_improvement_recordid: 0,
+        record: ""
+      })
+    },
+    getList(id, init = false) {
+      console.log("getList", id)
+      let content = {
+        ...this.data.content,
+        sa_service_improvementid: id || this.data.sa_service_improvementid
+      };
+      if (init) {
+        content.pageNumber = 1
+        content.pageTotal = 1
+      }
+      _Http.basic({
+        "id": 2026020210235502,
+        content
+      }).then(res => {
+        console.log("方案", res)
+        if (res.code != '1') return wx.showToast({
+          title: res.data,
+          icon: "none"
+        });
+        this.setData({
+          "content.pageNumber": res.pageNumber + 1,
+          "content.pageTotal": res.pageTotal,
+          "content.total": res.total,
+          list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),
+          sa_service_improvementid: content.sa_service_improvementid
+        })
+      })
+    },
+    onConfime(e) {
+      const {
+        item
+      } = e.currentTarget.dataset;
+      wx.showModal({
+        title: getApp().globalData.Language.getMapText('提示'),
+        content: getApp().globalData.Language.getMapText('是否确定完成该方案'),
+        cancelText: getApp().globalData.Language.getMapText('取消'),
+        confirmText: getApp().globalData.Language.getMapText('确定'),
+        complete: (res) => {
+          if (res.confirm) _Http.basic({
+            "id": 2026020210240002,
+            "content": {
+              "sa_service_improvement_planid": item.sa_service_improvement_planid
+            }
+          }).then(res => {
+            wx.showToast({
+              title: res.code != '1' ? res.msg : getApp().globalData.Language.getMapText('操作成功'),
+              icon: "none",
+              mask: true
+            });
+            if (res.code == '1') this.getList("", true)
+          })
+        }
+      })
+    },
+    deteleItem(e) {
+      const {
+        item
+      } = e.currentTarget.dataset;
+      wx.showModal({
+        title: getApp().globalData.Language.getMapText('提示'),
+        content: getApp().globalData.Language.getMapText('是否确定删除该记录'),
+        cancelText: getApp().globalData.Language.getMapText('取消'),
+        confirmText: getApp().globalData.Language.getMapText('确定'),
+        complete: (res) => {
+          if (res.confirm) _Http.basic({
+            "id": 2026020210271602,
+            "content": {
+              "sa_service_improvement_recordid": item.sa_service_improvement_recordid
+            }
+          }).then(res => {
+            wx.showToast({
+              title: res.code != '1' ? res.msg : getApp().globalData.Language.getMapText('删除成功'),
+              icon: "none",
+              mask: true
+            });
+            if (res.code == '1') this.getList("", true)
+          })
+        }
+      })
+    },
+    editItem(e) {
+      const {
+        item
+      } = e.currentTarget.dataset;
+      this.setData({
+        "sa_service_improvement_planid": item.sa_service_improvement_planid,
+        "sa_service_improvement_recordid": item.sa_service_improvement_recordid,
+        record: item.record
+      })
+      console.log(item)
+    }
+  }
+})

+ 6 - 0
E-service/serviceImprovement/execute/index.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-transition": "@vant/weapp/transition/index"
+  }
+}

+ 191 - 0
E-service/serviceImprovement/execute/index.scss

@@ -0,0 +1,191 @@
+.head {
+	display: flex;
+	align-items: center;
+	width: 100vw;
+	height: 120rpx;
+	padding: 0 20rpx 0 30rpx;
+	box-sizing: border-box;
+
+	.count {
+		font-size: 28rpx;
+		font-family: PingFang SC-Regular, PingFang SC;
+		color: #333333;
+	}
+
+	.expand {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+
+		.but {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-shrink: 0;
+			width: 80rpx;
+			height: 80rpx;
+			background: #FFFFFF;
+			border-radius: 8rpx;
+			border: 2rpx solid #CCCCCC;
+			margin-left: 20rpx;
+			color: #666666;
+		}
+	}
+}
+
+.item {
+	position: relative;
+	width: 100vw;
+	background-color: #fff;
+	padding: 20rpx 30rpx;
+	box-sizing: border-box;
+	margin-bottom: 20rpx;
+
+	.left {
+		position: absolute;
+		left: 0;
+		top: 0;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 80rpx;
+		height: 48rpx;
+		background: #3874F6;
+		border-radius: 0rpx 0rpx 16rpx 0rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 600;
+		font-size: 28rpx;
+		color: #FFFFFF;
+	}
+
+	.status {
+		position: absolute;
+		top: 10rpx;
+		right: 30rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-size: 24rpx;
+	}
+
+	.date {
+		margin-left: 70rpx;
+		line-height: 34rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-size: 24rpx;
+		color: #3874F6;
+		margin-top: -10rpx;
+	}
+
+	.title {
+		line-height: 40rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #333333;
+		margin-top: 18rpx;
+	}
+
+	.value {
+		line-height: 34rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-size: 24rpx;
+		color: #333333;
+		margin-top: 8rpx;
+	}
+
+	.bottom {
+		width: 100%;
+		border-top: 1px solid #DDDDDD;
+		margin-top: 20rpx;
+		padding-top: 20rpx;
+		box-sizing: border-box;
+		line-height: 40rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-size: 28rpx;
+
+		.first-line {
+			display: flex;
+
+			.label {
+				display: flex;
+				align-items: center;
+				color: #333333;
+
+				.iconfont {
+					color: #3874F6;
+					margin-left: 10rpx;
+				}
+			}
+
+			.confime {
+				color: #EA820A;
+				margin-right: 40rpx;
+
+				text {
+					margin-right: 10rpx;
+				}
+			}
+
+			.add {
+				color: #3874F6;
+			}
+		}
+
+		.rows {
+			position: relative;
+			width: 100%;
+			background: #F8F9FD;
+			border-radius: 8rpx;
+			margin-top: 20rpx;
+			padding: 20rpx;
+			box-sizing: border-box;
+
+			.right {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: absolute;
+				top: 0;
+				right: 0;
+				width: 128rpx;
+				height: 48rpx;
+				background: #ECF0F8;
+				border-radius: 0rpx 8rpx 0rpx 8rpx;
+
+				navigator {
+					font-size: 24rpx;
+					color: #999;
+					padding: 0 10rpx;
+				}
+
+
+			}
+
+			.changedate {
+				line-height: 34rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-size: 24rpx;
+				color: #3874F6;
+			}
+
+			.record {
+				line-height: 34rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-size: 24rpx;
+				color: #333333;
+				margin-top: 8rpx;
+			}
+		}
+	}
+}
+
+.textarea {
+	width: 90%;
+	height: 200rpx;
+	box-sizing: border-box;
+	padding: 20rpx 30rpx;
+	background-color: #FDF9FC;
+	margin: 20rpx auto;
+	border: 1rpx solid #EEECEF;
+	border-radius: 8rpx;
+}

+ 51 - 0
E-service/serviceImprovement/execute/index.wxml

@@ -0,0 +1,51 @@
+<view style="height: 20rpx;"></view>
+<view class="item" wx:for="{{list}}" wx:key="sa_service_improvement_planid">
+  <view class="left">{{index+1}}</view>
+  <view class="status" style="color:{{sColors[item.status]}};">{{language[item.status]||item.status}}</view>
+  <view class="date">{{item.begdate}} - {{item.enddate}} {{item.name}}</view>
+  <view class="title">{{item.title}}</view>
+  <view class="value">{{item.measure}}</view>
+  <view class="bottom">
+    <view class="first-line">
+      <navigator url="#" class="label" data-id="{{item.sa_service_improvement_planid}}" bind:tap="changeUndold">
+        {{language['改善记录']||'改善记录'}}({{item.recordCount}})
+        <text class="iconfont {{handle.isCheck(item.sa_service_improvement_planid,unfolds) ?'icon-xiangshangshouqi':'icon-xiangxiazhankai'}}"></text>
+      </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="add" data-item="{{item}}" bind:tap="add">
+        <van-icon name="plus" />
+        {{language['新增记录']||'新增记录'}}
+      </navigator>
+    </view>
+
+    <van-transition show="{{ handle.isCheck(item.sa_service_improvement_planid,unfolds) }}">
+      <view class="rows" wx:for="{{item.recordRows}}" wx:for-item="it" wx:for-index="i" wx:key="sa_service_improvement_recordid">
+        <view class="changedate">{{it.changedate}}</view>
+        <view class="record">{{it.record}}</view>
+
+        <view class="right" wx:if="{{!disabled && item.status!='已完成' && (userid==item.userid_charge)}}">
+          <navigator class="iconfont icon-bianji2" style="margin-right: 20rpx;" data-item="{{it}}" bind:tap="editItem" url="#"></navigator>
+          <navigator class="iconfont icon-shanchu1" url="#" data-item="{{it}}" bind:tap="deteleItem"></navigator>
+        </view>
+      </view>
+    </van-transition>
+  </view>
+</view>
+<van-dialog show="{{ sa_service_improvement_planid!=0 }}" confirmButtonText="{{language['确定']||'确定'}}" cancelButtonText="{{language['取消']||'取消'}}" use-slot title="{{language['改善记录']||'改善记录'}}" show-cancel-button confirm-button-color='#3874F6' bind:confirm='onRecord' bind:cancel='onCancel'>
+  <textarea placeholder="{{language['改善记录']||'改善记录'}}" value="{{record}}" data-name="record" bindinput="areaInput" class="textarea" />
+</van-dialog>
+
+
+<Yl_Empty wx:if="{{list.length==0}}" />
+
+<wxs module="handle">
+  module.exports = {
+    isCheck: function (id, list) {
+      return list.some(function (v) {
+        return v == id
+      });
+    },
+  }
+</wxs>

+ 1 - 1
E-service/serviceImprovement/index.scss

@@ -4,7 +4,7 @@
 	border-radius: 8rpx;
 	padding: 20rpx;
 	box-sizing: border-box;
-	margin: 20rpx auto 0;
+	margin: 0 auto 20rpx;
 
 	.head {
 		display: flex;

+ 3 - 0
E-service/serviceImprovement/index.wxml

@@ -1,4 +1,7 @@
 <Yl_Head2 threshold='3' tabs="{{[{title:'真因分析'},{title:'改善方案'},{title:'方案执行'},{title:'完成'},{title:'中止'}]}}" bind:onSearch='onSearch' bind:onChangeTab='onChangeTab' />
+<view class="global-total">
+	{{language['总共']||'总共'}} {{content.total}} {{language['个']||'个'}}
+</view>
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
 	<navigator class="item" url="/E-service/serviceImprovement/detail?id={{item.sa_service_improvementid}}" wx:for="{{list}}" wx:key="sa_serviceorderid">
 		<view class="head">

+ 18 - 15
E-service/workOrder/detail.js

@@ -100,21 +100,24 @@ Page({
   },
   // 中止
   onSuspend() {
-    let abortreason = this.data.reason.abortreason;
-    if (abortreason == '') return wx.showToast({
-      title: getApp().globalData.Language.getMapText("请说明中止原因"),
-      icon: "none"
-    })
-    _Http.basic({
-      "content": {
-        "sa_workorderid": this.data.detail.sa_workorderid,
-        abortreason
-      },
-      "id": 2026012714282702,
-    }).then(res => {
-      getApp().globalData.Language.showToast(res.code == '1' ? "中止成功" : res.msg)
-      if (res.code == 1) this.getDetail();
-    })
+    let that = this;
+    setTimeout(() => {
+      let abortreason = that.data.reason.abortreason;
+      if (abortreason == '') return wx.showToast({
+        title: getApp().globalData.Language.getMapText("请说明中止原因"),
+        icon: "none"
+      })
+      _Http.basic({
+        "content": {
+          "sa_workorderid": that.data.detail.sa_workorderid,
+          abortreason
+        },
+        "id": 2026012714282702,
+      }).then(res => {
+        getApp().globalData.Language.showToast(res.code == '1' ? "中止成功" : res.msg)
+        if (res.code == 1) that.getDetail();
+      })
+    });
   },
   tabbarOnClick(e) {
     let that = this,

+ 1 - 1
E-service/workOrder/index.scss

@@ -4,7 +4,7 @@
 	border-radius: 8rpx;
 	padding: 20rpx;
 	box-sizing: border-box;
-	margin: 20rpx auto 0;
+	margin: 0 auto 20rpx;
 
 	.head {
 		display: flex;

+ 3 - 0
E-service/workOrder/index.wxml

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

+ 1 - 1
E-service/workOrder/product/index.wxml

@@ -49,7 +49,7 @@
         </view>
         <view class="bottom">
           <text style="color: #666;">{{language['问题描述']||'问题描述'}}:</text>
-          <textarea auto-focus placeholder-style='line-height:58rpx;' value='{{item.problem_description}}' data-name='problem_description' placeholder="{{language['问题描述']||'问题描述'}}" disabled="{{disabled}}" data-item="{{item}}" data-index="{{index}}" bindblur="onBlur" />
+          <textarea placeholder-style='line-height:58rpx;' value='{{item.problem_description}}' data-name='problem_description' placeholder="{{language['问题描述']||'问题描述'}}" disabled="{{disabled}}" data-item="{{item}}" data-index="{{index}}" bindblur="onBlur" />
         </view>
         <view class="bottom">
           <view style="color: #666;">{{language['处理过程']||'处理过程'}}:</view>