Merge branch 'feature/pyh_工单结算调整'

src/views/mallManagement/brand/index.vue

@@ -24,6 +24,7 @@
               <el-tag :type="scope.row.status ? 'success' : 'danger'">{{ scope.row.status ? '开启' : '禁用'}}</el-tag>
             </template>
           </el-table-column>
+		  <el-table-column align="center" label="排序" prop="sortNum"></el-table-column>
           <el-table-column align="center" label="创建人" prop="createBy" min-width="100"></el-table-column>
           <el-table-column align="center" label="创建时间" prop="createTime" min-width="160"></el-table-column>
           <el-table-column align="center" label="修改人" prop="updateBy" min-width="100"></el-table-column>
@@ -65,6 +66,9 @@
             <el-radio :label="false">禁用</el-radio>
           </el-radio-group>
         </el-form-item>
+		<el-form-item label="排序" prop="sortNum">
+		  <el-input v-model="addForm.sortNum" autocomplete="off" placeholder="请输入"></el-input>
+		</el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancelAddForm">取 消</el-button>
@@ -93,6 +97,7 @@ export default {
         name: '', // 名称
         imgUrl: '', // 图片
         status: true,
+		sortNum: 0
       },
       addFormRules: {
         name: [
@@ -104,6 +109,9 @@ export default {
         status: [
           { required: true, message: '请选择状态', trigger: 'change' }
         ],
+		sortNum: [
+          { required: true, message: '请输入排序', trigger: 'blur' }
+        ],
       },
     }
   },
@@ -131,6 +139,7 @@ export default {
             name: res.data.brandName,
             imgUrl: res.data.imageUrl,
             status: res.data.status,
+			sortNum: res.data.sortNum
           }
         })
       }
@@ -151,6 +160,7 @@ export default {
             brandName: this.addForm.name,
             imageUrl: this.addForm.imgUrl,
             status: this.addForm.status,
+			sortNum: this.addForm.sortNum
           }
           if(this.addFormType == 'edit') {
             params.id = this.editId;

src/views/mallManagement/configCenter/business_type/index.vue

@@ -47,6 +47,7 @@ export default {
       formData: {
         name: "",
         status: true,
+		sortNum: 0
       },
     }
   },
@@ -93,6 +94,17 @@ export default {
           prop: 'status',
           rules: [...required]
         }
+      },
+      {
+        md: 24,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入' },
+        formItemAttributes: {
+          label: '排序',
+          prop: 'sortNum',
+          rules: [...required]
+        }
       }
       ]
     }

src/views/mallManagement/goods/goods_add/index.vue

@@ -634,7 +634,7 @@ export default {
     },
 
     getTypeList() {
-      getTypeList({ pageNum: 1, pageSize: -1, params: [{ param: 'a.order_type', compare: '=', value: 'INSTALL' }, { param: 'a.status', compare: '=', value: true }] }).then(res => {
+      getTypeList({ pageNum: 1, pageSize: -1, params: [{ param: 'a.status', compare: '=', value: true }] }).then(res => {
         this.orderTypeList = res.data.records
       })
     },

src/views/workOrder/settleAccountsManagement/summaryBill/detailList.vue

@@ -102,7 +102,7 @@
 			</el-table-column>
 			<el-table-column prop="customerName" align="center" label="客户名字"></el-table-column>
 			<el-table-column prop="customerMobile" align="center" label="客户电话" width="110"></el-table-column>
-			<el-table-column prop="customerAddress" align="center" label="详细地址" width="180"></el-table-column>
+			<el-table-column prop="customerAddress" align="center" label="详细地址" width="350" show-overflow-tooltip></el-table-column>
 			<el-table-column prop="orderStatus" align="center" label="工单状态" width="120">
 				<template slot-scope="scope">
 					{{scope.row.orderStatus == 'DYY'?'待预约':scope.row.orderStatus == 'DSHPG'?'待商户派工':scope.row.orderStatus == 'DWDPG'?'待网点派工':scope.row.orderStatus == 'DJD'?'待接单':scope.row.orderStatus == 'FWZ'?'服务中':scope.row.orderStatus == 'YCD'?'异常单':scope.row.orderStatus == 'YWG'?'已完工待结算':scope.row.orderStatus == 'YJS'?'已结算':scope.row.orderStatus == 'YQX'?'已取消':''}}
@@ -124,7 +124,11 @@
 			</el-table-column>
 			<el-table-column prop="installLabel" align="center" label="安装功率"></el-table-column>
 			<el-table-column prop="installNormAmount" align="center" label="安装结算标准" width="110"></el-table-column>
-			<el-table-column prop="repairLabel" align="center" label="质保类型"></el-table-column>
+			<el-table-column prop="repairLabel" align="center" label="质保类型">
+				<template slot-scope="scope">
+					{{scope.row.repairLabel == 'INSIDE'?'保内':scope.row.repairLabel == 'OUT'?'保外':''}}
+				</template>
+			</el-table-column>
 			<el-table-column prop="repairAmount" align="center" label="维修上门费" width="110"></el-table-column>
 			<el-table-column prop="repairRate" align="center" label="维修费用结算比例" width="140"></el-table-column>
 			<el-table-column prop="repairSettleAmount" align="center" label="维修费用"></el-table-column>