修改

UI2/src/components/tools/UserMenu.vue

@@ -197,8 +197,13 @@
             return that.Logout({}).then(() => {
               // update-begin author:scott date:20211223 for:【JTC-198】退出登录体验不好
               //that.$router.push({ path: '/user/login' });
-              window.location.reload()
+              // window.location.reload()
               // update-end author:scott date:20211223 for:【JTC-198】退出登录体验不好
+              let sevice = 'http://' + window.location.host + '/'
+              console.log("sevice=====" + sevice);
+              // let serviceUrl = encodeURIComponent(sevice)
+
+              window.location.href = sevice
             }).catch(err => {
               that.$message.error({
                 title: '错误',

UI2/src/views/qcsb/modules/QcSsgqzysytdqkForm.vue

@@ -1190,7 +1190,7 @@ export default {
             httpurl += this.url.add
             method = 'post'
           } else {
-            httpurl += this.url.edit10
+            httpurl += this.url.edit1
             method = 'put'
           }
           httpAction(httpurl, this.model, method).then((res) => {

UI2/src/views/sydwqcsb/QcSsgqzysytdqkList.vue

@@ -122,6 +122,7 @@
                         <a-space>
                           <a-button v-has="'conten:bj'" v-if="record.sfsb===0" @click="handleEdit(record)">编辑</a-button>
                                <a-button @click="handleDetail(record)" type='primary'>查看</a-button>
+                          <a-button v-if="record.sfsb===3" @click="handleEdit1(record)" type='primary'>变更</a-button>
                           <a-popconfirm title="报送后将不可修改，是否确认上报?" @confirm="() => handleSB(record.id)">
                   <a-button v-has="'conten:sb'" v-if="record.sfsb===0" >报送</a-button>
                 </a-popconfirm>

UI2/src/views/sydwqcsb/modules/QcSsgqzysytdqkForm.vue

@@ -645,6 +645,7 @@ export default {
       url: {
         add: '/qcsb/qcSsgqzysytdqk/add2',
         edit: '/qcsb/qcSsgqzysytdqk/edit',
+        edit1: '/qcsb/qcSsgqzysytdqk/edit1',
         queryById: '/qcsb/qcSsgqzysytdqk/queryById',
         stag:'qcsb/qcSsgqzysytdqk/addStag'
       },
@@ -813,6 +814,10 @@ export default {
       this.model = Object.assign({}, record)
       this.visible = true
     },
+    edit1(record) {
+      this.model = Object.assign({}, record)
+      this.visible = true
+    },
     //暂存
     stagForm(){
       const that = this
@@ -887,6 +892,53 @@ export default {
 
       })
     },
+    submitForm1() {
+      if (this.postion.lat != '' && this.postion.lng != '') {
+        this.model.lat = this.postion.lat;
+        this.model.lng = this.postion.lng;
+      };
+      /*  if(this.model.lat == '' && this.model.lng == ''){
+          this.$info({
+            title: '说明',
+            content: (<div><p>请点击坐落位置后的定位按钮，选择地块相应位置</p></div>),
+            onOk() {
+            }
+          })
+        }*/
+      const that = this
+      // 触发表单验证
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          let startTime = moment(this.model.qsqssj);
+          let endTime = moment(this.model.qsdqsj);
+          if (endTime.valueOf() < startTime.valueOf()) {
+            this.$message.error('请检查权属到期时间是否正确！');
+            return
+          }
+          that.confirmLoading = true
+          let httpurl = ''
+          let method = ''
+          if (!this.model.id) {
+            httpurl += this.url.add
+            method = 'post'
+          } else {
+            httpurl += this.url.edit1
+            method = 'put'
+          }
+          httpAction(httpurl, this.model, method).then((res) => {
+            if (res.success) {
+              that.$message.success(res.message)
+              that.$emit('ok')
+            } else {
+              that.$message.warning(res.message)
+            }
+          }).finally(() => {
+            that.confirmLoading = false
+          })
+        }
+
+      })
+    },
     popupCallback(value, row) {
       this.model = Object.assign(this.model, row);
     },

UI2/src/views/sydwqcsb/modules/QcSsgqzysytdqkModal.vue

@@ -23,6 +23,16 @@
       </div>
 
     </template>
+    <template>
+      <div style="position: absolute;left: 10%;top:13px;">
+        <a-button v-if="!disableSubmit" @click="handleOk1" type="primary" style="margin-bottom: 0;margin-right: 8px">保存</a-button>
+
+        <a-button @click="handleCancel">关闭</a-button>
+
+
+      </div>
+
+    </template>
     <!--邱东宝 增加modal按钮调整到顶部 end-->
     <apply-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>
     <qc-ssgqzysytdqk-form ref="realForm" @ok="submitCallback" :postion="this.model" :toqyxx="this.toDk"
@@ -90,7 +100,16 @@ export default {
         this.$refs.realForm.edit(record);
       })
     },
-
+    edit1(record) {
+      this.stag=false;
+      /*   this.lats=record.lat;
+         this.lngs=record.lng
+         console.log(6666666666666,this.lats,this.lngs)*/
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs.realForm.edit(record);
+      })
+    },
     close() {
       this.$emit('close');
       this.visible = false;
@@ -100,6 +119,11 @@ export default {
       this.$refs.realForm.submitForm();
       this.disa = false
     },
+    handleOk1() {
+      this.disa = true
+      this.$refs.realForm.submitForm1();
+      this.disa = false
+    },
     stagInfo(){
       this.$refs.realForm.stagForm();
     },