Merge branch 'demo_' of http://124.71.196.186:8888/hfxc226/hitch-antd into demo_

src/views/purchase/purchase-order-page/modules/SpareStoreSelectModalYY.vue

@@ -180,6 +180,7 @@ export default {
           ...parameter,
           ...this.queryParam,
           tokenType: this.tokenType,
+          purchaseFlag: 1,
           dataScope: {
             sortBy: 'desc',
             sortName: 'update_time'

src/views/repair/application-form/RepairFormPool.vue

@@ -112,7 +112,7 @@
             <a @click="handleView(record)">工单主页</a>
             <operation-button
               @click="handlePushCalendar(record)"
-              v-if="record.calendarDate ==null" >加入日历图</operation-button>
+              v-if="record.calendarDate ==null && record.status===2" >加入日历图</operation-button>
             <!-- <operation-button
               v-show="allocatedFlag"
               v-if="(DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === record.status)"

src/views/store/sparestore/modules/SpareStoreSelectModalYY3.vue

@@ -31,6 +31,7 @@
                 <a-col :md="6" :sm="24">
                   <a-form-item label="仓库名称">
                     <a-input v-model.trim="queryParam.storeName" placeholder="仓库名称"/>
+                    <a-input type="hidden" v-model="queryParam.purchaseFlag"/>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
@@ -134,7 +135,7 @@ export default {
       isSpecial: null,
       // 查询参数
       queryParam: {
-        storeNo: '09'
+        storeNo: '09',
       },
       // 表头
       columns: [
@@ -187,6 +188,7 @@ export default {
           ...parameter,
           ...this.queryParam,
           tokenType: this.tokenType,
+          purchaseFlag: 1,
           dataScope: {
             sortBy: 'desc',
             sortName: 'update_time'