mrp运算-页面字段修改

src/views/production/mrp/modules/MRPEdit.vue

@@ -18,12 +18,12 @@
                 <a-row :gutter="24">
                     <a-col :md="4" :sm="24">
                         <a-form-item label="生产组织">
-                            <a-input-search placeholder="请输入" v-model="form.productionOrg" @search="onSearchPlanOrg" readOnly ></a-input-search>
+                            <a-input-search placeholder="请输入" v-model="form.orgName" @search="onSearchPlanOrg" readOnly ></a-input-search>
                         </a-form-item>
                     </a-col>
-                    <a-col :md="4" :sm="24">
-                        <a-form-item label="项目">
-                            <a-input-search placeholder="请输入" v-model="form.projectName" @search="onSearchProject" readOnly ></a-input-search>
+                    <a-col  :md="4" :sm="24">
+                        <a-form-item label="单据号">
+                            <a-input placeholder="请输入" v-model="form.orderCode" disabled></a-input>
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
@@ -31,10 +31,9 @@
                             <a-date-picker showTime valueFormat="YYYY-MM-DD" format = "YYYY-MM-DD" v-model="form.orderDate" style="width:100%" />
                         </a-form-item>
                     </a-col>
-                    
-                    <a-col  :md="4" :sm="24">
-                        <a-form-item label="单据号">
-                            <a-input placeholder="请输入" v-model="form.orderCode" ></a-input>
+                    <a-col :md="4" :sm="24">
+                        <a-form-item label="单据状态">
+                            <a-input placeholder="请输入" v-model="form.state"  disabled></a-input>
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
@@ -48,18 +47,15 @@
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
-                        <a-form-item label="单据状态">
-                            <a-select v-model="form.state"  style='width:100%' disabled>
-                                <a-select-option value='自由'> 自由</a-select-option>
-                                <a-select-option value='已批准'> 已批准</a-select-option>
-                            </a-select>
+                        <a-form-item label="项目名称">
+                            <a-input-search placeholder="请输入" v-model="form.projectName" @search="onSearchProject" readOnly ></a-input-search>
                         </a-form-item>
-                    </a-col>
+                    </a-col>  
                     <a-col :md="4" :sm="24">
-                        <a-form-item label="备注">
-                            <a-input-search placeholder="请输入" v-model="form.remarks"  @search="onSearch" ></a-input-search>
+                        <a-form-item label="项目编码">
+                            <a-input placeholder="请输入" v-model="form.projectCode" disabled></a-input>
                         </a-form-item>
-                    </a-col>
+                    </a-col>  
                     <a-col :md="4" :sm="24">
                         <a-form-item label="业务类型">
                             <a-select v-model="form.type"  style='width:100%'  @change="changeType">
@@ -67,12 +63,27 @@
                                 <a-select-option value='家装'> 家装</a-select-option>
                             </a-select>
                         </a-form-item>
+                    </a-col>                   
+                    <a-col :md="4" :sm="24">
+                        <a-form-model-item label="制单人">
+                            <a-input placeholder="请输入" v-model="form.createBy"  disabled></a-input>
+                        </a-form-model-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
-                        <a-form-item label="工单号">
-                            <a-input placeholder="请输入" v-model="form.workNo"  ></a-input>
-                        </a-form-item>
+                        <a-form-model-item label="审核人">
+                            <a-input placeholder="请输入" v-model="form.reviewer" disabled></a-input>
+                        </a-form-model-item>
                     </a-col>
+                    <a-col :md="4" :sm="24">
+                        <a-form-model-item label="工单号" prop='workNo'>
+                            <a-input placeholder="请输入" v-model="form.workNo" ></a-input>
+                        </a-form-model-item>
+                    </a-col>
+                    <a-col :md="4" :sm="24">
+                        <a-form-model-item label="备注">
+                            <a-input placeholder="请输入" v-model="form.remarks"></a-input>
+                        </a-form-model-item>
+                    </a-col>  
                 </a-row>
             </a-form>
         </div>
@@ -102,34 +113,6 @@
         </a-tabs>
        
     </a-card>
-    <a-card :bordered="false" class="bottom" style="margin-bottom:1%">
-        <div class="table-page-search-wrapper">
-            <a-form layout="inline" >
-                <a-row :gutter="24">
-                    <a-col :md="6" :sm="24">
-                        <a-form-item label="制单人">
-                            <a-input placeholder="请输入" v-model="form1.createBy" disabled></a-input>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :md="6" :sm="24">
-                        <a-form-item label="审批人">
-                            <a-input placeholder="请输入" v-model="form1.reviewer" disabled></a-input>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :md="6" :sm="24">
-                        <a-form-item label="最后修改人">
-                            <a-input placeholder="请输入" v-model="form1.updateBy" disabled></a-input>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :md="6" :sm="24">
-                        <a-form-item label="最后修改时间">
-                            <a-date-picker showTime valueFormat="YYYY-MM-DD" format = "YYYY-MM-DD" v-model="form1.updateTime" disabled/>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </a-form>
-         </div>
-    </a-card>
     <organizationPopup ref="organizationPopup" @okData="okDataOrganization"></organizationPopup>
     <OperatorsPopup ref="OperatorsPopup" @okData="okDataOperators"></OperatorsPopup>
     <projectPopup ref="projectPopup" @okData="okData"></projectPopup>
