ソースを参照

fix: 全局中文状态转为英文状态

Howie 1 年間 前
コミット
0380c0edc4

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

@@ -96,7 +96,7 @@ export default {
                         return
                       }
                       for (let index = 0; index < this.recordSelected.length; index++) {
-                        if (!(this.recordSelected[index].orderStatus == '已审核' && this.recordSelected[index].status == '跟进中')) {
+                        if (!(this.recordSelected[index].orderStatus == 'OK' && this.recordSelected[index].status == 'ING')) {
                           this.$message.error('请选择审核通过并且跟进中的数据')
                           return
                         }
@@ -118,7 +118,7 @@ export default {
                         return
                       }
                       for (let index = 0; index < this.recordSelected.length; index++) {
-                        if (this.recordSelected[index].orderStatus !== '已审核') {
+                        if (this.recordSelected[index].orderStatus !== 'OK') {
                           this.$message.error('请选择审核通过的数据')
                           return
                         }
@@ -144,7 +144,7 @@ export default {
                       }
                       if(!this.isTradeExaminer){
                         for (let index = 0; index < this.recordSelected.length; index++) {
-                        if (this.recordSelected[index].orderStatus !== '保存') {
+                        if (this.recordSelected[index].orderStatus !== 'SAVE') {
                           this.$message.error('请选择保存的数据')
                           return
                         }

+ 4 - 4
src/views/commercialEngineering/frock/frockList.vue

@@ -104,8 +104,8 @@ export default {
                         for (let index = 0; index < this.recordSelected.length; index++) {
                           if (
                             !(
-                              this.recordSelected[index].orderStatus == '已审核' &&
-                              this.recordSelected[index].status == '跟进中'
+                              this.recordSelected[index].orderStatus == 'OK' &&
+                              this.recordSelected[index].status == 'ING'
                             )
                           ) {
                             this.$message.error('请选择审核通过并且跟进中的数据')
@@ -129,7 +129,7 @@ export default {
                           return
                         }
                         for (let index = 0; index < this.recordSelected.length; index++) {
-                          if (this.recordSelected[index].orderStatus !== '已审核') {
+                          if (this.recordSelected[index].orderStatus !== 'OK') {
                             this.$message.error('请选择审核通过的数据')
                             return
                           }
@@ -155,7 +155,7 @@ export default {
                 }
                 if (!this.isTradeExaminer) {
                   for (let index = 0; index < this.recordSelected.length; index++) {
-                    if (this.recordSelected[index].orderStatus !== '保存') {
+                    if (this.recordSelected[index].orderStatus !== 'SAVE') {
                       this.$message.error('请选择保存的数据')
                       return
                     }

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

@@ -102,7 +102,7 @@ export default {
                         return
                       }
                       for (let index = 0; index < this.recordSelected.length; index++) {
-                        if (!(this.recordSelected[index].orderStatus == '已审核' && this.recordSelected[index].status == '跟进中')) {
+                        if (!(this.recordSelected[index].orderStatus == 'OK' && this.recordSelected[index].status == 'ING')) {
                           this.$message.error('请选择审核通过并且跟进中的数据')
                           return
                         }
@@ -124,7 +124,7 @@ export default {
                         return
                       }
                       for (let index = 0; index < this.recordSelected.length; index++) {
-                        if (this.recordSelected[index].orderStatus !== '已审核') {
+                        if (this.recordSelected[index].orderStatus !== 'OK') {
                           this.$message.error('请选择审核通过的数据')
                           return
                         }
@@ -150,7 +150,7 @@ export default {
                       }
                       if(!this.isTradeExaminer){
                         for (let index = 0; index < this.recordSelected.length; index++) {
-                        if (this.recordSelected[index].orderStatus !== '保存') {
+                        if (this.recordSelected[index].orderStatus !== 'SAVE') {
                           this.$message.error('请选择保存的数据')
                           return
                         }

+ 1 - 1
src/views/logisticsBill/components/ExceptionBox.vue

@@ -82,7 +82,7 @@ export default {
               ALL: '所有类型,广州的订单统一 开单价',
               TOC: '佛山销售销售订单类型公司'
             }
-            return <div>{typeObj[orderType]}</div>
+            return <div>{typeObj[orderType]||row.orderType}</div>
           }
         },
         {

+ 3 - 2
src/views/sales_policy/policy_list.vue

@@ -139,14 +139,15 @@ export default {
           [
             {
               name: '批量修改延期',
-              isRole: this.$checkBtnRole('yanqi', this.$route.meta.roles),
+
               click: () => {
                 if (!this.recordSelected.length) {
                   this.$errorMsg('请选择内容')
                   return
                 }
                 for (let i = 0; i < this.recordSelected.length; i++) {
-                  if (this.recordSelected[i].examineStatus !== '审核通过') {
+                  console.log(this.recordSelected[i].examineStatus)
+                  if (this.recordSelected[i].examineStatus !== 'OK') {
                     this.$errorMsg('请选择审核通过的政策')
                     return
                   }

+ 3 - 3
src/views/supply/transferOrder/transferOrderForm.vue

@@ -446,7 +446,7 @@ export default {
               FO_SHAN: '佛山销售公司',
               OTHER: '其他销售公司'
             }
-            return <div>{typeObj[belongCompanyType]}</div>
+            return <div>{typeObj[belongCompanyType] || row.belongCompanyType }</div>
           }
         },
         {
@@ -644,7 +644,7 @@ export default {
               ALL: '所有类型,广州的订单统一 开单价',
               TOC: '佛山销售销售订单类型公司'
             }
-            return <div>{typeObj[orderType]}</div>
+            return <div>{typeObj[orderType]|| row.orderType}</div>
           }
         },
         {
@@ -662,7 +662,7 @@ export default {
               PROJECT_ORDER: '工程机订单',
               SALE_RETURN_ORDER: '销售退货单'
             }
-            return <div>{typeObj[orderType]}</div>
+            return <div>{typeObj[orderType]|| row.typeObj}</div>
           }
         },
         {