字段文档补充 + 前后端字段名称统一

field/document/order.md

@@ -1,55 +1,57 @@
 #### 单证【订单数据】查询页面
 
-order_number, 订单号
-order_date, 订单日期
-business_type_value, 业务类型
-customer_order_number, 客户订单
-sales_type_value, 销售类型
-customer_abbreviation, 客户简称
-customer_name, 客户名称
+## 查询接口位置：订单主表-分页列表查询
+orderNumber, 订单号
+orderDate, 订单日期
+businessTypeValue, 业务类型
+customerOrderNumber, 客户订单
+salesTypeValue, 销售类型
+customerAbbreviation, 客户简称
+customerName, 客户名称
 supplier, 供应商
-
-exchange_rate, 汇率
-whole_order_total, 整单合计
-sales_department, 销售部门
+exchangeRate, 汇率
+wholeOrderTotal, 整单合计
+salesDepartment, 销售部门
 salesman, 业务员
-currency_value, 币种
-brand_side, 品牌方
-third_party, 第三方
-deposit_ratio, 定金比例
+currencyValue, 币种
+brandSide, 品牌方
+thirdParty, 第三方
+depositRatio, 定金比例
 deposit, 定金
-collaborative_route, 协同路线
-term_of_payment, 付款条件
-end_customer, 最终客户
-order_remarks, 订单备注
-price_remarks, 价格备注
-order_change_description 订单变更说明
-account, 账套
+collaborativeRoute, 协同路线
+termOfPayment, 付款条件
+endCustomer, 最终客户
+orderRemarks, 订单备注
+priceRemarks, 价格备注
+orderChangeDescription 订单变更说明
+account 账套
+customerOrderNumber 客户订单号
+
 
-查询接口：订单主表-分页列表查询
 
 #### 详情页 子表字段，主表字段同上
+## 接口位置：订单子表信息-分页列表查询
 
-item_number 款号
-pre_delivery_date 预发货日期
-pre_completion_date 预完工日期
-pack_id
-small_po 小 po
-distribution_point 分销点
-inventory_code 存货编码
-inventory_name 存货名称
-specification_and_model 规格型号
+itemNumber 款号
+preDeliveryDate 预发货日期
+preCompletionDate 预完工日期
+packId
+smallPo 小 po
+distributionPoint 分销点
+inventoryCode 存货编码
+inventoryName 存货名称
+specificationAndModel 规格型号
 colour 颜色
 size 尺码
-coding_rules 配码规则
-guangpei_gate_width 光坯毛门幅 CM
-box_number 箱数
+codingRules 配码规则
+guangpeiGateWidth 光坯毛门幅 CM
+boxNumber 箱数
 quantity 数量
-master_metering 主计量
-unit_price_including_tax 含税单价
-total_price_and_tax 价税合计
-tax_rate 税率（%）
+masterMetering 主计量
+unitPriceIncludingTax 含税单价
+totalPriceAndTax 价税合计
+taxRate 税率（%）
 remarks 备注
-bank_closed_by 行关闭人
+bankClosedBy 行关闭人
+
 
-接口：订单子表信息-分页列表查询

field/document/orderData.md

@@ -1,4 +1,4 @@
-#### 参照订单主表字段
+#### 【发运明细】中参照订单主表字段
 
 `id` '主键 id',
 `orderNumber` '订单号',

field/document/shipmentDetail.md

@@ -86,18 +86,18 @@ chineseName '中文品名',
 englishName '英文品名',
 garmentFactory '成衣工厂',
 
-#### 格式：
 
-{
-"documentNo":"001",
-"preDeliveryDate":"2020-02-02",
+#### 申报要素 弹框
 
-"syShippingDetailsItemList":[
-{
-"chineseName":"值",
-"declarationElements":"asda"
-}
-]
+## 主表
+hsCode   HSCODE
 
-}
+englishProductName  英文品名
 
+declarationName 报关品名
+
+## 子表 
+
+typeValue  类型
+
+describeText 描述

src/views/advance-packingList/adPaList-clothes.vue

@@ -146,19 +146,14 @@ export default {
           fixed: 'left',
           className: 'replacecolor'
         },
