add

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

@@ -103,7 +103,7 @@
                                 <Button type="primary" @click="feedReady()"
                                     >准备上料</Button
                                 >
-                                <Button type="primary">安装完成</Button>
+                                <Button type="primary" @click="installOver()">安装完成</Button>
                             </div>
                         </TabPane>
                         <TabPane label="下料" :disabled="attr2" name="2"

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

@@ -106,7 +106,6 @@
                 class="tableClass"
                 :columns="columns1"
                 :data="data1"
-               
                 @on-row-click="onExpand"
             ></Table>
             <div class="pageDiv">
@@ -275,7 +274,10 @@ export default {
                                 highlightRow: true,
                             },
                             on: {
-                                'on-current-change': (currentRow,oldCurrentRow) => {
+                                "on-current-change": (
+                                    currentRow,
+                                    oldCurrentRow
+                                ) => {
                                     this.childObj = currentRow;
                                     console.log(currentRow);
                                 },
@@ -426,7 +428,7 @@ export default {
             fileurl: "",
             filename: "",
             UploadAction: this.axios.publicPath + "config/upload/UploadImage",
-            childObj:{}
+            childObj: {},
         };
     },
     created() {
@@ -477,7 +479,7 @@ export default {
             this.type = 1;
         },
         addPost() {
-            let url = '';
+            let url = "";
             let data = {
                 parentid: this.toolingId1, //父级工装ID
                 fixturetoolid: this.toolingId2, //工装ID
@@ -486,7 +488,7 @@ export default {
                 status: 1,
             };
             if (this.type == 1) {
-                url = '/acc/FixtureToolsAssembly/Add'
+                url = "/acc/FixtureToolsAssembly/Add";
             }
             if (this.type == 2) {
                 data.id = this.childObj.id;
@@ -501,25 +503,59 @@ export default {
             );
         },
         edit() {
-            if(!this.childObj.id){
-                this.$Message.error('请先选择子工装信息');
+            if (!this.childObj.id) {
+                this.$Message.error("请先选择子工装信息");
                 return false;
             }
             this.parentType = this.childObj.parentcategoryids;
-            this.sonType  = this.childObj.categoryids;
+            this.sonType = this.childObj.categoryids;
             this.parentId = this.childObj.parentcategoryid;
             this.getToolingList(1);
             this.sonId = this.childObj.categoryid;
             this.getToolingList(2);
-            this.$nextTick(()=>{
+            this.$nextTick(() => {
                 this.toolingId1 = this.childObj.parentid;
                 this.toolingId2 = this.childObj.fixturetoolid;
-            })
+            });
+            this.filename = this.childObj.filename;
+            this.fileurl = this.childObj.fileurl;
+            this.remark = this.childObj.remark;
             this.modal = true;
-
-            
         },
-        dele() {},
+        dele() {
+            return;
+            if (this.detailobj.id === undefined || this.detailobj.id === null) {
+                this.$Message.error(this.$t("1017"));
+                return false;
+            } else {
+                var params = {
+                    id: this.detailobj.id,
+                };
+                this.$Modal.confirm({
+                    title: this.$t("1018"),
+                    content: "",
+                    width: "290px",
+                    closable: true,
+                    okText: this.$t("1004"),
+                    onOk: () => {
+                        this.axios
+                            .request({
+                                url: "/acc/FixtureToolsProduct/Delete",
+                                params,
+                                method: "get",
+                            })
+                            .then((res) => {
+                                if (res.data.ret === 1) {
+                                    this.$Message.success(this.$t("1058"));
+                                    this.search(0);
+                                } else {
+                                    this.$Message.error(this.$t(res.data.msg));
+                                }
+                            });
+                    },
+                });
+            }
+        },
         loadExcel() {},
         exportEecel() {},
         //工装类型
@@ -617,6 +653,7 @@ export default {
             });
             this.data1[index]._expanded = !this.data1[index]._expanded;
             this.data1.sort();
+            this.childObj = {};
         },
         handlePageSize(value) {
             this.page = 1;