采购

ghs/src/views/in/list.vue

@@ -25,12 +25,29 @@
           {{ scope.row.customName }}
         </div>
       </template>
+      
+      <template #table-column-itemNum="{scope}">
+        <div>
+          {{ scope.row.itemNum?parseFloat(scope.row.itemNum):0 }}
+        </div>
+      </template>
+      
+      <template #table-column-yfPayWay="{scope}">
+        <div>
+          {{ scope.row.yfPayWay == 1 ? '寄付' : '到付' }}
+        </div>
+      </template>
+
       <template #table-column-addTime="{scope}">
         <div>
           {{ scope.row.addTime?scope.row.addTime.substr(5,11):'' }}
         </div>
       </template>
-      
+      <template #table-column-entryTime="{scope}">
+        <div>
+          {{ scope.row.entryTime?scope.row.entryTime.substr(5,11):'' }}
+        </div>
+      </template>
 
       <template #table-column-customMobile="{scope}">
         <div v-if="scope.row.customMobile == ''">-</div>
@@ -49,23 +66,15 @@
 
       <template #table-column-status="{scope}">
         <span v-if="scope.row.status == 2">待发货</span>
-        <span v-else-if="scope.row.status == 3">待收货</span>
-        <span v-else-if="scope.row.status == 4">已完成</span>
+        <span v-else-if="scope.row.status == 3">待入库</span>
+        <span v-else-if="scope.row.status == 4">已入库</span>
         <span v-else-if="scope.row.status == 5">已取消</span>
         <span v-else>待付款</span>
       </template>
 
       <template #slot-column-option="{scope}">
-        <el-button v-if="scope.row.book == 1" @click.stop="printOrder(scope.row)" size="mini" type="primary">打A4</el-button>
-        <el-button v-else disabled size="mini">打A4</el-button>
-      </template>
-
-      <template #slot-order-book="{scope}">
-        <el-radio-group v-model="book" @change="changeBook" style="margin-right:20px;padding-top:6px;margin-left:20px;">
-          <el-radio label="-1">全部订单</el-radio>
-          <el-radio label="0">普通订单</el-radio>
-          <el-radio label="1">预订单</el-radio>
-        </el-radio-group>
+        <el-button @click.stop="printOrder(scope.row)" size="mini" type="primary">入库改价</el-button>
+        <el-button @click.stop="printOrder(scope.row)" size="mini" type="success">订单详情</el-button>
       </template>
 
     </x-crud>
@@ -77,7 +86,7 @@
     <div class="print-html-box">
       <table border="0" width="730" style="border:solid 1px #fff;border-collapse:collapse">
         <tr>
-          <td style="width: 340px;">客户：{{orderData.customName}} {{orderData.customMobile}}</td>
+          <td style="width: 340px;">供货商：{{orderData.customName}} {{orderData.customMobile}}</td>
           <td style="width: 200px;">单号：{{orderData.orderSn}}</td>
           <td style="width: 220px;">日期：{{orderData.deadline}}</td>
         </tr>
@@ -150,24 +159,19 @@ export default {
           val: 0
         },
         {
-          text: '待付款',
+          text: '待入库',
           key: '1',
           val: 0
         },
         {
-          text: '待发货',
+          text: '已入库',
           key: '2',
           val: 0
         },
         {
-          text: '待收货',
+          text: '已取消',
           key: '3',
           val: 0
-        },
-        {
-          text: '已完成',
-          key: '4',
-          val: 0
         }
       ],
       optionData: {},
@@ -252,7 +256,7 @@ export default {
       if(this.$route.query.status){
         this.tabIndex = this.$route.query.status
       }
-      ctx.service(this.$service.order)
+      ctx.service(this.$service.purchaseOrder)
           .set('table', {
             columns: [
               {
@@ -262,72 +266,66 @@ export default {
                 width: '160'
               },
               {
-                prop: 'prePrice',
-                label: '总价',
+                prop: 'supplierName',
+                label: '供货商',
                 align: 'center',
-                width: '110'
+                width: '200'
               },
               {
-                prop: 'actPrice',
-                label: '实付款',
+                prop: 'cgStaffName',
+                label: '采购人',
                 align: 'center',
-                emptyText: '无',
-                width: '110'
-              },
-              {
-                prop: 'customName',
-                label: '客户',
-                align: 'center',
-                width: '150'
+                width: 110
               },
               {
-                prop: 'customMobile',
-                label: '手机号',
+                prop: 'adminName',
+                label: '录单人',
                 align: 'center',
-                width: '120'
+                width: 110
               },
               {
-                prop: 'bigNum',
+                prop: 'itemNum',
                 label: '数量',
                 align: 'center',
-                width: '60'
+                width: '80'
               },
               {
-                prop: 'book',
-                label: '预订单',
+                prop: 'prePrice',
+                label: '总金额',
                 align: 'center',
-                width: '150'
+                width: '110'
               },
               {
-                prop: 'sendTimeWant',
-                label: '预订发货',
+                prop: 'actPrice',
+                label: '实际金额',
                 align: 'center',
-                width: '150'
+                emptyText: '无',
+                width: '110'
               },
               {
-                prop: 'sendNum',
-                label: '编号',
+                prop: 'yfPayWay',
+                label: '支付方式',
                 align: 'center',
-                width: 80
+                width: 100
               },
               {
-                prop: 'shopAdminName',
-                label: '开单人',
+                prop: 'status',
+                label: '状态',
                 align: 'center',
                 width: 100
               },
               {
-                prop: 'addTime',
-                label: '开单时间',
+                prop: 'entryTime',
+                label: '入库时间',
                 align: 'center',
-                width: 110
+                width: 150
               },
               {
-                prop: 'status',
-                label: '状态',
+                prop: 'addTime',
+                label: '创建时间',
                 align: 'center',
-                width: 90
-              }
+                width: 150
+              },
             ],
             on: {
               'row-click': (row, column) => {
@@ -359,7 +357,7 @@ export default {
             }
           })
           .set('search', {
-            key: { placeholder: '订单号 | 客户名称' }
+            key: { placeholder: '订单号 | 供货商名称' }
           })
           .set('layout', [
             ['slot-tabs'],