@@ -169,7 +152,6 @@
           return {
             visible:false,
             form:{},
-            form1:{},
             execute:undefined,
             dataSource:[],
             loading:false,
@@ -189,35 +171,37 @@
                 this.activeKey='demand',
                 this.dataSource = [] 
                 this.form={}
-                this.form1={}
                 this.$emit('ok')
-            },
-            handleTableChange(){
-
-            },
-            onSearch(){
-               
             },
             onSearchProject(){
-                this.$refs.projectPopup.visible = true
-                this.$refs.projectPopup.getData()
+                if(this.form.orgName&&this.form.orgName!==''){
+                    this.$refs.projectPopup.visible = true
+                    this.$refs.projectPopup.getData(this.form.pkOrg)
+                }else{
+                    this.$message.warning('请选择生产组织！')
+                }
             },
             onSearchDept(){
-                this.$refs.deparmentPopup.visible = true
-                this.$refs.deparmentPopup.getData()
+                if(this.form.orgName&&this.form.orgName!==''){
+                    this.$refs.deparmentPopup.visible = true
+                    this.$refs.deparmentPopup.getData(this.form.pkOrg)
+                }else{
+                    this.$message.warning('请选择生产组织！')
+                }
             },
             okData(data){
+                this.$set(this.form,'projectCode',data.Code)
                 this.$set(this.form,'projectName',data.Name)
                 this.$set(this.form,'project',data.ID)
             },
             okDataDeparment(data){
                 this.$set(this.form,'planDept',data.Name)
+                this.$set(this.form,'planDeptId',data.ID)
             },
             getMainData(id){
                 getAction('/MRPOperationList/madeOperationList/queryById',{id:id}).then(res=>{
                     if(res.success){
                        this.form=res.result
-                       this.form1=res.result
                        this.getDemandData(this.form.id)
                        this.getSupplyData(this.form.id)
                        this.getSupplyDemandBalanceData(this.form.id)
@@ -276,11 +260,13 @@
                 })
             },
             onSearchPlanOrg(){
-                this.$refs.organizationPopup.visible = true
-                this.$refs.organizationPopup.getData()
+                    this.$refs.organizationPopup.visible = true
+                    this.$refs.organizationPopup.getData(this.form.pkOrg)
             },
             okDataOrganization(data){
-                this.$set(this.form,'productionOrg',data.Name)
+                this.$set(this.form,'orgName',data.Name)
+                this.$set(this.form,'orgCode',data.Code)
+                this.$set(this.form,'pkOrg',data.ID)
             },
             changeType(prop){
                 if(prop=='工装'){
@@ -288,11 +274,16 @@
                 }
             },
             onSearchPerson(){
-                this.$refs.OperatorsPopup.visible = true
-                this.$refs.OperatorsPopup.getData()
+                if(this.form.orgName&&this.form.orgName!==''){
+                    this.$refs.OperatorsPopup.visible = true
+                    this.$refs.OperatorsPopup.getData(this.form.pkOrg)
+                }else{
+                    this.$message.warning('请选择生产组织！')
+                }
             },
             okDataOperators(data){
                 this.$set(this.form,'salesperson',data.Name)
+                this.$set(this.form,'salespersonId',data.ID)
             },
             handleOk(){
                 var madeOperationListPage = this.form

src/views/production/mrp/modules/ProRequirements.vue

@@ -56,12 +56,6 @@
                         return parseInt(index)+1;
                     }
                 },
-                {
-                    title: '供应类型',
-                    align:"center",
-                    dataIndex: 'provideType',
-                    ellipsis: true,
-                },
                 {
                     title: '项目编码',
                     align:"center",
@@ -75,22 +69,23 @@
                     ellipsis: true,
                 },
                 {
-                    title: '按辅计量单位',
+                    title: '批次',
                     align:"center",
-                    dataIndex: 'isAuxiliaryUnit',
+                    dataIndex: 'batch',
                     ellipsis: true,
+
                 },
                 {
-                    title: '项目分类名称',
+                    title: '料品编码',
                     align:"center",
-                    dataIndex: 'projectClassName',
+                    dataIndex: 'inventoryCode',
                     ellipsis: true,
 
                 },
                 {
-                    title: '批次',
+                    title: '料品名称',
                     align:"center",
-                    dataIndex: 'batch',
+                    dataIndex: 'inventoryName',
                     ellipsis: true,
 
                 },
@@ -102,18 +97,67 @@
 
                 },
                 {
-                    title: '存货编码',
+                    title: '建议执行数量',
                     align:"center",
-                    dataIndex: 'inventoryCode',
+                    dataIndex: 'adviseExecuteNum',
+                    ellipsis: true,
+                 },
+                 {
+                    title: '本次采购主数量',
+                    align:"center",
+                    dataIndex: 'purchaseQuantity',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'purchaseQuantity' } 
+                 },
+                 {
+                    title: '本次采购辅数量',
+                    align:"center",
+                    dataIndex: 'purchaseUnQuantity',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'purchaseUnQuantity' } 
+                 },
+                 {
+                    title: '材料请购单主数量',
+                    align:"center",
+                    dataIndex: 'requisitionQuantity',
+                    ellipsis: true,
+                 },
+                 {
+                    title: '材料请购单辅数量',
+                    align:"center",
+                    dataIndex: 'requisitionUnQuantity',
+                    ellipsis: true,
+                 },
+                 {
+                    title: '计量单位',
+                    align:"center",
+                    dataIndex: 'unit',
+                    ellipsis: true,
+                 },
+                 {
+                    title: '辅助计量单位',
+                    align:"center",
+                    dataIndex: 'auxiliaryUnit',
+                    ellipsis: true,
+                 },
+                 {
+                    title: '主数量',
+                    align:"center",
+                    dataIndex: 'quantity',
                     ellipsis: true,
 
                 },
                 {
-                    title: '存货名称',
+                    title: '辅数量',
                     align:"center",
-                    dataIndex: 'inventoryName',
+                    dataIndex: 'unQuantity',
+                    ellipsis: true,
+                },
+                {
+                    title: '换算率',
+                    align:"center",
+                    dataIndex: 'rate',
                     ellipsis: true,
-
                 },
                 {
                     title: '规格',
@@ -133,6 +177,13 @@
                     dataIndex: 'color',
                     ellipsis: true,
                 },
+                {
+                    title: '支数',
+                    align:"center",
+                    dataIndex: 'fixedNum',
+                    ellipsis: true,
+
+                },
                 {   
                     title: '定尺',
                     align:"center",
@@ -140,16 +191,17 @@
                     ellipsis: true,
                 },
                 {
-                    title: '合金',
+                    title: '宽/高',
                     align:"center",
-                    dataIndex: 'alloy',
+                    dataIndex: 'widthHeight',
                     ellipsis: true,
                 },
                 {   
-                    title: '标准',
+                    title: '片数',
                     align:"center",
-                    dataIndex: 'standard',
+                    dataIndex: 'pieces',
                     ellipsis: true,
+
                 },
                 {
                     title: '米重',
@@ -164,93 +216,81 @@
                     ellipsis: true,
                 },
                 {
-                    title: '配置',
+                    title: '窗号',
                     align:"center",
-                    dataIndex: 'allocation',
+                    dataIndex: 'windowNo',
                     ellipsis: true,
                 },
