Merge branch 'dev' into 'purchaseDev'

Dev

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

src/components/popover-select-v2/index.vue

@@ -280,7 +280,8 @@ export default {
               </el-input>
             </el-form-item>
             <el-form-item>
-              <el-button icon="el-icon-refresh" @click="useReset"></el-button>
+              <el-button icon="el-icon-search" @click="useQuery">搜索</el-button>
+              <el-button icon="el-icon-refresh" @click="useReset">重置</el-button>
             </el-form-item>
           </div>
         </el-form>

src/views/purchase/DemandSummary/add.vue

@@ -291,7 +291,9 @@ export default {
       }).then(() => {
         this.loading = false
         this.tableList.forEach(item => {
-          item.puQtyRes = parseInt(item.puQtyRes)
+          if(item.puQtyRes) {
+            item.puQtyRes = parseFloat(item.puQtyRes).toFixed(0)
+          }
         })
       }).catch(err => {
         this.loading = false