Merge remote-tracking branch 'origin/master'

src/views/ordermanager/HwOrderList.vue

@@ -199,12 +199,12 @@
             title: '合同状态',
             align: 'left',
             width: 150,
-            dataIndex: 'contractStatus_dictText',
+            dataIndex: 'electronicContractStatus',
             customRender: function(value, record) {
-              if(record.contractStatus === 2){
-                return '--';
+              if(record.electronicContractStatus === 2){
+                return '已签署';
               }
-              return value;
+              return '待签署';
             }
           },
           {
@@ -274,12 +274,12 @@
             title: '合同状态',
             align: 'left',
             width: 150,
-            dataIndex: 'contractStatus_dictText',
+            dataIndex: 'electronicContractStatus',
             customRender: function(value, record) {
-              if(record.contractStatus === 2){
-                return '--';
+              if(record.electronicContractStatus === 2){
+                return '已签署';
               }
-              return value;
+              return '待签署';
             }
           },
           {