-                {
-                    title: '宽度',
+                {   
+                    title: '专用区',
                     align:"center",
-                    dataIndex: 'width',
+                    dataIndex: 'exclusiveZone',
                     ellipsis: true,
                 },
                 {
-                    title: '高度',
+                    title: '樘数(数量)',
                     align:"center",
-                    dataIndex: 'height',
+                    dataIndex: 'framesTang',
                     ellipsis: true,
                 },
+                
                 {
-                    title: '起订点',
+                    title: '框统计',
                     align:"center",
-                    dataIndex: 'startingPoint',
+                    dataIndex: 'framesCount',
                     ellipsis: true,
-                },                
+                },
                 {
-                    title: '安全库存',
-                    align:"center",
-                    dataIndex: 'safetyStock',
-                    ellipsis: true,
-                 },
-                 {
-                    title: '家装在途数量',
-                    align:"center",
-                    dataIndex: 'theWayNum',
-                    ellipsis: true,
-                 },
-                 {
-                    title: '家装现存量',
+                    title: '扇统计',
                     align:"center",
-                    dataIndex: 'handQuantity',
+                    dataIndex: 'leafCount',
                     ellipsis: true,
-                 },
-                 {
-                    title: '建议执行数量',
+                },
+                {
+                    title: '半成品分类',
                     align:"center",
-                    dataIndex: 'adviseExecuteNum',
+                    dataIndex: 'semiClass',
                     ellipsis: true,
-                 },
-                 {
-                    title: '本次采购主数量',
+                },
+                {
+                    title: '面积',
                     align:"center",
-                    dataIndex: 'purchaseQuantity',
+                    dataIndex: 'area',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'purchaseQuantity' } 
-                 },
-                 {
-                    title: '本次采购辅数量',
+                },
+                {
+                    title: '切割长度',
                     align:"center",
-                    dataIndex: 'purchaseUnQuantity',
+                    dataIndex: 'cuttingLength',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'purchaseUnQuantity' } 
-                 },
-                 {
-                    title: '材料请购单主数量',
+                },
+                {
+                    title: '切割角度左下',
                     align:"center",
-                    dataIndex: 'requisitionQuantity',
+                    dataIndex: 'cuttingLeftDown',
                     ellipsis: true,
-                 },
-                 {
-                    title: '材料请购单辅数量',
+                },
+                {
+                    title: '切割角度右上',
                     align:"center",
-                    dataIndex: 'requisitionUnQuantity',
+                    dataIndex: 'cuttingRightTop',
                     ellipsis: true,
-                 },
-                 {
-                    title: '计量单位',
+                },
+                
+                {
+                    title: '系列',
                     align:"center",
-                    dataIndex: 'unit',
+                    dataIndex: 'series',
                     ellipsis: true,
-                 },
-                 {
-                    title: '辅助计量单位',
+                },
+                {
+                    title: '玻璃编号',
                     align:"center",
-                    dataIndex: 'auxiliaryUnit',
+                    dataIndex: 'glassNumber',
                     ellipsis: true,
-                 },
-          ],
-      }
+                },
+        ]
+    }
     },
      props: {
       

src/views/production/mrp/modules/ProRequirementsDetail.vue

@@ -36,7 +36,7 @@
         selectedRows:[],
         dataSource:[],
         columns: [
-                {
+        {
                     title: '#',
                     dataIndex: '',
                     key: 'rowIndex',
@@ -46,12 +46,6 @@
                         return parseInt(index)+1;
                     }
                 },
-                {
-                    title: '供应类型',
-                    align:"center",
-                    dataIndex: 'provideType',
-                    ellipsis: true,
-                },
                 {
                     title: '项目编码',
                     align:"center",
@@ -65,22 +59,23 @@
                     ellipsis: true,
                 },
                 {
-                    title: '按辅计量单位',
+                    title: '批次',
                     align:"center",
-                    dataIndex: 'isAuxiliaryUnit',
+                    dataIndex: 'batch',
                     ellipsis: true,
+
                 },
                 {
-                    title: '项目分类名称',
+                    title: '料品编码',
                     align:"center",
-                    dataIndex: 'projectClassName',
+                    dataIndex: 'inventoryCode',
                     ellipsis: true,
 
                 },
                 {
-                    title: '批次',
+                    title: '料品名称',
                     align:"center",
-                    dataIndex: 'batch',
+                    dataIndex: 'inventoryName',
                     ellipsis: true,
 
                 },
@@ -92,18 +87,65 @@
 
                 },
                 {
-                    title: '存货编码',
+                    title: '建议执行数量',
                     align:"center",
-                    dataIndex: 'inventoryCode',
+                    dataIndex: 'adviseExecuteNum',
+                    ellipsis: true,
+                 },
+                 {
+                    title: '本次采购主数量',
+                    align:"center",
+                    dataIndex: 'purchaseQuantity',
+                    ellipsis: true,
+                 },
+                 {
+                    title: '本次采购辅数量',
+                    align:"center",
+                    dataIndex: 'purchaseUnQuantity',
+                    ellipsis: true,
+                 },
+                 {
+                    title: '材料请购单主数量',
+                    align:"center",
+                    dataIndex: 'requisitionQuantity',
+                    ellipsis: true,
+                 },
+                 {
+                    title: '材料请购单辅数量',
+                    align:"center",
+                    dataIndex: 'requisitionUnQuantity',
+                    ellipsis: true,
+                 },
+                 {
+                    title: '计量单位',
+                    align:"center",
+                    dataIndex: 'unit',
+                    ellipsis: true,
+                 },
+                 {
+                    title: '辅助计量单位',
+                    align:"center",
+                    dataIndex: 'auxiliaryUnit',
+                    ellipsis: true,
+                 },
+                 {
+                    title: '主数量',
+                    align:"center",
+                    dataIndex: 'quantity',
                     ellipsis: true,
 
                 },
                 {
-                    title: '存货名称',
+                    title: '辅数量',
                     align:"center",
-                    dataIndex: 'inventoryName',
+                    dataIndex: 'unQuantity',
+                    ellipsis: true,
+                },
+                {
+                    title: '换算率',
+                    align:"center",
+                    dataIndex: 'rate',
                     ellipsis: true,
-
                 },
                 {
                     title: '规格',
@@ -123,6 +165,13 @@
                     dataIndex: 'color',
                     ellipsis: true,
                 },
+                {
+                    title: '支数',
+                    align:"center",
+                    dataIndex: 'fixedNum',
+                    ellipsis: true,
+
+                },
                 {   
                     title: '定尺',
                     align:"center",
@@ -130,16 +179,17 @@
                     ellipsis: true,
                 },
                 {
-                    title: '合金',
+                    title: '宽/高',
                     align:"center",
-                    dataIndex: 'alloy',
+                    dataIndex: 'widthHeight',
                     ellipsis: true,
                 },
                 {   
-                    title: '标准',
+                    title: '片数',
                     align:"center",
-                    dataIndex: 'standard',
+                    dataIndex: 'pieces',
                     ellipsis: true,
+
                 },
                 {
                     title: '米重',
@@ -154,89 +204,79 @@
                     ellipsis: true,
                 },
                 {
-                    title: '配置',
+                    title: '窗号',
                     align:"center",
-                    dataIndex: 'allocation',
+                    dataIndex: 'windowNo',
                     ellipsis: true,
                 },
-                {
-                    title: '宽度',
+                {   
+                    title: '专用区',
                     align:"center",
-                    dataIndex: 'width',
+                    dataIndex: 'exclusiveZone',
                     ellipsis: true,
                 },
                 {
-                    title: '高度',
+                    title: '樘数(数量)',
                     align:"center",
-                    dataIndex: 'height',
+                    dataIndex: 'framesTang',
                     ellipsis: true,
                 },
+                
                 {
-                    title: '起订点',
+                    title: '框统计',
                     align:"center",
-                    dataIndex: 'startingPoint',
+                    dataIndex: 'framesCount',
                     ellipsis: true,
-                },                
+                },
                 {
-                    title: '安全库存',
-                    align:"center",
-                    dataIndex: 'safetyStock',
-                    ellipsis: true,
-                 },
-                 {
-                    title: '家装在途数量',
+                    title: '扇统计',
                     align:"center",
-                    dataIndex: 'theWayNum',
+                    dataIndex: 'leafCount',
                     ellipsis: true,
-                 },
-                 {
-                    title: '家装现存量',
-                    align:"center",
-                    dataIndex: 'handQuantity',
-                    ellipsis: true,
-                 },
-                 {
-                    title: '建议执行数量',
+                },
+                {
+                    title: '半成品分类',
                     align:"center",
-                    dataIndex: 'adviseExecuteNum',
+                    dataIndex: 'semiClass',
                     ellipsis: true,
-                 },
-                 {
-                    title: '本次采购主数量',
+                },
+                {
+                    title: '面积',
                     align:"center",
-                    dataIndex: 'purchaseQuantity',
+                    dataIndex: 'area',
                     ellipsis: true,
-                 },
-                 {
-                    title: '本次采购辅数量',
+                },
+                {
+                    title: '切割长度',
                     align:"center",
-                    dataIndex: 'purchaseUnQuantity',
+                    dataIndex: 'cuttingLength',
                     ellipsis: true,
-                 },
-                 {
-                    title: '材料请购单主数量',
+                },
+                {
+                    title: '切割角度左下',
                     align:"center",
-                    dataIndex: 'requisitionQuantity',
+                    dataIndex: 'cuttingLeftDown',
                     ellipsis: true,
-                 },
-                 {
-                    title: '材料请购单辅数量',
+                },
+                {
+                    title: '切割角度右上',
                     align:"center",
-                    dataIndex: 'requisitionUnQuantity',
+                    dataIndex: 'cuttingRightTop',
                     ellipsis: true,
-                 },
-                 {
-                    title: '计量单位',
+                },
+                
+                {
+                    title: '系列',
                     align:"center",
-                    dataIndex: 'unit',
+                    dataIndex: 'series',
                     ellipsis: true,
-                 },
-                 {
-                    title: '辅助计量单位',
+                },
+                {
+                    title: '玻璃编号',
                     align:"center",
-                    dataIndex: 'auxiliaryUnit',
+                    dataIndex: 'glassNumber',
                     ellipsis: true,
-                 },
+                },
           ],
       }
     },

