材料请购单-字段修改

src/views/production/materialprocurement/materialProcurementList.vue

@@ -7,8 +7,8 @@
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
             <a-col :md="4" :sm="24">
-              <a-form-item label="计划组织">
-                <a-input placeholder="请输入" v-model="queryParam.planOrg" ></a-input>
+              <a-form-item label="生产组织">
+                <a-input placeholder="请输入" v-model="queryParam.productionOrg" ></a-input>
               </a-form-item>
             </a-col>
             <a-col  :md="4" :sm="24">
@@ -17,8 +17,8 @@
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
-                <a-form-item label="项目">
-                  <a-input-search placeholder="请输入" v-model="queryParam.project" ></a-input-search>
+                <a-form-item label="项目编码">
+                  <a-input-search placeholder="请输入" v-model="queryParam.projectCode" ></a-input-search>
                 </a-form-item>
               </a-col>
             <a-col :md="4" :sm="24">
@@ -30,11 +30,10 @@
               <a-col :md="4" :sm="24">
                 <a-form-item label="单据状态">
                   <a-select v-model="queryParam.state"  style='width:100%' >
-                    <a-select-option value='自由'> 自由</a-select-option>
-                    <a-select-option value='已批准'> 已批准</a-select-option>
-                    <a-select-option value='已运算'> 已运算</a-select-option>
-                    <a-select-option value='已请购'> 已请购</a-select-option>
-                    <a-select-option value='已关闭'> 已关闭</a-select-option>
+                    <a-select-option value='开立'> 开立</a-select-option>
+                        <a-select-option value='审核'> 审核</a-select-option>
+                        <a-select-option value='已运算'> 已运算</a-select-option>
+                        <a-select-option value='关闭'> 关闭</a-select-option>
                    </a-select>
                 </a-form-item>
               </a-col>
@@ -51,25 +50,10 @@
                 </a-form-item>
               </a-col>
               <a-col :md="4" :sm="24">
-                <a-form-item label="业务员">
-                  <a-input placeholder="请输入" v-model="queryParam.salesperson" ></a-input>
-                </a-form-item>
-              </a-col>
-              <a-col :md="4" :sm="24">
-                <a-form-item label="备注">
-                  <a-input placeholder="请输入" v-model="queryParam.remarks"></a-input>
-                </a-form-item>
-              </a-col>
-              <a-col :md="4" :sm="24">
-                <a-form-item label="加工单号">
+                <a-form-item label="工单号">
                   <a-input placeholder="请输入" v-model="queryParam.workNo"></a-input>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
-                <a-form-item label="改单版本">
-                  <a-input placeholder="请输入" v-model="queryParam.version"></a-input>
-                </a-form-item>
-              </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-item label="业务类型">
                   <a-select v-model="queryParam.type"  style='width:100%' >
@@ -77,11 +61,6 @@
                    </a-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24" >
-                <a-form-item label="来源" :labelCol="{span: 4, offset: 2}">
-                  <a-input placeholder="请输入" v-model="queryParam.sourceInfo"></a-input>
-                </a-form-item>
-              </a-col>
             </template>
             <a-col  :md="4" :sm="24">
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -162,7 +141,7 @@
       },
       data () {
         return {
-          description: '资产调拨主表管理页面',
+          description: '材料请购单页面',
           queryParam:{},
           selectedRowKeys:[],
           selectedRows:[],
@@ -194,9 +173,9 @@
               }
             },
             {
-              title: '计划组织',
+              title: '生产组织',
               align:"center",
-              dataIndex: 'planOrg',
+              dataIndex: 'productionOrg',
               ellipsis: true,
 
             },
