Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/assets

src/components/Materialman/Archivesmaterials.vue

@@ -86,6 +86,7 @@
         <el-dialog
             :title="dialogtitle"
             :visible.sync="dialogState"
+            :before-close="closeChangeMachie"
             top="3%"
             width="850px">
             <el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0">
@@ -103,7 +104,7 @@
                 </el-form-item>
                 <el-form-item class="treeItem" style="float:left;">
                     <span class="label">分类</span>
-                    <treeselect style="height:32px" class='w200 fl' :options="treedata" v-model="addMsg.CategoryId" placeholder="不限"
+                    <treeselect style="height:32px" :options="treedata" v-model="addMsg.CategoryId" placeholder="不限"
                         :normalizer="normalizer" @select='treeClick' />
                 </el-form-item>
                 <el-form-item>
@@ -161,7 +162,7 @@
                 </div>
                 <div class="btnformItem">
                     <span class="submitBtn" type="primary" @click="submitForm('addMsg')">确定</span>
-                    <span class="exitBtn" @click="dialogState=false,linitMsg()">取消</span>
+                    <span class="exitBtn" @click="dialogState=false,initMsg()">取消</span>
                 </div>
             </el-form>
         </el-dialog>
@@ -348,7 +349,7 @@ export default {
     submitForm(formName) {
         this.$refs[formName].validate((valid) => {
             if (valid) {
-                this.apiJavaPost("/api/Supplies/SetWareHouseInfo",this.addMsg,
+                this.apiJavaPost("/api/Supplies/SetMaterialInfo",this.addMsg,
                     res => {
                     if (res.data.resultCode === 1) {
                         this.getList();
@@ -376,7 +377,6 @@ export default {
             res => {
             this.loading=false;
             if (res.data.resultCode === 1) {
-                console.log("res",res);
                 this.tableData=res.data.data.pageData;
                 this.total=res.data.data.count;
             } else {
@@ -390,6 +390,7 @@ export default {
         this.dialogtitle="编辑物料档案";
         this.dialogState=true;
         this.addMsg=Object.assign({},item)
+        console.log(item,'itemmm');
         if(!this.addMsg.ImageList){
             this.addMsg.ImageList=[];
         }
@@ -435,8 +436,11 @@ export default {
             },
             null
         );
-    }    
-
+    },
+    closeChangeMachie() {
+      this.dialogState=false;
+      this.initMsg();
+    }
   },
   
 }