报表【生产进度报表】查询接口调用+详情字段

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

@@ -4,5 +4,10 @@ import { getAction, postAction, deleteAction, putAction } from '@/api/manage'
 // 分页列表查询
 const proProgressList = params => getAction('/productionScheduleReport/productionSchedule/list', params)
 
+// 销售订单详情
+// const salesOrder = params => getAction('', params)
+
 // 获取图片
-export { proProgressList }
+const getImg = params => getAction('/productionScheduleReport/productionSchedule/selectPicture', params)
+
+export { proProgressList, getImg }

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

@@ -1,16 +1,16 @@
-cDepName 部门
+cdepName 部门
 
-cPersonName 业务员
+cpersonName 业务员
 
-cSOCode 销售订单号
+csocode 销售订单号
 
 planCode 计划单号
 
-cCusName 客户
+cCusName 客户 (暂未使用到)
 
-cDefine12 成衣加工厂
+cdefine12 成衣加工厂
 
-cInvCode 存货编码
+cInvCode 存货编码 (暂未使用到)
 
 cInvName 存货名称
 
@@ -18,11 +18,11 @@ itemNumber 款号
 
 color 颜色
 
-dPreDateBT 交期
+dpreDateBT 交期
 
 dDate 订单日期
 
-iQuantity 订单数量
+iquantity 订单数量
 
 iTaxUnitPrice 原币含税单价
 

src/views/order/orderList.vue

