Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/views/statement/business/businessDetail.vue

@@ -93,12 +93,12 @@
             <el-table-column prop="name" label="名称" align="center" min-width="100" />
             <el-table-column prop="billState" label="单据状态" align="center" width="100" />
             <el-table-column prop="serviceType" label="工种" align="center" width="100" />
-            <el-table-column prop="billType" label="维修单类型" align="center" width="100" />
+            <el-table-column prop="billType" label="维修单类型" align="center" width="120" />
             <el-table-column prop="subject" label="维修科目" align="center" width="100" />
             <el-table-column prop="goodsSkuTitle" label="图号" align="center" width="100" />
             <el-table-column prop="supplierName" label="供应商" align="center" min-width="100" />
             <el-table-column prop="manufacturerName" label="厂家" align="center" min-width="100" />
-            <el-table-column prop="price" label="销售价/工时单价" align="center" width="100" />
+            <el-table-column prop="price" label="销售价/工时单价" align="center" width="140" />
             <el-table-column prop="num" label="数量" align="center" width="100" />
             <el-table-column prop="discount" label="折扣" align="center" width="100" />
             <el-table-column prop="discountAmount" label="折后金额" align="center" width="100" />

yxt-as-ui/src/views/statement/business/serviceSummary.vue

@@ -45,13 +45,13 @@
             <el-table-column prop="name" label="名称" align="center" min-width="100" />
             <el-table-column prop="billState" label="单据状态" align="center" width="100" />
             <el-table-column prop="serviceType" label="工种" align="center" width="100" />
-            <el-table-column prop="billType" label="维修单类型" align="center" width="100" />
+            <el-table-column prop="billType" label="维修单类型" align="center" width="120" />
             <el-table-column prop="subject" label="维修科目" align="center" width="100" />
             <el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
             <el-table-column prop="supplierName" label="供应商" align="center" min-width="100" />
             <el-table-column prop="manufacturerName" label="厂家" align="center" min-width="100" />
             <el-table-column prop="num" label="数量" align="center" width="100" />
-            <el-table-column prop="discountAmount" label="折后金额合计" align="center" width="100" />
+            <el-table-column prop="discountAmount" label="折后金额合计" align="center" width="140" />
             <el-table-column prop="costTotal" label="成本合计" align="center" width="100" />
             <el-table-column prop="profit" label="利润" align="center" width="100" />
           </el-table>