Merge branch 'dev_NEW_pro' of http://114.132.189.42:9002/r/product-inventor...

huminmin

3 天以前 18dba31d39dcb701c16979ed3f607767dbdae80f

Merge branch 'dev_NEW_pro' of http://114.132.189.42:9002/r/product-inventory-management into dev_NEW_pro

 src/views/inventoryManagement/stockManagement/Record.vue

@@ -46,7 +46,7 @@
          </el-col>
        </el-row>
      </el-form>
      <div>
      <div style="display: flex; gap: 10px; flex-wrap: nowrap;">
        <el-button type="primary"
                   @click="isShowNewModal = true">新增库存</el-button>
        <el-button type="info"

 src/views/procurementManagement/procurementLedger/index.vue

@@ -221,7 +221,7 @@
            <el-button link
                       type="primary"
                       @click="openForm('edit', scope.row)"
                       :disabled="scope.row.stockInStatus === '完全入库'">编辑
                       :disabled="scope.row.approvalStatus === 3">编辑
            </el-button>
            <el-button link
                       type="primary"