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

@@ -277,7 +277,9 @@
           </el-col>
 
           <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-form-item>
           </el-col>
@@ -507,6 +509,7 @@ export default {
         bdcdjzmhrules: [
           { required: true, message: "不动产登记证明号： ", trigger: "blur" },
         ],
+        yysxrules: [{ required: true, message: "异议事项", trigger: "blur" }],
       },
       ableOperation: false,
     };

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

@@ -209,9 +209,14 @@
         return new Promise(resolve => {
           this.unitData = this.$parent.unitData;
           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);
+        }
           InitClml(formdata).then((res) => {
             if (res.code == 200) {
               resolve(res.code)

@@ -485,8 +485,19 @@
         //  this.taskList =this.formData.allCommentList;
         //  处理数据之后赋值
         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: 设置流程图元素状态

@@ -60,7 +60,7 @@
           </el-col>
           <el-col :span="8">
             <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-col>
           <el-col :span="8">

@@ -11,7 +11,8 @@
         :model="queryForm"
         ref="queryForm"
         @submit.native.prevent
-        label-width="80px">
+        label-width="80px"
+      >
         <el-row>
           <el-col :span="5">
             <el-form-item label="业务来源" label-width="70px">
@@ -22,12 +23,14 @@
                 class="width100"
                 filterable
                 clearable
-                placeholder="请选择业务来源">
+                placeholder="请选择业务来源"
+              >
                 <el-option
                   v-for="item in dictData['ywly']"
                   :key="item.dcode"
                   :label="item.dname"
-                  :value="item.dcode">
+                  :value="item.dcode"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
@@ -41,12 +44,14 @@
                 class="width100"
                 filterable
                 clearable
-                placeholder="请选择权利类型">
+                placeholder="请选择权利类型"
+              >
                 <el-option
                   v-for="item in dictData['A8']"
                   :key="item.dcode"
                   :label="item.dname"
-                  :value="item.dcode">
+                  :value="item.dcode"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
@@ -60,12 +65,14 @@
                 class="width100"
                 filterable
                 clearable
-                placeholder="请选择登记类型">
+                placeholder="请选择登记类型"
+              >
                 <el-option
                   v-for="item in dictData['A21']"
                   :key="item.dcode"
                   :label="item.dname"
-                  :value="item.dcode">
+                  :value="item.dcode"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
@@ -76,14 +83,20 @@
                 placeholder="请输入业务号"
                 v-model="queryForm.ywh"
                 clearable
-                class="width200px">
+                class="width200px"
+              >
               </el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="4" class="btnColRight">
             <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-form-item>
           </el-col>
@@ -95,14 +108,16 @@
               {{ item.name }}:{{ item.value }}
               <i
                 class="el-icon-circle-close"
-                @click="handelItem(item, index)"></i>
+                @click="handelItem(item, index)"
+              ></i>
             </li>
           </ul>
           <el-button
             class="clean-btn"
             type="text"
             v-if="searchList.length > 0"
-            @click.native="hanldeCleanAll">清除全部
+            @click.native="hanldeCleanAll"
+            >清除全部
           </el-button>
         </el-row>
       </el-form>
@@ -119,123 +134,131 @@
         @size-change="handleSizeChange"
         @p-current-change="handleCurrentChange"
         :column="tableData.columns"
-        :data="tableData.data">
+        :data="tableData.data"
+      >
       </lb-table>
     </div>
-    <searchBox v-model="isSearch" @getSearch="getSearch" :advancedForm="otherForm" />
+    <searchBox
+      v-model="isSearch"
+      @getSearch="getSearch"
+      :advancedForm="otherForm"
+    />
   </div>
 </template>
 <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 {
-    name: "ybx",
-    components: { searchBox },
-    mixins: [table, searchMin],
-    mounted () {
-      sendThis(this);
-    },
-    computed: {
-      ...mapGetters(["dictData"]),
-    },
-    data () {
-      return {
-        queryForm: {
-          ywly: "",
-          qllx: "",
-          djlx: "",
-          ywh: "",
-        },
-        searchForm: {
-          ywlymc: "",
-          qllxmc: "",
-          djlxmc: "",
-          ywh: "",
-        },
-        tableData: {
-          total: 0,
-          columns: datas.columns(),
-          data: [],
-        },
-      };
-    },
-    activated () {
-      this.queryClick()
-      window["getBpageList"] = () => {
-        this.queryClick()
-      }
-    },
-    methods: {
-      // 列表渲染接口
-      /**
-       * @description: 列表渲染接口
-       * @author: renchao
-       */
-      queryClick () {
-        this.$startLoading();
-        this.searchForm.ywh = this.queryForm.ywh;
-        this.iterationData();
-        searchTaskDone({
-          ...this.queryForm,
-          ...this.otherForm,
-          ...this.pageData,
-        }).then((res) => {
-          this.$endLoading();
-          if (res.code === 200) {
-            let { total, records } = res.result;
-            records.forEach((item) => {
-              item.qlrmc = item.qlrmc.join(",");
-              item.ywh = item.ywh.join(",");
-              item.zl = item.zl.join(",");
-              item.outstepdate = item.outstepdate[0];
-            });
-            this.tableData.total = total ? total : 0;
-            this.tableData.data = records ? records : [];
-          }
-        });
+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",
+  components: { searchBox },
+  mixins: [table, searchMin],
+  mounted() {
+    sendThis(this);
+  },
+  computed: {
+    ...mapGetters(["dictData"]),
+  },
+  data() {
+    return {
+      queryForm: {
+        ywly: "",
+        qllx: "",
+        djlx: "",
+        ywh: "",
+      },
+      searchForm: {
+        ywlymc: "",
+        qllxmc: "",
+        djlxmc: "",
+        ywh: "",
       },
-      /**
-       * @description: handleSort
-       * @param {*} val
-       * @author: renchao
-       */
-      handleSort (val) {
-        this.queryForm.sortField = val.prop;
-        this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc";
-        this.queryClick();
+      tableData: {
+        total: 0,
+        columns: datas.columns(),
+        data: [],
       },
-      /**
-       * @description: ywhClick
-       * @param {*} item
-       * @author: renchao
-       */
-      ywhClick (item) {
-        //有任务权限
-        if (item.sjlx == "3") {
-          const { href } = this.$router.resolve(
-            "/djbworkFrameview?bsmSlsq=" +
+    };
+  },
+  activated() {
+    this.queryClick();
+    window["getBpageList"] = () => {
+      this.queryClick();
+    };
+  },
+  methods: {
+    // 列表渲染接口
+    /**
+     * @description: 列表渲染接口
+     * @author: renchao
+     */
+    queryClick() {
+      this.$startLoading();
+      this.searchForm.ywh = this.queryForm.ywh;
+      this.iterationData();
+      searchTaskDone({
+        ...this.queryForm,
+        ...this.otherForm,
+        ...this.pageData,
+      }).then((res) => {
+        this.$endLoading();
+        if (res.code === 200) {
+          let { total, records } = res.result;
+          records.forEach((item) => {
+            item.qlrmc = item.qlrmc.join(",");
+            item.ywh = item.ywh.join(",");
+            item.zl = item.zl.join(",");
+            item.outstepdate = item.outstepdate[0];
+          });
+          this.tableData.total = total ? total : 0;
+          this.tableData.data = records ? records : [];
+        }
+      });
+    },
+    /**
+     * @description: handleSort
+     * @param {*} val
+     * @author: renchao
+     */
+    handleSort(val) {
+      this.queryForm.sortField = val.prop;
+      this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc";
+      this.queryClick();
+    },
+    /**
+     * @description: ywhClick
+     * @param {*} item
+     * @author: renchao
+     */
+    ywhClick(item) {
+      //有任务权限
+      if (item.sjlx == "3") {
+        item.djywbm = "DJBBL";
+        const { href } = this.$router.resolve(
+          "/djbworkFrameview?bsmSlsq=" +
             item.bsmSlsq +
             "&bestepid=" +
-            item.bestepid
-          );
-          window.open(href, `djbworkFrameview${item.bsmSlsq}`);
-        } else {
-          const { href } = this.$router.resolve(
-            "/workFrameView?bsmSlsq=" +
+            item.bestepid +
+            "&sqywbm=" +
+            item.djywbm
+        );
+        window.open(href, `djbworkFrameview${item.bsmSlsq}`);
+      } else {
+        const { href } = this.$router.resolve(
+          "/workFrameView?bsmSlsq=" +
             item.bsmSlsq +
             "&bestepid=" +
             item.bestepid
-          );
-          window.open(href, `workFrameView${item.bsmSlsq}`);
-        }
+        );
+        window.open(href, `workFrameView${item.bsmSlsq}`);
       }
-    }
-  }
+    },
+  },
+};
 </script>
 <style scoped lang="scss">
-  @import "~@/styles/public.scss";
+@import "~@/styles/public.scss";
 </style>