代码优化

src/renderer/components/views/Home.vue

@@ -76,7 +76,7 @@ export default {
       }
 
       &:nth-of-type(3) {
-        background-color: red;
+        background-color: orange;
       }
     }
   }

src/renderer/components/views/receiverWasteDeliveryNote.vue

@@ -84,8 +84,8 @@ const columns = [
   {
     width: 100,
     title: '订单类型',
-    dataIndex: 'orderCenterOrderType',
-    key: 'orderCenterOrderType',
+    dataIndex: 'entityType',
+    key: 'entityType',
   },
   {
     width: 100,
@@ -113,12 +113,9 @@ export default {
       dateFormat: "YYYY/MM/DD",
       moment,
       searchModel: {
-        factoryCode: '1500',
         identityCard: undefined,
         truckNumber: undefined,
         deliveryNote: undefined,
-        startTime: moment(new Date(new Date().getTime() - 6 * 24 * 60 * 60 * 1000)),
-        endTime: undefined
       },
       intervalID:undefined,
       list: [],
@@ -189,34 +186,26 @@ export default {
         this.$message.info('至少填写一个信息', 2);
         return;
       }
-      if (self.searchModel.identityCard !== undefined || self.searchModel.identityCard !== null || self.searchModel.identityCard !== '') {
+      if (self.searchModel.identityCard !== undefined && self.searchModel.identityCard !== null && self.searchModel.identityCard !== '') {
         if (self.searchModel.identityCard.length !== 18) {
           this.$message.info('身份信息填写有误！', 2);
           return;
         }
       }
-      if (self.searchModel.startTime === undefined) {
-        this.$message.info('提货开始时间不能为空', 2);
-        return;
-      }
-      let endTime = moment(new Date()).format('YYYY-MM-DD');
-      if (self.searchModel.endTime !== undefined && self.searchModel.endTime !== null) {
-        endTime = self.searchModel.endTime.format('YYYY-MM-DD')
-      }
       self.list = [];
       self.selectedRowKeys = [];
       self.selectedRows = [];
       self.axios({
         method: "post",//指定请求方式
         url: "/Print/searchWasteDeliveryNote.action",//请求接口（相对接口，后面会介绍到）
+        headers: {
+              'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8'
+        },
         params: {
-          // factoryCode: self.searchModel.factoryCode,
           truckNumber: self.searchModel.truckNumber,
           identityCard: self.searchModel.identityCard,
           deliveryNote: self.searchModel.deliveryNote,
-          loginName: self.default_login_name,
-          startTime: self.searchModel.startTime.format('YYYY-MM-DD'),
-          endTime: endTime
+          loginName: self.default_login_name
         }
       })
         .then(function (res) {
@@ -226,13 +215,12 @@ export default {
           } else {
             self.$message.info('请在下方指示位置放好身份证，行驶证，驾驶证！', 5);
             res.data.data.forEach(order => {
-              order.key = order.zorderno + order.zresno
-              order.kwmeng = 0
-              order.arktx = ''
-              order.items.forEach(item => {
-                order.kwmeng += item.kwmeng
-                order.arktx += item.arktx
-              })
+              order.key = order.orderCenterOrderId
+              if (Number(order.entityType) === 15) {
+                order.entityType = '过程品/研发品';
+              } else {
+                order.entityType = '废旧物资';
+              }
               self.list.push(order)
             });
             const pagination = { ...self.pagination }
@@ -740,4 +728,4 @@ export default {
   font-weight: 700;
   color: red;
 }
-</style>
+</style>