src/views/production/mrp/modules/TraRequirements.vue

@@ -51,12 +51,6 @@
                         return parseInt(index)+1;
                     }
                 },
-                {
-                    title: '供应类型',
-                    align:"center",
-                    dataIndex: 'provideType',
-                    ellipsis: true,
-                },
                 {
                     title: '转出仓库',
                     align:"center",
@@ -70,50 +64,50 @@
                     ellipsis: true,
                 },
                 {
-                    title: '现存量',
+                    title: '料品编码',
                     align:"center",
-                    dataIndex: 'handQuantity',
+                    dataIndex: 'inventoryCode',
                     ellipsis: true,
+
                 },
                 {
-                    title: '数量',
+                    title: '料品名称',
                     align:"center",
-                    dataIndex: 'quantity',
+                    dataIndex: 'inventoryName',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'quantity' } 
 
                 },
                 {
-                    title: '建议执行数量',
+                    title: '转入批次',
                     align:"center",
-                    dataIndex: 'adviseExecuteNum',
+                    dataIndex: 'batchIn',
                     ellipsis: true,
-
                 },
                 {
-                    title: '存货编码',
+                    title: '现存量',
                     align:"center",
-                    dataIndex: 'inventoryCode',
+                    dataIndex: 'handQuantity',
                     ellipsis: true,
-
                 },
                 {
-                    title: '存货名称',
+                    title: '数量',
                     align:"center",
-                    dataIndex: 'inventoryName',
+                    dataIndex: 'quantity',
                     ellipsis: true,
+                    scopedSlots: { customRender: 'quantity' } 
 
                 },
                 {
-                    title: '转出批次',
+                    title: '建议执行数量',
                     align:"center",
-                    dataIndex: 'batchOut',
+                    dataIndex: 'adviseExecuteNum',
                     ellipsis: true,
+
                 },
                 {
-                    title: '转入批次',
+                    title: '规格',
                     align:"center",
-                    dataIndex: 'batchIn',
+                    dataIndex: 'specs',
                     ellipsis: true,
                 },
                 {
@@ -122,35 +116,38 @@
                     dataIndex: 'model',
                     ellipsis: true,
                 },
+                
                 {
-                    title: '规格',
+                    title: '颜色',
                     align:"center",
-                    dataIndex: 'specs',
+                    dataIndex: 'color',
                     ellipsis: true,
                 },
                 {
-                    title: '颜色',
+                    title: '支数',
                     align:"center",
-                    dataIndex: 'color',
+                    dataIndex: 'fixedNum',
                     ellipsis: true,
+
                 },
-                {   
+                {
                     title: '定尺',
                     align:"center",
                     dataIndex: 'fixedLength',
                     ellipsis: true,
                 },
                 {
-                    title: '合金',
+                    title: '宽/高',
                     align:"center",
-                    dataIndex: 'alloy',
+                    dataIndex: 'widthHeight',
                     ellipsis: true,
                 },
                 {   
-                    title: '标准',
+                    title: '片数',
                     align:"center",
-                    dataIndex: 'standard',
+                    dataIndex: 'pieces',
                     ellipsis: true,
+
                 },
                 {
                     title: '米重',
@@ -165,47 +162,79 @@
                     ellipsis: true,
                 },
                 {
-                    title: '配置',
+                    title: '窗号',
+                    align:"center",
+                    dataIndex: 'windowNo',
+                    ellipsis: true,
+                },
+                {   
+                    title: '专用区',
                     align:"center",
-                    dataIndex: 'allocation',
+                    dataIndex: 'exclusiveZone',
                     ellipsis: true,
                 },
                 {
-                    title: '宽度',
+                    title: '樘数(数量)',
                     align:"center",
-                    dataIndex: 'width',
+                    dataIndex: 'framesTang',
                     ellipsis: true,
                 },
+                
                 {
-                    title: '高度',
+                    title: '框统计',
                     align:"center",
-                    dataIndex: 'height',
+                    dataIndex: 'framesCount',
                     ellipsis: true,
                 },
-                 {
-                    title: '计量单位',
+                {
+                    title: '扇统计',
                     align:"center",
-                    dataIndex: 'unit',
+                    dataIndex: 'leafCount',
                     ellipsis: true,
-                 },
-                 {
-                    title: '辅助计量单位',
+                },
+                {
+                    title: '半成品分类',
                     align:"center",
-                    dataIndex: 'auxiliaryUnit',
+                    dataIndex: 'semiClass',
                     ellipsis: true,
-                 },
-                 {
-                    title: '辅数量',
+                },
+                {
+                    title: '面积',
                     align:"center",
-                    dataIndex: 'unQuantity',
+                    dataIndex: 'area',
                     ellipsis: true,
-                 },
-                 {
-                    title: '换算率',
+                },
+                {
+                    title: '切割长度',
                     align:"center",
-                    dataIndex: 'rate',
+                    dataIndex: 'cuttingLength',
                     ellipsis: true,
-                 },
+                },
+                {
+                    title: '切割角度左下',
+                    align:"center",
+                    dataIndex: 'cuttingLeftDown',
+                    ellipsis: true,
+                },
+                {
+                    title: '切割角度右上',
+                    align:"center",
+                    dataIndex: 'cuttingRightTop',
+                    ellipsis: true,
+                },
+                
+                {
+                    title: '系列',
+                    align:"center",
+                    dataIndex: 'series',
+                    ellipsis: true,
+                },
+                {
+                    title: '玻璃编号',
+                    align:"center",
+                    dataIndex: 'glassNumber',
+                    ellipsis: true,
+                },
           ],
       }
     },

