【生产进度报表】列表页接口成功

src/api/document/shipmentList.js

@@ -1,4 +1,4 @@
-import { getAction, postAction, deleteAction, putAction } from '@/api/manage'
+import { getAction, postAction, deleteAction } from '@/api/manage'
 
 /** 单证 -- 发运明细 **/
 

src/api/reportForms/pro-progress-report.js

@@ -1 +1,8 @@
 /** 报表 -- 生产进度报表 **/
+import { getAction, postAction, deleteAction, putAction } from '@/api/manage'
+
+// 分页列表查询
+const proProgressList = params => getAction('/productionScheduleReport/productionSchedule/list', params)
+
+// 获取图片
+export { proProgressList }

src/field/reportForms/pro-progress-report.md

@@ -0,0 +1,45 @@
+cDepName 部门
+
+cPersonName 业务员
+
+cSOCode 销售订单号
+
+planCode 计划单号
+
+cCusName 客户
+
+cDefine12 成衣加工厂
+
+cInvCode 存货编码
+
+cInvName 存货名称
+
+itemNumber 款号
+
+color 颜色
+
+dPreDateBT 交期
+
+dDate 订单日期
+
+iQuantity 订单数量
+
+iTaxUnitPrice 原币含税单价
+
+totalSum 总额（原币）
+
+bbPrice 单价（本币）
+
+iNatSum 总额（本币）
+
+icostsum 实际发票成本
+
+foutquantity 已出库数量
+
+iKPQuantity 累计开票数量
+
+iKPMoney 累计开票金额
+
+pictureId 图片 id
+
+picture 图片流

src/views/order/orderDetailDrawer.vue

