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

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

@@ -94,7 +94,11 @@
                                         orderDetail.fixtureGuid
                                     }}</span>
                                 </p>
+                                <Button type="primary" @click="modal = true"
+                                    >储位选择</Button
+                                >
                             </div>
+
                             <div>
                                 <Button type="primary" @click="feedReady()"
                                     >准备上料</Button
@@ -217,6 +221,7 @@
                                 type="primary"
                                 size="large"
                                 v-text="$t('1011')"
+                                @click="modal = false"
                                 >提交</Button
                             >
                         </div>
@@ -391,9 +396,11 @@ export default {
             }
             let data = {
                 section: this.sectionid,
-                code: this.orderDetail.fixtureGuid,
+                code: this.orderDetail.orderNumber,
+                guid:this.orderDetail.fixtureGuid,
+                locationid:this.orderDetail.location
             };
-            this.request("/acc/AutomationOperate/Loading", data, "post").thne(
+            this.request("/acc/AutomationOperate/Loading", data, "post").then(
                 (res) => {
                     if (res.data.ret == 1) {
                         console.log(res.data.data);
@@ -416,6 +423,9 @@ export default {
         },
         handleRowChange(currentRow, oldCurrentRow) {
             this.detailobj = currentRow;
+            this.orderDetail.fixtureGuid = this.detailobj.fixtureguid;
+            this.orderDetail.location = this.detailobj.locationid;
+
         },
         request(url, data, type) {
             if (type == "get") {

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

@@ -379,6 +379,7 @@ export default {
     created() {
         this.columns1 = this.$time.initTableTitle(this.columns1);
         this.initFrockType();
+        this.search(1,10)
     },
     methods: {
         search(page, pagesize) {
@@ -402,6 +403,13 @@ export default {
             });
         },
         add() {
+            this.parentType = [];
+            this.parentId = 0;
+            this.sonType= [];
+            this.sonId = 0;
+            this.remark = '';
+            this.fileurl = '';
+            this.filename = '';
             this.modal = true;
             this.type = 1;
         },
@@ -413,7 +421,7 @@ export default {
                 filename: this.filename, //附件名称
                 status: 1,
             };
-            this.request("/acc/AutomationLocation/Add", data, "post").then(
+            this.request("/acc/FixtureToolsAssembly/Add", data, "post").then(
                 (res) => {
                     if (res.data.ret == 1) {
                     } else {

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

@@ -255,12 +255,6 @@ export default {
             filename: '',//文件名称
             fileurl:'',//文件路径
             UploadAction: this.axios.publicPath + "config/upload/UploadImage",
-            headers: {
-                token: localStorage.getItem("token"),
-                timestamp: localStorage.getItem("timestamp"),
-                nonce: localStorage.getItem("nonce"),
-                sign: localStorage.getItem("sign"),
-            },
             spinShow:false,
         }
     },

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

@@ -289,12 +289,6 @@ export default {
             filename: '',//文件名称
             fileurl:'',//文件路径
             UploadAction: this.axios.publicPath + "config/upload/UploadImage",
-            headers: {
-                token: localStorage.getItem("token"),
-                timestamp: localStorage.getItem("timestamp"),
-                nonce: localStorage.getItem("nonce"),
-                sign: localStorage.getItem("sign"),
-            },
             spinShow:false,
         }
     },