소스 검색

mrp-页面修改

jingbb 11 달 전
부모
커밋
d302dcd7b7
2개의 변경된 파일35개의 추가작업 그리고 25개의 파일을 삭제
  1. 5 6
      src/views/production/mrp/modules/MRPEdit.vue
  2. 30 19
      src/views/production/mrp/mrp.vue

+ 5 - 6
src/views/production/mrp/modules/MRPEdit.vue

@@ -1,6 +1,6 @@
 <template>
     <a-modal
-      title="编辑"
+      :title="title"
        width="95%"
       :visible="visible"
       :maskClosable="false"
@@ -91,8 +91,8 @@
      <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=='工装'">更新采购需求</a-button> -->
-            <a-button  size="small" @click="generatePurchaseOrder">生成采购单</a-button>
-            <a-button  size="small" @click="generatetRansferOrder">生成转库单</a-button>
+            <a-button  size="small" @click="generatePurchaseOrder" :disabled="activeKey!=='ProRequirements'||form.state=='开立'">生成采购单</a-button>
+            <a-button  size="small" @click="generatetRansferOrder" :disabled="activeKey!=='Warehousing'||form.state=='开立'">生成转库单</a-button>
        </div>
        <a-tabs v-model="activeKey" @change="handleChangeTabs">
             <a-tab-pane tab="需求" :key="refKeys[0]" :forceRender="true">
@@ -107,7 +107,7 @@
             <a-tab-pane tab="采购需求" :key="refKeys[3]" :forceRender="true">
                 <ProRequirements ref="ProRequirements"></ProRequirements>
             </a-tab-pane>
-            <a-tab-pane tab="转库需求" :key="refKeys[4]" :forceRender="true" v-if="form.type=='工装'">
+            <a-tab-pane tab="转库需求" :key="refKeys[4]" :forceRender="true" >
                 <TraRequirements ref="TraRequirements"></TraRequirements>
             </a-tab-pane>
         </a-tabs>
@@ -159,6 +159,7 @@
             selectedRowKeys:[],
             selectedRows:[],
             activeKey:'demand',
+            title:'编辑',
             refKeys:['demand','supply','supplyDemandBalance','ProRequirements','Warehousing'],
           }
         },
@@ -206,9 +207,7 @@
                        this.getSupplyData(this.form.id)
                        this.getSupplyDemandBalanceData(this.form.id)
                        this.getProRequirementsData(this.form.id)
-                       if(this.form.type=='工装'){
                         this.getTraRequirementsData(this.form.id)
-                       }  
                     }else{
                       this.$message.error(res.message);
                     }

+ 30 - 19
src/views/production/mrp/mrp.vue

@@ -106,6 +106,7 @@
           <div class="table-operator">
             <a-button type="danger" size="small" @click='operationList'>运算</a-button>
             <a-button  size="small" @click='editList'>修改</a-button>
+            <a-button  size="small" @click='actionList'>订单操作</a-button>
             <a-button  size="small" @click='detailList'>详情</a-button>
             <a-button type="danger" size="small" @click='DelectList'>删除</a-button>
             <a-button  size="small" @click='examine'>审批</a-button>
@@ -277,13 +278,13 @@
     
                 },
                 
-                {
-                  title: '创建人',
-                  align:"center",
-                  dataIndex: 'createBy',
-                  ellipsis: true,
+                // {
+                //   title: '创建人',
+                //   align:"center",
+                //   dataIndex: 'createBy',
+                //   ellipsis: true,
     
-                },
+                // },
                 {
                   title: '创建时间',
                   align:"center",
@@ -291,24 +292,20 @@
                   ellipsis: true,
                 },
               ],
-              importExcelUrl:'/production/safetyStock/importExcel',
                  // ---------workflow  by fhf start -------------
               serviceName: 'assetAllocationService',
               // ---------workflow  by fhf end -------------
               }
             },
             computed: {
-              importExcelUrl: function(){
-                  return `${window._CONFIG['domianURL']}/${this.importExcelUrl}`;
-              },
             },
       
           created () {
-            this.getTableList()
+            this.loadData()
            },
           methods: {
             //获取数据
-            getTableList(){
+            loadData(){
               alertModal.loading("执行中,请稍后!")
               getAction('/MRPOperationList/madeOperationList/list',this.queryParam).then(res=>{
                         alertModal.closeLoading();
@@ -332,7 +329,7 @@
               this.selectedRowKeys=[]
               this.selectedRows=[]
               this.queryParam.pageNo=1
-              this.getTableList()
+              this.loadData()
             },
             //单据日期
             changeStartDate(data){
@@ -346,7 +343,7 @@
             searchReset(){
                 this.queryParam={}
                 this.orderDate = []
-                this.getTableList()
+                this.loadData()
             },
             //新增
             operationList(){
@@ -355,8 +352,22 @@
             editList(){
               if(this.selectedRowKeys.length!==1){
                 this.$message.warning('请勾选一条数据!')
+              }else if(this.selectedRows[0].state=='审核'){
+                this.$message.warning('此状态数据不可修改!')
+              }else{
+                this.$refs.MRPEdit.visible = true
+                this.$refs.MRPEdit.title = '编辑'
+                this.$refs.MRPEdit.getMainData(this.selectedRowKeys[0])
+              }
+            },
+            actionList(){
+              if(this.selectedRowKeys.length!==1){
+                this.$message.warning('请勾选一条数据!')
+              }else if(this.selectedRows[0].state=='开立'||this.selectedRows[0].state=='关闭'){
+                this.$message.warning('该状态订单不可操作')
               }else{
                 this.$refs.MRPEdit.visible = true
+                this.$refs.MRPEdit.title = '订单操作'
                 this.$refs.MRPEdit.getMainData(this.selectedRowKeys[0])
               }
             },
@@ -381,7 +392,7 @@
                           alertModal.closeLoading();
                           if (res.success) {
                             this.$message.success('删除成功!');
-                            this.getTableList()
+                            this.loadData()
                           } else {
                             this.$message.error(res.message);
                           }
@@ -399,7 +410,7 @@
                       alertModal.closeLoading();
                       if (res.success) {
                         this.$message.success('删除成功!');
-                        this.getTableList()
+                        this.loadData()
                       } else {
                         this.$message.error(res.message);
                       }
@@ -423,7 +434,7 @@
                               if(res.success){
                                 var arr = res.message.split(";");
                                 var str = arr.join(' <br/> ');
-                                this.getTableList()
+                                this.loadData()
                                 Message({
                                   dangerouslyUseHTMLString: true,
                                   message: str,
@@ -458,7 +469,7 @@
                               if(res.success){
                                 var arr = res.message.split(";");
                                 var str = arr.join(' <br/> ');
-                                this.getTableList()
+                                this.loadData()
                                 Message({
                                   dangerouslyUseHTMLString: true,
                                   message: str,
@@ -487,7 +498,7 @@
             handleTableChange(pagination, filters, sorter) {
                 this.queryParam.pageNo = pagination.current
                 this.queryParam.pageSize = pagination.pageSize
-                this.getTableList()
+                this.loadData()
             },
            
             //双击