mrp运算-字段修改

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

@@ -17,12 +17,12 @@
                 <a-row :gutter="24">
                     <a-col :md="4" :sm="24">
                         <a-form-item label="生产组织">
-                            <a-input-search placeholder="请输入" v-model="form.productionOrg" @search="onSearch" disabled></a-input-search>
+                            <a-input-search placeholder="请输入" v-model="form.orgName" @search="onSearch" 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" @search="onSearch" disabled></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">
@@ -30,10 +30,9 @@
                             <a-date-picker showTime valueFormat="YYYY-MM-DD" format = "YYYY-MM-DD" v-model="form.orderDate" style="width:100%" disabled/>
                         </a-form-item>
                     </a-col>
-                    
-                    <a-col  :md="4" :sm="24">
-                        <a-form-item label="单据号">
-                            <a-input placeholder="请输入" v-model="form.orderCode" disabled></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">
@@ -47,18 +46,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="onSearch" 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.remarks"  @search="onSearch"  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>  
                     <a-col :md="4" :sm="24">
                         <a-form-item label="业务类型">
                             <a-select v-model="form.type"  style='width:100%'  @change="changeType" disabled>
@@ -67,6 +63,27 @@
                             </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-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-item label="备注">
+                            <a-input placeholder="请输入" v-model="form.remarks"   disabled></a-input>
+                        </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>
@@ -77,11 +94,6 @@
         </div>
      </a-card>
      <a-card :bordered="false" class="three" style="margin-bottom:1%" :loading = 'loading'>
-       <div class="table-operator">
-            <a-button type="danger" size="small"  @click="updataProRequirment" v-if="form.type=='工装'" disabled>更新采购需求</a-button>
-            <a-button  size="small" disabled>生成采购单</a-button>
-            <a-button  size="small" disabled>生成转库单</a-button>
-       </div>
        <a-tabs v-model="activeKey" @change="handleChangeTabs">
             <a-tab-pane tab="需求" :key="refKeys[0]" :forceRender="true">
                 <demand ref="demand"></demand>
@@ -101,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" @keyup.enter.native="searchQuery">
-                <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>
     </a-modal>
   </template>
   <script>
@@ -156,7 +140,6 @@
           return {
             visible:false,
             form:{},
-            form1:{},
             execute:undefined,
             dataSource:[],
             loading:false,
@@ -176,7 +159,6 @@
                 this.activeKey='demand',
                 this.dataSource = [] 
                 this.form={}
-                this.form1={}
                 this.$emit('ok')
             },
             handleTableChange(){
@@ -189,7 +171,6 @@
                 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)

src/views/production/mrp/mrp.vue

@@ -122,7 +122,7 @@
               :columns="columns"
               :dataSource="dataSource"
               :pagination="ipagination"
-              :scroll="{ x: 1500, y: 300 }"
+              :scroll="{ x: 1800, y: 300 }"
               :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
               @change="handleTableChange"
               :customRow ="clickRow"
@@ -193,9 +193,9 @@
                   }
                 },
                 {
-                  title: '生产组织',
+                  title: '组织',
                   align:"center",
-                  dataIndex: 'productionOrg',
+                  dataIndex: 'orgName',
                   ellipsis: true,
     
                 },