@@ -250,25 +229,11 @@
 
             },
             {
-              title: '加工单号',
+              title: '工单号',
               align:"center",
               dataIndex: 'workNo',
               ellipsis: true,
 
-            },
-            {
-              title: '改单版本',
-              align:"center",
-              dataIndex: 'version',
-              ellipsis: true,
-
-            },
-            {
-              title: '来源',
-              align:"center",
-              dataIndex: 'sourceInfo',
-              ellipsis: true,
-
             },
             {
               title: '业务类型',

src/views/production/materialprocurement/modules/materialProcurementAdd.vue

@@ -13,8 +13,8 @@
             <a-form layout="inline" @keyup.enter.native="searchQuery">
                 <a-row :gutter="24">
                     <a-col :md="4" :sm="24">
-                        <a-form-item label="计划组织">
-                            <a-input-search placeholder="请输入" v-model="form.planOrg" @search="onSearchPlanOrg" readOnly></a-input-search>
+                        <a-form-item label="生产组织">
+                            <a-input-search placeholder="请输入" v-model="form.productionOrg" @search="onSearchPlanOrg" readOnly></a-input-search>
                         </a-form-item>
                     </a-col>
                     <a-col  :md="4" :sm="24">
@@ -27,25 +27,19 @@
                             <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-col :md="4" :sm="24">
                         <a-form-item label="单据状态">
                             <a-select v-model="form.state"  style='width:100%' >
-                                <a-select-option value='自由'> 自由</a-select-option>
-                                <a-select-option value='已批准'> 已批准</a-select-option>
+                                <a-select-option value='开立'> 开立</a-select-option>
+                                <a-select-option value='审核'> 审核</a-select-option>
                                 <a-select-option value='已运算'> 已运算</a-select-option>
-                                <a-select-option value='已请购'> 已请购</a-select-option>
-                                <a-select-option value='已关闭'> 已关闭</a-select-option>
+                                <a-select-option value='关闭'> 关闭</a-select-option>
                             </a-select>
                         </a-form-item>
-                    </a-col> -->
-                    <a-col :md="4" :sm="24">
-                        <a-form-item label="项目编码">
-                            <a-input placeholder="请输入" v-model="form.projectCode" disabled></a-input>
-                        </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-form-item label="业务员">
+                            <a-input-search placeholder="请输入" v-model="form.salesperson"  @search="onSearchPerson" readOnly></a-input-search>
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
@@ -54,39 +48,40 @@
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
-                        <a-form-item label="业务类型">
-                            <a-select v-model="form.type"  style='width:100%' >
-                                <a-select-option value='家装'>家装</a-select-option>
-                                <a-select-option value='工装'>工装</a-select-option>
-                            </a-select>
+                        <a-form-item label="项目编码">
+                            <a-input placeholder="请输入" v-model="form.projectCode" disabled></a-input>
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
-                        <a-form-item label="业务员">
-                            <a-input-search placeholder="请输入" v-model="form.salesperson"  @search="onSearchPerson" readOnly></a-input-search>
+                        <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 :md="4" :sm="24">
-                        <a-form-item label="加工单号">
-                            <a-input placeholder="请输入" v-model="form.workNo"></a-input>
+                        <a-form-item label="业务类型">
+                            <a-select v-model="form.type"  style='width:100%' >
+                                <a-select-option value='家装'>家装</a-select-option>
+                                <a-select-option value='工装'>工装</a-select-option>
+                            </a-select>
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
-                        <a-form-item label="改单版本">
-                            <a-input placeholder="请输入" v-model="form.version"></a-input>
+                        <a-form-item label="制单人">
+                            <a-input placeholder="请输入" v-model="form.createBy" disabled></a-input>
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
-                        <a-form-item label="来源">
-                            <a-input placeholder="请输入" v-model="form.sourceInfo"></a-input>
+                        <a-form-item label="审批人">
+                            <a-input placeholder="请输入" v-model="form.reviewer" disabled></a-input>
                         </a-form-item>
                     </a-col>
+                    
                     <a-col :md="4" :sm="24">
-                        <a-form-item label="备注" :labelCol="{span: 3, offset: 2}">
-                            <a-input placeholder="请输入" v-model="form.remarks"></a-input>
+                        <a-form-item label="工单号">
+                            <a-input placeholder="请输入" v-model="form.workNo"></a-input>
                         </a-form-item>
                     </a-col>
-                    
                 </a-row>
             </a-form>
         </div>
@@ -125,31 +120,36 @@
                     <a-input placeholder="请输入" v-model="record.inventoryCode"></a-input>
                 </a-form-model-item>
             </template>
+            <template slot="attribute" slot-scope="text, record, index">
+                <a-form-model-item prop="attribute" class='sonItem'>
+                    <a-input placeholder="请输入" v-model="record.attribute"></a-input>
+                </a-form-model-item>
+            </template>
             <template slot="unit" slot-scope="text, record, index">
                 <a-form-model-item prop="unit" class='sonItem'>
                     <a-input placeholder="请输入" v-model="record.unit"></a-input>
                 </a-form-model-item>
             </template>
-            <template slot="quantity" slot-scope="text, record, index">
-                <a-form-model-item prop="quantity" class='sonItem'>
-                    <a-input placeholder="请输入" v-model="record.quantity" @blur="chengQuantity(record)"></a-input>
-                </a-form-model-item>
-            </template>
-            <template slot="rate" slot-scope="text, record, index">
-                <a-form-model-item prop="rate" class='sonItem'>
-                    <a-input placeholder="请输入" v-model="record.rate"></a-input>
-                </a-form-model-item>
-            </template>
             <template slot="auxiliaryUnit" slot-scope="text, record, index">
                 <a-form-model-item prop="auxiliaryUnit" class='sonItem'>
                     <a-input placeholder="请输入" v-model="record.auxiliaryUnit"></a-input>
                 </a-form-model-item>
             </template>
+            <template slot="quantity" slot-scope="text, record, index">
+                <a-form-model-item prop="quantity" class='sonItem'>
+                    <a-input placeholder="请输入" v-model="record.quantity" @blur="chengQuantity(record)"></a-input>
+                </a-form-model-item>
+            </template>
             <template slot="unQuantity" slot-scope="text, record, index">
                 <a-form-model-item prop="unQuantity" class='sonItem'>
                     <a-input placeholder="请输入" v-model="record.unQuantity" @blur="chengQuantity(record)"></a-input>
                 </a-form-model-item>
             </template>
+            <template slot="rate" slot-scope="text, record, index">
+                <a-form-model-item prop="rate" class='sonItem'>
+                    <a-input placeholder="请输入" v-model="record.rate"></a-input>
+                </a-form-model-item>
+            </template>
             <template slot="specs" slot-scope="text, record, index">
                 <a-form-model-item prop="specs" class='sonItem'>
                     <a-input placeholder="请输入" v-model="record.specs"></a-input>
@@ -165,24 +165,24 @@
                     <a-input placeholder="请输入" v-model="record.color"></a-input>
                 </a-form-model-item>
             </template>
+            <template slot="fixedNum" slot-scope="text, record, index">
+                <a-form-model-item prop="fixedNum" class='sonItem'>
+                    <a-input placeholder="请输入" v-model="record.fixedNum"></a-input>
+                </a-form-model-item>
+            </template>
             <template slot="fixedLength" slot-scope="text, record, index">
                 <a-form-model-item prop="fixedLength" class='sonItem'>
                     <a-input placeholder="请输入" v-model="record.fixedLength"></a-input>
                 </a-form-model-item>
             </template>
-            <template slot="alloy" slot-scope="text, record, index">
-                <a-form-model-item prop="alloy" class='sonItem'>
-                    <a-input placeholder="请输入" v-model="record.alloy"></a-input>
-                </a-form-model-item>
-            </template>
-            <template slot="standard" slot-scope="text, record, index">
-                <a-form-model-item prop="standard" class='sonItem'>
-                    <a-input placeholder="请输入" v-model="record.standard"></a-input>
+            <template slot="widthHeight" slot-scope="text, record, index">
+                <a-form-model-item prop="widthHeight" class='sonItem'>
+                    <a-input placeholder="请输入" v-model="record.widthHeight"></a-input>
                 </a-form-model-item>
             </template>
-            <template slot="windowNo" slot-scope="text, record, index">
-                <a-form-model-item prop="windowNo" class='sonItem'>
-                    <a-input placeholder="请输入" v-model="record.stanwindowNodard"></a-input>
+            <template slot="pieces" slot-scope="text, record, index">
+                <a-form-model-item prop="pieces" class='sonItem'>
+                    <a-input placeholder="请输入" v-model="record.pieces"></a-input>
                 </a-form-model-item>
             </template>
             <template slot="meterWeight" slot-scope="text, record, index">
@@ -195,16 +195,16 @@
                     <a-input placeholder="请输入" v-model="record.decorationLength"></a-input>
                 </a-form-model-item>
             </template>
+            <template slot="windowNo" slot-scope="text, record, index">
+                <a-form-model-item prop="windowNo" class='sonItem'>
+                    <a-input placeholder="请输入" v-model="record.stanwindowNodard"></a-input>
+                </a-form-model-item>
+            </template>
             <template slot="exclusiveZone" slot-scope="text, record, index">
                 <a-form-model-item prop="exclusiveZone" class='sonItem'>
                     <a-input placeholder="请输入" v-model="record.exclusiveZone"></a-input>
                 </a-form-model-item>
             </template>
-            <template slot="configuration" slot-scope="text, record, index">
-                <a-form-model-item prop="configuration" class='sonItem'>
-                    <a-input placeholder="请输入" v-model="record.configuration"></a-input>
-                </a-form-model-item>
-            </template>
             <template slot="widthLength" slot-scope="text, record, index">
                 <a-form-model-item prop="widthLength" class='sonItem'>
                     <a-input placeholder="请输入" v-model="record.widthLength"></a-input>
@@ -260,11 +260,6 @@
                     <a-input placeholder="请输入" v-model="record.cuttingRightTop"></a-input>
                 </a-form-model-item>
             </template>
-            <template slot="remarks" slot-scope="text, record, index">
-                <a-form-model-item prop="remarks" class='sonItem'>
-                    <a-input placeholder="请输入" v-model="record.remarks"></a-input>
-                </a-form-model-item>
-            </template>
             <template slot="series" slot-scope="text, record, index">
                 <a-form-model-item prop="series" class='sonItem'>
                     <a-input placeholder="请输入" v-model="record.series"></a-input>
@@ -277,44 +272,6 @@
             </template>
         </a-table>
        </a-form-model">
-    </a-card>
-     <a-card :bordered="false" class="bottom" style="margin-bottom:1%">
-        <div class="table-page-search-wrapper">
-            <a-form layout="inline" @keyup.enter.native="searchQuery">
-                <a-row :gutter="24">
-                    <a-col :md="4" :sm="24">
-                        <a-form-item label="制单人">
-                            <a-input placeholder="请输入" v-model="form1.createBy" disabled></a-input>
-                        </a-form-item>
-                    </a-col>
-                    <a-col  :md="4" :sm="24">
-                        <a-form-item label="制单日期">
-                            <a-date-picker showTime valueFormat="YYYY-MM-DD" format = "YYYY-MM-DD" v-model="form1.createTime" disabled/>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :md="4" :sm="24">
-                        <a-form-item label="审批人">
-                            <a-input placeholder="请输入" v-model="form1.reviewer" disabled></a-input>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :md="4" :sm="24">
-                        <a-form-item label="审批日期">
-                            <a-date-picker showTime valueFormat="YYYY-MM-DD" format = "YYYY-MM-DD" v-model="form1.reviewerTime" disabled/>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :md="4" :sm="24">
-                        <a-form-item label="最后修改人">
-                            <a-input placeholder="请输入" v-model="form1.updateBy" disabled></a-input>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :md="4" :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>
     <projectPopup ref="projectPopup" @okData="okData"></projectPopup>
     <inventoryPopup ref="inventoryPopup" @okData="okDataInvent"></inventoryPopup>
@@ -348,7 +305,6 @@
           return {
             visible:false,
             form:{},
-            form1:{},
             defaultMethod:'add',
             dataSource:[],
             loading:false,
@@ -386,45 +342,45 @@
                     ellipsis: true,
                 },
                 {
-                    title: '存货名称',
+                    title: '料品名称',
                     align:"center",
                     dataIndex: 'inventoryName',
                     ellipsis: true,
                     scopedSlots: { customRender: 'inventoryName' } 
                 },
                 {
-                    title: '存货编码',
+                    title: '料品编码',
                     align:"center",
                     dataIndex: 'inventoryCode',
                     ellipsis: true,
                 },
                 {
-                    title: '计量单位',
+                    title: '料品属性',
                     align:"center",
-                    dataIndex: 'unit',
+                    dataIndex: 'attribute',
                     ellipsis: true,
-
+                    scopedSlots: { customRender: 'attribute' } 
                 },
                 {
-                    title: '主数量',
+                    title: '计量单位',
                     align:"center",
-                    dataIndex: 'quantity',
+                    dataIndex: 'unit',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'quantity' } 
 
                 },
                 {
-                    title: '换算率',
+                    title: '辅计量单位',
                     align:"center",
-                    dataIndex: 'rate',
+                    dataIndex: 'auxiliaryUnit',
                     ellipsis: true,
-
                 },
                 {
-                    title: '辅计量单位',
+                    title: '主数量',
                     align:"center",
-                    dataIndex: 'auxiliaryUnit',
+                    dataIndex: 'quantity',
                     ellipsis: true,
+                    scopedSlots: { customRender: 'quantity' } 
+
                 },
                 {
                     title: '辅数量',
@@ -433,6 +389,12 @@
                     ellipsis: true,
                     scopedSlots: { customRender: 'unQuantity' } 
                 },
