zh 2 年之前
父节点
当前提交
500f2ae867

+ 22 - 1
src/views/commercialEngineering/components/operate.vue

@@ -240,6 +240,27 @@ export default {
           columnAttributes: {
             label: '机组类型',
             prop: 'machineType'
+          },
+
+          render: (h, { row, column, $index }) => {
+            console.log(row, 999)
+            const obj = {
+              TYPE_1: '风管机',
+              TYPE_2: '多联机',
+              TYPE_3: '模块机',
+              TYPE_4: '螺杆机',
+              TYPE_5: '离心机',
+              TYPE_6: '热水机',
+              TYPE_7: '冷冻冷藏',
+              TYPE_8: '末端',
+              TYPE_9: '其他'
+
+            }
+            return (
+              <div>
+                {obj[row.machineType] || row.machineType }
+              </div>
+            )
           }
         },
         {
@@ -260,7 +281,7 @@ export default {
             }
             return (
               <div>
-                {obj[row.status]}
+                {obj[row.status] || row.status}
               </div>
             )
           }

+ 1 - 1
src/views/commercialEngineering/crossDistrict/crossDistrictkList.vue

@@ -95,7 +95,7 @@ export default {
                         return
                       }
                       for (let index = 0; index < this.recordSelected.length.length; index++) {
-                        if (this.recordSelected[index].orderStatus !== '登录成功' && this.recordSelected[index].status === '跟进中') {
+                        if (this.recordSelected[index].orderStatus !== '登录成功' || this.recordSelected[index].status !== '跟进中') {
                           this.$message.error('请选择审核通过并且跟进中的数据')
                           return
                         }

+ 2 - 1
src/views/commercialEngineering/frock/frockList.vue

@@ -91,8 +91,9 @@ export default {
                         this.$message.error('请选择需要更新的数据')
                         return
                       }
+
                       for (let index = 0; index < this.recordSelected.length.length; index++) {
-                        if (this.recordSelected[index].orderStatus !== '登录成功' && this.recordSelected[index].status === '跟进中') {
+                        if (this.recordSelected[index].orderStatus !== '登录成功' || this.recordSelected[index].status !== '跟进中') {
                           this.$message.error('请选择审核通过并且跟进中的数据')
                           return
                         }

+ 1 - 1
src/views/commercialEngineering/homeDecoration/homeDecorationList.vue

@@ -103,7 +103,7 @@ export default {
                         return
                       }
                       for (let index = 0; index < this.recordSelected.length.length; index++) {
-                        if (this.recordSelected[index].orderStatus !== '登录成功' && this.recordSelected[index].status === '跟进中') {
+                        if (this.recordSelected[index].orderStatus !== '登录成功' || this.recordSelected[index].status !== '跟进中') {
                           this.$message.error('请选择审核通过并且跟进中的数据')
                           return
                         }