Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -45,8 +45,11 @@
       <el-table-column prop="deductWeight" label="扣重比"></el-table-column>
       <el-table-column prop="saleLimit" label="销量上限(吨/年)"></el-table-column>
       <el-table-column prop="dryGrainPrice" label="干粮收购价"></el-table-column>
-      <el-table-column prop="approveStatus" label="状态">
-        
+      <el-table-column label="状态">
+        <template scope="scope">
+          <span v-if="scope.row.approveStatus">{{ scope.row.approveStatus }}</span>
+          <span v-else>{{ scope.row.status }}</span>
+        </template>
       </el-table-column>
       <el-table-column prop="updateDate" label="通过时间"></el-table-column>
       <el-table-column label="操作" width="500">

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -1072,6 +1072,7 @@ export default {
         // 货名
         getinspectLookGoods({
           warehouseId: this.cangid,
+          flag: '1',
         }).toPromise()
           .then((response) => {
             this.purchasePriceList = response

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -146,7 +146,7 @@
 
             <span class="corles" v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.delete`
-              " v-if="!scope.row.approveStatus" @click="deleteclick(scope.row)">删除</span>
+              " v-if="!scope.row.approveStatus&&scope.row.completedQuantity== '0'" @click="deleteclick(scope.row)">删除</span>
           </template>
         </el-table-column>
       </el-table>