Merge remote-tracking branch 'origin/master'

 <template>
 	<div id="app">
 		<router-view v-if="isRouterAlive" />
+		<div class="loading" v-show="isShow">
+			<div class="content">
+				<i class="fa fa-spinner fa-pulse fa-3x fa-fw" style="color:#0081FF"></i>
+				<span>{{tips}}</span>
+			</div>
+		</div>
 	</div>
 </template>
 
@@ -14,10 +20,13 @@ export default {
 	data(){
 		return{
 			isRouterAlive:true,
+			isShow:false,
+			tips:'正在努力加载中...'
 		}
 	},
 	mounted() {
 		window.addEventListener("unload", this.saveState);
+		window.vm = this;
 	},
 	methods: {
 		saveState() {
@@ -29,11 +38,56 @@ export default {
 				this.isRouterAlive = true;
 			})
 		},
+		loadingShow(tips){
+			this.isShow = true;
+			this.tips = tips+'...';
+		},
+		loadingHide(tips){
+			this.isShow = false;
+		}
 	},
 };
 </script>
 
 <style lang="less">
+#app{
+	position: relative;
+	
+	.loading{
+		width: 100%;
+		height: 100%;
+		// background-color: rgba(255, 255, 255, .3);
+		position: absolute;
+		top: 0;
+		left: 0;
+		z-index: 1;
+		.content{
+			width: 240px;
+			height: 160px;
+			background: #FFFFFF;
+			box-shadow: 0px 4px 28px 0px rgba(0, 0, 0, 0.24);
+			border-radius: 4px;
+			border: 1px solid #E6E6E6;
+			box-sizing: border-box;
+			padding: 32px;
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			margin-left: -80px;
+			margin-top: -120px;
+			i,span{
+				display: block;
+				margin: 0 auto;
+				text-align: center;
+			}
+			span{
+				margin-top: 26px;
+				color: #6D7278;
+				font-size: 14px;
+			}
+		}
+	}
+}
 .popper-zxx{
 	padding: 0!important;
 	/deep/ .el-tabs__header{

@@ -254,7 +254,7 @@
 									ref="pzytdm"
 									:multiple="multiple"
 									:placeholder="placeholder"
-									:disabled="disabled"
+									:disabled="formData.qszt!='0'"
 									:data="$store.state.tdytList"
 									:props="treeProps"
 									:check-strictly="checkStrictly"
@@ -269,7 +269,7 @@
 									ref="sjytdm"
 									:multiple="multiple"
 									:placeholder="placeholder"
-									:disabled="disabled"
+									:disabled="formData.qszt!='0'"
 									:data="$store.state.tdytList"
 									:props="treeProps"
 									:check-strictly="checkStrictly"
@@ -281,6 +281,7 @@
 								<el-date-picker
 									v-model="childItem.tdsyqssj"
 									ref="tdsyqssj"
+									:disabled="formData.qszt!='0'"
 									:picker-options="childItem.pickerStart"
 									type="date"
 									value-format="yyyy-MM-dd"
@@ -314,7 +315,7 @@
 								<input
 									type="text"
 									style="top: -1px;"
-									
+									:disabled="formData.qszt!='0'"
 									v-model="childItem.pzytdm"
 									class="formInput"
 								/>
@@ -322,7 +323,7 @@
 							<li>
 								<input
 									type="text"
-									
+									:disabled="formData.qszt!='0'"
 									v-model="childItem.sjytdm"
 									class="formInput"
 								/>
@@ -330,6 +331,7 @@
 							<li>
 								<el-date-picker
 									v-model="childItem.tdsyjssj"
+									:disabled="formData.qszt!='0'"
 									ref="tdsyjssj"
 									type="date"
 									value-format="yyyy-MM-dd"

 <template>
-    <div>
-        <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
-            <el-tab-pane label="日志管理" name="log"><log></log></el-tab-pane>
-            <el-tab-pane label="字典管理" name="dictionary"><dictionary></dictionary></el-tab-pane>
-        </el-tabs>
-    </div>
+    <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
+        <el-tab-pane label="日志管理" name="log"><log></log></el-tab-pane>
+        <el-tab-pane label="字典管理" name="dictionary"><dictionary></dictionary></el-tab-pane>
+    </el-tabs>
 </template>
 
 <script>

@@ -372,14 +372,10 @@ export default {
 	.tj{
 		flex: 1;
 		width: 100%;
-		display: -webkit-box;
-		display: -moz-box;
-		display: box;
+		display: flex;
 		>div{
 			flex: 1;
-			-webkit-box-orient: vertical;   /*属性值：[horizontal]横向/[vertical]纵向*/
-			-moz-box-orient: horizontal;
-			box-orient: horizontal;
+			// flex-grow:1;
 			height: 100%;
 			margin-right: 20px;
 			background: #fff;

@@ -768,8 +768,10 @@
                             if (this.$refs.qlrxxModule.getQlgyfsData() == 'PSHGSBDCQJDC000000000000DC340020' && this.$refs.qlrxxModule.getQlrxxData().length < 2 ) {
                                 Message.error('当前权利人共有方式至少需要添加两名权利人')
                             }else{
+                                 vm.loadingShow('请求发送中');
                                  updateQjZdjbxx(this.formData)
                                     .then((res) => {
+                                        vm.loadingHide();
                                         if (res.code == 200) {
                                             this.$message({
                                                 message: '保存成功',
@@ -785,6 +787,7 @@
                                         }
                                     })
                                     .catch((error) => {
+                                        vm.loadingHide();
                                         this.$message({
                                             message: error.message+"，查看日志，联系管理员",
                                             type: "error",