src/views/production/mrp/modules/TraRequirementsDeatail.vue

@@ -36,7 +36,7 @@
         selectedRows:[],
         dataSource:[],
         columns: [
-                {
+        {
                     title: '#',
                     dataIndex: '',
                     key: 'rowIndex',
@@ -46,12 +46,6 @@
                         return parseInt(index)+1;
                     }
                 },
-                {
-                    title: '供应类型',
-                    align:"center",
-                    dataIndex: 'provideType',
-                    ellipsis: true,
-                },
                 {
                     title: '转出仓库',
                     align:"center",
@@ -65,49 +59,50 @@
                     ellipsis: true,
                 },
                 {
-                    title: '现存量',
+                    title: '料品编码',
                     align:"center",
-                    dataIndex: 'handQuantity',
+                    dataIndex: 'inventoryCode',
                     ellipsis: true,
+
                 },
                 {
-                    title: '数量',
+                    title: '料品名称',
                     align:"center",
-                    dataIndex: 'quantity',
+                    dataIndex: 'inventoryName',
                     ellipsis: true,
 
                 },
                 {
-                    title: '建议执行数量',
+                    title: '转入批次',
                     align:"center",
-                    dataIndex: 'adviseExecuteNum',
+                    dataIndex: 'batchIn',
                     ellipsis: true,
-
                 },
                 {
-                    title: '存货编码',
+                    title: '现存量',
                     align:"center",
-                    dataIndex: 'inventoryCode',
+                    dataIndex: 'handQuantity',
                     ellipsis: true,
-
                 },
                 {
-                    title: '存货名称',
+                    title: '数量',
                     align:"center",
-                    dataIndex: 'inventoryName',
+                    dataIndex: 'quantity',
                     ellipsis: true,
+                    scopedSlots: { customRender: 'quantity' } 
 
                 },
                 {
-                    title: '转出批次',
+                    title: '建议执行数量',
                     align:"center",
-                    dataIndex: 'batchOut',
+                    dataIndex: 'adviseExecuteNum',
                     ellipsis: true,
+
                 },
                 {
-                    title: '转入批次',
+                    title: '规格',
                     align:"center",
-                    dataIndex: 'batchIn',
+                    dataIndex: 'specs',
                     ellipsis: true,
                 },
                 {
@@ -116,35 +111,38 @@
                     dataIndex: 'model',
                     ellipsis: true,
                 },
+                
                 {
-                    title: '规格',
+                    title: '颜色',
                     align:"center",
-                    dataIndex: 'specs',
+                    dataIndex: 'color',
                     ellipsis: true,
                 },
                 {
-                    title: '颜色',
+                    title: '支数',
                     align:"center",
-                    dataIndex: 'color',
+                    dataIndex: 'fixedNum',
                     ellipsis: true,
+
                 },
-                {   
+                {
                     title: '定尺',
                     align:"center",
                     dataIndex: 'fixedLength',
                     ellipsis: true,
                 },
                 {
-                    title: '合金',
+                    title: '宽/高',
                     align:"center",
-                    dataIndex: 'alloy',
+                    dataIndex: 'widthHeight',
                     ellipsis: true,
                 },
                 {   
-                    title: '标准',
+                    title: '片数',
                     align:"center",
-                    dataIndex: 'standard',
+                    dataIndex: 'pieces',
                     ellipsis: true,
+
                 },
                 {
                     title: '米重',
@@ -159,47 +157,79 @@
                     ellipsis: true,
                 },
                 {
-                    title: '配置',
+                    title: '窗号',
+                    align:"center",
+                    dataIndex: 'windowNo',
+                    ellipsis: true,
+                },
+                {   
+                    title: '专用区',
+                    align:"center",
+                    dataIndex: 'exclusiveZone',
+                    ellipsis: true,
+                },
+                {
+                    title: '樘数(数量)',
+                    align:"center",
+                    dataIndex: 'framesTang',
+                    ellipsis: true,
+                },
+                
+                {
+                    title: '框统计',
                     align:"center",
-                    dataIndex: 'allocation',
+                    dataIndex: 'framesCount',
                     ellipsis: true,
                 },
                 {
-                    title: '宽度',
+                    title: '扇统计',
                     align:"center",
-                    dataIndex: 'width',
+                    dataIndex: 'leafCount',
                     ellipsis: true,
                 },
                 {
-                    title: '高度',
+                    title: '半成品分类',
                     align:"center",
-                    dataIndex: 'height',
+                    dataIndex: 'semiClass',
                     ellipsis: true,
                 },
-                 {
-                    title: '计量单位',
+                {
+                    title: '面积',
                     align:"center",
-                    dataIndex: 'unit',
+                    dataIndex: 'area',
                     ellipsis: true,
-                 },
-                 {
-                    title: '辅助计量单位',
+                },
+                {
+                    title: '切割长度',
                     align:"center",
-                    dataIndex: 'auxiliaryUnit',
+                    dataIndex: 'cuttingLength',
                     ellipsis: true,
-                 },
-                 {
-                    title: '辅数量',
+                },
+                {
+                    title: '切割角度左下',
                     align:"center",
-                    dataIndex: 'unQuantity',
+                    dataIndex: 'cuttingLeftDown',
                     ellipsis: true,
-                 },
-                 {
-                    title: '换算率',
+                },
+                {
+                    title: '切割角度右上',
                     align:"center",
-                    dataIndex: 'rate',
+                    dataIndex: 'cuttingRightTop',
                     ellipsis: true,
-                 },
+                },
+                
+                {
+                    title: '系列',
+                    align:"center",
+                    dataIndex: 'series',
+                    ellipsis: true,
+                },
+                {
+                    title: '玻璃编号',
+                    align:"center",
+                    dataIndex: 'glassNumber',
+                    ellipsis: true,
+                },
           ],
       }
     },

src/views/production/mrp/modules/demand.vue

