Merge branch 'hjw-spfmui' into 'test-new'

Hjw spfmui

See merge request spfm/spfm-market-front!188

src/pages/main/leader/leaderTag.vue

@@ -233,12 +233,11 @@ export default {
       }).then((res) => {
         if (res.data.result == 0) {
           this.$notify({
-            title: "成功",
+            title: "保存成功",
             message: res.data.desc,
             type: "success",
           });
-          this.menuStatus = false;
-          location.reload();
+          this.setStatus = false;
         }
       });
     },
@@ -256,12 +255,11 @@ export default {
       }).then((res) => {
         if (res.data.result == 0) {
           this.$notify({
-            title: "成功",
+            title: "删除成功",
             message: res.data.desc,
             type: "success",
           });
-          this.menuStatus = false;
-          location.reload();
+          this.setStatus = false;
         }
       });
     },

src/pages/main/leader/leaderhomeTask.vue

@@ -340,7 +340,7 @@
           <iframe
             height="100%"
             width="100%"
-            :src="dialogdiv.actionUrl"
+            :src="dialogdiv"
             frameborder="0"
           ></iframe>
         </div>
@@ -364,7 +364,7 @@ export default {
       launchStatus: false, //查看我的发起弹窗
       DoneStatus: false, //查看已办弹窗
       WorkOrderStatus1: false, //处理弹窗
-      dialogdiv: {}, //iframe
+      dialogdiv: "", //iframe
       StatusList: [], //form表单里列表
       WorkOrderList: [], //我的待办流程节点
       DoneList: [], //我的已办流程节点
@@ -380,13 +380,13 @@ export default {
     //查看标题按钮
     RowTitle(v) {
       this.StatusList = v;
-      this.dialogdiv = v;
-      console.log(this.dialogdiv.actionUrl);
-      // this.dialogdiv.actionUrl="/static/views/insideFilecollect/launch.html"
-      this.dialogdiv.actionUrl.split("/static/views").join("/marketfront/views")
-      this.dialogdiv.actionUrl.split("/dist/views").join("/marketfront/views")
-      this.dialogdiv.actionUrl.split("/views").join("/marketfront/views")
-      console.log(this.dialogdiv.actionUrl+"new");
+      let url= v.actionUrl;
+      console.log(url+111);
+      // this.dialogdiv="/static/views/insideFilecollect/launch.html"
+      this.dialogdiv=url.replace("/views","/static/views")
+      this.dialogdiv=url.replace("/static/views","/static/views")
+      this.dialogdiv=url.replace("/dist/views/","/static/views/")
+      console.log( this.dialogdiv+"new");
       this.WorkOrderStatus = true;
       this.$http({
         url: "/market/cwo/queryProcStepByWono",