Merge branch 'master' of http://139.196.39.194:9021/yuansh/doors-windows-web

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

@@ -84,11 +84,11 @@
                         </a-form-item>
                     </a-col>
                     
-                    <a-col :md="4" :sm="24">
+                  <!--  <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> -->
                 </a-row>
             </a-form>
         </div>
@@ -107,7 +107,7 @@
             <a-tab-pane tab="采购需求" :key="refKeys[3]" :forceRender="true">
                 <ProRequirementsDetail ref="ProRequirementsDetail"></ProRequirementsDetail>
             </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">
                 <TraRequirementsDeatail ref="TraRequirementsDeatail"></TraRequirementsDeatail>
             </a-tab-pane>
         </a-tabs>

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

@@ -330,7 +330,7 @@
                                 alertModal.closeLoading();
                                 if(res.success){
                                     this.getProRequirementsData(this.form.id)
-                                    this.$message.error(res.message);
+                                    this.$message.success(res.message);
                                 }else{
                                     this.$message.error(res.message);
                                 }
@@ -359,7 +359,7 @@
                                 alertModal.closeLoading();
                                 if(res.success){
                                     this.getTraRequirementsData(this.form.id)
-                                    this.$message.error(res.message);
+                                    this.$message.success(res.message);
                                 }else{
                                     this.$message.error(res.message);
                                 }

src/views/production/mrp/mrp.vue

@@ -220,6 +220,13 @@
                   dataIndex: 'state',
                   ellipsis: true,
     
+                },
+                {
+                  title: '类型',
+                  align:"center",
+                  dataIndex: 'type1',
+                  ellipsis: true,
+    
                 },
                 {
                   title: '业务员',
@@ -438,7 +445,7 @@
                                 Message({
                                   dangerouslyUseHTMLString: true,
                                   message: str,
-                                  type: 'info'
+                                  type: ''
                                 });
                               }else{
                                 var arr = res.message.split(";");