-        //         {
-        //   title: '创建时间',
-        //   dataIndex: 'createTime',
-        //   align: 'center',
-        //   sorter: true,
-        //   customRender: text => {
-        //     return moment(text).format('YYYY-MM-DD')
-        //   }
-        // },
+
         {
           title: '预发货日期',
           dataIndex: 'scheduledShipDate',
           width: 120,
+          customRender: text => {
+            return moment(text).format('YYYY-MM-DD')
+          },
           className: 'replacecolor'
         },
         {

src/views/advance-packingList/editAdpackingDrawer.vue

@@ -97,65 +97,65 @@
               :scroll="{ x: 1500 }"
               @change="handleTableChange"
             >
-              <!-- 结束箱号 输入框-->
+              <!-- 结束箱号 输入框 required :rules="rules.styleNum"-->
               <template slot="endBoxNo" slot-scope="text, record, index">
-                <a-form-model-item prop="endBoxNo" :rules="rules.styleNum" required>
+                <a-form-model-item prop="endBoxNo">
                   <a-input style="width:100%" type="text" v-model="record.endBoxNo" />
                 </a-form-model-item>
               </template>
 
               <!-- 颜色（中英文） -->
               <template slot="colorChUsa" slot-scope="text, record, index">
-                <a-form-model-item prop="colorChUsa" :rules="rules.styleNum" required>
+                <a-form-model-item prop="colorChUsa">
                   <a-input style="width:100%" type="text" v-model="record.colorChUsa" />
                 </a-form-model-item>
               </template>
 
               <!-- 箱数 -->
               <template slot="boxes" slot-scope="text, record, index">
-                <a-form-model-item prop="boxes" :rules="rules.styleNum" required>
+                <a-form-model-item prop="boxes">
                   <a-input style="width:100%" type="text" v-model="record.boxes" />
                 </a-form-model-item>
               </template>
 
               <!-- 总件数 -->
               <template slot="totalPackagesNum" slot-scope="text, record, index">
-                <a-form-model-item prop="totalPackagesNum" :rules="rules.styleNum" required>
+                <a-form-model-item prop="totalPackagesNum">
                   <a-input style="width:100%" type="text" v-model="record.totalPackagesNum" />
                 </a-form-model-item>
               </template>
 
               <!-- 总净重 -->
               <template slot="totalSuttle" slot-scope="text, record, index">
-                <a-form-model-item prop="totalSuttle" :rules="rules.styleNum" required>
+                <a-form-model-item prop="totalSuttle">
                   <a-input style="width:100%" type="text" v-model="record.totalSuttle" />
                 </a-form-model-item>
               </template>
 
               <!-- 总毛重 -->
               <template slot="totalRoughWeigh" slot-scope="text, record, index">
-                <a-form-model-item prop="totalRoughWeigh" :rules="rules.styleNum" required>
+                <a-form-model-item prop="totalRoughWeigh">
                   <a-input style="width:100%" type="text" v-model="record.totalRoughWeigh" />
                 </a-form-model-item>
               </template>
 
               <!-- 外箱宽度 -->
               <template slot="boxWidth" slot-scope="text, record, index">
-                <a-form-model-item prop="boxWidth" :rules="rules.styleNum" required>
+                <a-form-model-item prop="boxWidth">
                   <a-input style="width:100%" type="text" v-model="record.boxWidth" />
                 </a-form-model-item>
               </template>
 
               <!-- 外箱高度 -->
               <template slot="boxHeight" slot-scope="text, record, index">
-                <a-form-model-item prop="boxHeight" :rules="rules.styleNum" required>
+                <a-form-model-item prop="boxHeight">
                   <a-input style="width:100%" type="text" v-model="record.boxHeight" />
                 </a-form-model-item>
               </template>
 
               <!-- 总体积 -->
               <template slot="totalVolume" slot-scope="text, record, index">
-                <a-form-model-item prop="totalVolume" :rules="rules.styleNum" required>
+                <a-form-model-item prop="totalVolume">
                   <a-input style="width:100%" type="text" v-model="record.totalVolume" />
                 </a-form-model-item>
               </template>
@@ -458,12 +458,12 @@ export default {
       data: [{}, {}, {}, {}, {}],
       loading: false, // 表格加载
       visible: false,
-      validatorRules: {
-        orderNum: [{ required: true, message: '订单号不能为空', trigger: 'blur' }],
-        styleNum: [{ required: true, message: '款号不能为空', trigger: 'blur' }],
-        name: [{ required: true, message: '品名不能为空', trigger: 'blur' }]
-        // 待确定还有哪些必填信息
-      },
+      // validatorRules: {
+      //   orderNum: [{ required: true, message: '订单号不能为空', trigger: 'blur' }],
+      //   styleNum: [{ required: true, message: '款号不能为空', trigger: 'blur' }],
+      //   name: [{ required: true, message: '品名不能为空', trigger: 'blur' }]
+      //   // 待确定还有哪些必填信息
+      // },
       addAdpacking: {},
       confirmLoading: false
     }

src/views/reportForms/supply-capacity-table.vue

@@ -8,7 +8,7 @@
           <a-row :gutter="24">
             <a-col :md="6" :sm="8">
               <a-form-item label="订单号">
-                <a-input placeholder="请输入订单号" v-model="queryParam.orderNum"></a-input>
+                <a-input placeholder="请输入订单号" v-model="queryParam.csrccode"></a-input>
               </a-form-item>
             </a-col>
 
@@ -37,7 +37,7 @@
             <template v-if="toggleSearchStatus">
               <a-col :md="6" :sm="8">
                 <a-form-item label="订单类型">
-                  <a-select placeholder="请选择订单类型" v-model="queryParam.orderType">
+                  <a-select placeholder="请选择订单类型" v-model="queryParam.iOrderType">
                     <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>
@@ -48,13 +48,13 @@
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="供应商">
-                  <a-input placeholder="请输入供应商" v-model="queryParam.supplier"></a-input>
+                  <a-input placeholder="请输入供应商" v-model="queryParam.cVenCode"></a-input>
                 </a-form-item>
               </a-col>
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="计划单号">
-                  <a-input placeholder="请输入计划单号" v-model="queryParam.planNum"></a-input>
+                  <a-input placeholder="请输入计划单号" v-model="queryParam.cPlanLotNumber"></a-input>
                 </a-form-item>
               </a-col>
             </template>
@@ -102,6 +102,8 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
 
+import { supplyCapList } from '@api/reportForms/supply-capacity-table'
+
 export default {
   name: 'SupplyCapacityTable', // 供应商产能报表
   mixins: [JeecgListMixin],
@@ -115,19 +117,19 @@ export default {
         {
           title: '订单号',
           width: 120,
-          dataIndex: 'orderNum',
+          dataIndex: 'csrccode',
           className: 'replacecolor'
         },
 
         {
           title: '计划单号',
           width: 120,
-          dataIndex: 'planNum',
+          dataIndex: 'cPlanLotNumber',
           className: 'replacecolor'
         },
-        { title: '部门', width: 120, dataIndex: 'department', className: 'replacecolor' },
-        { title: '业务员', width: 120, dataIndex: 'salesman', className: 'replacecolor' },
-        { title: '供应商', width: 120, dataIndex: 'supplier', className: 'replacecolor' },
+        { title: '部门', width: 120, dataIndex: 'cDepCode', className: 'replacecolor' },
+        { title: '业务员', width: 120, dataIndex: 'cPersonCode', className: 'replacecolor' },
+        { title: '供应商', width: 120, dataIndex: 'cVenCode', className: 'replacecolor' },
         // customRender: function(text) {
         //   if (text == '1') {
         //     return '销售类型1'
@@ -142,55 +144,74 @@ export default {
         //     return '销售类型4'
         //   }
         // }
-        { title: '供应商类型', width: 120, dataIndex: 'supplierType', className: 'replacecolor' },
-        { title: '订单类型', width: 120, dataIndex: 'orderType', className: 'replacecolor' },
+        { title: '供应商类型', width: 120, dataIndex: 'cVenCodeType', className: 'replacecolor' },
+        { title: '订单类型', width: 120, dataIndex: 'iOrderType', className: 'replacecolor' },
         {
           title: '数量',
           width: 120,
-          dataIndex: 'quantity',
+          dataIndex: 'iQuantity',
           className: 'replacecolor'
         },
-        { title: '累计入库数量', width: 120, dataIndex: 'accumulativeInQuantity', className: 'replacecolor' },
+        { title: '累计入库数量', width: 120, dataIndex: 'iReceivedQTY', className: 'replacecolor' },
         { title: '单位', width: 100, dataIndex: 'unit', className: 'replacecolor' },
         {
           title: '计划到货月份',
           width: 120,
-          dataIndex: 'planDeliveryMonth',
-          customRender: text => {
-            return moment(text).format('YYYY-MM')
-          },
+          dataIndex: 'arriveMonth',
+          // customRender: text => {
+          //   return moment(text).format('YYYY-MM')
+          // },
           className: 'replacecolor'
         },
         {
           title: '计划到货日期',
           width: 120,
           dataIndex: 'planDeliveryData',
-          customRender: text => {
-            return moment(text).format('YYYY-MM-DD')
-          },
+          // customRender: text => {
+          //   return moment(text).format('YYYY-MM-DD')
+          // },
           className: 'replacecolor'
         },
         { title: '系数', width: 100, dataIndex: 'coefficient', className: 'replacecolor' }
       ],
-      supplyCapacityData: [{ orderNum: '3749505' }],
+      supplyCapacityData: [],
       loading: false, // 表格加载
       // 查询条件
       queryParam: {
-        orderNum: '',
+        csrccode: '',
         startDate: '',
         endDate: '',
-        orderType: '',
-        supplier: '',
-        planNum: ''
-      }
-      // dateFormat: 'YYYY-MM-DD'
+        iOrderType: '',
+        cVenCode: '',
+        cPlanLotNumber: '',
+        pageNo: '', // 当前页
+        pageSize: '-1' // 页面大小
+      },
+      // 分页
+      pagination: {
+        total: '',
+        current: 0,
+        pageSize: 0
+      },
+      dateFormat: 'YYYY-MM-DD'
     }
   },
   created() {
-    // 渲染供应链产能报表
+    this.getSupplyCapList() // 渲染供应链产能报表
   },
 
   methods: {
+    // 供应商产能数据
+    getSupplyCapList() {
+      this.$nextTick(() => {
+        supplyCapList(this.queryParam).then(res => {
+          if (res.success) {
+            console.log('查询结果:', res.result)
+            this.supplyCapacityData = res.result
+          }
+        })
+      })
+    },
     // 月份供应链合计导出
     monthlySupplyExport() {},
     // 月份部门合计导出
@@ -198,11 +219,12 @@ export default {
 
     // 查询按钮
     searchQuery() {
-      // 渲染染损列表
+      this.getSupplyCapList()
     },
     searchReset() {
       // console.log('>>>>重置')
       this.queryParam = {}
+      this.getSupplyCapList()
     }
   },
   computed: {},