lilei hace 4 años
padre
commit
f40f070815

+ 85 - 7
src/components/global.less

@@ -542,7 +542,7 @@ body {
 }
 
 /* 扩展ant design pro按钮组件颜色 */
-.ant-btn.button-primary {
+.ant-btn-primary.button-primary {
   background-color: #39f;
   border-color: #39f;
   margin: 0 5px;
@@ -558,7 +558,7 @@ body {
   }
 }
  
-.ant-btn.button-info {
+.ant-btn-primary.button-info {
   background-color: #2db7f5;
   border-color: #2db7f5;
   margin: 0 5px;
@@ -574,7 +574,7 @@ body {
   }
 }
  
-.ant-btn.button-success {
+.ant-btn-primary.button-success {
   background-color: #0c6;
   border-color: #0c6;
   margin: 0 5px;
@@ -590,7 +590,7 @@ body {
   }
 }
  
-.ant-btn.button-warning {
+.ant-btn-primary.button-warning {
   background-color: #f90;
   border-color: #f90;
   margin: 0 5px;
@@ -606,7 +606,7 @@ body {
   }
 }
  
-.ant-btn.button-error {
+.ant-btn-primary.button-error {
   background-color: #f30;
   border-color: #f30;
   margin: 0 5px;
@@ -622,7 +622,7 @@ body {
   }
 }
  
-.ant-btn.button-geekblue {
+.ant-btn-primary.button-geekblue {
   background-color: #2F54EB;
   border-color: #2F54EB;
   margin: 0 5px;
@@ -638,7 +638,7 @@ body {
   }
 }
  
-.ant-btn.button-purple {
+.ant-btn-primary.button-purple {
   background-color: #722ED1;
   border-color: #722ED1;
   margin: 0 5px;
@@ -653,3 +653,81 @@ body {
     border-color: #531dab;
   }
 }
+
+// btn-link
+.ant-btn-link.button-primary {
+  color: #39f;
+  &:hover, &:focus {
+    color: #52a6fb;
+  }
+ 
+  &:active, &.active {
+    color: #3d80bf;
+  }
+}
+ 
+.ant-btn-link.button-info {
+  color: #2db7f5;
+  &:hover, &:focus {
+    color: #32c8f5;
+  }
+ 
+  &:active, &.active {
+    color: #27a3d8;
+  }
+}
+ 
+.ant-btn-link.button-success {
+  color: #0c6;
+  &:hover, &:focus {
+    color: #01dc8c;
+  }
+ 
+  &:active, &.active {
+    color: #00af57;
+  }
+}
+ 
+.ant-btn-link.button-warning {
+  color: #e89105;
+  &:hover, &:focus {
+    color: #ffb60a;
+  }
+ 
+  &:active, &.active {
+    color: #dd8500;
+  }
+}
+ 
+.ant-btn-link.button-error {
+  color: #f30;
+  &:hover, &:focus {
+    color: #ff6666;
+  }
+ 
+  &:active, &.active {
+    color: #d62a00;
+  }
+}
+ 
+.ant-btn-link.button-geekblue {
+  color: #2F54EB;
+  &:hover, &:focus {
+    color: #1d39c4;
+  }
+ 
+  &:active, &.active {
+    color: #597ef7;
+  }
+}
+ 
+.ant-btn-link.button-purple {
+  color: #722ED1;
+  &:hover, &:focus {
+    color: #9254de;
+  }
+ 
+  &:active, &.active {
+    color: #531dab;
+  }
+}

+ 5 - 1
src/views/salesManagement/salesQuery/list.vue

@@ -116,6 +116,10 @@
       <template slot="oosFlag" slot-scope="text, record">
         <a-tag :color="record.oosFlag==1?'red':'#ccc'" >{{ record.oosFlagDictValue }}</a-tag>
       </template>
+      <!-- 财务状态 -->
+      <template slot="financialStatus" slot-scope="text, record">
+        <a-badge :color="text=='FINISH'?'#87d068':'gold'" :text="record.financialStatusDictValue" />
+      </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
         <a-button
@@ -209,7 +213,7 @@ export default {
         { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '急件', dataIndex: 'oosFlag', scopedSlots: { customRender: 'oosFlag' }, width: 100, align: 'center' },
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: 110, align: 'center' },
-        { title: '财务状态', dataIndex: 'financialStatusDictValue', width: 110, align: 'center' },
+        { title: '财务状态', dataIndex: 'financialStatus', scopedSlots: { customRender: 'financialStatus' }, width: 110, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 280, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 9 - 1
src/views/salesManagement/salesQuery/queryPart.vue

@@ -101,7 +101,6 @@
       :data="loadData"
       :customRow="handleClickRow"
       :scroll="{ x: tableWidth, y: 300 }"
-      :pageSize="30"
       bordered>
       <!-- 售价 -->
       <template slot="salePrice" slot-scope="text, record">
@@ -244,8 +243,17 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.queryParam.salePriceType = this.priceType
+        // 排序
+        parameter.sortAlias = 'sd'
+        if (parameter.sortField == 'brandName') {
+          parameter.sortField = 'brandSn'
+        }
+        if (parameter.sortField == 'warehouseName') {
+          parameter.sortField = 'warehouseSn'
+        }
         return querySumByProductLocation(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
+          data.list = data.list.filter(item => item != null)
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1