@@ -65,39 +65,50 @@
                     ellipsis: true,
                 },
                 {
-                    title: '仓库',
+                    title: '项目编码',
                     align:"center",
-                    dataIndex: 'warehouse',
+                    dataIndex: 'projectCode',
+                    ellipsis: true,
+                },
+                {
+                    title: '项目名称',
+                    align:"center",
+                    dataIndex: 'projectName',
                     ellipsis: true,
                 },
                 {
-                    title: '存货编码',
+                    title: '料品编码',
                     align:"center",
                     dataIndex: 'inventoryCode',
                     ellipsis: true,
 
                 },
                 {
-                    title: '存货名称',
+                    title: '料品名称',
                     align:"center",
                     dataIndex: 'inventoryName',
                     ellipsis: true,
 
                 },
                 {
-                    title: '规格',
+                    title: '仓库',
                     align:"center",
-                    dataIndex: 'specs',
+                    dataIndex: 'warehouse',
                     ellipsis: true,
 
                 },
                 {
-                    title: '型号',
+                    title: '计量单位',
                     align:"center",
-                    dataIndex: 'model',
+                    dataIndex: 'unit',
                     ellipsis: true,
-
-                },
+                },      
+                {
+                    title: '辅助计量单位',
+                    align:"center",
+                    dataIndex: 'auxiliaryUnit',
+                    ellipsis: true,
+                }, 
                 {
                     title: '主数量',
                     align:"center",
@@ -106,35 +117,44 @@
 
                 },
                 {
-                    title: '项目编码',
+                    title: '辅数量',
                     align:"center",
-                    dataIndex: 'projectCode',
+                    dataIndex: 'unQuantity',
                     ellipsis: true,
                 },
                 {
-                    title: '项目名称',
+                    title: '换算率',
                     align:"center",
-                    dataIndex: 'projectName',
+                    dataIndex: 'rate',
                     ellipsis: true,
                 },
                 {
-                    title: '按辅计量单位',
+                    title: '规格',
                     align:"center",
-                    dataIndex: 'isAuxiliaryUnit',
+                    dataIndex: 'specs',
                     ellipsis: true,
                 },
                 {
-                    title: '项目分类名称',
+                    title: '型号',
                     align:"center",
-                    dataIndex: 'projectClassName',
+                    dataIndex: 'model',
                     ellipsis: true,
+
                 },
+                
                 {
                     title: '颜色',
                     align:"center",
                     dataIndex: 'color',
                     ellipsis: true,
                 },
+                {
+                    title: '支数',
+                    align:"center",
+                    dataIndex: 'fixedNum',
+                    ellipsis: true,
+
+                },
                 {   
                     title: '定尺',
                     align:"center",
@@ -142,16 +162,17 @@
                     ellipsis: true,
                 },
                 {
-                    title: '合金',
+                    title: '宽/高',
                     align:"center",
-                    dataIndex: 'alloy',
+                    dataIndex: 'widthHeight',
                     ellipsis: true,
                 },
                 {   
-                    title: '标准',
+                    title: '片数',
                     align:"center",
-                    dataIndex: 'standard',
+                    dataIndex: 'pieces',
                     ellipsis: true,
+
                 },
                 {
                     title: '米重',
@@ -166,41 +187,79 @@
                     ellipsis: true,
                 },
                 {
-                    title: '配置',
+                    title: '窗号',
+                    align:"center",
+                    dataIndex: 'windowNo',
+                    ellipsis: true,
+                },
+                {   
+                    title: '专用区',
                     align:"center",
-                    dataIndex: 'allocation',
+                    dataIndex: 'exclusiveZone',
                     ellipsis: true,
                 },
                 {
-                    title: '宽度',
+                    title: '樘数(数量)',
                     align:"center",
-                    dataIndex: 'width',
+                    dataIndex: 'framesTang',
                     ellipsis: true,
                 },
+                
+                {
+                    title: '框统计',
+                    align:"center",
+                    dataIndex: 'framesCount',
+                    ellipsis: true,
+                 },
                 {
-                    title: '高度',
+                    title: '扇统计',
                     align:"center",
-                    dataIndex: 'height',
+                    dataIndex: 'leafCount',
                     ellipsis: true,
                 },
                 {
-                    title: '计量单位',
+                    title: '半成品分类',
                     align:"center",
-                    dataIndex: 'unit',
+                    dataIndex: 'semiClass',
                     ellipsis: true,
-                },      
+                },
                 {
-                    title: '辅助计量单位',
+                    title: '面积',
                     align:"center",
-                    dataIndex: 'auxiliaryUnit',
+                    dataIndex: 'area',
                     ellipsis: true,
-                },           
+                },
                 {
-                    title: '辅数量',
+                    title: '切割长度',
                     align:"center",
-                    dataIndex: 'unQuantity',
+                    dataIndex: 'cuttingLength',
                     ellipsis: true,
-                 },
+                },
+                {
+                    title: '切割角度左下',
+                    align:"center",
+                    dataIndex: 'cuttingLeftDown',
+                    ellipsis: true,
+                },
+                {
+                    title: '切割角度右上',
+                    align:"center",
+                    dataIndex: 'cuttingRightTop',
+                    ellipsis: true,
+                },
+                
+                {
+                    title: '系列',
+                    align:"center",
+                    dataIndex: 'series',
+                    ellipsis: true,
+                },
+                {
+                    title: '玻璃编号',
+                    align:"center",
+                    dataIndex: 'glassNumber',
+                    ellipsis: true,
+                },
           ],
       }
     },

src/views/production/mrp/modules/operation.vue

@@ -16,8 +16,8 @@
                     <a-col :md="24" :sm="24">
                         <a-form-model-item label="业务类型" prop="type">
                             <a-select v-model="form.type"  style='width:100%' @change="changeType">
-                                <a-select-option value='家装'>家装</a-select-option>
-                                <a-select-option value='工装'>工装</a-select-option>
+                                <a-select-option value='mrp'>mrp</a-select-option>
+                                <a-select-option value='安全库存'>安全库存</a-select-option>
                             </a-select>
                         </a-form-model-item>
                     </a-col>
@@ -28,21 +28,14 @@
                     </a-col>
                     <a-col :md="24" :sm="24">
                         <a-form-model-item label="工单号" prop="workNo">
-                            <a-input-search placeholder="请输入" v-model="form.workNo" @search="onSearch"></a-input-search>
+                            <a-input placeholder="请输入" v-model="form.workNo"></a-input>
                         </a-form-model-item>
-                    </a-col>
-                    <a-col :md="24" :sm="24">
-                        <a-form-model-item label="存货分类" prop="inventoryType">
-                            <a-input-search placeholder="请输入" v-model="form.inventoryType" @search="onSearchType"></a-input-search>
-                        </a-form-model-item>
-                    </a-col>
-   
+                    </a-col>   
                 </a-row>
             </a-form-model>
         </div>
      </a-card>
      <projectPopup ref="projectPopup" @okData="okData"></projectPopup>
