Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!298

src/views/purchase/PurchaseDemandList/add.vue

@@ -631,6 +631,7 @@ export default {
     } else if(this.pageStu == 'edit') {
       this.getDetails(this.row)
     } else if (this.pageStu == 'add') {
+      this.loading = false
       if (this.basicForm.demandPersonal) { this.reBackRefer('CONTACTS_PARAM', this.basicForm.demandPersonal, '需求人员') }
       if (this.basicForm.demandDept) { this.reBackRefer('DEPT_PARAM', this.basicForm.demandDept) }
     }

src/views/purchase/task/index.vue

@@ -151,14 +151,14 @@ export default {
         >
         </zp-button>
       </el-button-group>
-      <el-button-group>
+      <!-- <el-button-group>
         <dc-button
           :size="size"
           :page="page"
           :data="params"
           @success="useQuery(params, page)"
         ></dc-button>
-      </el-button-group>
+      </el-button-group> -->
     </div>
     <el-super-table
       v-model="tableData"

src/views/purchase/transferOrder/add.vue

@@ -1531,6 +1531,8 @@ export default {
       this.getDetails(this.row);
       this.isDRCk = false;
       this.isDCCk = false;
+    } else if (this.pageStu == "add") {
+      this.loading = false
     }
   },
   methods: {