作者 张晓杰

Merge branch 'dev' of http://39.105.222.208:1024/leihd/factory-web into dev

@@ -175,7 +175,7 @@ export default { @@ -175,7 +175,7 @@ export default {
175 this.res = ress.result.map((item) => ({ 175 this.res = ress.result.map((item) => ({
176 workingProcedure: item.gongxu + ' (' + (item.bili * 100).toFixed() + '%)', 176 workingProcedure: item.gongxu + ' (' + (item.bili * 100).toFixed() + '%)',
177 undertaker: '', // 初始为空,等待用户输入 177 undertaker: '', // 初始为空,等待用户输入
178 - workHours: parseFloat((record.totalWorkingHours * item.bili).toFixed(2)) 178 + workHours: parseFloat((record.totalWorkingHours * item.bili).toFixed(1))
179 .toString() 179 .toString()
180 .replace(/(\.\d*?[1-9])0+$/, '$1'), // 初始为空,等待用户输入 180 .replace(/(\.\d*?[1-9])0+$/, '$1'), // 初始为空,等待用户输入
181 dispatchTime: new Date(), 181 dispatchTime: new Date(),
@@ -190,7 +190,7 @@ export default { @@ -190,7 +190,7 @@ export default {
190 this.res = ress.result.map((item) => ({ 190 this.res = ress.result.map((item) => ({
191 workingProcedure: item.gongxu + ' (' + (item.bili * 100).toFixed() + '%)', 191 workingProcedure: item.gongxu + ' (' + (item.bili * 100).toFixed() + '%)',
192 undertaker: '', // 初始为空,等待用户输入 192 undertaker: '', // 初始为空,等待用户输入
193 - workHours: parseFloat(((record.totalWorkingHours - record.dispatchedWorkingHours) * item.bili).toFixed(2)) 193 + workHours: parseFloat(((record.totalWorkingHours - record.dispatchedWorkingHours) * item.bili).toFixed(1))
194 .toString() 194 .toString()
195 .replace(/(\.\d*?[1-9])0+$/, '$1'), // 初始为空,等待用户输入 195 .replace(/(\.\d*?[1-9])0+$/, '$1'), // 初始为空,等待用户输入
196 dispatchTime: new Date(), 196 dispatchTime: new Date(),