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

@@ -277,7 +277,9 @@
           </el-col>
           </el-col>
 
 
           <el-col :span="8">
           <el-col :span="8">
-            <el-form-item label="异议事项：">
+            <el-form-item label="异议事项："
+              prop="yydj.yysx"
+              :rules="rules.yysxrules">
               <el-input v-model="ruleForm.yydj.yysx"></el-input>
               <el-input v-model="ruleForm.yydj.yysx"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -507,6 +509,7 @@ export default {
         bdcdjzmhrules: [
         bdcdjzmhrules: [
           { required: true, message: "不动产登记证明号： ", trigger: "blur" },
           { required: true, message: "不动产登记证明号： ", trigger: "blur" },
         ],
         ],
+        yysxrules: [{ required: true, message: "异议事项", trigger: "blur" }],
       },
       },
       ableOperation: false,
       ableOperation: false,
     };
     };

@@ -113,14 +113,6 @@ export default {
     },
     },
   },
   },
   mounted() {
   mounted() {
-    console.log(
-      "bestepid: this.$route.query.bestepid,",
-      this.$route.query.bestepid
-    );
-    console.log(
-      "bestepid: this.$route.query.sqywbm,",
-      this.$route.query.sqywbm
-    );
     this.ableOperation = this.$parent.ableOperation;
     this.ableOperation = this.$parent.ableOperation;
   },
   },
   methods: {
   methods: {
@@ -162,7 +154,6 @@ export default {
       return new Promise((resolve) => {
       return new Promise((resolve) => {
         this.unitData = this.$parent.unitData;
         this.unitData = this.$parent.unitData;
         var formdata = new FormData();
         var formdata = new FormData();
-
         formdata.append("bsmSlsq", this.$parent.bsmSlsq);
         formdata.append("bsmSlsq", this.$parent.bsmSlsq);
         if (this.$route.query.sqywbm == "DJBBL") {
         if (this.$route.query.sqywbm == "DJBBL") {
           formdata.append("bsmSldy", this.$parent.bsmRepair);
           formdata.append("bsmSldy", this.$parent.bsmRepair);
@@ -259,6 +250,9 @@ export default {
         sjlx: data.cllx,
         sjlx: data.cllx,
         sfxjcl: "1", // 是否必选
         sfxjcl: "1", // 是否必选
       };
       };
+       if (this.$route.query.sqywbm == "DJBBL") {
+          obj.bsmSldy=this.$parent.bsmRepair
+        }
       saveClml(obj).then(async (res) => {
       saveClml(obj).then(async (res) => {
         if (res.code == 200) {
         if (res.code == 200) {
           let res = await this.clmlInitList(2);
           let res = await this.clmlInitList(2);
@@ -324,6 +318,7 @@ export default {
           data: this.tableData,
           data: this.tableData,
           unitData: this.$parent.unitData,
           unitData: this.$parent.unitData,
           ableOperation: this.$parent.ableOperation,
           ableOperation: this.$parent.ableOperation,
+          bsmRepair:this.$parent.bsmRepair
         },
         },
         "60%",
         "60%",
         true
         true

@@ -209,9 +209,14 @@
         return new Promise(resolve => {
         return new Promise(resolve => {
           this.unitData = this.$parent.unitData;
           this.unitData = this.$parent.unitData;
           var formdata = new FormData();
           var formdata = new FormData();
-          formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy);
         formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
         formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
+        if (Vue.prototype.$currentRoute.query.sqywbm == "DJBBL") {
+          formdata.append("bsmSldy", this.formData.bsmRepair);
+          formdata.append("clfl", 3);
+        } else {
+             formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy);
           formdata.append("clfl", 2);
           formdata.append("clfl", 2);
+        }
           InitClml(formdata).then((res) => {
           InitClml(formdata).then((res) => {
             if (res.code == 200) {
             if (res.code == 200) {
               resolve(res.code)
               resolve(res.code)

@@ -485,8 +485,19 @@
         //  this.taskList =this.formData.allCommentList;
         //  this.taskList =this.formData.allCommentList;
         //  处理数据之后赋值
         //  处理数据之后赋值
         this.taskCommentList = this.taskList;
         this.taskCommentList = this.taskList;
+      this.taskCommentList=this.taskCommentList.sort(this.sortDownDate)
       },
       },
+      /**
+       *  时间排序函数
+       * @description: formatDate
+       * @param {*} row
+       * @param {*} column
+       * @author: renchao
+       */
 
 
+      sortDownDate(a, b) {
+     return Date.parse(a.createTime) - Date.parse(b.createTime);
+     },
       // 设置流程图元素状态
       // 设置流程图元素状态
       /**
       /**
        * @description: 设置流程图元素状态
        * @description: 设置流程图元素状态

@@ -60,7 +60,7 @@
           </el-col>
           </el-col>
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item label="不动产单元号：">
             <el-form-item label="不动产单元号：">
-              <el-input v-model="ruleForm.zdjbxx.bdcdyh"></el-input>
+              <el-input v-model="ruleForm.sldy.bdcdyh"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="8">
           <el-col :span="8">

@@ -11,7 +11,8 @@
         :model="queryForm"
         :model="queryForm"
         ref="queryForm"
         ref="queryForm"
         @submit.native.prevent
         @submit.native.prevent
-        label-width="80px">
+        label-width="80px"
+      >
         <el-row>
         <el-row>
           <el-col :span="5">
           <el-col :span="5">
             <el-form-item label="业务来源" label-width="70px">
             <el-form-item label="业务来源" label-width="70px">
@@ -22,12 +23,14 @@
                 class="width100"
                 class="width100"
                 filterable
                 filterable
                 clearable
                 clearable
-                placeholder="请选择业务来源">
+                placeholder="请选择业务来源"
+              >
                 <el-option
                 <el-option
                   v-for="item in dictData['ywly']"
                   v-for="item in dictData['ywly']"
                   :key="item.dcode"
                   :key="item.dcode"
                   :label="item.dname"
                   :label="item.dname"
-                  :value="item.dcode">
+                  :value="item.dcode"
+                >
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
@@ -41,12 +44,14 @@
                 class="width100"
                 class="width100"
                 filterable
                 filterable
                 clearable
                 clearable
-                placeholder="请选择权利类型">
+                placeholder="请选择权利类型"
+              >
                 <el-option
                 <el-option
                   v-for="item in dictData['A8']"
                   v-for="item in dictData['A8']"
                   :key="item.dcode"
                   :key="item.dcode"
                   :label="item.dname"
                   :label="item.dname"
-                  :value="item.dcode">
+                  :value="item.dcode"
+                >
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
@@ -60,12 +65,14 @@
                 class="width100"
                 class="width100"
                 filterable
                 filterable
                 clearable
                 clearable
-                placeholder="请选择登记类型">
+                placeholder="请选择登记类型"
+              >
                 <el-option
                 <el-option
                   v-for="item in dictData['A21']"
                   v-for="item in dictData['A21']"
                   :key="item.dcode"
                   :key="item.dcode"
                   :label="item.dname"
                   :label="item.dname"
-                  :value="item.dcode">
+                  :value="item.dcode"
+                >
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
@@ -76,14 +83,20 @@
                 placeholder="请输入业务号"
                 placeholder="请输入业务号"
                 v-model="queryForm.ywh"
                 v-model="queryForm.ywh"
                 clearable
                 clearable
-                class="width200px">
+                class="width200px"
+              >
               </el-input>
               </el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
 
 
           <el-col :span="4" class="btnColRight">
           <el-col :span="4" class="btnColRight">
             <el-form-item>
             <el-form-item>
-              <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
+              <el-button
+                type="primary"
+                native-type="submit"
+                @click="handleSearch"
+                >查询</el-button
+              >
               <el-button @click="moreQueryClick">高级查询</el-button>
               <el-button @click="moreQueryClick">高级查询</el-button>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -95,14 +108,16 @@
               {{ item.name }}:{{ item.value }}
               {{ item.name }}:{{ item.value }}
               <i
               <i
                 class="el-icon-circle-close"
                 class="el-icon-circle-close"
-                @click="handelItem(item, index)"></i>
+                @click="handelItem(item, index)"
+              ></i>
             </li>
             </li>
           </ul>
           </ul>
           <el-button
           <el-button
             class="clean-btn"
             class="clean-btn"
             type="text"
             type="text"
             v-if="searchList.length > 0"
             v-if="searchList.length > 0"
-            @click.native="hanldeCleanAll">清除全部
+            @click.native="hanldeCleanAll"
+            >清除全部
           </el-button>
           </el-button>
         </el-row>
         </el-row>
       </el-form>
       </el-form>
@@ -119,30 +134,35 @@
         @size-change="handleSizeChange"
         @size-change="handleSizeChange"
         @p-current-change="handleCurrentChange"
         @p-current-change="handleCurrentChange"
         :column="tableData.columns"
         :column="tableData.columns"
-        :data="tableData.data">
+        :data="tableData.data"
+      >
       </lb-table>
       </lb-table>
     </div>
     </div>
-    <searchBox v-model="isSearch" @getSearch="getSearch" :advancedForm="otherForm" />
+    <searchBox
+      v-model="isSearch"
+      @getSearch="getSearch"
+      :advancedForm="otherForm"
+    />
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
-  import { mapGetters } from "vuex";
-  import searchMin from "../components/mixin/index";
-  import table from "@/utils/mixin/table";
-  import { datas, sendThis } from "./ybxdata";
-  import { searchTaskDone } from "@/api/workflow/search.js";
-  import searchBox from "../components/search.vue";
-  export default {
+import { mapGetters } from "vuex";
+import searchMin from "../components/mixin/index";
+import table from "@/utils/mixin/table";
+import { datas, sendThis } from "./ybxdata";
+import { searchTaskDone } from "@/api/workflow/search.js";
+import searchBox from "../components/search.vue";
+export default {
   name: "ybx",
   name: "ybx",
   components: { searchBox },
   components: { searchBox },
   mixins: [table, searchMin],
   mixins: [table, searchMin],
-    mounted () {
+  mounted() {
     sendThis(this);
     sendThis(this);
   },
   },
   computed: {
   computed: {
     ...mapGetters(["dictData"]),
     ...mapGetters(["dictData"]),
   },
   },
-    data () {
+  data() {
     return {
     return {
       queryForm: {
       queryForm: {
         ywly: "",
         ywly: "",
@@ -163,11 +183,11 @@
       },
       },
     };
     };
   },
   },
-    activated () {
-      this.queryClick()
+  activated() {
+    this.queryClick();
     window["getBpageList"] = () => {
     window["getBpageList"] = () => {
-        this.queryClick()
-      }
+      this.queryClick();
+    };
   },
   },
   methods: {
   methods: {
     // 列表渲染接口
     // 列表渲染接口
@@ -175,7 +195,7 @@
      * @description: 列表渲染接口
      * @description: 列表渲染接口
      * @author: renchao
      * @author: renchao
      */
      */
-      queryClick () {
+    queryClick() {
       this.$startLoading();
       this.$startLoading();
       this.searchForm.ywh = this.queryForm.ywh;
       this.searchForm.ywh = this.queryForm.ywh;
       this.iterationData();
       this.iterationData();
@@ -203,7 +223,7 @@
      * @param {*} val
      * @param {*} val
      * @author: renchao
      * @author: renchao
      */
      */
-      handleSort (val) {
+    handleSort(val) {
       this.queryForm.sortField = val.prop;
       this.queryForm.sortField = val.prop;
       this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc";
       this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc";
       this.queryClick();
       this.queryClick();
@@ -213,14 +233,17 @@
      * @param {*} item
      * @param {*} item
      * @author: renchao
      * @author: renchao
      */
      */
-      ywhClick (item) {
+    ywhClick(item) {
       //有任务权限
       //有任务权限
       if (item.sjlx == "3") {
       if (item.sjlx == "3") {
+        item.djywbm = "DJBBL";
         const { href } = this.$router.resolve(
         const { href } = this.$router.resolve(
           "/djbworkFrameview?bsmSlsq=" +
           "/djbworkFrameview?bsmSlsq=" +
             item.bsmSlsq +
             item.bsmSlsq +
             "&bestepid=" +
             "&bestepid=" +
-            item.bestepid
+            item.bestepid +
+            "&sqywbm=" +
+            item.djywbm
         );
         );
         window.open(href, `djbworkFrameview${item.bsmSlsq}`);
         window.open(href, `djbworkFrameview${item.bsmSlsq}`);
       } else {
       } else {
@@ -232,10 +255,10 @@
         );
         );
         window.open(href, `workFrameView${item.bsmSlsq}`);
         window.open(href, `workFrameView${item.bsmSlsq}`);
       }
       }
-      }
-    }
-  }
+    },
+  },
+};
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
-  @import "~@/styles/public.scss";
+@import "~@/styles/public.scss";
 </style>
 </style>