@@ -196,9 +196,9 @@ export default {
         { title: '存货编码', width: 120, dataIndex: 'inventoryCode', className: 'replacecolor' },
         { title: '存货名称', width: 120, dataIndex: 'inventoryName', className: 'replacecolor' },
         { title: '规格型号', width: 100, dataIndex: 'specificationAndModel', className: 'replacecolor' },
-        { title: '颜色', width: 100, dataIndex: 'colour', className: 'replacecolor' },
+        { title: '颜色', width: 160, dataIndex: 'colour', className: 'replacecolor' },
         { title: '尺码', width: 100, dataIndex: 'size', className: 'replacecolor' },
-        { title: '配码规则', width: 100, dataIndex: 'codingRules', className: 'replacecolor' },
+        { title: '配码规则', width: 160, dataIndex: 'codingRules', className: 'replacecolor' },
         { title: '光坯毛门幅CM', width: 140, dataIndex: 'guangpeiGateWidth', className: 'replacecolor' },
         { title: '箱数', width: 100, dataIndex: 'boxNumber', className: 'replacecolor' },
         { title: '数量', width: 100, dataIndex: 'quantity', className: 'replacecolor' },

src/views/reportForms/pro-progress-report.vue

@@ -8,49 +8,50 @@
           <a-row :gutter="24">
             <a-col :md="6" :sm="8">
               <a-form-item label="销售订单号">
-                <a-input placeholder="请输入订单号" v-model="queryParam.salesOrderNo"></a-input>
+                <a-input placeholder="请输入订单号" v-model="queryParam.csocode"></a-input>
               </a-form-item>
             </a-col>
 
             <a-col :md="6" :sm="8">
               <a-form-item label="部门">
-                <a-input placeholder="请输入部门" v-model="queryParam.department"></a-input>
+                <a-input placeholder="请输入部门" v-model="queryParam.cdepName"></a-input>
               </a-form-item>
             </a-col>
 
             <a-col :md="6" :sm="8">
               <a-form-item label="物料名称">
-                <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
+                <a-input placeholder="请输入物料名称" v-model="queryParam.cinvName"></a-input>
               </a-form-item>
             </a-col>
 
             <template v-if="toggleSearchStatus">
               <a-col :md="6" :sm="8">
                 <a-form-item label="成衣加工厂">
-                  <a-select placeholder="请选择成衣加工厂" v-model="queryParam.garmentFactory">
+                  <a-input placeholder="请输入物料名称" v-model="queryParam.cdefine12"></a-input>
+                  <!-- <a-select placeholder="请选择成衣加工厂" v-model="queryParam.cdefine12">
                     <a-select-option :value="''">请选择</a-select-option>
                     <a-select-option :value="0">成衣加工厂1</a-select-option>
                     <a-select-option :value="1">成衣加工厂2</a-select-option>
                     <a-select-option :value="2">成衣加工厂3</a-select-option>
-                  </a-select>
+                  </a-select> -->
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="业务员">
-                  <a-input placeholder="请输入业务员" v-model="queryParam.salesman"></a-input>
+                  <a-input placeholder="请输入业务员" v-model="queryParam.cpersonName"></a-input>
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="计划单号">
-                  <a-input placeholder="请输入计划单号" v-model="queryParam.planOrderNo"></a-input>
+                  <a-input placeholder="请输入计划单号" v-model="queryParam.planCode"></a-input>
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-item label="日期" has-feedback>
-                  <a-date-picker style="width: 100%" v-model="queryParam.date"></a-date-picker>
+                <a-form-item label="订单日期" has-feedback>
+                  <a-date-picker style="width: 100%" v-model="queryParam.dDate"></a-date-picker>
                 </a-form-item>
               </a-col>
 
@@ -62,7 +63,7 @@
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="交期" has-feedback>
-                  <a-date-picker style="width: 100%" v-model="queryParam.deliveryDate"></a-date-picker>
+                  <a-date-picker style="width: 100%" v-model="queryParam.dPreDateBT"></a-date-picker>
                 </a-form-item>
               </a-col>
             </template>
@@ -91,12 +92,13 @@
         :columns="proProgressColumns"
         :data-source="proProgressData"
         :loading="loading"
-        :pagination="ipagination"
+        :pagination="pagination"
         :scroll="{ x: 1500 }"
         @change="handleTableChange"
       >
         <!-- 销售订单号  链接-->
-        <span slot="salesOrderNo" slot-scope="text">
+        
+        <span slot="csocode" slot-scope="text">
           <a>{{ text }}</a>
         </span>
 
@@ -105,10 +107,9 @@
           <img style="width:50px;heigth:50px" :src="record.image" />
         </span>
       </a-table>
-
     </a-card>
     <!-- 单个订单报表 抽屉 -->
-    <singleOrderReport-drawer ref="singleOrderReportDrawer" :father="aa" @ok="modalFormOk"></singleOrderReport-drawer>
+    <singleOrderReport-drawer ref="singleOrderReportDrawer" @ok="modalFormOk"></singleOrderReport-drawer>
   </div>
 </template>
 
@@ -117,6 +118,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
 import singleOrderReportDrawer from '@views/reportForms/pro-progress-report/singleOrderReportDrawer.vue'
+import { proProgressList } from '@api/reportForms/pro-progress-report.js'
 
 export default {
   name: 'ProProgressReport', // 生产进度报表
@@ -132,39 +134,38 @@ export default {
       proProgressColumns: [
         {
           title: '部门',
-          width: 120,
-          dataIndex: 'department',
+          width: 100,
+          dataIndex: 'cdepName',
           fixed: 'left',
           className: 'replacecolor'
         },
-
+        { title: '业务员', width: 90, fixed: 'left', dataIndex: 'cpersonName', className: 'replacecolor' },
         {
           title: '销售订单号',
           width: 210,
           fixed: 'left',
-          dataIndex: 'salesOrderNo',
+          dataIndex: 'csocode',
           className: 'replacecolor',
           customCell: this.showDrawer,
-          scopedSlots: { customRender: 'salesOrderNo' }
+          scopedSlots: { customRender: 'csocode' }
         },
-        { title: '业务员', width: 120, dataIndex: 'salesman', className: 'replacecolor' },
-        { title: '计划单号', width: 120, dataIndex: 'planOrderNo', className: 'replacecolor' },
+        { title: '计划单号', width: 180, dataIndex: 'planCode', className: 'replacecolor' },
         {
           title: '成衣加工厂',
           width: 120,
-          dataIndex: 'garmentFactory',
+          dataIndex: 'cdefine12',
           className: 'replacecolor'
         },
-        { title: '物料编号（多个分行显示）', width: 210, dataIndex: 'materialNum', className: 'replacecolor' },
+        { title: '物料编号（多个分行显示）', width: 210, dataIndex: 'what', className: 'replacecolor' },
         {
           title: '物料名称',
-          width: 210,
-          dataIndex: 'materialName',
+          width: 320,
+          dataIndex: 'cinvName',
           customRender: t => ellipsis(t),
           className: 'replacecolor'
         },
-        { title: '款号', width: 90, dataIndex: 'styleNum', className: 'replacecolor' },
-        { title: '颜色', width: 210, dataIndex: 'color', customRender: t => ellipsis(t), className: 'replacecolor' },
+        { title: '款号', width: 90, dataIndex: 'itemNumber', className: 'replacecolor' },
+        { title: '颜色', width: 200, dataIndex: 'color', customRender: t => ellipsis(t), className: 'replacecolor' },
         // {
         //   title: '创建时间',
         //   dataIndex: 'createTime',
@@ -174,15 +175,23 @@ export default {
         //     return moment(text).format('YYYY-MM-DD')
         //   }
         // },
-        { title: '交期', width: 120, dataIndex: 'deliveryDate', className: 'replacecolor' },
-        { title: '订单数量', width: 120, dataIndex: 'orderQuantity', className: 'replacecolor' },
-        { title: '单价(原币)', width: 120, dataIndex: 'priceOriginal', className: 'replacecolor' },
-        { title: '总额(原币)', width: 120, dataIndex: 'totalAmountOriginal', className: 'replacecolor' },
-        { title: '单价(本币)', width: 120, dataIndex: 'priceLocal', className: 'replacecolor' },
-        { title: '总额(本币)', width: 120, dataIndex: 'totalAmountLocal', className: 'replacecolor' },
-        { title: '实际发票成本', width: 120, dataIndex: 'actualInvoiceCost', className: 'replacecolor' },
-        { title: '已出库数量', width: 120, dataIndex: 'quantityDelivered', className: 'replacecolor' },
-        { title: '累计开票数量', width: 120, dataIndex: 'invoicesCumulativeNum', className: 'replacecolor' },
+        {
+          title: '交期',
+          width: 120,
+          dataIndex: 'dpreDateBT',
+          customRender: text => {
+            return moment(text).format('YYYY-MM-DD')
+          },
+          className: 'replacecolor'
+        },
+        { title: '订单数量', width: 180, dataIndex: 'iquantity', className: 'replacecolor' },
+        { title: '单价(原币)', width: 120, dataIndex: 'icostsum', className: 'replacecolor' },
+        { title: '总额(原币)', width: 120, dataIndex: 'totalSum', className: 'replacecolor' },
+        { title: '单价(本币)', width: 160, dataIndex: 'bbPrice', className: 'replacecolor' },
+        { title: '总额(本币)', width: 120, dataIndex: 'inatSum', className: 'replacecolor' },
+        { title: '实际发票成本', width: 160, dataIndex: 'itaxUnitPrice', className: 'replacecolor' },
+        { title: '已出库数量', width: 160, dataIndex: 'foutquantity', className: 'replacecolor' },
+        { title: '累计开票数量', width: 160, dataIndex: 'ikpquantity', className: 'replacecolor' },
         {
           title: '图片',
           width: 120,
@@ -193,70 +202,54 @@ export default {
         },
         { title: '附件', width: 120, dataIndex: 'accessory', fixed: 'right', className: 'replacecolor' }
       ],
-      proProgressData: [
-        {
-          department: '业务二部',
-          salesman: '陈',
-          salesOrderNo: 'SS22-71499-PH1-GY SEN',
-          materialNum: '1901000890',
-          materialName: '春夏女装印花袋鼠袋拉毛绒布带帽衫',
-          styleNum: '71499',
-          color: '浅绿green14-0114tcx',
-          deliveryDate: '2021-10-07',
-          orderQuantity: '69270',
-          priceOriginal: '2.53',
-          totalAmountOriginal: '175253.1',
-          priceLocal: '18',
-          totalAmountLocal: '1246860',
-          quantityDelivered: '69270'
-        },
-        {
-          department: '业务一部',
-          salesman: '张',
-          salesOrderNo: 'SS22-51349-PH1-GY SEN',
-          materialNum: '1902300890',
-          materialName: '裙子',
-          styleNum: '71249',
-          color: 'orange',
-          deliveryDate: '2022-04-07',
-          orderQuantity: '624570',
-          priceOriginal: '2.53',
-          totalAmountOriginal: '335253.1',
-          priceLocal: '18',
-          totalAmountLocal: '1346860',
-          quantityDelivered: '624570'
-        },
-        {},
-        {}
-      ],
+      proProgressData: [], //生产进度数据
       loading: false, // 表格加载
-
+      pagination: {
+        // total: '',
+        // current: 0,
+        // pageSize: 0
+      },
       // 查询条件
       queryParam: {
-        salesOrderNo: '', // 销售订单号
-        department: '', // 部门
-        materialName: '',
-        garmentFactory: '', // 成衣加工厂
-        salesman: '',
-        planOrderNo: '', // 计划单号
-        date: '',
+        pageNo: '',
+        csocode: '', // 销售订单号
+        cdepName: '', // 部门
+        cinvName: '',
+        cdefine12: '', // 成衣加工厂
+        cpersonName: '',
+        planCode: '', // 计划单号
+        dDate: '',
         color: '',
-        deliveryDate: '' // 交期
+        dPreDateBT: '' // 交期
       }
     }
   },
   created() {
-    // 渲染订单销售列表
+    this.getproProgressList()
   },
   methods: {
+    getproProgressList() {
+      this.$nextTick(() => {
+        proProgressList(this.queryParam).then(res => {
+          if (res.success) {
+            this.proProgressData = res.result.records
+            console.log('生产进度列表页', this.proProgressData)
+            this.pagination = {
+              total: res.result.total,
+              current: res.result.current,
+              pageSize: res.result.size
+            }
+          }
+        })
+      })
+    },
     // 查询
     searchQuery() {
-      // 渲染订单销售列表
+      this.getproProgressList()
     },
     searchReset() {
-      // console.log('>>>>重置')
       this.queryParam = {}
-      // 重新渲染生产进度表报
+      this.getproProgressList()
     },
 
     // 【销售订单号】 抽屉
@@ -271,15 +264,17 @@ export default {
       }
     },
 
-    // father
-    aa() {}
-
-    // 分页、排序、筛选变化时触发
-    // handleTableChange(pagination, filters, sorter) {
-    //   // console.log('当前页信息>>>>',pagination)
-    //   this.queryParam.pageNo = pagination.current
-    //   // this.getOrderList()
-    // }
+    // 分页变化时触发
+    handleTableChange(pagination, filters, sorter) {
+      // console.log('分页器信息', pagination)
+      if (Object.keys(sorter).length > 0) {
+        this.isorter.column = sorter.field
+        this.isorter.order = sorter.order == 'ascend' ? 'asc' : 'desc'
+      }
+      console.log('sorter', sorter)
+      this.queryParam.pageNo = pagination.current
+      this.getproProgressList()
+    }
   },
   computed: {},
   mounted() {}