+                {
+                    title: '换算率',
+                    align:"center",
+                    dataIndex: 'rate',
+                    ellipsis: true,
+                },
                 {
                     title: '规格',
                     align:"center",
@@ -454,33 +416,32 @@
                     scopedSlots: { customRender: 'color' } 
                 },
                 {
-                    title: '定尺',
+                    title: '支数',
                     align:"center",
-                    dataIndex: 'fixedLength',
+                    dataIndex: 'fixedNum',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'fixedLength' } 
+                    scopedSlots: { customRender: 'fixedNum' } 
                 },
                 {
-                    title: '合金',
+                    title: '定尺',
                     align:"center",
-                    dataIndex: 'alloy',
+                    dataIndex: 'fixedLength',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'alloy' } 
+                    scopedSlots: { customRender: 'fixedLength' } 
                 },
                 {
-                    title: '标准',
+                    title: '宽/高',
                     align:"center",
-                    dataIndex: 'standard',
+                    dataIndex: 'widthHeight',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'standard' } 
+                    scopedSlots: { customRender: 'widthHeight' } 
                 },
                 {
-                    title: '窗号',
+                    title: '片数',
                     align:"center",
-                    dataIndex: 'windowNo',
+                    dataIndex: 'pieces',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'windowNo' } 
-
+                    scopedSlots: { customRender: 'pieces' } 
                 },
                 {   
                     title: '米重',
@@ -496,6 +457,15 @@
                     ellipsis: true,
                     scopedSlots: { customRender: 'decorationLength' } 
                 },
