订单相关页面调整

src/views/ordermanager/HwOrderList.vue

@@ -207,7 +207,7 @@
             dataIndex: 'contractStatus_dictText',
             customRender: function(value, record) {
               if(record.contractStatus === 2){
-                return '-';
+                return '--';
               }
               return value;
             }

src/views/ordermanager/modules/HwOrderModal.vue

@@ -61,13 +61,13 @@
             <span slot="endDate" slot-scope="text, record">
               <template v-if="record.isAutoRenew === 0 && text">
                 <template v-if="record.contractStatus == 1">
-                  <span style="color: #FF7312">{{text.substring(0,10)}}(即将到期)</span>
+                  <span style="color: #FF7312">{{text.length > 10 ? text.substring(0,10) : text}}(即将到期)</span>
                 </template>
                 <template v-else-if="record.contractStatus == 2">
-                  <span style="color: #F01B1B">{{text.substring(0,10)}}(已到期)</span>
+                  <span style="color: #F01B1B">{{text.length > 10 ? text.substring(0,10) : text}}(已到期)</span>
                 </template>
                 <template v-else>
-                  {{text.substring(0,10)}}
+                  {{text.length > 10 ? text.substring(0,10) : text}}
                 </template>
               </template>
               <template v-else>
@@ -77,7 +77,7 @@
 
             <span slot="isPayment" slot-scope="text, record">
               <template v-if="record.isPayment">
-                已走款：{{record.minPaymentTime.substring(0,10)}}~{{record.maxPaymentTime.substring(0,10)}}
+                已走款：{{record.minPaymentTime.length > 10 ? record.minPaymentTime.substring(0,10) : record.minPaymentTime}}~{{record.maxPaymentTime.length > 10 ? record.maxPaymentTime.substring(0,10) : record.maxPaymentTime}}
               </template>
               <template v-else>
                 未走款

src/views/ordermanager/modules/HwOrderSubcontractorContract.vue

@@ -19,7 +19,7 @@
         <!-- 操作按钮区域 -->
         <div class="table-operator">
           <template v-if="model.isPayment">
-            已走款：{{model.minPaymentTime.substring(0,10)}}~{{model.maxPaymentTime.substring(0,10)}}
+            已走款：{{model.minPaymentTime.length > 10 ? model.minPaymentTime.substring(0,10) : model.minPaymentTime}}~{{model.maxPaymentTime.length > 10 ? model.maxPaymentTime.substring(0,10) : model.maxPaymentTime}}
           </template>
           <template v-else>
             未走款
@@ -48,13 +48,13 @@
             <span slot="endDate" slot-scope="text, record">
               <template v-if="record.isAutoRenew === 0 && text">
                 <template v-if="record.contractStatus == 1">
-                  <span style="color: #FF7312">{{text.substring(0,10)}}(即将到期)</span>
+                  <span style="color: #FF7312">{{text.length > 10 ? text.substring(0,10) : text}}(即将到期)</span>
                 </template>
                 <template v-else-if="record.contractStatus == 2">
-                  <span style="color: #F01B1B">{{text.substring(0,10)}}(已到期)</span>
+                  <span style="color: #F01B1B">{{text.length > 10 ? text.substring(0,10) : text}}(已到期)</span>
                 </template>
                 <template v-else>
-                  {{text.substring(0,10)}}
+                  {{text.length > 10 ? text.substring(0,10) : text}}
                 </template>
               </template>
               <template v-else>
@@ -105,7 +105,7 @@
           'overflow-y': 'auto'
         },
         modelStyle: {
-          width: '56%',
+          width: '62%',
           style: { top: '20px' },
           fullScreen: false
         },

src/views/ordermanager/modules/HwOrderUploadContractModal.vue

@@ -100,7 +100,7 @@
         form: this.$form.createForm(this),
         title:"操作",
         modelStyle: {
-          width: '46%',
+          width: '52%',
           style: { top: '20px' },
           fullScreen: false
         },