Merge remote-tracking branch 'origin/master'

supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue

@@ -206,16 +206,13 @@
           },
           industryAllList: [],
           industryList: [],
-          userSid:'',
           imgList: [],
           msg:[],
           checkList:[],
           projectSidList:[]
-          
         }
       },
       created() {
-        this.formobj.user_sid = window.sessionStorage.getItem('userSid')
         this.projectSidList= JSON.parse(window.sessionStorage.getItem("projectSidList"));
       },
       watch: {
@@ -233,6 +230,7 @@
     },
       methods: {
         saveOrUpdate() {
+          this.formobj.user_sid=window.sessionStorage.getItem('userSid')
           this.backcheckList()
           if (this.formobj.sid) {
             req.sealrecordSave(this.formobj)
@@ -270,6 +268,7 @@
           
         },
         saveSubmit(){
+          this.formobj.user_sid=window.sessionStorage.getItem('userSid')
           this.backcheckList()
             req.sealrecordSubmit(this.formobj)
               .then(resp => {

supervise-enterprise-ui/src/views/Yjsq/LookYzsq/index.vue

@@ -214,7 +214,6 @@
         const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
         const obj = JSON.parse(decodeURIComponent(data))
         this.showEdit(obj.businessSid)
-        this.formobj.user_sid = window.sessionStorage.getItem('userSid')
       },
       watch: {
        imgList:{
@@ -231,6 +230,7 @@
     },
       methods: {
         saveOrUpdate() {
+          this.formobj.user_sid = window.sessionStorage.getItem('userSid')
           this.backcheckList()
           if( this.formobj.sid){
             req.sealrecordSave(this.formobj)
@@ -251,6 +251,7 @@
           }
           },
         saveSubmit(){
+          this.formobj.user_sid = window.sessionStorage.getItem('userSid')
           this.backcheckList()
             req.sealrecordSubmit(this.formobj)
               .then(resp => {

supervise-portal-ui/src/views/flow/todoList.vue

@@ -123,7 +123,7 @@
       :before-close="closeIt"
       center
     >
-      <iframe id="iframe" frameborder="0" style="width:100%;" :src= " this.centerDialogVisible === true ? url :''" />
+      <iframe id="iframe" frameborder="0" style="width:100%;" :src=" this.centerDialogVisible === true ? url :''" />
     </el-dialog>
     <!-- End办理页面-->
 
@@ -256,7 +256,6 @@ export default {
             iframe.height = this.dialogHeight // iframeWin.document.documentElement.scrollHeight || iframeWin.document.body.scrollHeight;
       },
       async handleMessage(event) {
-
         if (event !== undefined) {
           var code = event.data.params.code
           if (code === 1) {
@@ -313,7 +312,7 @@ export default {
         selectUrl(this.selectUrl_list).then((response) => {
           if (response.success && response.data.url !== '') {
             // this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
-             this.url =  "http://supervise.yxtsoft.com" + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
+             this.url = '' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
             // this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
             console.log('已办拼接url:', this.url)
           } else if (response.success && response.data.url === '') {