Merge branch 'master' of http://test.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

Html/src/view/fml/operation_manage/feedingBlanking.vue

@@ -352,12 +352,15 @@ export default {
             this.b = index;
             let status = this.stationList[index].status;
             this.sectionid = this.stationList[index].section;
-            if (status == 1) {
-                this.attr2 = true;
-            } else {
+            if (status == 3) {
                 this.attr1 = true;
                 this.tabindex = "2";
                 this.getRunningDetail(index);
+            } else {
+                this.attr2 = true;
+            }
+            if (status == 2) {
+                this.getRunningDetail(index);
             }
         },
         //获取储位

Html/src/view/fms/associate/assemblyInfo.vue

@@ -424,6 +424,7 @@ export default {
             fileurl: "",
             filename: "",
             UploadAction: this.axios.publicPath + "config/upload/UploadImage",
+            childObj:{}
         };
     },
     created() {

Html/src/view/fms/config/accountInfo.vue

@@ -23,7 +23,7 @@
             <div class="searchBtn">
                 <Button type="primary" class="twoWord" icon="ios-search" @click="tosearch()">{{ $t(1001) }}</Button>
                 <Button type="success" class="twoWord" icon="md-add-circle" @click="add()">{{$t('1002')}}</Button>
-                <Button type="warning" class="twoWord" icon="ios-create-outline" @click="edit()">{{$t('1003')}}</Button>
+                <Button type="warning" class="twoWord intervalRight" icon="ios-create-outline" @click="edit()">{{$t('1003')}}</Button>
                 <Button type="primary" class="fourWord" icon="md-download" @click="loadexcel()">{{$t('1005')}}</Button>
                 <Upload
                     style="display:inline-block"
@@ -127,9 +127,9 @@
                         <Upload
                             ref="upload"
                             :show-upload-list="false"
-                            :on-success="handleSuccess"
+                            :on-success="handleSuccess1"
                             :before-upload="handleBeforeUpload"
-                            :on-error="handleError"
+                            :on-error="handleError1"
                             type="drag"
                             :headers="headers"
                             :action="UploadAction">