+                {
+                    title: '窗号',
+                    align:"center",
+                    dataIndex: 'windowNo',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'windowNo' } 
+
+                },
+               
                 {   
                     title: '专用区',
                     align:"center",
@@ -503,13 +473,6 @@
                     ellipsis: true,
                     scopedSlots: { customRender: 'exclusiveZone' } 
                 },
-                {
-                    title: '配置',
-                    align:"center",
-                    dataIndex: 'configuration',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'configuration' } 
-                },
                 {
                     title: '宽度/长度',
                     align:"center",
@@ -587,13 +550,6 @@
                     ellipsis: true,
                     scopedSlots: { customRender: 'cuttingRightTop' } 
                 },
-                {
-                    title: '备注',
-                    align:"center",
-                    dataIndex: 'remarks',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'remarks' } 
-                },
                 {
                     title: '系列',
                     align:"center",
@@ -620,7 +576,6 @@
                 this.defaultMethod='add'
                 this.dataSource = [] 
                 this.form={}
-                this.form1={}
             },
             handleOk(){
                 var mergedObj = this.form
@@ -673,7 +628,6 @@
                 getAction('/materialRequisition/madeMaterialRequisition/queryById',{id:id}).then(res=>{
                     if(res.success){
                        this.form=res.result
-                       this.form1=res.result
                        this.getSonData(this.form.id)
                     }else{
                       this.$message.error(res.message);
@@ -747,7 +701,7 @@
                 this.$set(this.form,'salesperson',data.Name)
             },
             okDataOrganization(data){
-                this.$set(this.form,'planOrg',data.Name)
+                this.$set(this.form,'productionOrg',data.Name)
             },
             delectRow(){
                 if( this.selectedRowKeys.length==0){

src/views/production/materialprocurement/modules/materialProcurementDetail.vue

@@ -15,8 +15,8 @@
             <a-form layout="inline" @keyup.enter.native="searchQuery">
                 <a-row :gutter="24">
                     <a-col :md="4" :sm="24">
-                        <a-form-item label="计划组织">
-                            <a-input-search placeholder="请输入" v-model="form.planOrg" disabled></a-input-search>
+                        <a-form-item label="生产组织">
+                            <a-input-search placeholder="请输入" v-model="form.productionOrg" disabled></a-input-search>
                         </a-form-item>
                     </a-col>
                     <a-col  :md="4" :sm="24">
@@ -32,32 +32,31 @@
                     <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-option value='开立'> 开立</a-select-option>
+                                <a-select-option value='审核'> 审核</a-select-option>
                                 <a-select-option value='已运算'> 已运算</a-select-option>
-                                <a-select-option value='已请购'> 已请购</a-select-option>
-                                <a-select-option value='已关闭'> 已关闭</a-select-option>
+                                <a-select-option value='关闭'> 关闭</a-select-option>
                             </a-select>
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
-                        <a-form-item label="项目编码">
-                            <a-input placeholder="请输入" v-model="form.projectCode" disabled></a-input>
+                        <a-form-item label="业务员">
+                            <a-input-search placeholder="请输入" v-model="form.salesperson"  disabled></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.project" disabled></a-input-search>
+                        <a-form-item label="计划部门">
+                            <a-input-search placeholder="请输入" v-model="form.planDept" disabled></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.planDept" disabled></a-input-search>
+                        <a-form-item label="项目编码">
+                            <a-input placeholder="请输入" v-model="form.projectCode" disabled></a-input>
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
-                        <a-form-item label="业务员">
-                            <a-input-search placeholder="请输入" v-model="form.salesperson"  disabled></a-input-search>
+                        <a-form-item label="项目名称">
+                            <a-input-search placeholder="请输入" v-model="form.projectName" disabled></a-input-search>
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
@@ -69,26 +68,20 @@
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
-                        <a-form-item label="加工单号">
-                            <a-input placeholder="请输入" v-model="form.workNo" disabled></a-input>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :md="4" :sm="24">
-                        <a-form-item label="改单版本">
-                            <a-input placeholder="请输入" v-model="form.version" disabled></a-input>
+                        <a-form-item label="制单人">
+                            <a-input placeholder="请输入" v-model="form.createBy" disabled></a-input>
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
-                        <a-form-item label="来源">
-                            <a-input placeholder="请输入" v-model="form.sourceInfo" disabled></a-input>
+                        <a-form-item label="审批人">
+                            <a-input placeholder="请输入" v-model="form.reviewer" disabled></a-input>
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
-                        <a-form-item label="备注" :labelCol="{span: 3, offset: 2}">
-                            <a-input placeholder="请输入" v-model="form.remarks" disabled></a-input>
+                        <a-form-item label="工单号">
+                            <a-input placeholder="请输入" v-model="form.workNo" disabled></a-input>
                         </a-form-item>
-                    </a-col>
-                    
+                    </a-col>                    
                 </a-row>
             </a-form>
         </div>
@@ -110,44 +103,6 @@
           >
         </a-table>
        </a-form-model">
-    </a-card>
-     <a-card :bordered="false" class="bottom" style="margin-bottom:1%">
-        <div class="table-page-search-wrapper">
-            <a-form layout="inline" @keyup.enter.native="searchQuery">
-                <a-row :gutter="24">
-                    <a-col :md="4" :sm="24">
-                        <a-form-item label="制单人">
-                            <a-input placeholder="请输入" v-model="form1.createBy" disabled></a-input>
-                        </a-form-item>
-                    </a-col>
-                    <a-col  :md="4" :sm="24">
-                        <a-form-item label="制单日期">
-                            <a-date-picker showTime valueFormat="YYYY-MM-DD" format = "YYYY-MM-DD" v-model="form1.createTime" disabled/>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :md="4" :sm="24">
-                        <a-form-item label="审批人">
-                            <a-input placeholder="请输入" v-model="form1.reviewer" disabled></a-input>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :md="4" :sm="24">
-                        <a-form-item label="审批日期">
-                            <a-date-picker showTime valueFormat="YYYY-MM-DD" format = "YYYY-MM-DD" v-model="form1.reviewerTime" disabled/>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :md="4" :sm="24">
-                        <a-form-item label="最后修改人">
-                            <a-input placeholder="请输入" v-model="form1.updateBy" disabled></a-input>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :md="4" :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>
     </a-modal>
   </template>
@@ -174,7 +129,7 @@
             selectedRowKeys:[],
             selectedRows:[],
             columns: [
-                {
+            {
                     title: '#',
                     dataIndex: '',
                     key: 'rowIndex',
@@ -203,40 +158,42 @@
                     ellipsis: true,
                 },
                 {
-                    title: '存货名称',
+                    title: '料品名称',
                     align:"center",
                     dataIndex: 'inventoryName',
                     ellipsis: true,
                 },
                 {
-                    title: '存货编码',
+                    title: '料品编码',
                     align:"center",
                     dataIndex: 'inventoryCode',
                     ellipsis: true,
                 },
                 {
-                    title: '计量单位',
+                    title: '料品属性',
                     align:"center",
-                    dataIndex: 'unit',
+                    dataIndex: 'attribute',
                     ellipsis: true,
                 },
                 {
-                    title: '主数量',
+                    title: '计量单位',
                     align:"center",
-                    dataIndex: 'quantity',
+                    dataIndex: 'unit',
                     ellipsis: true,
+
                 },
                 {
-                    title: '换算率',
+                    title: '辅计量单位',
                     align:"center",
-                    dataIndex: 'rate',
+                    dataIndex: 'auxiliaryUnit',
                     ellipsis: true,
                 },
                 {
-                    title: '辅计量单位',
+                    title: '主数量',
                     align:"center",
-                    dataIndex: 'auxiliaryUnit',
+                    dataIndex: 'quantity',
                     ellipsis: true,
+
                 },
                 {
                     title: '辅数量',
@@ -244,6 +201,12 @@
                     dataIndex: 'unQuantity',
                     ellipsis: true,
                 },
+                {
+                    title: '换算率',
+                    align:"center",
+                    dataIndex: 'rate',
+                    ellipsis: true,
+                },
                 {
                     title: '规格',
                     align:"center",
@@ -263,29 +226,28 @@
                     ellipsis: true,
                 },
                 {
-                    title: '定尺',
+                    title: '支数',
                     align:"center",
-                    dataIndex: 'fixedLength',
+                    dataIndex: 'fixedNum',
                     ellipsis: true,
                 },
                 {
-                    title: '合金',
+                    title: '定尺',
                     align:"center",
-                    dataIndex: 'alloy',
+                    dataIndex: 'fixedLength',
                     ellipsis: true,
                 },
                 {
-                    title: '标准',
+                    title: '宽/高',
                     align:"center",
-                    dataIndex: 'standard',
+                    dataIndex: 'widthHeight',
                     ellipsis: true,
                 },
                 {
-                    title: '窗号',
+                    title: '片数',
                     align:"center",
-                    dataIndex: 'windowNo',
+                    dataIndex: 'pieces',
                     ellipsis: true,
-
                 },
                 {   
                     title: '米重',
@@ -299,16 +261,18 @@
                     dataIndex: 'decorationLength',
                     ellipsis: true,
                 },
-                {   
-                    title: '专用区',
+                {
+                    title: '窗号',
                     align:"center",
-                    dataIndex: 'exclusiveZone',
+                    dataIndex: 'windowNo',
                     ellipsis: true,
+
                 },
-                {
-                    title: '配置',
+               
+                {   
+                    title: '专用区',
                     align:"center",
-                    dataIndex: 'configuration',
+                    dataIndex: 'exclusiveZone',
                     ellipsis: true,
                 },
                 {
@@ -377,12 +341,6 @@
                     dataIndex: 'cuttingRightTop',
                     ellipsis: true,
                 },
-                {
-                    title: '备注',
-                    align:"center",
-                    dataIndex: 'remarks',
-                    ellipsis: true,
-                },
                 {
                     title: '系列',
                     align:"center",