jingbb vor 10 Monaten
Ursprung
Commit
f3773a825f
2 geänderte Dateien mit 45 neuen und 16 gelöschten Zeilen
  1. 44 15
      src/views/production/mrp/modules/operation.vue
  2. 1 1
      src/views/production/mrp/mrp.vue

+ 44 - 15
src/views/production/mrp/modules/operation.vue

@@ -13,21 +13,28 @@
         <div class="table-page-search-wrapper">
             <a-form-model layout="inline" :model="form" :rules="rules"  ref="form">
                 <a-row :gutter="24">
+                    <a-col :md="24" :sm="24">
+                        <a-form-model-item label="组织" prop="pkOrg">
+                            <a-select v-model="form.pkOrg"  style='width:100%'>
+                                <a-select-option v-for="(item,index) in optionOrg" :key="index" :value="item.ID">{{ item.Name }}</a-select-option>
+                            </a-select>
+                        </a-form-model-item>
+                    </a-col>
                     <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 v-model="form.type"  style='width:100%'>
                                 <a-select-option value='mrp'>mrp</a-select-option>
                                 <a-select-option value='安全库存'>安全库存</a-select-option>
                             </a-select>
                         </a-form-model-item>
                     </a-col>
                     <a-col  :md="24" :sm="24">
-                        <a-form-model-item label="项目名称" prop="projectName" >
-                            <a-input-search placeholder="请输入" v-model="form.projectName" @search="onSearchProject"></a-input-search>
+                        <a-form-model-item label="项目名称" prop="projectName" v-if="form.type=='mrp'">
+                            <a-input-search placeholder="请输入" v-model="form.projectName" @search="onSearchProject" readOnly></a-input-search>
                         </a-form-model-item>
                     </a-col>
                     <a-col :md="24" :sm="24">
-                        <a-form-model-item label="工单号" prop="workNo">
+                        <a-form-model-item label="工单号" prop="workNo" v-if="form.type=='mrp'">
                             <a-input placeholder="请输入" v-model="form.workNo"></a-input>
                         </a-form-model-item>
                     </a-col>   
@@ -58,14 +65,17 @@
             form1:{},
             loading:false,
             rules:{
+                pkOrg:[
+                    { required: true, trigger: 'change' },
+                ],
                 type: [
                     { required: true, trigger: 'change' },
                 ],
                 projectName: [
-                    { required: false, trigger: 'change' },
+                    { required: true, trigger: 'change' },
                 ],
                 workNo: [
-                    { required: false, trigger: 'change' },
+                    { required: true, trigger: 'change' },
                 ],
                 inventoryType: [
                     { required: false, trigger: 'change' },
@@ -74,10 +84,11 @@
             // ipagination:{},
             selectedRowKeys:[],
             selectedRows:[],
+            optionOrg:[]
           }
         },
         created() {
-          
+          this.getOption()
         },
         methods: {
             handleCancel(){
@@ -90,12 +101,30 @@
             handleOk(){
                 this.$refs.form.validate(success => {
 	              if (success) {
-
+                    getAction('/production/safetyStock/selectOrganization',this.form).then(res=>{
+                        if(res.success){
+                            this.handleCancel()
+                          this.$emit('ok')
+                        }else{
+                          this.$message.error(res.message);
+                          
+                        }
+                    })
                   }
                 })
             },
             onSearch(){
                
+            },
+            getOption(){
+                getAction('/production/safetyStock/selectOrganization').then(res=>{
+                        if(res.success){
+                          this.optionOrg = res.result.records
+                        }else{
+                          this.$message.error(res.message);
+                          
+                        }
+                })
             },
             onSearchProject(){
                 this.$refs.projectPopup.visible = true
@@ -106,13 +135,13 @@
                 this.$set(this.form,'project',data.ID)
             },
             changeType(prop){
-                // 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
-                // }
+                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
+                }
             }
         }
       }

+ 1 - 1
src/views/production/mrp/mrp.vue

@@ -130,7 +130,7 @@
       
             </a-table>
           </div>
-          <operation ref="operation"></operation>
+          <operation ref="operation" @ok="searchQuery"></operation>
           <MRPEdit ref="MRPEdit" @ok="searchQuery"></MRPEdit>
           <MRPDetail ref="MRPDetail" @ok="searchQuery"></MRPDetail>
           <!-- table区域-end -->