sunyize 2 лет назад
Родитель
Сommit
f6cd8d5a99

+ 1 - 2
src/views/smscheck/modules/TaskCheckList.vue

@@ -104,8 +104,7 @@
 <!--              <a @click="showUpload(record)">上传</a>-->
 <!--              <a-divider type="vertical"/>-->
 <!--            </span>-->
-            <span v-has="'task:check:list:improve'" v-if="record.checkState == 1 || record.checkState == 0
-            || record.checkState == 3  "  >
+            <span v-has="'task:check:list:improve'" v-if="record.checkState == 1 || record.checkState == 0 "  >
               <a @click="showImprove(record)">完善上传</a>
               <a-divider type="vertical"/>
             </span>

+ 39 - 2
src/views/smscheck/modules/TaskUploadData.vue

@@ -2842,10 +2842,13 @@ export default {
           this.uploading = false;
         }}
       )
-
+      var text= "";
       for (var i in this.steps.stepsNow) {
         if (this.steps.stepsNow[i].status !== "finish") {
-           this.$message.warn( this.steps.stepsNow[i].title +"资料或备注都未上传!!!");
+         // text+= '111<br/> ';
+          var str=this.steps.stepsNow[i].title;
+          text+=  str+"资料或备注都未上传!!!"+'<br/><br/>';
+          //this.$message.warn( this.steps.stepsNow[i].title +"资料或备注都未上传!!!");
            info="no";
         }
       }
@@ -2857,7 +2860,32 @@ export default {
           this.$message.warn( "增值业务许可证到期时间未填写!!!");
         }
       }
+      var stringToHTML = function (str) {
+        var dom = document.createElement('div');
+        dom.innerHTML = str;
+        return dom;
+
+      };
+      console.log(stringToHTML('<h1>Hello world!</h1><p>How are you today?</p>'));
       if (info==="no"){
+       //  this.$warning({
+       //    title: '提示',
+       //    dangerouslyUseHTMLString:true,
+       //    content: ( <p>确定要删除及其内容吗?<br />请谨慎操作!</p >),
+       // // content: ( text),
+       //    // content: ( text),
+       //  })
+        this.$warning({
+        title: '提示',
+          dangerouslyUseHTMLString: true,
+          content:(h) => {
+          return h('div', {
+            domProps: {
+              innerHTML: text
+            },
+          }, []);
+        }
+        })
         return
       }
       var that = this;
@@ -2883,6 +2911,15 @@ export default {
         this.uploading = false;
       })
     },
+    HTMLEncode(str) {
+      var stringToHTML = function (str) {
+        var dom = document.createElement('div');
+        dom.innerHTML = str;
+        return dom;
+
+      };
+      console.log(stringToHTML('<h1>Hello world!</h1><p>How are you today?</p >'));
+    },
     /**步骤条点击事件*/
     stepsClick(current) {
       this.steps.current = current;