whj 1 年之前
父节点
当前提交
5e40244dbe

+ 12 - 0
src/utils/dict.js

@@ -1562,6 +1562,18 @@ DictCache.COLOR = {
     8: 'error' // "推送失败"
 
   },
+  LONG_YAN_PURCHASE_DETAIL_STATUS: {
+    1: 'warning',
+    2: 'warning',
+    3: 'processing',
+    4: 'processing',
+    5: 'processing',
+    6: 'success',
+    7: 'warning',
+    8: 'default',
+    9: 'success',
+    10: 'error'
+  },
   /**
    * 报修状态
    */

+ 11 - 9
src/views/purchase/purchase-order-record/PurchaseOrderRecord.vue

@@ -71,6 +71,9 @@
           <template>
           </template>
         </span>
+        <template #detailStatus="text">
+          <badge :text="BaseTool.Object.getField(detailStatusMap,text)" :status="DictCache.COLOR.LONG_YAN_PURCHASE_DETAIL_STATUS[text]"/>
+        </template>
       </s-table>
     </div>
     <!--    <purchase-dispatch-order ref="dispatchOrder" @ok="handleOk"/>-->
@@ -166,15 +169,6 @@ export default {
           checked: true,
           width: 150
         },
-        {
-          title: '明细状态',
-          width: 100,
-          dataIndex: 'detailStatus',
-          checked: true,
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.getMapText(this.detailStatusMap, text)
-          }
-        },
 
         {
           title: '创建人',
@@ -187,6 +181,14 @@ export default {
           dataIndex: 'createdTime',
           checked: true,
           width: 120
+        },
+        {
+          title: '明细状态',
+          width: 100,
+          dataIndex: 'detailStatus',
+          fixed: 'right',
+          checked: true,
+          scopedSlots: { customRender: 'detailStatus' }
         }
         // {
         //   title: '操作',

+ 0 - 4
src/views/purchase/purchase-order-report/PurchaseOrderReportPie.vue

@@ -148,7 +148,6 @@ export default {
   },
   computed: {
     chartOption1 () {
-      console.log(this.chartsData)
       const data = this.chartsData[1].map(item => {
         return {
           value: item.num,
@@ -191,7 +190,6 @@ export default {
       }
     },
     chartOption2 () {
-      console.log(this.chartsData)
       const data = this.chartsData[2].map(item => {
         return {
           value: item.num,
@@ -234,7 +232,6 @@ export default {
       }
     },
     chartOption3 () {
-      console.log(this.chartsData)
       const data = this.chartsData[3].map(item => {
         return {
           value: item.num,
@@ -277,7 +274,6 @@ export default {
       }
     },
     chartOption4 () {
-      console.log(this.chartsData)
       const data = this.chartsData[4].map(item => {
         return {
           value: item.num,