Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -37,7 +37,9 @@ export function saveSqdjyw (data) {
   return request({
   return request({
     url: '/system/sysSqdjyw/saveSqdjyw',
     url: '/system/sysSqdjyw/saveSqdjyw',
     method: 'post',
     method: 'post',
-    data
+    data,
+    showLoading: true,
+    loadingTarget: '正在保存中...'
   })
   })
 }
 }
 
 

@@ -3,7 +3,7 @@
     <!-- 表单部分 -->
     <!-- 表单部分 -->
     <div class="from-clues-header">
     <div class="from-clues-header">
       <el-form :model="ruleForm">
       <el-form :model="ruleForm">
-        <el-row>
+        <el-row :gutter="20">
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="字典类型编码">
             <el-form-item label="字典类型编码">
               <el-input v-model="ruleForm.dcode" placeholder="字典类型编码"></el-input>
               <el-input v-model="ruleForm.dcode" placeholder="字典类型编码"></el-input>

@@ -24,6 +24,7 @@ class data extends filter {
       },
       },
       {
       {
         prop: "qllx",
         prop: "qllx",
+        width: '110',
         label: "权利类型编码",
         label: "权利类型编码",
       },
       },
       {
       {

@@ -3,10 +3,10 @@
     <!-- 表单部分 -->
     <!-- 表单部分 -->
     <div class="from-clues-header">
     <div class="from-clues-header">
       <el-form :model="queryForm" ref="queryForm">
       <el-form :model="queryForm" ref="queryForm">
-        <el-row>
+        <el-row :gutter="20">
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="权利类型">
             <el-form-item label="权利类型">
-              <el-select v-model="queryForm.qllx" filterable clearable placeholder="请选择权利类型">
+              <el-select v-model="queryForm.qllx" class="width100" filterable clearable placeholder="请选择权利类型">
                 <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                 <el-option v-for="item in dictData['A8']" :key="item.dcode" :label="item.dname" :value="item.dcode">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>

@@ -76,8 +76,12 @@ export default {
     },
     },
     subData: {
     subData: {
       handler (newValue, oldValue) {
       handler (newValue, oldValue) {
-        this.dataList.sxql = newValue.sxql
-        this.dataList.sxzt = newValue.sxzt
+        if (!_.isEqual(newValue.sxql, this.dataList.sxql)) {
+          this.dataList.sxql = _.cloneDeep(newValue.sxql)
+        }
+        if (!_.isEqual(newValue.sxzt, this.dataList.sxzt)) {
+          this.dataList.sxzt = _.cloneDeep(newValue.sxzt)
+        }
       },
       },
       deep: true
       deep: true
     },
     },
@@ -89,12 +93,12 @@ export default {
       }
       }
     },
     },
     handleSelectall () {
     handleSelectall () {
-      this.dataList.qlxxList.forEach(item => {
+      this.dataList.sxql.forEach(item => {
         item.checked = true
         item.checked = true
       })
       })
     },
     },
     handleInvert () {
     handleInvert () {
-      this.dataList.qlxxList.forEach(item => {
+      this.dataList.sxql.forEach(item => {
         item.checked = false
         item.checked = false
       })
       })
     }
     }

@@ -252,8 +252,12 @@ export default {
     },
     },
     // 单元状态设定
     // 单元状态设定
     getDyztsdValue (val) {
     getDyztsdValue (val) {
-      this.subData.sxql = val.sxql
-      this.subData.sxzt = val.sxzt
+      if (!_.isEqual(val.sxql, this.subData.sxql)) {
+        this.subData.sxql = val.sxql
+      }
+      if (!_.isEqual(val.sxzt, this.subData.sxzt)) {
+        this.subData.sxzt = val.sxzt
+      }
     },
     },
     submitForm () {
     submitForm () {
       this.$refs['ruleForm'].validate(async (valid) => {
       this.$refs['ruleForm'].validate(async (valid) => {

@@ -3,10 +3,10 @@
     <!-- 表单部分 -->
     <!-- 表单部分 -->
     <div class="from-clues-header">
     <div class="from-clues-header">
       <el-form :model="queryForm" ref="queryForm">
       <el-form :model="queryForm" ref="queryForm">
-        <el-row>
+        <el-row :gutter="20">
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="权利类型">
             <el-form-item label="权利类型">
-              <el-select v-model="queryForm.qllx" filterable clearable placeholder="请选择权利类型">
+              <el-select v-model="queryForm.qllx" filterable class="width100" clearable placeholder="请选择权利类型">
                 <el-option v-for="item in qllxs" :key="item.value" :label="item.label" :value="item.value">
                 <el-option v-for="item in qllxs" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>

@@ -25,6 +25,7 @@ class data extends filter {
       {
       {
         prop: "sqfl",//申请分类（1：正常申请，2：一并申请，3：补录申请）
         prop: "sqfl",//申请分类（1：正常申请，2：一并申请，3：补录申请）
         label: "申请分类",
         label: "申请分类",
+        width: '100',
         render: (h, scope) => {
         render: (h, scope) => {
           return <div>{this.sqfls(scope.row.sqfl)}</div>;
           return <div>{this.sqfls(scope.row.sqfl)}</div>;
         }
         }
@@ -32,6 +33,7 @@ class data extends filter {
       },
       },
       {
       {
         prop: "nodecode",
         prop: "nodecode",
+        width: '110',
         label: "权利类型编码",
         label: "权利类型编码",
       },
       },
       {
       {