Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-web

src/components/MoreSearchBar/index.vue

@@ -13,6 +13,13 @@
                         <el-option v-for="(item, index) in nodes" :key="index" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-col>
+                <el-col :xs="24" :sm="12" :lg="3" :span="6">
+                    <el-select v-if="cancellation" v-model="listQuery.isCancellation" placeholder="项目作废" clearable 
+                        class="filter-item">
+                        <el-option label="未作废" :value="false" />
+                        <el-option label="已作废" :value="true" />
+                    </el-select>
+                </el-col>
                 <el-col :xs="24" :sm="12" :lg="6" :span="6">
                     <el-date-picker class="filter-item" v-if="orderDateSearch" clearable v-model="orderDate"
                         type="daterange" align="center" unlink-panels range-separator="至" start-placeholder="下单日期（开始）"
@@ -297,6 +304,11 @@ export default {
             require: false,
             default: false
         },
+        cancellation: {
+            type: Boolean,
+            require: false,
+            default: null
+        },
     },
 
 

src/views/personal/pendingList.vue

@@ -5,7 +5,7 @@
     </div>
     <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getPage" >
       <template slot="left">
-        <MoreSearchBar business="PERSONAL_BUSINESS" :nodes="personalNodes"  @fliterSearch="fliterSearch" @resetParams="resetParams" :listQuery="listQuery">
+        <MoreSearchBar business="PERSONAL_BUSINESS" :cancellation="true" :nodes="personalNodes"  @fliterSearch="fliterSearch" @resetParams="resetParams" :listQuery="listQuery">
           <template v-slot:otherButton>
             <el-button class="filter-item" round @click="showAllLabel()">显示全部列</el-button>
           </template>

src/views/personal/todoDetail.vue

@@ -1188,7 +1188,7 @@ export default {
     },
     target: {
       handler(newVal, oldVal) {
-        this.getPersonal();
+        //this.getPersonal();
         if (newVal.acreage != null && newVal.price != null && newVal.price !=null && newVal.price != 0) {
           let acrege = Decimal(newVal.acreage);
           let price = Decimal(newVal.price);