-     <inventoryTypePopup ref="inventoryTypePopup" @okData="okDataType"></inventoryTypePopup>
     </a-modal>
   </template>
   <script>
@@ -52,13 +45,11 @@
       import moment from "moment"
       import { httpAction ,getAction,postAction,putAction} from '@/api/manage'
       import projectPopup from '../../Popup/projectPopup'
-      import inventoryTypePopup from '../../Popup/inventoryTypePopup'
       export default {
         name: 'operation',
         mixins: [JEditableTableModelMixin],
         components: {
             projectPopup,
-            inventoryTypePopup
         },
         data() {
           return {
@@ -110,27 +101,18 @@
                 this.$refs.projectPopup.visible = true
                 this.$refs.projectPopup.getData()
             },
-            onSearchType(){
-                this.$refs.inventoryTypePopup.visible = true
-                this.$refs.inventoryTypePopup.getData()
-            },
             okData(data){
                 this.$set(this.form,'projectName',data.Name)
                 this.$set(this.form,'project',data.ID)
             },
-            okDataType(data){
-                this.$set(this.form,'inventoryType',data.Name)
-            },
             changeType(prop){
-                if(prop=='家装'){
-                    this.rules.inventoryType[0].required = true
-                    this.rules.projectName[0].required = false
-                    this.rules.workNo[0].required = false
-                }else{
-                    this.rules.projectName[0].required = true
-                    this.rules.workNo[0].required = true
-                    this.rules.inventoryType[0].required = false
-                }
+                // if(prop=='家装'){
+                //     this.rules.projectName[0].required = false
+                //     this.rules.workNo[0].required = false
+                // }else{
+                //     this.rules.projectName[0].required = true
+                //     this.rules.workNo[0].required = true
+                // }
             }
         }
       }

src/views/production/mrp/modules/supply.vue

@@ -52,6 +52,13 @@
                     dataIndex: 'provideType',
                     ellipsis: true,
                 },
+                {
+                    title: '批次',
+                    align:"center",
+                    dataIndex: 'batch',
+                    ellipsis: true,
+
+                },
                 {
                     title: '项目编码',
                     align:"center",
@@ -65,38 +72,37 @@
                     ellipsis: true,
                 },
                 {
-                    title: '项目分类编码',
+                    title: '料品编码',
                     align:"center",
-                    dataIndex: 'projectClassCode',
+                    dataIndex: 'inventoryCode',
                     ellipsis: true,
+
                 },
                 {
-                    title: '项目分类名称',
+                    title: '料品名称',
                     align:"center",
-                    dataIndex: 'projectClassName',
+                    dataIndex: 'inventoryName',
                     ellipsis: true,
 
                 },
                 {
-                    title: '批次',
+                    title: '仓库',
                     align:"center",
-                    dataIndex: 'batch',
+                    dataIndex: 'warehouse',
                     ellipsis: true,
-
                 },
                 {
-                    title: '存货编码',
+                    title: '主数量',
                     align:"center",
-                    dataIndex: 'inventoryCode',
+                    dataIndex: 'quantity',
                     ellipsis: true,
 
                 },
                 {
-                    title: '存货名称',
+                    title: '辅数量',
                     align:"center",
-                    dataIndex: 'inventoryName',
+                    dataIndex: 'unQuantity',
                     ellipsis: true,
-
                 },
                 {
                     title: '规格',
@@ -117,6 +123,13 @@
                     dataIndex: 'color',
                     ellipsis: true,
                 },
+                {
+                    title: '支数',
+                    align:"center",
+                    dataIndex: 'fixedNum',
+                    ellipsis: true,
+
+                },
                 {
                     title: '定尺',
                     align:"center",
@@ -124,16 +137,17 @@
                     ellipsis: true,
                 },
                 {
-                    title: '合金',
+                    title: '宽/高',
                     align:"center",
-                    dataIndex: 'alloy',
+                    dataIndex: 'widthHeight',
                     ellipsis: true,
                 },
                 {   
-                    title: '标准',
+                    title: '片数',
                     align:"center",
-                    dataIndex: 'standard',
+                    dataIndex: 'pieces',
                     ellipsis: true,
+
                 },
                 {
                     title: '米重',
@@ -148,41 +162,79 @@
                     ellipsis: true,
                 },
                 {
-                    title: '配置',
+                    title: '窗号',
+                    align:"center",
+                    dataIndex: 'windowNo',
+                    ellipsis: true,
+                },
+                {   
+                    title: '专用区',
+                    align:"center",
+                    dataIndex: 'exclusiveZone',
+                    ellipsis: true,
+                },
+                {
+                    title: '樘数(数量)',
                     align:"center",
-                    dataIndex: 'allocation',
+                    dataIndex: 'framesTang',
                     ellipsis: true,
                 },
+                
+                {
+                    title: '框统计',
+                    align:"center",
+                    dataIndex: 'framesCount',
+                    ellipsis: true,
+                 },
                 {
-                    title: '宽度',
+                    title: '扇统计',
                     align:"center",
-                    dataIndex: 'width',
+                    dataIndex: 'leafCount',
                     ellipsis: true,
                 },
                 {
-                    title: '高度',
+                    title: '半成品分类',
                     align:"center",
-                    dataIndex: 'height',
+                    dataIndex: 'semiClass',
                     ellipsis: true,
                 },
                 {
-                    title: '计量单位',
+                    title: '面积',
                     align:"center",
-                    dataIndex: 'unit',
+                    dataIndex: 'area',
                     ellipsis: true,
-                },                
+                },
                 {
-                    title: '仓库',
+                    title: '切割长度',
                     align:"center",
-                    dataIndex: 'warehouse',
+                    dataIndex: 'cuttingLength',
                     ellipsis: true,
-                 },
-                 {
-                    title: '主数量',
+                },
+                {
+                    title: '切割角度左下',
                     align:"center",
-                    dataIndex: 'quantity',
+                    dataIndex: 'cuttingLeftDown',
                     ellipsis: true,
-                 },
+                },
+                {
+                    title: '切割角度右上',
+                    align:"center",
+                    dataIndex: 'cuttingRightTop',
+                    ellipsis: true,
+                },
+                
+                {
+                    title: '系列',
+                    align:"center",
+                    dataIndex: 'series',
+                    ellipsis: true,
+                },
+                {
+                    title: '玻璃编号',
+                    align:"center",
+                    dataIndex: 'glassNumber',
+                    ellipsis: true,
+                },
           ],
       }
     },

src/views/production/mrp/modules/supplyDemandBalance.vue

