mrp-档案弹窗

src/views/production/Popup/OperatorsPopup.vue

@@ -77,9 +77,9 @@
                     ellipsis: true,
                 },
                 {
-                    title: 'ID',
+                    title: 'Code',
                     align:"center",
-                    dataIndex: 'ID',
+                    dataIndex: 'Code',
                     ellipsis: true,
                 },
             ]

src/views/production/Popup/deparmentPopup.vue

@@ -77,9 +77,9 @@
                     ellipsis: true,
                 },
                 {
-                    title: 'ID',
+                    title: 'Code',
                     align:"center",
-                    dataIndex: 'ID',
+                    dataIndex: 'Code',
                     ellipsis: true,
                 },
             ]

src/views/production/Popup/organizationPopup.vue

@@ -77,9 +77,9 @@
                     ellipsis: true,
                 },
                 {
-                    title: 'ID',
+                    title: 'Code',
                     align:"center",
-                    dataIndex: 'ID',
+                    dataIndex: 'Code',
                     ellipsis: true,
                 },
             ]

src/views/production/Popup/projectPopup.vue

@@ -83,9 +83,9 @@
                     ellipsis: true,
                 },
                 {
-                    title: 'ID',
+                    title: 'Code',
                     align:"center",
-                    dataIndex: 'ID',
+                    dataIndex: 'Code',
                     ellipsis: true,
                 },
             ]

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

@@ -14,16 +14,16 @@
      </template>
       <a-card :bordered="false" class="top" style="margin-bottom:1%;margin-top:1%" :loading = 'loading'>
         <div class="table-page-search-wrapper">
-            <a-form layout="inline" @keyup.enter.native="searchQuery">
+            <a-form layout="inline" >
                 <a-row :gutter="24">
                     <a-col :md="4" :sm="24">
                         <a-form-item label="生产组织">
-                            <a-input-search placeholder="请输入" v-model="form.productionOrg" @search="onSearch" ></a-input-search>
+                            <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">
                         <a-form-item label="项目">
-                            <a-input-search placeholder="请输入" v-model="form.project" @search="onSearch" ></a-input-search>
+                            <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">
@@ -44,7 +44,7 @@
                     </a-col>
                     <a-col :md="4" :sm="24">
                         <a-form-item label="计划部门">
-                            <a-input-search placeholder="请输入" v-model="form.planDept" @search="onSearch" ></a-input-search>
+                            <a-input-search placeholder="请输入" v-model="form.planDept" @search="onSearchDept" readOnly ></a-input-search>
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
@@ -104,7 +104,7 @@
     </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-form layout="inline" >
                 <a-row :gutter="24">
                     <a-col :md="6" :sm="24">
                         <a-form-item label="制单人">
@@ -130,6 +130,9 @@
             </a-form>
          </div>
     </a-card>
+    <organizationPopup ref="organizationPopup" @okData="okDataOrganization"></organizationPopup>
+    <projectPopup ref="projectPopup" @okData="okData"></projectPopup>
+    <deparmentPopup ref="deparmentPopup" @okData="okDataDeparment"></deparmentPopup>
     </a-modal>
   </template>
   <script>
@@ -143,6 +146,9 @@
       import supplyDemandBalance from './supplyDemandBalance'
       import ProRequirements from './ProRequirements'
       import TraRequirements from './TraRequirements'
+      import organizationPopup from '../../Popup/organizationPopup.vue'
+      import projectPopup from '../../Popup/projectPopup'
+      import deparmentPopup from '../../Popup/deparmentPopup.vue'
       export default {
         name: 'MRPEdit',
         mixins: [JEditableTableModelMixin],
@@ -151,7 +157,10 @@
             supply,
             supplyDemandBalance,
             ProRequirements,
-            TraRequirements
+            TraRequirements,
+            organizationPopup,
+            projectPopup,
+            deparmentPopup
         },
         data() {
           return {
@@ -185,6 +194,20 @@
             },
             onSearch(){
                
+            },
+            onSearchProject(){
+                this.$refs.projectPopup.visible = true
+                this.$refs.projectPopup.getData()
+            },
+            onSearchDept(){
+                this.$refs.deparmentPopup.visible = true
+                this.$refs.deparmentPopup.getData()
+            },
+            okData(data){
+                this.$set(this.form,'projectName',data.Name)
+            },
+            okDataDeparment(data){
+                this.$set(this.form,'planDept',data.Name)
             },
             getMainData(id){
                 getAction('/MRPOperationList/madeOperationList/queryById',{id:id}).then(res=>{
@@ -248,6 +271,13 @@
                     }
                 })
             },
+            onSearchPlanOrg(){
+                this.$refs.organizationPopup.visible = true
+                this.$refs.organizationPopup.getData()
+            },
+            okDataOrganization(data){
+                this.$set(this.form,'productionOrg',data.Name)
+            },
             changeType(prop){
                 if(prop=='工装'){
                     this.getTraRequirementsData(this.form.id)

src/views/production/mrp/mrp.vue

@@ -8,7 +8,7 @@
               <a-row :gutter="24">
                 <a-col :md="4" :sm="24">
                   <a-form-item label="生产组织">
-                    <a-input-search placeholder="请输入" v-model="queryParam.productionOrg" @search="onSearch"></a-input-search>
+                    <a-input placeholder="请输入" v-model="queryParam.productionOrg"></a-input>
                   </a-form-item>
                 </a-col>
                 <a-col  :md="4" :sm="24">
@@ -24,18 +24,18 @@
                   </a-col>
                   <a-col :md="4" :sm="24">
                     <a-form-item label="项目">
-                      <a-input-search placeholder="请输入" v-model="queryParam.project" @search="onSearch"></a-input-search>
+                      <a-input placeholder="请输入" v-model="queryParam.project" ></a-input>
                     </a-form-item>
                   </a-col>
                 <template v-if="toggleSearchStatus">
                   <a-col :md="4" :sm="24">
                     <a-form-item label="业务员">
-                      <a-input-search placeholder="请输入" v-model="queryParam.salesperson" @search="onSearch"></a-input-search>
+                      <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-search placeholder="请输入" v-model="queryParam.planDept" @search="onSearch"></a-input-search>
+                        <a-input placeholder="请输入" v-model="queryParam.planDept" ></a-input>
                     </a-form-item>
                   </a-col>
                   <a-col :md="4" :sm="24">