@@ -106,7 +106,7 @@ export default {
   components: { JEllipsis, moment, OrderDetailDrawer },
 
   data() {
-    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} /> // 省略
+    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
     // sorter: true, table表头排序
     return {
       // 表头
@@ -118,7 +118,6 @@ export default {
           fixed: 'left',
           className: 'replacecolor',
           align: 'left',
-          // customRender: t => ellipsis(t),
           customCell: this.showDrawer,
           scopedSlots: { customRender: 'orderNumber' }
         },
@@ -208,7 +207,7 @@ export default {
     this.getOrderList()
   },
   methods: {
-    // 订单数据查询
+    // 分页查询
     getOrderList() {
       this.$nextTick(() => {
         orderList(this.queryParam).then(res => {
@@ -225,18 +224,6 @@ export default {
       })
     },
 
-    // 查询按钮
-    searchQuery() {
-      this.getOrderList()
-      console.log('发货状态', this.queryParam.dilivery)
-    },
-
-    searchReset() {
-      // console.log('>>>>重置')
-      this.queryParam = {}
-      this.getOrderList()
-    },
-
     // 【订单号】 抽屉
     showDrawer(record) {
       return {
@@ -247,16 +234,25 @@ export default {
             this.$refs.orderDetailDrawer.record = record
             this.$refs.orderDetailDrawer.getOrderChild()
             console.log('---', this.$refs.orderDetailDrawer.record)
-            console.log('打开订单详情')
-            this.$refs.orderDetailDrawer.orderDetail = record
+            this.$refs.orderDetailDrawer.orderDetail = record//详情页主表赋值
           }
         }
       }
     },
+    // 查询按钮
+    searchQuery() {
+      this.getOrderList()
+      console.log('发货状态', this.queryParam.dilivery)
+    },
+
+    searchReset() {
+      // console.log('>>>>重置')
+      this.queryParam = {}
+      this.getOrderList()
+    },
 
     // 查询条件 订单日期转换成字符串并赋值
     onDateChange(value, dateString) {
-      // console.log('订单日期', dateString)
       this.queryParam.orderDate = dateString
     },
     // 同步

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

@@ -8,38 +8,32 @@
           <a-row :gutter="24">
             <a-col :md="6" :sm="8">
               <a-form-item label="销售订单号">
-                <a-input placeholder="请输入订单号" v-model="queryParam.csocode"></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.cdepName"></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.cinvName"></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-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-input placeholder="请输入物料名称" v-model="queryParam.CDefine12"></a-input>
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="业务员">
-                  <a-input placeholder="请输入业务员" v-model="queryParam.cpersonName"></a-input>
+                  <a-input placeholder="请输入业务员" v-model="queryParam.CPersonName"></a-input>
                 </a-form-item>
               </a-col>
 
@@ -51,7 +45,13 @@
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="订单日期" has-feedback>
-                  <a-date-picker style="width: 100%" v-model="queryParam.dDate"></a-date-picker>
+                  <a-date-picker
+                    style="width: 100%"
+                    format="YYYY-MM-DD"
+                    placeholder="请选择订单日期"
+                    v-model="queryParam.DDate"
+                    @change="onDateChange"
+                  ></a-date-picker>
                 </a-form-item>
               </a-col>
 
@@ -63,7 +63,13 @@
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="交期" has-feedback>
-                  <a-date-picker style="width: 100%" v-model="queryParam.dPreDateBT"></a-date-picker>
+                  <a-date-picker
+                    style="width: 100%"
+                    format="YYYY-MM-DD"
+                    placeholder="请选择交期"
+                    @change="onDateChange"
+                    v-model="queryParam.DPreDateBT"
+                  ></a-date-picker>
                 </a-form-item>
               </a-col>
             </template>
@@ -97,19 +103,19 @@
         @change="handleTableChange"
       >
         <!-- 销售订单号  链接-->
-        
         <span slot="csocode" slot-scope="text">
           <a>{{ text }}</a>
         </span>
 
-        <!-- 图片 -->
-        <span slot="imageslot" slot-scope="text, record">
-          <img style="width:50px;heigth:50px" :src="record.image" />
+        <!-- 图片 弹框-->
+        <span slot="imageslot">
+          <a>查看</a>
+          <!-- <img style="width:50px;heigth:50px" :src="record.image" /> -->
         </span>
       </a-table>
     </a-card>
     <!-- 单个订单报表 抽屉 -->
-    <singleOrderReport-drawer ref="singleOrderReportDrawer" @ok="modalFormOk"></singleOrderReport-drawer>
+    <salesOrderDetails-drawer ref="salesOrderDetailsDrawer" @ok="modalFormOk"></salesOrderDetails-drawer>
   </div>
 </template>
 
@@ -117,46 +123,50 @@
 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'
+
+import salesOrderDetailsDrawer from '@views/reportForms/pro-progress-report/salesOrderDetailsDrawer.vue'
+
+import { proProgressList, getImg } from '@api/reportForms/pro-progress-report.js'
 
 export default {
   name: 'ProProgressReport', // 生产进度报表
   mixins: [JeecgListMixin],
-  components: { JEllipsis, moment, singleOrderReportDrawer },
+  components: { JEllipsis, moment, salesOrderDetailsDrawer },
 
   data() {
-    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} /> // 省略
+    let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
 
     return {
       description: '生产进度报表',
       // 表头
       proProgressColumns: [
-        {
-          title: '部门',
-          width: 100,
-          dataIndex: 'cdepName',
-          fixed: 'left',
-          className: 'replacecolor'
-        },
-        { title: '业务员', width: 90, fixed: 'left', dataIndex: 'cpersonName', className: 'replacecolor' },
         {
           title: '销售订单号',
           width: 210,
           fixed: 'left',
+          align: 'left',
           dataIndex: 'csocode',
           className: 'replacecolor',
           customCell: this.showDrawer,
           scopedSlots: { customRender: 'csocode' }
         },
-        { title: '计划单号', width: 180, dataIndex: 'planCode', className: 'replacecolor' },
+        {
+          title: '部门',
+          width: 100,
+          dataIndex: 'cdepName',
+          fixed: 'left',
+          className: 'replacecolor'
+        },
+        { title: '业务员', width: 90, fixed: 'left', dataIndex: 'cpersonName', className: 'replacecolor' },
+
+        { title: '计划单号', width: 280, dataIndex: 'planCode', className: 'replacecolor' },
         {
           title: '成衣加工厂',
-          width: 120,
+          width: 220,
           dataIndex: 'cdefine12',
           className: 'replacecolor'
         },
-        { title: '物料编号（多个分行显示）', width: 210, dataIndex: 'what', className: 'replacecolor' },
+        { title: '物料编号（多个分行显示）', width: 220, dataIndex: 'what', className: 'replacecolor' },
         {
           title: '物料名称',
           width: 320,
@@ -164,7 +174,7 @@ export default {
           customRender: t => ellipsis(t),
           className: 'replacecolor'
         },
-        { title: '款号', width: 90, dataIndex: 'itemNumber', className: 'replacecolor' },
+        { title: '款号', width: 100, dataIndex: 'itemNumber', className: 'replacecolor' },
         { title: '颜色', width: 200, dataIndex: 'color', customRender: t => ellipsis(t), className: 'replacecolor' },
         // {
         //   title: '创建时间',
@@ -194,11 +204,12 @@ export default {
         { title: '累计开票数量', width: 160, dataIndex: 'ikpquantity', className: 'replacecolor' },
         {
           title: '图片',
-          width: 120,
+          width: 90,
           dataIndex: 'image',
-          scopedSlots: { customRender: 'imageslot' },
+          customCell: this.picShow,
           fixed: 'right',
-          className: 'replacecolor'
+          className: 'replacecolor',
+          scopedSlots: { customRender: 'imageslot' }
         },
         { title: '附件', width: 120, dataIndex: 'accessory', fixed: 'right', className: 'replacecolor' }
       ],
@@ -228,6 +239,7 @@ export default {
     this.getproProgressList()
   },
   methods: {
+    // 分页查询 生产进度列表
     getproProgressList() {
       this.$nextTick(() => {
         proProgressList(this.queryParam).then(res => {
@@ -243,41 +255,59 @@ export default {
         })
       })
     },
-    // 查询
-    searchQuery() {
-      this.getproProgressList()
-    },
-    searchReset() {
-      this.queryParam = {}
-      this.getproProgressList()
-    },
-
     // 【销售订单号】 抽屉
     showDrawer(record) {
       return {
         on: {
           click: event => {
-            console.log('点击了【销售订单号】--【单个订单报表】')
-            this.$refs.singleOrderReportDrawer.visible = true
+            console.log('点击的【销售订单号】', record)
+            this.$refs.salesOrderDetailsDrawer.visible = true
+            console.log('此处只打开抽屉,方法在抽屉页面')
+          }
+        }
+      }
+    },
+
+    // 图片 查看
+    picShow(record) {
+      return {
+        on: {
+          click: event => {
+            console.log('【查看】的图片ID', record.pictureId)
+            this.$nextTick(() => {
+              getImg({ pictureId: record.pictureId }).then(res => {
+                if (res.success) {
+                  console.log('图片返回结果', res.result)
+                }
+              })
+            })
+
+            // this.$refs.salesOrderDetails.visible = true
           }
         }
       }
     },
+    // 查询
+    searchQuery() {
+      this.getproProgressList()
+    },
+    searchReset() {
+      this.queryParam = {}
+      this.getproProgressList()
+    },
 
     // 分页变化时触发
     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()
+    },
+    // 查询条件 订单日期转换成字符串并赋值
+    onDateChange(value, dateString) {
+      this.queryParam.dDate = dateString
+      this.queryParam.DPreDateBT = dateString
     }
-  },
-  computed: {},
-  mounted() {}
+  }
 }
 </script>
 <style lang="less" scoped>

src/views/reportForms/pro-progress-report/singleOrderReportDrawer.vue → src/views/reportForms/pro-progress-report/salesOrderDetailsDrawer.vue

@@ -1,13 +1,7 @@
 <template>
-  <!-- 订单报表详情-----点击【销售订单号】后 -->
-  <div id="singleOrderReportDrawer">
-    <a-drawer
-      title="订单报表详情"
-      width="89%"
-      placement="right"
-      :closable="true"
-      :visible="visible"
-      @close="onClose">
+  <!-- 销售订单详情-----点击【销售订单号】 -->
+  <div id="salesOrderDetailsDrawer">
+    <a-drawer title="销售订单详情" width="89%" placement="right" :closable="true" :visible="visible" @close="onClose">
       <!-- 主表 展示 -->
       <a-card :bordered="true">
         <div class="table-page-search-wrapper">
@@ -15,124 +9,105 @@
             <a-row :gutter="24">
               <a-col :md="6" :sm="8">
                 <a-form-item label="部门">
-                  业务二部
-                  <!-- <a-input v-model="singleOrder.department"></a-input> -->
+                  {{ salesOrderDetails.cdepName }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="业务员">
-                  业务员1
-                  <!-- <a-input v-model="singleOrder.salesman"></a-input> -->
+                  {{ salesOrderDetails.cpersonName }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="客户">
-                  客户1
-                  <!-- <a-input v-model="singleOrder.customer"></a-input> -->
+                  {{ salesOrderDetails.cCusName }}
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="8">
                 <a-form-item label="物料编号">
-                  物料编号763dz9
-                  <!-- <a-input v-model="singleOrder.materialNum"></a-input> -->
+                  {{ salesOrderDetails.todo }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="物料名称">
-                  4.5CM黑色橡胶丝进口橡筋
-                  <!-- <a-input v-model="singleOrder.materialName"></a-input> -->
+                  {{ salesOrderDetails.CInvName }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="款号">
-                  AW3572833
-                  <!-- <a-input v-model="singleOrder.styleNum"></a-input> -->
+                  {{ salesOrderDetails.itemNumber }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="颜色">
-                  65#碳麻灰
-                  <!-- <a-input v-model="singleOrder.color"></a-input> -->
+                  {{ salesOrderDetails.color }}
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="8">
                 <a-form-item label="交期">
-                  2022-04-11
-                  <!-- <a-date-picker style="width: 100%" v-model="queryParam.deliveryDate"></a-date-picker> -->
-                  <!-- <a-input v-model="singleOrder.deliveryDate"></a-input> -->
+                  {{ salesOrderDetails.dpreDateBT }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="订单数量">
-                  8765
-                  <!-- <a-input v-model="singleOrder.orderQuantity"></a-input> -->
+                  {{ salesOrderDetails.iquantity }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="单价(原币)">
-                  88.80
-                  <!-- <a-input v-model="singleOrder.priceOriginal"></a-input> -->
+                  {{ salesOrderDetails.icostsum }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="总额(原币)">
-                  274364,283
-                  <!-- <a-input v-model="singleOrder.totalAmountOriginal"></a-input> -->
+                  {{ salesOrderDetails.totalSum }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="单价(本币)">
-                  76.89
-                  <!-- <a-input v-model="singleOrder.priceLocal"></a-input> -->
+                  {{ salesOrderDetails.bbPrice }}
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="8">
                 <a-form-item label="总额(本币)">
-                  9998,8990
-                  <!-- <a-input v-model="singleOrder.totalAmountLocal"></a-input> -->
+                  {{ salesOrderDetails.iNatSum }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="单件成本(本币)">
-                  67.88
-                  <!-- <a-input v-model="singleOrder.UnitCostLocal"></a-input> -->
+                  {{ salesOrderDetails.todo2 }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="已出库数量">
-                  77689
-                  <!-- <a-input v-model="singleOrder.quantityDelivered"></a-input> -->
+                  {{ salesOrderDetails.foutquantity }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="累计开票数量">
-                  25374
-                  <!-- <a-input v-model="singleOrder.invoicesCumulativeNum"></a-input> -->
+                  {{ salesOrderDetails.iKPQuantity }}
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="8">
                 <a-form-item label="计划单号">
-                  FR546
-                  <!-- <a-input v-model="singleOrder.planOrderNo"></a-input> -->
+                  {{ salesOrderDetails.planCode }}
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="业务填写">
-                  业务填写test
-                  <!-- <a-input v-model="singleOrder.businessFill"></a-input> -->
+                  {{ salesOrderDetails.todo3 }}
                 </a-form-item>
               </a-col>
             </a-row>
@@ -242,7 +217,7 @@
     </a-drawer>
 
     <!-- 点击【物料编号】----出入库详细数据 抽屉 -->
-    <outInDetailData-drawer ref="outInDetailDataDrawer" :father="aa" @ok="modalFormOk"></outInDetailData-drawer>
+    <outInDetailData-drawer ref="outInDetailDataDrawer" @ok="modalFormOk"></outInDetailData-drawer>
   </div>
 </template>
 
@@ -251,19 +226,19 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
 
+// import { } from '@api/reportForms/pro-progress-report.js'
+
 import outInDetailDataDrawer from '@views/reportForms/pro-progress-report/outInDetailDataDrawer.vue'
 
 export default {
-  name: 'SingleOrderReportDrawer', // 订单报表详情
+  name: 'salesOrderDetailsDrawer', // 销售订单详情
   mixins: [JeecgListMixin],
   components: { JEllipsis, moment, outInDetailDataDrawer },
   data() {
     return {
-      description: '单个订单报表抽屉 页面',
       loading: false, // 表格加载
       visible: false, // 单个订单报表 抽屉
-
-      singleOrder: [], // 主表信息
+      salesOrderDetails: [], // 主表信息
 
       // 物料卡 查询条件
       queryParam: {
@@ -392,39 +367,46 @@ export default {
       materialCardData: [{}, {}]
     }
   },
-  created() {},
+  created() {
+    this.getDetails()
+  },
   methods: {
+    // 获取详情
+    getDetails() {
+      this.$nextTick(() => {
+        salesOrder().then(res => {
+          if (res.success) {
+            console.log('详情页获取结果', res.result)
+            this.salesOrderDetails = res.result.record //主表信息
+          }
+        })
+      })
+    },
+
     // 采购、委外 【物料编号】 抽屉--打开【出入库详细数据】
     materialNumCustomCell(record) {
       return {
         on: {
           click: event => {
-            // console.log('this:', this)
-            // console.log('event:', event)
-            console.log('点击了【物料编号】--【出入库详细数据】')
+            console.log('点击了【物料编号】--【出入库详细数据】', record)
             this.$refs.outInDetailDataDrawer.visible = true
           }
         }
       }
     },
-    // 查询按钮
+
+    // 物料卡----查询按钮
     searchQuery() {
       // 渲染订单销售列表
     },
     searchReset() {
-      // console.log('>>>>重置')
       this.queryParam = {}
     },
     // 关闭抽屉
     onClose() {
       this.visible = false
-    },
-
-    // 出入库详细数据 抽屉father
-    aa() {}
-  },
-  computed: {},
-  mounted() {}
+    }
+  }
 }
 </script>
 <style lang="less" scoped>