@@ -65,29 +65,33 @@
                     ellipsis: true,
                 },
                 {
-                    title: '存货编码',
+                    title: '批次',
                     align:"center",
-                    dataIndex: 'inventoryCode',
+                    dataIndex: 'batch',
                     ellipsis: true,
                 },
                 {
-                    title: '存货名称',
+                    title: '项目编码',
                     align:"center",
-                    dataIndex: 'inventoryName',
+                    dataIndex: 'projectCode',
                     ellipsis: true,
-
                 },
                 {
-                    title: '建议执行',
+                    title: '项目名称',
                     align:"center",
-                    dataIndex: 'adviseExecute',
+                    dataIndex: 'projectName',
                     ellipsis: true,
-
                 },
                 {
-                    title: '建议执行数量',
+                    title: '料品编码',
                     align:"center",
-                    dataIndex: 'adviseExecuteNum',
+                    dataIndex: 'inventoryCode',
+                    ellipsis: true,
+                },
+                {
+                    title: '料品名称',
+                    align:"center",
+                    dataIndex: 'inventoryName',
                     ellipsis: true,
 
                 },
@@ -99,70 +103,72 @@
 
                 },
                 {
-                    title: '主数量',
+                    title: '建议执行',
                     align:"center",
-                    dataIndex: 'quantity',
+                    dataIndex: 'adviseExecute',
                     ellipsis: true,
 
                 },
                 {
-                    title: '已匹配主数量',
+                    title: '建议执行数量',
                     align:"center",
-                    dataIndex: 'matchQuantity',
+                    dataIndex: 'adviseExecuteNum',
                     ellipsis: true,
+
                 },
                 {
-                    title: '剩余需求主数量',
+                    title: '主数量',
                     align:"center",
-                    dataIndex: 'surplusQuantity',
+                    dataIndex: 'quantity',
                     ellipsis: true,
+
                 },
                 {
-                    title: '辅数量',
+                    title: '计量单位',
                     align:"center",
-                    dataIndex: 'unQuantity',
+                    dataIndex: 'unit',
                     ellipsis: true,
-                },
+                 },
                 {
-                    title: '已匹配辅数量',
+                    title: '已匹配主数量',
                     align:"center",
-                    dataIndex: 'matchUnQuantity',
+                    dataIndex: 'matchQuantity',
                     ellipsis: true,
                 },
-                {   
-                    title: '剩余需求辅数量',
+                {
+                    title: '剩余主数量',
                     align:"center",
-                    dataIndex: 'surplusUnQuantity',
+                    dataIndex: 'surplusQuantity',
                     ellipsis: true,
                 },
                 {
-                    title: '项目编码',
+                    title: '辅助计量单位',
                     align:"center",
-                    dataIndex: 'projectCode',
+                    dataIndex: 'auxiliaryUnit',
                     ellipsis: true,
-                },
+                 },
                 {
-                    title: '项目名称',
+                    title: '辅数量',
                     align:"center",
-                    dataIndex: 'projectName',
+                    dataIndex: 'unQuantity',
                     ellipsis: true,
                 },
                 {
-                    title: '按辅计量单位',
+                    title: '已匹配辅数量',
                     align:"center",
-                    dataIndex: 'isAuxiliaryUnit',
+                    dataIndex: 'matchUnQuantity',
                     ellipsis: true,
                 },
-                {
-                    title: '项目分类名称',
+                {   
+                    title: '剩余辅数量',
                     align:"center",
-                    dataIndex: 'projectClassName',
+                    dataIndex: 'surplusUnQuantity',
                     ellipsis: true,
                 },
                 {
-                    title: '批次',
+                    title: '换算率',
                     align:"center",
-                    dataIndex: 'batch',
+                    dataIndex: 'rate',
                     ellipsis: true,
                 },
                 {
@@ -184,24 +190,32 @@
                     ellipsis: true,
                  },
                  {
+                    title: '支数',
+                    align:"center",
+                    dataIndex: 'fixedNum',
+                    ellipsis: true,
+
+                },
+                {   
                     title: '定尺',
                     align:"center",
                     dataIndex: 'fixedLength',
                     ellipsis: true,
-                 },
-                 {
-                    title: '合金',
+                },
+                {
+                    title: '宽/高',
                     align:"center",
-                    dataIndex: 'alloy',
+                    dataIndex: 'widthHeight',
                     ellipsis: true,
-                 },
-                 {
-                    title: '标准',
+                },
+                {   
+                    title: '片数',
                     align:"center",
-                    dataIndex: 'standard',
+                    dataIndex: 'pieces',
                     ellipsis: true,
-                 },
-                 {
+
+                },
+                {
                     title: '米重',
                     align:"center",
                     dataIndex: 'meterWeight',
@@ -214,41 +228,79 @@
                     ellipsis: true,
                  },
                  {
-                    title: '配置',
+                    title: '窗号',
                     align:"center",
-                    dataIndex: 'allocation',
+                    dataIndex: 'windowNo',
                     ellipsis: true,
-                 },
-                 {
-                    title: '宽度',
+                },
+                {   
+                    title: '专用区',
                     align:"center",
-                    dataIndex: 'width',
+                    dataIndex: 'exclusiveZone',
                     ellipsis: true,
-                 },
-                 {
-                    title: '高度',
+                },
+                {
+                    title: '樘数(数量)',
                     align:"center",
-                    dataIndex: 'height',
+                    dataIndex: 'framesTang',
                     ellipsis: true,
-                 },
-                 {
-                    title: '计量单位',
+                },
+                
+                {
+                    title: '框统计',
                     align:"center",
-                    dataIndex: 'unit',
+                    dataIndex: 'framesCount',
                     ellipsis: true,
                  },
-                 {
-                    title: '辅助计量单位',
+                {
+                    title: '扇统计',
                     align:"center",
-                    dataIndex: 'auxiliaryUnit',
+                    dataIndex: 'leafCount',
                     ellipsis: true,
-                 },
-                 {
-                    title: '转库和采购关联PK',
+                },
+                {
+                    title: '半成品分类',
                     align:"center",
-                    dataIndex: 'correlationPk',
+                    dataIndex: 'semiClass',
                     ellipsis: true,
-                 },
+                },
+                {
+                    title: '面积',
+                    align:"center",
+                    dataIndex: 'area',
+                    ellipsis: true,
+                },
+                {
+                    title: '切割长度',
+                    align:"center",
+                    dataIndex: 'cuttingLength',
+                    ellipsis: true,
+                },
+                {
+                    title: '切割角度左下',
+                    align:"center",
+                    dataIndex: 'cuttingLeftDown',
+                    ellipsis: true,
+                },
+                {
+                    title: '切割角度右上',
+                    align:"center",
+                    dataIndex: 'cuttingRightTop',
+                    ellipsis: true,
+                },
+                
+                {
+                    title: '系列',
+                    align:"center",
+                    dataIndex: 'series',
+                    ellipsis: true,
+                },
+                {
+                    title: '玻璃编号',
+                    align:"center",
+                    dataIndex: 'glassNumber',
+                    ellipsis: true,
+                }
           ],
       }
     },