ZhangWenQiang 4 роки тому
батько
коміт
5b11899db2

+ 15 - 3
src/views/ordermanager/HwOrderList.vue

@@ -219,6 +219,12 @@
             dataIndex: 'workContractType_dictText',
           },
           {
+            title: '创建时间',
+            align: 'left',
+            width: 150,
+            dataIndex: 'createTime',
+          },
+          {
             title: '操作',
             dataIndex: 'action',
             align: 'left',
@@ -288,6 +294,12 @@
             dataIndex: 'isCheck_dictText'
           },
           {
+            title: '创建时间',
+            align: 'left',
+            width: 150,
+            dataIndex: 'createTime',
+          },
+          {
             title: '操作',
             dataIndex: 'action',
             align: 'left',
@@ -296,7 +308,7 @@
             scopedSlots: { customRender: 'action' }
           }
         ],
-        scrollX: 1780,
+        scrollX: 1930,
         isorter: {
           column: 'updateTime',
           order: 'desc'
@@ -333,10 +345,10 @@
         console.log('bo',bo)
         if (bo) {
           this.columns = this.defColumns;
-          this.scrollX = 1780;
+          this.scrollX = 1930;
         } else {
           this.columns = this.comColumns;
-          this.scrollX = 1630;
+          this.scrollX = 1780;
         }
       },
       getQueryParams(){

+ 29 - 46
src/views/ordermanager/modules/HwOrderModal.vue

@@ -66,37 +66,37 @@
                 :loading='loading'
                 @change='handleTableChange'>
 
-            <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.length > 10 ? text.substring(0, 10) : text }}(即将到期)</span>
-                </template>
-                <template v-else-if='record.contractStatus == 2'>
-                  <span style='color: #F01B1B'>{{ text.length > 10 ? text.substring(0, 10) : text }}(已到期)</span>
-                </template>
-                <template v-else>
-                  {{ text.length > 10 ? text.substring(0, 10) : text }}
-                </template>
-              </template>
-              <template v-else>
-                 --
-              </template>
-            </span>
+                  <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.length > 10 ? text.substring(0, 10) : text }}(即将到期)</span>
+                      </template>
+                      <template v-else-if='record.contractStatus == 2'>
+                        <span style='color: #F01B1B'>{{ text.length > 10 ? text.substring(0, 10) : text }}(已到期)</span>
+                      </template>
+                      <template v-else>
+                        {{ text.length > 10 ? text.substring(0, 10) : text }}
+                      </template>
+                    </template>
+                    <template v-else>
+                       --
+                    </template>
+                  </span>
 
-                <span slot='isPayment' slot-scope='text, record'>
-              <template v-if='record.isPayment'>
-                已走款:{{ 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>
-                未走款
-              </template>
-            </span>
+                  <span slot='isPayment' slot-scope='text, record'>
+                    <template v-if='record.isPayment'>
+                      已走款:{{ 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>
+                      未走款
+                    </template>
+                  </span>
 
-                <span slot='workContract' slot-scope='text, record'>
-              <a @click='uploadWorkContract(record)'>{{ record.workContract ? '已上传' : '未上传' }}</a>
-            </span>
+                  <span slot='workContract' slot-scope='text, record'>
+                    <a @click='uploadWorkContract(record)'>{{ record.workContract ? '已上传' : '未上传' }}</a>
+                  </span>
               </a-table>
 
             </detail-list>
@@ -248,23 +248,6 @@ export default {
       }
     }
   },
-  // mounted() {
-  //   this.initAutoListConfig().then(() => {
-  //
-  //   }).catch(msg => {
-  //     console.log(msg)
-  //   })
-  // },
-  // watch: {
-  //   '$route'() {
-  //     // 刷新参数放到这里去触发,就可以刷新相同界面了
-  //     this.initAutoListConfig().then(() => {
-  //
-  //     }).catch(msg => {
-  //       console.log(msg)
-  //     })
-  //   }
-  // },
   computed: {},
   methods: {
     resetData() {